flake: Add libs

2026-06-10 07:13:38 +00:00 · 2025-06-02 13:08:36 +02:00
519 changed files with 5320 additions and 9273 deletions
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -11,7 +11,6 @@ on:

 permissions:
  contents: read
-  issues: write
  pull-requests: write

 jobs:
@@ -50,13 +49,13 @@ jobs:

      - name: "Add 'has: port to stable' label"
        if: steps.backport.outputs.created_pull_numbers != ''
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          # Not using the app on purpose to avoid triggering another workflow run after adding this label.
-          script: |
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number,
-              labels: [ '8.has: port to stable' ]
-            })
+        env:
+          # Not the app on purpose to avoid triggering another workflow run after adding this label
+          GH_TOKEN: ${{ github.token }}
+          REPOSITORY: ${{ github.repository }}
+          NUMBER: ${{ github.event.number }}
+        run: |
+          gh api \
+            --method POST \
+            /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
+            -f "labels[]=8.has: port to stable"
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -10,12 +10,7 @@ on:
      - 'staging-**'
      - '!staging-next'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions:
-  pull-requests: write
+permissions: {}

 jobs:
  check:
@@ -29,108 +24,8 @@ jobs:
          path: trusted

      - name: Check cherry-picks
-        id: check
-        continue-on-error: true
        env:
          BASE_SHA: ${{ github.event.pull_request.base.sha }}
          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
        run: |
-          ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" checked-cherry-picks.md
-
-      - name: Prepare review
-        if: steps.check.outcome == 'failure'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { readFile, writeFile } = require('node:fs/promises')
-
-            const job_url = (await github.rest.actions.listJobsForWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: context.runId
-            })).data.jobs[0].html_url + '?pr=' + context.payload.pull_request.number
-
-            const header = await readFile('trusted/ci/check-cherry-picks.md')
-            const body = await readFile('checked-cherry-picks.md')
-            const footer =
-              `\n_Hint: The full diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`
-
-            const review = header + body + footer
-            await writeFile('review.md', review)
-            core.summary.addRaw(review)
-            core.summary.write()
-
-      - name: Request changes
-        if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'failure' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { readFile } = require('node:fs/promises')
-            const body = await readFile('review.md', 'utf-8')
-
-            const pendingReview = (await github.paginate(github.rest.pulls.listReviews, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.number
-            })).find(review =>
-              review.user.login == 'github-actions[bot]' && (
-                // If a review is still pending, we can just update this instead
-                // of posting a new one.
-                review.state == 'CHANGES_REQUESTED' ||
-                // No need to post a new review, if an older one with the exact
-                // same content had already been dismissed.
-                review.body == body
-              )
-            )
-
-            // Either of those two requests could fail for very long comments. This can only happen
-            // with multiple commits all hitting the truncation limit for the diff. If you ever hit
-            // this case, consider just splitting up those commits into multiple PRs.
-            if (pendingReview) {
-              await github.rest.pulls.updateReview({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number,
-                review_id: pendingReview.id,
-                body
-              })
-            } else {
-              await github.rest.pulls.createReview({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number,
-                event: 'REQUEST_CHANGES',
-                body
-              })
-            }
-
-      - name: Dismiss old reviews
-        if: ${{ github.event_name == 'pull_request_target' && steps.check.outcome == 'success' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            await Promise.all(
-              (await github.paginate(github.rest.pulls.listReviews, {
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number
-              })).filter(review =>
-                review.user.login == 'github-actions[bot]' &&
-                review.state == 'CHANGES_REQUESTED'
-              ).map(async (review) => {
-                await github.rest.pulls.dismissReview({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  pull_number: context.payload.pull_request.number,
-                  review_id: review.id,
-                  message: 'All cherry-picks are good now, thank you!'
-                })
-                await github.graphql(`mutation($node_id:ID!) {
-                  minimizeComment(input: {
-                    classifier: RESOLVED,
-                    subjectId: $node_id
-                  })
-                  { clientMutationId }
-                }`, { node_id: review.node_id })
-              })
-            )
+          ./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -6,10 +6,6 @@ on:
      - .github/workflows/check-format.yml
  pull_request_target:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -9,10 +9,6 @@ on:
      - 'shell.nix'
      - 'ci/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -29,10 +29,6 @@ on:
  pull_request_target:
    types: [opened, ready_for_review, synchronize, reopened]

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 env:
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -1,30 +0,0 @@
-name: Dismissed Review
-
-on:
-  pull_request_review:
-    types: [dismissed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  # The check-cherry-picks workflow creates review comments,
-  # that should sometimes be manually dismissed.
-  # When a CI-generated review is dismissed, this job automatically
-  # minimizes it, to prevent it from cluttering the PR.
-  minimize:
-    name: Minimize as resolved
-    if: github.event.review.user.login == 'github-actions[bot]'
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            await github.graphql(`mutation($node_id:ID!) {
-              minimizeComment(input: {
-                classifier: RESOLVED,
-                subjectId: $node_id
-              })
-              { clientMutationId }
-            }`, { node_id: context.payload.review.node_id })
-
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -16,10 +16,6 @@ on:
  pull_request_target:
    types: [edited]

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
@@ -38,17 +34,16 @@ jobs:
          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
          permission-pull-requests: write

-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.app-token.outputs.token }}
-          script: |
-            function changeState(state) {
-              return github.rest.pulls.update({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number,
-                state
-              })
-            }
-            await changeState('closed')
-            await changeState('open')
+      - env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          REPOSITORY: ${{ github.repository }}
+          NUMBER: ${{ github.event.number }}
+        run: |
+          gh api \
+            --method PATCH \
+            /repos/"$REPOSITORY"/pulls/"$NUMBER" \
+            -f "state=closed"
+          gh api \
+            --method PATCH \
+            /repos/"$REPOSITORY"/pulls/"$NUMBER" \
+            -f "state=open"
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -6,10 +6,6 @@ on:
      - .github/workflows/eval-aliases.yml
  pull_request_target:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -16,10 +16,6 @@ on:
      - haskell-updates
      - python-updates

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
@@ -91,43 +87,44 @@ jobs:
      - name: Get target run id
        if: needs.prepare.outputs.targetSha
        id: targetRunId
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        env:
+          GH_TOKEN: ${{ github.token }}
          MATRIX_SYSTEM: ${{ matrix.system }}
+          REPOSITORY: ${{ github.repository }}
          TARGET_SHA: ${{ needs.prepare.outputs.targetSha }}
-        with:
-          script: |
-            const system = process.env.MATRIX_SYSTEM
-            const targetSha = process.env.TARGET_SHA
+        run: |
+          # Get the latest eval.yml workflow run for the PR's target commit
+          if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
+            -f head_sha="$TARGET_SHA" -f event=push \
+            --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
+            || [[ -z "$run" ]]; then
+            echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
+            exit 1
+          fi
+          echo "Comparing against $(jq .html_url <<< "$run")"
+          runId=$(jq .id <<< "$run")

-            let run_id
-            try {
-              run_id = (await github.rest.actions.listWorkflowRuns({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                workflow_id: 'eval.yml',
-                event: 'push',
-                head_sha: targetSha
-              })).data.workflow_runs[0].id
-            } catch {
-              throw new Error(`Could not find an eval.yml workflow run for ${targetSha}.`)
-            }
+          if ! job=$(gh api --method GET /repos/"$REPOSITORY"/actions/runs/"$runId"/jobs \
+            --jq ".jobs[] | select (.name == \"Outpaths ($MATRIX_SYSTEM)\")") \
+            || [[ -z "$job" ]]; then
+            echo "Could not find the Outpaths ($MATRIX_SYSTEM) job for workflow run $runId, cannot make comparison"
+            exit 1
+          fi
+          jobId=$(jq .id <<< "$job")
+          conclusion=$(jq -r .conclusion <<< "$job")

-            core.setOutput('targetRunId', run_id)
+          while [[ "$conclusion" == null || "$conclusion" == "" ]]; do
+            echo "Job not done, waiting 10 seconds before checking again"
+            sleep 10
+            conclusion=$(gh api /repos/"$REPOSITORY"/actions/jobs/"$jobId" --jq '.conclusion')
+          done

-            // Waiting 120 * 5 sec = 10 min. max.
-            // 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: `merged-${system}`
-              })
-              if (result.data.total_count > 0) return
-              await new Promise(resolve => setTimeout(resolve, 5000))
-            }
-            throw new Error(`No merged-${system} artifact found.`)
+          if [[ "$conclusion" != "success" ]]; then
+            echo "Job was not successful (conclusion: $conclusion), cannot make comparison"
+            exit 1
+          fi
+
+          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"

      - uses: actions/download-artifact@v4
        if: steps.targetRunId.outputs.targetRunId
@@ -215,75 +212,57 @@ jobs:

      - name: Labelling pull request
        if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { readFile } = require('node:fs/promises')
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPOSITORY: ${{ github.repository }}
+          NUMBER: ${{ github.event.number }}
+        run: |
+          # Get all currently set labels that we manage
+          gh api \
+            /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
+            --jq '.[].name | select(startswith("10.rebuild") or . == "11.by: package-maintainer")' \
+            | sort > before

-            const pr = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number
-            }
+          # And the labels that should be there
+          jq -r '.labels[]' comparison/changed-paths.json \
+            | sort > after

-            // Get all currently set labels that we manage
-            const before =
-              (await github.paginate(github.rest.issues.listLabelsOnIssue, pr))
-              .map(({ name }) => name)
-              .filter(name => name.startsWith('10.rebuild') || name == '11.by: package-maintainer')
+          # Remove the ones not needed anymore
+          while read -r toRemove; do
+            echo "Removing label $toRemove"
+            gh api \
+              --method DELETE \
+              /repos/"$REPOSITORY"/issues/"$NUMBER"/labels/"$toRemove"
+          done < <(comm -23 before after)

-            // And the labels that should be there
-            const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
-
-            // Remove the ones not needed anymore
-            await Promise.all(
-              before.filter(name => !after.includes(name))
-              .map(name => github.rest.issues.removeLabel({
-                ...pr,
-                name
-              }))
-            )
-
-            // And add the ones that aren't set already
-            const added = after.filter(name => !before.includes(name))
-            if (added.length > 0) {
-              await github.rest.issues.addLabels({
-                ...pr,
-                labels: added
-              })
-            }
+          # And add the ones that aren't set already
+          while read -r toAdd; do
+            echo "Adding label $toAdd"
+            gh api \
+              --method POST \
+              /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
+              -f "labels[]=$toAdd"
+          done < <(comm -13 before after)

      - name: Add eval summary to commit statuses
        if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { readFile } = require('node:fs/promises')
-            const changed = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8'))
-            const description =
-              'Package: ' + [
-                `added ${changed.attrdiff.added.length}`,
-                `removed ${changed.attrdiff.removed.length}`,
-                `changed ${changed.attrdiff.changed.length}`
-              ].join(', ') +
-              ' — Rebuild: ' + [
-                `linux ${changed.rebuildCountByKernel.linux}`,
-                `darwin ${changed.rebuildCountByKernel.darwin}`
-              ].join(', ')
-
-            const { serverUrl, repo, runId, payload } = context
-            const target_url =
-              `${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}?pr=${payload.pull_request.number}`
-
-            await github.rest.repos.createCommitStatus({
-              owner: repo.owner,
-              repo: repo.repo,
-              sha: payload.pull_request.head.sha,
-              context: 'Eval / Summary',
-              state: 'success',
-              description,
-              target_url
-            })
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          NUMBER: ${{ github.event.number }}
+        run: |
+          description=$(jq -r '
+          "Package: added " + (.attrdiff.added | length | tostring) +
+          ", removed " + (.attrdiff.removed | length | tostring) +
+          ", changed " + (.attrdiff.changed | length | tostring) +
+          ", Rebuild: linux " + (.rebuildCountByKernel.linux | tostring) +
+          ", darwin " + (.rebuildCountByKernel.darwin | tostring)
+          ' <comparison/changed-paths.json)
+          target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID?pr=$NUMBER"
+          gh api --method POST \
+            -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \
+            "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \
+            -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url"

  reviewers:
    name: Reviewers
@@ -294,5 +273,3 @@ jobs:
    if: needs.prepare.outputs.targetSha
    uses: ./.github/workflows/reviewers.yml
    secrets: inherit
-    with:
-      caller: ${{ github.workflow }}
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -8,10 +8,6 @@ name: "Label PR"
 on:
  pull_request_target:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions:
  contents: read
  issues: write # needed to create *new* labels
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -9,10 +9,6 @@ on:
      - 'lib/**'
      - 'maintainers/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -7,7 +7,6 @@ on:
  pull_request_target:
    branches:
      - master
-      - release-*
    paths:
      - "nixos/**"
      # Also build when the nixpkgs doc changed, since we take things like
@@ -18,10 +17,6 @@ on:
      # Since the lib functions are used to 'massage' the options before producing the manual
      - "lib/**"

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
@@ -57,7 +52,7 @@ jobs:

      - name: Build NixOS manual
        id: build-manual
-        run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}
+        run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}

      - name: Upload NixOS manual
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -10,10 +10,6 @@ on:
      - 'lib/**'
      - 'pkgs/by-name/ni/nixdoc/**'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -6,10 +6,6 @@ on:
      - .github/workflows/nix-parse-v2.yml
  pull_request_target:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 jobs:
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -11,10 +11,6 @@ on:
      - .github/workflows/nixpkgs-vet.yml
  pull_request_target:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions: {}

 # We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -10,15 +10,6 @@ on:
  pull_request_target:
    types: [ready_for_review]
  workflow_call:
-    inputs:
-      caller:
-        description: Name of the calling workflow.
-        required: true
-        type: string
-
-concurrency:
-  group: ${{ inputs.caller }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true

 permissions: {}

--- a/ci/check-cherry-picks.md
+++ b/ci/check-cherry-picks.md
@@ -1,7 +0,0 @@
-This report is automatically generated by the `check-cherry-picks` CI workflow.
-
-Some of the commits in this PR have not been cherry-picked exactly and require the author's and reviewer's attention.
-
-Please make sure to follow the [backporting guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-backport-pull-requests) and cherry-pick with the `-x` flag. This requires changes to go to the unstable branches (`master` / `staging`) first, before backporting them.
-
-Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable. If you need to merge this PR despite the warnings, please [dismiss](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review) this review.
--- a/ci/check-cherry-picks.sh
+++ b/ci/check-cherry-picks.sh
@@ -1,16 +1,13 @@
 #!/usr/bin/env bash
 # Find alleged cherry-picks

-set -euo pipefail
+set -eo pipefail

-if [[ $# != "2" && $# != "3" ]] ; then
-  echo "usage: check-cherry-picks.sh base_rev head_rev [markdown_file]"
+if [ $# != "2" ] ; then
+  echo "usage: check-cherry-picks.sh base_rev head_rev"
  exit 2
 fi

-markdown_file="$(realpath ${3:-/dev/null})"
-[ -v 3 ] && rm -f "$markdown_file"
-
 # Make sure we are inside the nixpkgs repo, even when called from outside
 cd "$(dirname "${BASH_SOURCE[0]}")"

@@ -22,43 +19,11 @@ remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"

 commits="$(git rev-list --reverse "$1..$2")"

-log() {
-  type="$1"
-  shift 1
-
-  local -A prefix
-  prefix[success]="  ✔ "
-  if [ -v GITHUB_ACTIONS ]; then
-    prefix[warning]="::warning::"
-    prefix[error]="::error::"
-  else
-    prefix[warning]="  ⚠ "
-    prefix[error]="  ✘ "
-  fi
-
-  echo "${prefix[$type]}$@"
-
-  # Only logging errors and warnings, which allows comparing the markdown file
-  # between pushes to the PR. Even if a new, proper cherry-pick, commit is added
-  # it won't change the markdown file's content and thus not trigger another comment.
-  if [ "$type" != "success" ]; then
-    local -A alert
-    alert[warning]="WARNING"
-    alert[error]="CAUTION"
-    echo >> $markdown_file
-    echo "> [!${alert[$type]}]" >> $markdown_file
-    echo "> $@" >> $markdown_file
-  fi
-}
-
-endgroup() {
-  if [ -v GITHUB_ACTIONS ] ; then
-    echo ::endgroup::
-  fi
-}
-
 while read -r new_commit_sha ; do
-  if [ -v GITHUB_ACTIONS ] ; then
+  if [ -z "$new_commit_sha" ] ; then
+    continue  # skip empty lines
+  fi
+  if [ "$GITHUB_ACTIONS" = 'true' ] ; then
    echo "::group::Commit $new_commit_sha"
  else
    echo "================================================="
@@ -72,8 +37,15 @@ while read -r new_commit_sha ; do
    | grep -Eoi -m1 '[0-9a-f]{40}' || true
  )
  if [ -z "$original_commit_sha" ] ; then
-    endgroup
-    log warning "Couldn't locate original commit hash in message of $new_commit_sha."
+    if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+      echo ::endgroup::
+      echo -n "::error ::"
+    else
+      echo -n "  ✘ "
+    fi
+    echo "Couldn't locate original commit hash in message"
+    echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
+      "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
    problem=1
    continue
  fi
@@ -93,6 +65,8 @@ while read -r new_commit_sha ; do

    while read -r picked_branch ; do
      if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
+        echo "  ✔ $original_commit_sha present in branch $picked_branch"
+
        range_diff_common='git --no-pager range-diff
          --no-notes
          --creation-factor=100
@@ -101,38 +75,23 @@ while read -r new_commit_sha ; do
        '

        if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
-          log success "$original_commit_sha present in branch $picked_branch"
-          endgroup
-          log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection."
-
-          # First line contains commit SHAs, which we already printed.
-          $range_diff_common --color | tail -n +2
-
-          echo -e "> <details><summary>Show diff</summary>\n>" >> $markdown_file
-          echo '> ```diff' >> $markdown_file
-          # The output of `git range-diff` is indented with 4 spaces, which we need to match with the
-          # code blocks indent to get proper syntax highlighting on GitHub.
-          diff="$($range_diff_common | tail -n +2 | sed -Ee 's/^ {4}/> /g')"
-          # Also limit the output to 10k bytes (and remove the last, potentially incomplete line), because
-          # GitHub comments are limited in length. The value of 10k is arbitrary with the assumption, that
-          # after the range-diff becomes a certain size, a reviewer is better off reviewing the regular diff
-          # in GitHub's UI anyway, thus treating the commit as "new" and not cherry-picked.
-          # Note: This could still lead to a too lengthy comment with multiple commits touching the limit. We
-          # consider this too unlikely to happen, to deal with explicitly.
-          max_length=10000
-          if [ "${#diff}" -gt $max_length ]; then
-            printf -v diff "%s\n\n[...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)"
+          if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+            echo ::endgroup::
+            echo -n "::warning ::"
+          else
+            echo -n "  ⚠ "
          fi
-          echo "$diff" >> $markdown_file
-          echo '> ```' >> $markdown_file
-          echo "> </details>" >> $markdown_file
+          echo "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:"

+          $range_diff_common --color
+
+          echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
+            "be drawn to it and github actions have no way of doing that but to raise a 'failure'"
          problem=1
        else
-          log success "$original_commit_sha present in branch $picked_branch"
-          log success "$original_commit_sha highly similar to $new_commit_sha"
+          echo "  ✔ $original_commit_sha highly similar to $new_commit_sha"
          $range_diff_common --color
-          endgroup
+          [ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
        fi

        # move on to next commit
@@ -141,8 +100,13 @@ while read -r new_commit_sha ; do
    done <<< "$branches"
  done

-  endgroup
-  log error "$original_commit_sha given in $new_commit_sha not found in any pickable branch."
+  if [ "$GITHUB_ACTIONS" = 'true' ] ; then
+    echo ::endgroup::
+    echo -n "::error ::"
+  else
+    echo -n "  ✘ "
+  fi
+  echo "$original_commit_sha not found in any pickable branch"

  problem=1
 done <<< "$commits"
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -173,12 +173,7 @@ runCommand "compare"
      } >> $out/step-summary.md
    fi

-    {
-      echo
-      echo "# Packages"
-      echo
-      jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
-    } >> $out/step-summary.md
+    jq -r -f ${./generate-step-summary.jq} < ${changed-paths} >> $out/step-summary.md

    cp "$maintainersPath" "$out/maintainers.json"
  ''
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@@ -35,7 +35,6 @@ python.section.md
 scons.section.md
 tauri.section.md
 tetex-tex-live.section.md
-udevCheckHook.section.md
 unzip.section.md
 validatePkgConfig.section.md
 versionCheckHook.section.md
--- a/doc/hooks/udevCheckHook.section.md
+++ b/doc/hooks/udevCheckHook.section.md
@@ -1,36 +0,0 @@
-# udevCheckHook {#udevcheckhook}
-
-The `udevCheckHook` derivation adds `udevCheckPhase` to the [`preInstallCheckHooks`](#ssec-installCheck-phase),
-which finds all udev rules in all outputs and verifies them using `udevadm verify --resolve-names=never --no-style`.
-It should be used in any package that has udev rules outputs to ensure the rules are and stay valid.
-
-The hook runs in `installCheckPhase`, requiring `doInstallCheck` is enabled for the hook to take effect:
-```nix
-{
-  lib,
-  stdenv,
-  udevCheckHook,
-# ...
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  # ...
-
-  nativeInstallCheckInputs = [
-    udevCheckHook
-  ];
-  doInstallCheck = true;
-
-  # ...
-})
-```
-Note that for [`buildPythonPackage`](#buildpythonpackage-function) and [`buildPythonApplication`](#buildpythonapplication-function), `doInstallCheck` is enabled by default.
-
-All outputs are scanned for their `/{etc,lib}/udev/rules.d` paths.
-If no rule output is found, the hook is basically a no-op.
-
-The `udevCheckHook` adds a dependency on `systemdMinimal`.
-It is internally guarded behind `hostPlatform` supporting udev and `buildPlatform` being able to execute `udevadm`.
-The hook does not need explicit platform checks in the places where it is used.
-
-The hook can be disabled using `dontUdevCheck`, which is necessary if you want to run some different task in `installCheckPhase` on a package with broken udev rule outputs.
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -2429,9 +2429,6 @@
  "tetex-tex-live": [
    "index.html#tetex-tex-live"
  ],
-  "udevcheckhook": [
-    "index.html#udevcheckhook"
-  ],
  "unzip": [
    "index.html#unzip"
  ],
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,24 @@
      );
    in
    {
+      /**
+        The Nixpkgs repository/flake houses multiple components that provide functions.
+
+        These include the Nixpkgs `lib` library, with a larger number of functions for various purposes, as well as the `nixpkgs` (TBD) and `nixos` libraries whose main purpose is to provide configurability for those respective components.
+       */
+      # This attribute set is intentionally not extensible. Its purpose is not dependency injection.
+      libs = {
+        /**
+          [The Nixpkgs library](https://nixos.org/manual/nixpkgs/unstable/#id-1.4)
+         */
+        lib = import ./lib;
+
+        /**
+          Entrypoints into [NixOS](https://nixos.org/manual/nixos/unstable/), including [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos).
+        */
+        nixos = import ./nixos/lib { };
+      };
+
      /**
        `nixpkgs.lib` is a combination of the [Nixpkgs library](https://nixos.org/manual/nixpkgs/unstable/#id-1.4), and other attributes
        that are _not_ part of the Nixpkgs library, but part of the Nixpkgs flake:
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1166,12 +1166,6 @@
    githubId = 2335822;
    name = "Alexandre Esteves";
  };
-  alexnabokikh = {
-    email = "nabokikh@duck.com";
-    github = "alexnabokikh";
-    githubId = 42908293;
-    name = "Alex Nabokikh";
-  };
  alexnortung = {
    name = "alexnortung";
    email = "alex_nortung@live.dk";
@@ -1337,6 +1331,13 @@
    githubId = 9567176;
    name = "Alexis Simon";
  };
+  alyaeanyx = {
+    email = "alyaeanyx@mailbox.org";
+    github = "alyaeanyx";
+    githubId = 74795488;
+    name = "alyaeanyx";
+    keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ];
+  };
  amadaluzia = {
    email = "amad@atl.tools";
    github = "amadaluzia";
@@ -6876,12 +6877,6 @@
    githubId = 7389000;
    name = "Dominic Wrege";
  };
-  dwt = {
-    email = "spamfaenger@gmx.de";
-    github = "dwt";
-    githubId = 57199;
-    name = "Martin Häcker";
-  };
  dxf = {
    email = "dingxiangfei2009@gmail.com";
    github = "dingxiangfei2009";
@@ -19164,13 +19159,6 @@
    githubId = 13225611;
    name = "Nicolas Martin";
  };
-  pentane = {
-    email = "cyclopentane@aidoskyneen.eu";
-    github = "cyclic-pentane";
-    githubId = 74795488;
-    name = "pentane";
-    keys = [ { fingerprint = "4231 75F6 8360 68C8 2ACB AEDA 63F4 EC2F FE55 0874"; } ];
-  };
  perchun = {
    name = "Perchun Pak";
    email = "nixpkgs@perchun.it";
@@ -26270,6 +26258,14 @@
    githubId = 230381;
    name = "Daniel Nilsson";
  };
+  vrifox = {
+    email = "vrifox@vrifox.cc";
+    github = "vrifox";
+    githubId = 109021367;
+    keys = [ { fingerprint = "413C 73F0 C5BD 6318 826A  42D9 D400 98E5 B60B 2197"; } ];
+    matrix = "@vri:cozy.town";
+    name = "Vri";
+  };
  vrinek = {
    email = "vrinek@hey.com";
    github = "vrinek";
@@ -27110,12 +27106,6 @@
    githubId = 99486674;
    name = "山下";
  };
-  yanek = {
-    name = "Noé Ksiazek";
-    email = "noe.ksiazek@pm.me";
-    github = "yanek";
-    githubId = 5952366;
-  };
  yanganto = {
    name = "Antonio Yang";
    email = "yanganto@gmail.com";
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -8,7 +8,6 @@
  baseOptionsJSON ? null,
  warningsAreErrors ? true,
  prefix ? ../../..,
-  checkRedirects ? true,
 }:

 let
@@ -147,7 +146,7 @@ rec {

        nixos-render-docs -j $NIX_BUILD_CORES manual html \
          --manpage-urls ${manpageUrls} \
-          ${if checkRedirects then "--redirects ${./redirects.json}" else ""} \
+          --redirects ${./redirects.json} \
          --revision ${escapeShellArg revision} \
          --generator "nixos-render-docs ${pkgs.lib.version}" \
          --stylesheet style.css \
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -11,7 +11,6 @@
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

 - [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).

 - [FileBrowser](https://filebrowser.org/), a web application for managing and sharing files. Available as [services.filebrowser](#opt-services.filebrowser.enable).

--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -69,7 +69,6 @@ let
    version = config.system.nixos.release;
    revision = "release-${version}";
    extraSources = cfg.nixos.extraModuleSources;
-    checkRedirects = cfg.nixos.checkRedirects;
    options =
      let
        scrubbedEval = evalModules {
@@ -354,14 +353,6 @@ in
        '';
      };

-      nixos.checkRedirects = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Check redirects for manualHTML.
-        '';
-      };
-
    };

  };
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -180,7 +180,6 @@
  ./programs/cdemu.nix
  ./programs/cfs-zen-tweaks.nix
  ./programs/chromium.nix
-  ./programs/chrysalis.nix
  ./programs/clash-verge.nix
  ./programs/cnping.nix
  ./programs/command-not-found/command-not-found.nix
@@ -262,7 +261,6 @@
  ./programs/nano.nix
  ./programs/nautilus-open-any-terminal.nix
  ./programs/nbd.nix
-  ./programs/nekoray.nix
  ./programs/neovim.nix
  ./programs/nethoscope.nix
  ./programs/nexttrace.nix
--- a/nixos/modules/programs/chrysalis.nix
+++ b/nixos/modules/programs/chrysalis.nix
@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.programs.chrysalis;
-in
-{
-  options = {
-    programs.chrysalis = {
-      enable = lib.mkEnableOption "Chrysalis";
-      package = lib.mkPackageOption pkgs "Chrysalis" { default = "chrysalis"; };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
-    services.udev.packages = [ cfg.package ];
-  };
-
-  meta.maintainers = with lib.maintainers; [ atalii ];
-}
--- a/nixos/modules/programs/nekoray.nix
+++ b/nixos/modules/programs/nekoray.nix
@@ -1,90 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  cfg = config.programs.nekoray;
-in
-{
-  options = {
-    programs.nekoray = {
-      enable = lib.mkEnableOption "nekoray, a GUI proxy configuration manager";
-
-      package = lib.mkPackageOption pkgs "nekoray" { };
-
-      tunMode = {
-        enable = lib.mkEnableOption "TUN mode of nekoray";
-
-        setuid = lib.mkEnableOption ''
-          setting suid bit for nekobox_core to run as root, which is less
-          secure than default setcap method but closer to upstream assumptions.
-          Enable this if you find the default setcap method configured in
-          this module doesn't work for you
-        '';
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
-
-    security.wrappers.nekobox_core = lib.mkIf cfg.tunMode.enable {
-      source = "${cfg.package}/share/nekoray/nekobox_core";
-      owner = "root";
-      group = "root";
-      setuid = lib.mkIf cfg.tunMode.setuid true;
-      # Taken from https://github.com/SagerNet/sing-box/blob/dev-next/release/config/sing-box.service
-      capabilities = lib.mkIf (
-        !cfg.tunMode.setuid
-      ) "cap_net_admin,cap_net_raw,cap_net_bind_service,cap_sys_ptrace,cap_dac_read_search+ep";
-    };
-
-    # avoid resolvectl password prompt popping up three times
-    # https://github.com/SagerNet/sing-tun/blob/0686f8c4f210f4e7039c352d42d762252f9d9cf5/tun_linux.go#L1062
-    # We use a hack here to determine whether the requested process is nekobox_core
-    # Detect whether its capabilities contain at least `net_admin` and `net_raw`.
-    # This does not reduce security, as we can already bypass `resolved` with them.
-    # Alternatives to consider:
-    # 1. Use suid to execute as a specific user, and check username with polkit.
-    #    However, NixOS module doesn't let us to set setuid and capabilities at the
-    #    same time, and it's tricky to make both work together because of some security
-    #    considerations in the kernel.
-    # 2. Check cmdline to get executable path. This is insecure because the process can
-    #    change its own cmdline. `/proc/<pid>/exe` is reliable but kernel forbids
-    #    checking that entry of process from different users, and polkit runs `spawn`
-    #    as an unprivileged user.
-    # 3. Put nekobox_core into a systemd service, and let polkit check service name.
-    #    This is the most secure and convenient way but requires heavy modification
-    #    to nekoray source code. Would be good to let upstream support that eventually.
-    security.polkit.extraConfig =
-      lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable)
-        ''
-          polkit.addRule(function(action, subject) {
-            const allowedActionIds = [
-              "org.freedesktop.resolve1.set-domains",
-              "org.freedesktop.resolve1.set-default-route",
-              "org.freedesktop.resolve1.set-dns-servers"
-            ];
-
-            if (allowedActionIds.indexOf(action.id) !== -1) {
-              try {
-                var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim();
-                var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim();
-                if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) {
-                  return polkit.Result.YES;
-                } else {
-                  return polkit.Result.NOT_HANDLED;
-                }
-              } catch (e) {
-                return polkit.Result.NOT_HANDLED;
-              }
-            }
-          })
-        '';
-  };
-
-  meta.maintainers = with lib.maintainers; [ aleksana ];
-}
--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -7,39 +7,11 @@
  config,
  lib,
  pkgs,
-  utils,
  ...
 }:

 let
  cfg = config.services.desktopManager.cosmic;
-  excludedCorePkgs = lib.lists.intersectLists corePkgs config.environment.cosmic.excludePackages;
-  # **ONLY ADD PACKAGES WITHOUT WHICH COSMIC CRASHES, NOTHING ELSE**
-  corePkgs =
-    with pkgs;
-    [
-      cosmic-applets
-      cosmic-applibrary
-      cosmic-bg
-      cosmic-comp
-      cosmic-files
-      config.services.displayManager.cosmic-greeter.package
-      cosmic-idle
-      cosmic-launcher
-      cosmic-notifications
-      cosmic-osd
-      cosmic-panel
-      cosmic-session
-      cosmic-settings
-      cosmic-settings-daemon
-      cosmic-workspaces-epoch
-    ]
-    ++ lib.optionals cfg.xwayland.enable [
-      # Why would you want to enable XWayland but exclude the package
-      # providing XWayland support? Doesn't make sense. Add `xwayland` to the
-      # `corePkgs` list.
-      xwayland
-    ];
 in
 {
  meta.maintainers = lib.teams.cosmic.members;
@@ -48,21 +20,10 @@ in
    services.desktopManager.cosmic = {
      enable = lib.mkEnableOption "Enable the COSMIC desktop environment";

-      showExcludedPkgsWarning = lib.mkEnableOption "Disable the warning for excluding core packages." // {
-        default = true;
-      };
-
      xwayland.enable = lib.mkEnableOption "Xwayland support for the COSMIC compositor" // {
        default = true;
      };
    };
-
-    environment.cosmic.excludePackages = lib.mkOption {
-      description = "List of packages to exclude from the COSMIC environment.";
-      type = lib.types.listOf lib.types.package;
-      default = [ ];
-      example = lib.literalExpression "[ pkgs.cosmic-player ]";
-    };
  };

  config = lib.mkIf cfg.enable {
@@ -71,32 +32,45 @@ in
      "/share/backgrounds"
      "/share/cosmic"
    ];
-    environment.systemPackages = utils.removePackagesByName (
-      corePkgs
-      ++ (
-        with pkgs;
-        [
-          adwaita-icon-theme
-          alsa-utils
-          cosmic-edit
-          cosmic-icons
-          cosmic-player
-          cosmic-randr
-          cosmic-screenshot
-          cosmic-term
-          cosmic-wallpapers
-          hicolor-icon-theme
-          playerctl
-          pop-icon-theme
-          pop-launcher
-          xdg-user-dirs
-        ]
-        ++ lib.optionals config.services.flatpak.enable [
-          # User may have Flatpaks enabled but might not want the `cosmic-store` package.
-          cosmic-store
-        ]
-      )
-    ) config.environment.cosmic.excludePackages;
+    environment.systemPackages =
+      with pkgs;
+      [
+        adwaita-icon-theme
+        alsa-utils
+        cosmic-applets
+        cosmic-applibrary
+        cosmic-bg
+        cosmic-comp
+        cosmic-edit
+        cosmic-files
+        config.services.displayManager.cosmic-greeter.package
+        cosmic-icons
+        cosmic-idle
+        cosmic-launcher
+        cosmic-notifications
+        cosmic-osd
+        cosmic-panel
+        cosmic-player
+        cosmic-randr
+        cosmic-screenshot
+        cosmic-session
+        cosmic-settings
+        cosmic-settings-daemon
+        cosmic-term
+        cosmic-wallpapers
+        cosmic-workspaces-epoch
+        hicolor-icon-theme
+        playerctl
+        pop-icon-theme
+        pop-launcher
+        xdg-user-dirs
+      ]
+      ++ lib.optionals cfg.xwayland.enable [
+        xwayland
+      ]
+      ++ lib.optionals config.services.flatpak.enable [
+        cosmic-store
+      ];

    # Distro-wide defaults for graphical sessions
    services.graphical-desktop.enable = true;
@@ -157,22 +131,5 @@ in
    services.power-profiles-daemon.enable = lib.mkDefault (
      !config.hardware.system76.power-daemon.enable
    );
-
-    warnings = lib.optionals (cfg.showExcludedPkgsWarning && excludedCorePkgs != [ ]) [
-      ''
-        The `environment.cosmic.excludePackages` option was used to exclude some
-        packages from the environment which also includes some packages that the
-        maintainers of the COSMIC DE deem necessary for the COSMIC DE to start
-        and initialize. Excluding said packages creates a high probability that
-        the COSMIC DE will fail to initialize properly, or completely. This is an
-        unsupported use case. If this was not intentional, please assign an empty
-        list to the `environment.cosmic.excludePackages` option. If you want to
-        exclude non-essential packages, please look at the NixOS module for the
-        COSMIC DE and look for the essential packages in the `corePkgs` list.
-
-        You can stop this warning from appearing by setting the option
-        `services.desktopManager.cosmic.showExcludedPkgsWarning` to `false`.
-      ''
-    ];
  };
 }
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -31,7 +31,7 @@ in
      default = false;
      description = ''
        Whether to open TCP firewall ports, which are specified in
-        {option}`services.stalwart-mail.settings.server.listener` on all interfaces.
+        {option}`services.stalwart-mail.settings.listener` on all interfaces.
      '';
    };

@@ -107,17 +107,21 @@ in
      resolver.public-suffix = lib.mkDefault [
        "file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
      ];
-      spam-filter.resource = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml";
-      webadmin =
-        let
-          hasHttpListener = builtins.any (listener: listener.protocol == "http") (
-            lib.attrValues (cfg.settings.server.listener or { })
-          );
-        in
-        {
-          path = "/var/cache/stalwart-mail";
-          resource = lib.mkIf (hasHttpListener) (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip");
-        };
+      config = {
+        spam-filter.resource = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml";
+        webadmin =
+          let
+            hasHttpListener = builtins.any (listener: listener.protocol == "http") (
+              lib.attrValues cfg.settings.server.listener
+            );
+          in
+          {
+            path = "/var/cache/stalwart-mail";
+          }
+          // lib.optionalAttrs ((builtins.hasAttr "listener" cfg.settings.server) && hasHttpListener) {
+            resource = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip";
+          };
+      };
    };

    # This service stores a potentially large amount of data.
--- a/nixos/modules/services/matrix/mautrix-signal.nix
+++ b/nixos/modules/services/matrix/mautrix-signal.nix
@@ -270,7 +270,7 @@ in
    buildDocsInSandbox = false;
    doc = ./mautrix-signal.md;
    maintainers = with lib.maintainers; [
-      pentane
+      alyaeanyx
      frederictobiasc
    ];
  };
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -8,11 +8,11 @@ let

  cfg = config.services.octoprint;

-  baseConfig = lib.recursiveUpdate {
+  baseConfig = {
    plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
    server.port = cfg.port;
    webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
-  } (lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; });
+  } // lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; };

  fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;

--- a/nixos/modules/services/networking/openconnect.nix
+++ b/nixos/modules/services/networking/openconnect.nix
@@ -159,5 +159,5 @@ in
    }) cfg.interfaces;
  };

-  meta.maintainers = with maintainers; [ pentane ];
+  meta.maintainers = with maintainers; [ alyaeanyx ];
 }
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -486,7 +486,7 @@ in
  };

  meta.maintainers = with lib.maintainers; [
-    pentane
+    alyaeanyx
    raylas
    rvdp
    neverbehave
--- a/nixos/modules/services/web-apps/bluemap.nix
+++ b/nixos/modules/services/web-apps/bluemap.nix
@@ -18,6 +18,10 @@ let
    ) cfg.maps
  );

+  addonsFolder = pkgs.linkFarm "addons" (
+    lib.attrsets.mapAttrs' (name: value: lib.nameValuePair "${name}.jar" value) cfg.addons
+  );
+
  storageFolder = pkgs.linkFarm "storage" (
    lib.attrsets.mapAttrs' (
      name: value: lib.nameValuePair "${name}.conf" (format.generate "${name}.conf" value)
@@ -30,7 +34,8 @@ let
    "core.conf" = coreConfig;
    "webapp.conf" = webappConfig;
    "webserver.conf" = webserverConfig;
-    "packs" = pkgs.linkFarm "packs" cfg.packs;
+    "packs" = pkgs.linkFarm "packs" cfg.resourcepacks;
+    "addons" = addonsFolder;
  };

  inherit (lib) mkOption;
@@ -41,7 +46,6 @@ in
      [ "services" "bluemap" "resourcepacks" ]
      [ "services" "bluemap" "packs" ]
    )
-    (lib.mkRenamedOptionModule [ "services" "bluemap" "addons" ] [ "services" "bluemap" "packs" ])
  ];

  options.services.bluemap = {
@@ -235,6 +239,26 @@ in
      '';
    };

+    addons = mkOption {
+      type = lib.types.attrsOf lib.types.pathInStore;
+      default = { };
+      description = ''
+        A set of jar addons to be loaded.
+
+        See <https://bluemap.bluecolored.de/3rdPartySupport.html> for a list of officially recognized addons.
+      '';
+
+      example = lib.literalExpression ''
+        {
+          blueBridge = ./blueBridge.jar;
+          blueBorder = pkgs.fetchurl {
+            url = "https://github.com/pop4959/BlueBorder/releases/download/1.1.1/BlueBorder-1.1.1.jar";
+            hash = "...";
+          };
+        }
+      '';
+    };
+
    storage = mkOption {
      type = lib.types.attrsOf (
        lib.types.submodule {
--- a/nixos/modules/services/web-apps/filebrowser.nix
+++ b/nixos/modules/services/web-apps/filebrowser.nix
@@ -7,8 +7,8 @@
 }:
 let
  cfg = config.services.filebrowser;
-  format = pkgs.formats.json { };
  inherit (lib) types;
+  format = pkgs.formats.json { };
 in
 {
  options = {
@@ -17,18 +17,6 @@ in

      package = lib.mkPackageOption pkgs "filebrowser" { };

-      user = lib.mkOption {
-        type = types.str;
-        default = "filebrowser";
-        description = "User account under which FileBrowser runs.";
-      };
-
-      group = lib.mkOption {
-        type = types.str;
-        default = "filebrowser";
-        description = "Group under which FileBrowser runs.";
-      };
-
      openFirewall = lib.mkEnableOption "opening firewall ports for FileBrowser";

      settings = lib.mkOption {
@@ -108,9 +96,7 @@ in
          CacheDirectory = "filebrowser";
          WorkingDirectory = cfg.settings.root;

-          User = cfg.user;
-          Group = cfg.group;
-          UMask = "0077";
+          DynamicUser = true;

          NoNewPrivileges = true;
          PrivateDevices = true;
@@ -131,31 +117,15 @@ in
        };
      };

-      tmpfiles.settings.filebrowser = {
-        "${cfg.settings.root}".d = {
-          inherit (cfg) user group;
-          mode = "0700";
-        };
-        "${cfg.settings.cache-dir}".d = {
-          inherit (cfg) user group;
-          mode = "0700";
-        };
-        "${builtins.dirOf cfg.settings.database}".d = {
-          inherit (cfg) user group;
-          mode = "0700";
-        };
-      };
-    };
-
-    users.users = lib.mkIf (cfg.user == "filebrowser") {
-      filebrowser = {
-        inherit (cfg) group;
-        isSystemUser = true;
-      };
-    };
-
-    users.groups = lib.mkIf (cfg.group == "filebrowser") {
-      filebrowser = { };
+      tmpfiles.settings.filebrowser =
+        lib.genAttrs
+          [
+            cfg.settings.root
+            (builtins.dirOf cfg.settings.database)
+          ]
+          (_: {
+            d.mode = "0700";
+          });
    };

    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.port ];
--- a/nixos/modules/services/web-apps/stash.nix
+++ b/nixos/modules/services/web-apps/stash.nix
@@ -167,7 +167,7 @@ let
            presets.recentlyAddedImages
          ]
        '';
-        apply = type: if lib.isFunction type then (type uiPresets) else type;
+        apply = type: if builtins.isFunction type then (type uiPresets) else type;
      };
      blobs_path = mkOption {
        type = types.path;
@@ -324,47 +324,47 @@ let
      '';
      apply =
        srcs:
-        pkgs.runCommand "stash-${kind}"
-          {
-            inherit srcs;
-            nativeBuildInputs = [ pkgs.yq-go ];
-            preferLocalBuild = true;
-          }
-          ''
-            mkdir -p $out
-            touch $out/.keep
-            find $srcs -mindepth 1 -name '*.yml' | while read plugin_file; do
-              grep -q "^#pkgignore" "$plugin_file" && continue
+        optionalString (srcs != [ ]) (
+          pkgs.runCommand "stash-${kind}"
+            {
+              inherit srcs;
+              nativeBuildInputs = [ pkgs.yq-go ];
+              preferLocalBuild = true;
+            }
+            ''
+              find $srcs -mindepth 1 -name '*.yml' | while read plugin_file; do
+                grep -q "^#pkgignore" "$plugin_file" && continue

-              plugin_dir=$(dirname $plugin_file)
-              out_path=$out/$(basename $plugin_dir)
-              mkdir -p $out_path
-              ls $plugin_dir | xargs -I{} ln -sf "$plugin_dir/{}" $out_path
+                plugin_dir=$(dirname $plugin_file)
+                out_path=$out/$(basename $plugin_dir)
+                mkdir -p $out_path
+                ls $plugin_dir | xargs -I{} ln -sf "$plugin_dir/{}" $out_path

-              env \
-                plugin_id=$(basename $plugin_file .yml) \
-                plugin_name="$(yq '.name' $plugin_file)" \
-                plugin_description="$(yq '.description' $plugin_file)" \
-                plugin_version="$(yq '.version' $plugin_file)" \
-                plugin_files="$(find -L $out_path -mindepth 1 -type f -printf "%P\n")" \
-                yq -n '
-                  .id = strenv(plugin_id) |
-                  .name = strenv(plugin_name) |
-                  (
-                    strenv(plugin_description) as $desc |
-                    with(select($desc == "null"); .metadata = {}) |
-                    with(select($desc != "null"); .metadata.description = $desc)
-                  ) |
-                  (
-                    strenv(plugin_version) as $ver |
-                    with(select($ver == "null"); .version = "Unknown") |
-                    with(select($ver != "null"); .version = $ver)
-                  ) |
-                  .date = (now | format_datetime("2006-01-02 15:04:05")) |
-                  .files = (strenv(plugin_files) | split("\n"))
-                ' > $out_path/manifest
-            done
-          '';
+                env \
+                  plugin_id=$(basename $plugin_file .yml) \
+                  plugin_name="$(yq '.name' $plugin_file)" \
+                  plugin_description="$(yq '.description' $plugin_file)" \
+                  plugin_version="$(yq '.version' $plugin_file)" \
+                  plugin_files="$(find -L $out_path -mindepth 1 -type f -printf "%P\n")" \
+                  yq -n '
+                    .id = strenv(plugin_id) |
+                    .name = strenv(plugin_name) |
+                    (
+                      strenv(plugin_description) as $desc |
+                      with(select($desc == "null"); .metadata = {}) |
+                      with(select($desc != "null"); .metadata.description = $desc)
+                    ) |
+                    (
+                      strenv(plugin_version) as $ver |
+                      with(select($ver == "null"); .version = "Unknown") |
+                      with(select($ver != "null"); .version = $ver)
+                    ) |
+                    .date = (now | format_datetime("2006-01-02 15:04:05")) |
+                    .files = (strenv(plugin_files) | split("\n"))
+                  ' > $out_path/manifest
+              done
+            ''
+        );
    };
 in
 {
@@ -512,7 +512,7 @@ in
          ExecStartPre = pkgs.writers.writeBash "stash-setup.bash" (
            ''
              install -d ${cfg.settings.generated}
-              if [[ -z "${toString cfg.mutableSettings}" || ! -f ${cfg.dataDir}/config.yml ]]; then
+              if [[ ! -z "${toString cfg.mutableSettings}" || ! -f ${cfg.dataDir}/config.yml ]]; then
                env \
                  password=$(< ${cfg.passwordFile}) \
                  jwtSecretKeyFile=$(< ${cfg.jwtSecretKeyFile}) \
--- a/nixos/tests/cosmic.nix
+++ b/nixos/tests/cosmic.nix
@@ -112,13 +112,11 @@
          gui_apps_to_launch['cosmic-term'] = 'com.system76.CosmicTerm'

          for gui_app, app_id in gui_apps_to_launch.items():
-              # Don't fail the test if binary is absent
-              if machine.execute(f"su - ${user.name} -c 'command -v {gui_app}'", timeout=5)[0] == 0:
-                  machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} >&2 &'", timeout=5)
-                  # Nix builds the following non-commented expression to the following:
-                  #                              `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^    \\"app-id\\": \\"{app_id}\\"$"' `
-                  machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^    \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30)
-                  machine.succeed(f"pkill {gui_app}", timeout=5)
+              machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} >&2 &'", timeout=5)
+              # Nix builds the following non-commented expression to the following:
+              #                              `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^    \\"app-id\\": \\"{app_id}\\"$"' `
+              machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^    \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30)
+              machine.succeed(f"pkill {gui_app}", timeout=5)

      machine.succeed("echo 'test completed succeessfully' > /${testName}", timeout=5)
      machine.copy_from_vm('/${testName}')
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -5,12 +5,12 @@ let

  template-bootstrap3 = pkgs.stdenv.mkDerivation rec {
    name = "bootstrap3";
-    version = "2024-02-06";
+    version = "2022-07-27";
    src = pkgs.fetchFromGitHub {
      owner = "giterlizzi";
      repo = "dokuwiki-template-bootstrap3";
      rev = "v${version}";
-      hash = "sha256-PSA/rHMkM/kMvOV7CP1byL8Ym4Qu7a4Rz+/aPX31x9k=";
+      hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo=";
    };
    installPhase = "mkdir -p $out; cp -R * $out/";
  };
--- a/nixos/tests/stalwart-mail.nix
+++ b/nixos/tests/stalwart-mail.nix
@@ -42,31 +42,15 @@ in
              bind = [ "[::]:143" ];
              protocol = "imap";
            };
-
-            "http" = {
-              bind = [ "[::]:80" ];
-              protocol = "http";
-            };
          };

          session.auth.mechanisms = "[plain]";
          session.auth.directory = "'in-memory'";
          storage.directory = "in-memory";

-          storage.data = "rocksdb";
-          storage.fts = "rocksdb";
-          storage.blob = "rocksdb";
-          storage.lookup = "rocksdb";
-
          session.rcpt.directory = "'in-memory'";
          queue.outbound.next-hop = "'local'";

-          store."rocksdb" = {
-            type = "rocksdb";
-            path = "/var/lib/stalwart-mail/data";
-            compression = "lz4";
-          };
-
          directory."in-memory" = {
            type = "memory";
            principals = [
@@ -130,19 +114,9 @@ in
      main.wait_for_unit("stalwart-mail.service")
      main.wait_for_open_port(587)
      main.wait_for_open_port(143)
-      main.wait_for_open_port(80)

      main.succeed("test-smtp-submission")
-
-      # restart stalwart to test rocksdb compaction of existing database
-      main.succeed("systemctl restart stalwart-mail.service")
-      main.wait_for_open_port(587)
-      main.wait_for_open_port(143)
-
      main.succeed("test-imap-read")
-
-      main.succeed("test -d /var/cache/stalwart-mail/STALWART_WEBADMIN")
-      main.succeed("curl --fail http://localhost")
    '';

  meta = {
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -943,9 +943,6 @@ Reviewing process:
 - Ensure that the meta field information [fits the guidelines](#meta-attributes) and is correct:
  - License can change with version updates, so it should be checked to match the upstream license.
  - If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package.
- Verify any change of upstream.
-  - If switching from e.g. PyPi to GitHub, verify that the repo is the official one.
-  - If switching to a fork, check with external sources like other package repositories for community consensus.
 - Ensure that the code contains no typos.
 - Build the package locally.
  - Pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
@@ -976,7 +973,6 @@ Sample template for a package update review is provided below.
 - [ ] package version fits guidelines
 - [ ] package builds on ARCHITECTURE
 - [ ] executables tested on ARCHITECTURE
- [ ] any change of upstream are verified
 - [ ] all depending packages build
 - [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed
 - [ ] patches that are remotely available are fetched rather than vendored
@@ -996,7 +992,6 @@ Review process:
 - Ensure that the package name and version [fits the guidelines](#package-naming).
 - Ensure that the package versioning [fits the guidelines](#versioning).
 - Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions).
- Ensure that the source is fetched from an official location, one of our [trusted mirrors](./build-support/fetchurl/mirrors.nix), or a mirror trusted by the authors.
 - Ensure that the meta fields [fits the guidelines](#meta-attributes) and contain the correct information:
  - License must match the upstream license.
  - Platforms should be set (or the package will not get binary substitutes).
@@ -1025,7 +1020,6 @@ Sample template for a new package review is provided below.
 - [ ] `meta.maintainers` is set
 - [ ] `meta.mainProgram` is set, if applicable.
 - [ ] build time only dependencies are declared in `nativeBuildInputs`
- [ ] source is fetched from an official or trusted location
 - [ ] source is fetched using the appropriate function
 - [ ] the list of `phases` is not overridden
 - [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`.
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -15,11 +15,11 @@

 stdenv.mkDerivation rec {
  pname = "drumkv1";
-  version = "1.3.2";
+  version = "1.3.1";

  src = fetchurl {
    url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz";
-    hash = "sha256-Z9F9lbLSAJRlVh7tnSMNTlK7FiZhhlVfeHPlbbVuWXk=";
+    hash = "sha256-CzboTrMRxPr5O6caKrxW9X9uSi5Su5LRSQpwJBMGkGI=";
  };

  buildInputs = [
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/applications/audio/noson/default.nix
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "noson";
-  version = "5.6.10";
+  version = "5.6.8";

  src = fetchFromGitHub {
    owner = "janbar";
    repo = "noson-app";
    rev = finalAttrs.version;
-    hash = "sha256-ERlZtQTwPu5Y1i5cV9c5IMSJW30ootjmFix0EiF+/x0=";
+    hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "samplv1";
-  version = "1.3.2";
+  version = "1.3.1";

  src = fetchurl {
    url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz";
-    hash = "sha256-YCxt9RAP02uAigddA6HjBt2ryM6MyOtI3L2eLg0AhFg=";
+    hash = "sha256-DcMtNGiMJ9YfTKZLns+3mBKHbkG3Ven3IJAU/qSDyh0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -9,10 +9,10 @@
    elpaBuild {
      pname = "a68-mode";
      ename = "a68-mode";
-      version = "1.2.0.20250524.125533";
+      version = "1.2.0.20250516.72801";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/a68-mode-1.2.0.20250524.125533.tar";
-        sha256 = "0z8cmasvzbziwgi52p8bn4xdcz5izkhj12laf1gzwwzik1lmh5kj";
+        url = "https://elpa.gnu.org/devel/a68-mode-1.2.0.20250516.72801.tar";
+        sha256 = "09nxmij8db3ddhl9hyz0khw2crpfxgrhp2rci1v4w4g3y6k6pjxk";
      };
      packageRequires = [ ];
      meta = {
@@ -461,10 +461,10 @@
    elpaBuild {
      pname = "auctex";
      ename = "auctex";
-      version = "14.0.9.0.20250530.145847";
+      version = "14.0.9.0.20250515.195355";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auctex-14.0.9.0.20250530.145847.tar";
-        sha256 = "05mdn3ymwv7zr5ik8rga859cggvz5r4qwnmb5ri78jww6bk96dbj";
+        url = "https://elpa.gnu.org/devel/auctex-14.0.9.0.20250515.195355.tar";
+        sha256 = "0n39wh9cw1pfjmyjcahxrgsa3b1p0swwkh31wn5wc2c2rfjkl8xk";
      };
      packageRequires = [ ];
      meta = {
@@ -548,10 +548,10 @@
    elpaBuild {
      pname = "auth-source-xoauth2-plugin";
      ename = "auth-source-xoauth2-plugin";
-      version = "0.2.1.0.20250518.225313";
+      version = "0.2.0.20250516.15306";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.2.1.0.20250518.225313.tar";
-        sha256 = "0mqvlnqib2my2alm2lbvij89r5c8r6zzi7lwvpgylays342lrry0";
+        url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.2.0.20250516.15306.tar";
+        sha256 = "0i205h7fc4gkaa7hn1516bqzffv64bani2v1080kn7cbnrf9kq1b";
      };
      packageRequires = [ oauth2 ];
      meta = {
@@ -740,10 +740,10 @@
    elpaBuild {
      pname = "beframe";
      ename = "beframe";
-      version = "1.3.0.0.20250530.55351";
+      version = "1.3.0.0.20250410.82528";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/beframe-1.3.0.0.20250530.55351.tar";
-        sha256 = "1f9gf6cy46dd52701vg8xnm8nmbqk09c2xwhcz03f3djbd1fxhjl";
+        url = "https://elpa.gnu.org/devel/beframe-1.3.0.0.20250410.82528.tar";
+        sha256 = "1rdq1yrszn22np2maibn54qrq1d5231a34l9xrczi13fv0b6sah2";
      };
      packageRequires = [ ];
      meta = {
@@ -1105,10 +1105,10 @@
    elpaBuild {
      pname = "cape";
      ename = "cape";
-      version = "2.1.0.20250521.64514";
+      version = "2.0.0.20250512.155407";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-2.1.0.20250521.64514.tar";
-        sha256 = "0ibaxcdsiki6zg08fmfsj7a5p9wsrp2nc6bnki5y1g1619ln5gk5";
+        url = "https://elpa.gnu.org/devel/cape-2.0.0.20250512.155407.tar";
+        sha256 = "13j8wcdj4azmi7gfaqs08wm0b6razj10i8wkh3qa8bqadjyqmhfw";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1274,10 +1274,10 @@
    elpaBuild {
      pname = "cobol-mode";
      ename = "cobol-mode";
-      version = "1.1.0.20250527.194517";
+      version = "1.1.0.20241020.181020";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20250527.194517.tar";
-        sha256 = "057n1ck9pn9mkh3kkzw5ps2iwjfy9fbyr9cviccfh46avlfkyqq0";
+        url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20241020.181020.tar";
+        sha256 = "05vxahbqs8an5s5c7v40yhziaa61n5yg4j92k8pqjypqrwhpw7vw";
      };
      packageRequires = [ ];
      meta = {
@@ -1318,10 +1318,10 @@
    elpaBuild {
      pname = "colorful-mode";
      ename = "colorful-mode";
-      version = "1.2.4.0.20250529.222523";
+      version = "1.2.3.0.20250508.204004";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/colorful-mode-1.2.4.0.20250529.222523.tar";
-        sha256 = "1g1x1p6ayy6nqmhj109k3y4bddas0bdljia5rwzkkysfqqxj8rqr";
+        url = "https://elpa.gnu.org/devel/colorful-mode-1.2.3.0.20250508.204004.tar";
+        sha256 = "1zrdxxc115h4zk2a1lhl45is7cjvxq333m1f1lmrmnyahzgg3a46";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1386,10 +1386,10 @@
    elpaBuild {
      pname = "company";
      ename = "company";
-      version = "1.0.2.0.20250522.193744";
+      version = "1.0.2.0.20250426.131956";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/company-1.0.2.0.20250522.193744.tar";
-        sha256 = "1h74h8rh3ya89ajfhkym879ll6v5qsvww4rjv0r1kn0yhhn79c3j";
+        url = "https://elpa.gnu.org/devel/company-1.0.2.0.20250426.131956.tar";
+        sha256 = "1lkrhb0xc9d2ylb85k49h62w9k3dnm4j2i6438xc2jkjrjids575";
      };
      packageRequires = [ ];
      meta = {
@@ -1546,10 +1546,10 @@
    elpaBuild {
      pname = "consult";
      ename = "consult";
-      version = "2.4.0.20250530.124807";
+      version = "2.3.0.20250512.141021";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-2.4.0.20250530.124807.tar";
-        sha256 = "09a7wyprhzlwyy0x3b3wpy68qdwxlkpff84sdhms76sz3mx5jnz9";
+        url = "https://elpa.gnu.org/devel/consult-2.3.0.20250512.141021.tar";
+        sha256 = "1k3xhqqrz72zfy92376h8livr938z2kqarkljdri44vh8yqm7j0i";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1659,10 +1659,10 @@
    elpaBuild {
      pname = "corfu";
      ename = "corfu";
-      version = "2.2.0.20250528.194504";
+      version = "2.1.0.20250516.184150";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-2.2.0.20250528.194504.tar";
-        sha256 = "0j9z6nm80h6016slgh8pzia84dry9kaj3m1rzjsqlpvjhvxwfc3l";
+        url = "https://elpa.gnu.org/devel/corfu-2.1.0.20250516.184150.tar";
+        sha256 = "1fnhsn6mvz2cp6cwphrjgr0lizkkfpirp3bxg2vxnj869asyayva";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1940,10 +1940,10 @@
    elpaBuild {
      pname = "dape";
      ename = "dape";
-      version = "0.24.1.0.20250529.103551";
+      version = "0.24.1.0.20250509.163537";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dape-0.24.1.0.20250529.103551.tar";
-        sha256 = "0wyhcncgxqp9jc65k8zwha21rvgxk0zfm79psmwz9i64rg9j9bn1";
+        url = "https://elpa.gnu.org/devel/dape-0.24.1.0.20250509.163537.tar";
+        sha256 = "0r0kjrzqw0dlj0vw7lgsc2mg2sr0js1aambkwc3qvf57jp875jwb";
      };
      packageRequires = [ jsonrpc ];
      meta = {
@@ -2074,10 +2074,10 @@
    elpaBuild {
      pname = "denote";
      ename = "denote";
-      version = "4.0.0.0.20250525.143413";
+      version = "4.0.0.0.20250508.42428";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-4.0.0.0.20250525.143413.tar";
-        sha256 = "1n6zjpx5qbwahvnmj3al4xx17f6vrh6apll4vyla5xingp3h4mf5";
+        url = "https://elpa.gnu.org/devel/denote-4.0.0.0.20250508.42428.tar";
+        sha256 = "1zi78mfncjpaldvaq4g99ls65vs9qi1rphcwmzhqwnv9ckgdnqv1";
      };
      packageRequires = [ ];
      meta = {
@@ -2096,10 +2096,10 @@
    elpaBuild {
      pname = "denote-journal";
      ename = "denote-journal";
-      version = "0.1.1.0.20250517.43843";
+      version = "0.1.1.0.20250422.45242";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-journal-0.1.1.0.20250517.43843.tar";
-        sha256 = "1v5r87mdmdpfqdyb0zr3z9brkml7dac92pp6gam8qsc1l7zx359l";
+        url = "https://elpa.gnu.org/devel/denote-journal-0.1.1.0.20250422.45242.tar";
+        sha256 = "1hyhahdyxnx6q2lxy8pngj0isscb0wv1946w5bp1qkq6ygjp3chv";
      };
      packageRequires = [ denote ];
      meta = {
@@ -2162,10 +2162,10 @@
    elpaBuild {
      pname = "denote-org";
      ename = "denote-org";
-      version = "0.1.1.0.20250521.104352";
+      version = "0.1.1.0.20250508.64419";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-org-0.1.1.0.20250521.104352.tar";
-        sha256 = "037jbn4j454y5lki6lchx36cma89gysbn0jy74nfnsv9f30gvz9h";
+        url = "https://elpa.gnu.org/devel/denote-org-0.1.1.0.20250508.64419.tar";
+        sha256 = "1xnvpdpn55vcws1v5dhkvragiyq1kn40xmylxpxi1xv9rv61z6ml";
      };
      packageRequires = [ denote ];
      meta = {
@@ -2206,10 +2206,10 @@
    elpaBuild {
      pname = "denote-sequence";
      ename = "denote-sequence";
-      version = "0.1.1.0.20250522.82830";
+      version = "0.1.1.0.20250501.102153";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-sequence-0.1.1.0.20250522.82830.tar";
-        sha256 = "1g0fxfkj5asv0zixwril4di3sqbgb5hzph6mam1igz359nnkabc3";
+        url = "https://elpa.gnu.org/devel/denote-sequence-0.1.1.0.20250501.102153.tar";
+        sha256 = "08aqb3ps1czag73jm6avk4xq3wbxx02gyl0bml8vnxdc0l22skjy";
      };
      packageRequires = [ denote ];
      meta = {
@@ -2368,10 +2368,10 @@
    elpaBuild {
      pname = "diff-hl";
      ename = "diff-hl";
-      version = "1.10.0.0.20250520.20816";
+      version = "1.10.0.0.20250507.203711";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20250520.20816.tar";
-        sha256 = "15m4bca2arig6d6l2ml8ab4dg08rpi5m7pzps5lidad83ipl3cvv";
+        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20250507.203711.tar";
+        sha256 = "1gv7yn2hynf09sw5r5axg6b0vb79id4jv6n07cmr2wknf0q3di4a";
      };
      packageRequires = [ cl-lib ];
      meta = {
@@ -2495,10 +2495,10 @@
    elpaBuild {
      pname = "dired-preview";
      ename = "dired-preview";
-      version = "0.5.2.0.20250507.81237";
+      version = "0.5.2.0.20250427.44935";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dired-preview-0.5.2.0.20250507.81237.tar";
-        sha256 = "12f510r8f6z9qp679dipyv1damincr2q6bbi4vcn17ylwhaqdp6s";
+        url = "https://elpa.gnu.org/devel/dired-preview-0.5.2.0.20250427.44935.tar";
+        sha256 = "0zc7kd1apyq0bwxi3qjihxayjb5j6ga9rhmzc3lmm29ysxfz90n5";
      };
      packageRequires = [ ];
      meta = {
@@ -2655,27 +2655,6 @@
      };
    }
  ) { };
-  doric-themes = callPackage (
-    {
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "doric-themes";
-      ename = "doric-themes";
-      version = "0.1.0.0.20250530.91206";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/doric-themes-0.1.0.0.20250530.91206.tar";
-        sha256 = "153gnj81lw4z6mrw509jv3022nnyqrxmk5fga7dqnmzpkydxbp8c";
-      };
-      packageRequires = [ ];
-      meta = {
-        homepage = "https://elpa.gnu.org/devel/doric-themes.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
  drepl = callPackage (
    {
      comint-mime,
@@ -2887,10 +2866,10 @@
    elpaBuild {
      pname = "ef-themes";
      ename = "ef-themes";
-      version = "1.10.0.0.20250524.83143";
+      version = "1.10.0.0.20250429.104336";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ef-themes-1.10.0.0.20250524.83143.tar";
-        sha256 = "1dmjfydzw5aabhbwfcvdxh123s08a11khj7vzg38whx4f4mxhji2";
+        url = "https://elpa.gnu.org/devel/ef-themes-1.10.0.0.20250429.104336.tar";
+        sha256 = "0a4fpc9i4sjfx4cnngbdddffs6qg03c15fz2znix56b4hp7jl4sv";
      };
      packageRequires = [ ];
      meta = {
@@ -2915,10 +2894,10 @@
    elpaBuild {
      pname = "eglot";
      ename = "eglot";
-      version = "1.18.0.20250524.65524";
+      version = "1.18.0.20250513.114504";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250524.65524.tar";
-        sha256 = "0vxswngxr3bvwbcjmmsciw3is7b02ilz1wlppj1krmagpmwffsa2";
+        url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250513.114504.tar";
+        sha256 = "0jgma92l0smvm8np78sx924dlvbli1j3pgjrpps8m7av7xjab5v1";
      };
      packageRequires = [
        eldoc
@@ -2944,10 +2923,10 @@
    elpaBuild {
      pname = "el-job";
      ename = "el-job";
-      version = "2.4.7.0.20250524.200444";
+      version = "2.4.7.0.20250516.190810";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/el-job-2.4.7.0.20250524.200444.tar";
-        sha256 = "0f5k94x24hhjrlxq4gjfm551pgir701hxyjb7k9hcbhxq06l4ay4";
+        url = "https://elpa.gnu.org/devel/el-job-2.4.7.0.20250516.190810.tar";
+        sha256 = "14l3xa5xii7xg6006gyap5jcd3z5ramik0q9sd14gaqx7i9s8081";
      };
      packageRequires = [ ];
      meta = {
@@ -3088,10 +3067,10 @@
    elpaBuild {
      pname = "ellama";
      ename = "ellama";
-      version = "1.8.1.0.20250526.173209";
+      version = "1.8.1.0.20250402.164949";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ellama-1.8.1.0.20250526.173209.tar";
-        sha256 = "1h3ypfrp4jxgamrc6y75rzsj1iq7n03ng2zg8ab3n0lf8xz5x61k";
+        url = "https://elpa.gnu.org/devel/ellama-1.8.1.0.20250402.164949.tar";
+        sha256 = "04ydy4lapx67r6lcg9dardvzznda2wisffzz3g9fxiyxrri5810w";
      };
      packageRequires = [
        compat
@@ -3136,10 +3115,10 @@
    elpaBuild {
      pname = "embark";
      ename = "embark";
-      version = "1.1.0.20250530.134842";
+      version = "1.1.0.20250423.105002";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/embark-1.1.0.20250530.134842.tar";
-        sha256 = "15lwgw9340h33crdhy8n2bfb7v2xlj5z02pvll7zmzr1wwiaqrja";
+        url = "https://elpa.gnu.org/devel/embark-1.1.0.20250423.105002.tar";
+        sha256 = "1i01q1imn32sbii0kwz51i41a9f5mql564lmhbifwh4hsgrras2g";
      };
      packageRequires = [ compat ];
      meta = {
@@ -3160,10 +3139,10 @@
    elpaBuild {
      pname = "embark-consult";
      ename = "embark-consult";
-      version = "1.1.0.20250530.134842";
+      version = "1.1.0.20250423.105002";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250530.134842.tar";
-        sha256 = "1apy9ld2wi6yyqdqzyxamr6qascfghwc83wkdvqm54aiv2ks3g76";
+        url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250423.105002.tar";
+        sha256 = "1qkg36d67fwhijrhkfjs7397rcmjs7cga7l9dj0n9d1634f7q3h4";
      };
      packageRequires = [
        compat
@@ -3436,10 +3415,10 @@
    elpaBuild {
      pname = "expreg";
      ename = "expreg";
-      version = "1.4.1.0.20250520.204305";
+      version = "1.3.1.0.20230915.150818";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/expreg-1.4.1.0.20250520.204305.tar";
-        sha256 = "1cvvwdbbkdm6npbyfz5w6pl3iha1v9sxqdvafqpj03nxlknjvjhh";
+        url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar";
+        sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m";
      };
      packageRequires = [ ];
      meta = {
@@ -3480,10 +3459,10 @@
    elpaBuild {
      pname = "exwm";
      ename = "exwm";
-      version = "0.33.0.20250528.173021";
+      version = "0.33.0.20250426.232314";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250528.173021.tar";
-        sha256 = "1nbjwvzl1rndz9ygmww1i80sxq5pxq68lamsw9ablbg19bvkajl6";
+        url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250426.232314.tar";
+        sha256 = "090kdzcayczn0jv3bkcg2kp08f9w2acjdrq9ly87li41rpsbh2gk";
      };
      packageRequires = [
        compat
@@ -4193,10 +4172,10 @@
    elpaBuild {
      pname = "greader";
      ename = "greader";
-      version = "0.12.6.0.20250526.83546";
+      version = "0.12.6.0.20250304.172206";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20250526.83546.tar";
-        sha256 = "1ivmz9cjss4naf02si5ikmlkad0lbic3kbs989n561d0lq25dfmw";
+        url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20250304.172206.tar";
+        sha256 = "1cpvh9pn855q8gjz43alpipbchfbbgg0ds6qbnn7k9s0n38iyzr3";
      };
      packageRequires = [
        compat
@@ -4238,10 +4217,10 @@
    elpaBuild {
      pname = "gtags-mode";
      ename = "gtags-mode";
-      version = "1.8.6.0.20250518.10237";
+      version = "1.8.5.0.20250511.220137";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gtags-mode-1.8.6.0.20250518.10237.tar";
-        sha256 = "0xisbx4k8baj8hzklmpz0gfkx82f3sss3mnji9v0pbv1g9q7v2w9";
+        url = "https://elpa.gnu.org/devel/gtags-mode-1.8.5.0.20250511.220137.tar";
+        sha256 = "185c583y06lm97hd1nlhsx96byz34m0fg2xlz99vwxzm75ch3s5h";
      };
      packageRequires = [ ];
      meta = {
@@ -4455,10 +4434,10 @@
    elpaBuild {
      pname = "hyperbole";
      ename = "hyperbole";
-      version = "9.0.2pre0.20250518.175059";
+      version = "9.0.2pre0.20250509.132519";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250518.175059.tar";
-        sha256 = "1dcra27asrpfg1ymqbzqss6dy7vlrrk14070gna1x4b6fvag9jdg";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250509.132519.tar";
+        sha256 = "0jmjaa6bj93qw7i62spc4kk117bbc3g3nvdq0lkcwd9900ir1xhb";
      };
      packageRequires = [ ];
      meta = {
@@ -4519,10 +4498,10 @@
    elpaBuild {
      pname = "indent-bars";
      ename = "indent-bars";
-      version = "0.8.4.0.20250529.164202";
+      version = "0.8.4.0.20250508.135540";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/indent-bars-0.8.4.0.20250529.164202.tar";
-        sha256 = "1zwrd6g43qqzm1kzacpgq6m20kir3m2r94li8yx74vqpw9cca8hp";
+        url = "https://elpa.gnu.org/devel/indent-bars-0.8.4.0.20250508.135540.tar";
+        sha256 = "0167f1q8snk98j7akns3mg07pxm1221i9vxplc4x55z7qlryvi7c";
      };
      packageRequires = [ compat ];
      meta = {
@@ -4625,10 +4604,10 @@
    elpaBuild {
      pname = "ivy";
      ename = "ivy";
-      version = "0.15.1.0.20250519.175035";
+      version = "0.15.1.0.20250417.121946";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20250519.175035.tar";
-        sha256 = "094xx1zpxs1qf799s3cv2ymr5q7bgs87yr8haf6wqwf44rxdwycw";
+        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20250417.121946.tar";
+        sha256 = "13xrixysvh3g358fi91lx2b4ra8npyhl573klfzvwr0w1pkpzc8g";
      };
      packageRequires = [ ];
      meta = {
@@ -4832,10 +4811,10 @@
    elpaBuild {
      pname = "jinx";
      ename = "jinx";
-      version = "2.2.0.20250526.33048";
+      version = "2.1.0.20250512.155547";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jinx-2.2.0.20250526.33048.tar";
-        sha256 = "0bh9mmknxnd62wbiga9s67dnrq5ggh1d9pqhk0vf163nk5bdng6a";
+        url = "https://elpa.gnu.org/devel/jinx-2.1.0.20250512.155547.tar";
+        sha256 = "13yi3cv4111px48fzr8rnx70bhcb7b3gy64vcddvpcr2gvwlrzvz";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5284,10 +5263,10 @@
    elpaBuild {
      pname = "llm";
      ename = "llm";
-      version = "0.26.0.0.20250526.213557";
+      version = "0.25.0.0.20250510.105336";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.26.0.0.20250526.213557.tar";
-        sha256 = "1fc895kvacwsimdbir51iy8xiyhxrad6hh8nj3lap07j3xki4107";
+        url = "https://elpa.gnu.org/devel/llm-0.25.0.0.20250510.105336.tar";
+        sha256 = "0mnc820if3jcj909bmsjgcvdg10d7ijzqa4fgc0bw2s92hrzp37n";
      };
      packageRequires = [
        compat
@@ -5524,10 +5503,10 @@
    elpaBuild {
      pname = "marginalia";
      ename = "marginalia";
-      version = "2.0.0.20250527.162947";
+      version = "2.0.0.20250512.155419";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/marginalia-2.0.0.20250527.162947.tar";
-        sha256 = "1f3h4grgnxdkq0njpq9jfdlk4ljmzjsk324kz54799fj8v2n59qj";
+        url = "https://elpa.gnu.org/devel/marginalia-2.0.0.20250512.155419.tar";
+        sha256 = "042nay3vr19ldbgqz1hzmacf53gz66dgpazr53xffq6pjxpih5p1";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5630,10 +5609,10 @@
    elpaBuild {
      pname = "matlab-mode";
      ename = "matlab-mode";
-      version = "6.3.0.20250530.124947";
+      version = "6.3.0.20250512.120312";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20250530.124947.tar";
-        sha256 = "0kbm0y8qn72k01gh1ynz7cm1b59wr0lnq349ky9m6g7m13dc7zbq";
+        url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20250512.120312.tar";
+        sha256 = "07lsjj3ch66xl680isn9mrmbiz28n7r85gwgrzqva9gyxilfh1wm";
      };
      packageRequires = [ ];
      meta = {
@@ -5823,10 +5802,10 @@
    elpaBuild {
      pname = "minuet";
      ename = "minuet";
-      version = "0.5.4.0.20250523.4704";
+      version = "0.5.4.0.20250510.3940";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/minuet-0.5.4.0.20250523.4704.tar";
-        sha256 = "0r4qajdknkcj9bmgnczxj7zw626aa2cicziy1h294dbmpia02021";
+        url = "https://elpa.gnu.org/devel/minuet-0.5.4.0.20250510.3940.tar";
+        sha256 = "0akavbg2bl1amwr55ch1m3apkjdwdgiqar1kjnld28rfa027gxj6";
      };
      packageRequires = [
        dash
@@ -5869,10 +5848,10 @@
    elpaBuild {
      pname = "modus-themes";
      ename = "modus-themes";
-      version = "4.7.0.0.20250527.103951";
+      version = "4.7.0.0.20250428.45622";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-4.7.0.0.20250527.103951.tar";
-        sha256 = "1r9jv8w0nb7x56hpgyqarljrpm1zbb5sfgsw0mxv9rfa1wb65zpj";
+        url = "https://elpa.gnu.org/devel/modus-themes-4.7.0.0.20250428.45622.tar";
+        sha256 = "0dyicvmcnf99isdrjg8wazxm1hmqdy81s72glnc86pl6xaiikxf9";
      };
      packageRequires = [ ];
      meta = {
@@ -6450,10 +6429,10 @@
    elpaBuild {
      pname = "org";
      ename = "org";
-      version = "9.8pre0.20250529.210300";
+      version = "9.8pre0.20250512.165453";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-9.8pre0.20250529.210300.tar";
-        sha256 = "1nnas0kdnymi6c8m7i683cacimzfjvakmy5c347ayqq9z161jv78";
+        url = "https://elpa.gnu.org/devel/org-9.8pre0.20250512.165453.tar";
+        sha256 = "1hdy7zxl1d9hpv02j99r0w0kqrwpw567w6sycx3d1xdz8r93z8c5";
      };
      packageRequires = [ ];
      meta = {
@@ -6472,10 +6451,10 @@
    elpaBuild {
      pname = "org-contacts";
      ename = "org-contacts";
-      version = "1.1.0.20250528.75549";
+      version = "1.1.0.20250513.100113";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20250528.75549.tar";
-        sha256 = "187k9rkqpiw44301ymqsisfrdz6qd5f1d2hk82v4jzvy5jcd2b88";
+        url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20250513.100113.tar";
+        sha256 = "03rbhicxw9glwrdhsw364kyjxdzbs4h63h927n5scbn71gkwr3bc";
      };
      packageRequires = [ org ];
      meta = {
@@ -6569,10 +6548,10 @@
    elpaBuild {
      pname = "org-modern";
      ename = "org-modern";
-      version = "1.8.0.20250526.33139";
+      version = "1.7.0.20250512.155443";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-modern-1.8.0.20250526.33139.tar";
-        sha256 = "03n21xa0y9hs8fiyfb9zzca402fxck4b13x42sizamns9dxwrh9y";
+        url = "https://elpa.gnu.org/devel/org-modern-1.7.0.20250512.155443.tar";
+        sha256 = "0pnnwsfamfmg3cm832736kaxjlj9bg62f00bjcdrxkkad0c0gbf6";
      };
      packageRequires = [
        compat
@@ -7197,10 +7176,10 @@
    elpaBuild {
      pname = "polymode";
      ename = "polymode";
-      version = "0.2.2.0.20250525.212258";
+      version = "0.2.2.0.20250511.135208";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20250525.212258.tar";
-        sha256 = "1p0whbfzcd0fl8yz9id7sinmdyavb905aa826x25gdc9fpmlr01r";
+        url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20250511.135208.tar";
+        sha256 = "1l5x9y6m8la0rlz56s1iqlqfr9v5gq0wfykiv8gir8sk0xgnz315";
      };
      packageRequires = [ ];
      meta = {
@@ -7347,10 +7326,10 @@
    elpaBuild {
      pname = "project";
      ename = "project";
-      version = "0.11.1.0.20250529.192738";
+      version = "0.11.1.0.20250428.24648";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250529.192738.tar";
-        sha256 = "1p3g2h7yakj8vzffyilsgqifdrv2mdvl8zpqjv2x7dp3ljs79cqn";
+        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250428.24648.tar";
+        sha256 = "142jsslwxg2s590szngpzm2srw1n7qdvl3gzbqrnngy91wpv7n9a";
      };
      packageRequires = [ xref ];
      meta = {
@@ -8754,10 +8733,10 @@
    elpaBuild {
      pname = "standard-themes";
      ename = "standard-themes";
-      version = "2.2.0.0.20250519.60302";
+      version = "2.2.0.0.20250216.155518";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250519.60302.tar";
-        sha256 = "170h064wawzm2h4sfrfwrn4zq87p6kmc6blkiprwzz0i4iw30y10";
+        url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250216.155518.tar";
+        sha256 = "0dvshs7zshi1s7rgrhrn4igi96y76gybhmwq337sigjm76fh37i2";
      };
      packageRequires = [ ];
      meta = {
@@ -9365,10 +9344,10 @@
    elpaBuild {
      pname = "tramp";
      ename = "tramp";
-      version = "2.7.2.4.0.20250530.70623";
+      version = "2.7.2.3.1.0.20250408.65900";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tramp-2.7.2.4.0.20250530.70623.tar";
-        sha256 = "10vhj25haax1gj45cka8678i81lygr7v122j9wm7f3qcvxk68snb";
+        url = "https://elpa.gnu.org/devel/tramp-2.7.2.3.1.0.20250408.65900.tar";
+        sha256 = "0fl70dainnhz78bx611x4295ic751d4ranz9zh89xdygaj6hvzz8";
      };
      packageRequires = [ ];
      meta = {
@@ -9451,10 +9430,10 @@
    elpaBuild {
      pname = "transient";
      ename = "transient";
-      version = "0.8.8.0.20250520.104007";
+      version = "0.8.8.0.20250511.180821";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.8.8.0.20250520.104007.tar";
-        sha256 = "1v5f6y6gmgj9x0ay4zs89818gav6rjfn5ifywmb5qkilsqzjfhxh";
+        url = "https://elpa.gnu.org/devel/transient-0.8.8.0.20250511.180821.tar";
+        sha256 = "1lh8d85qfc7yxc6gj33j930bikq3f7j7n87ajmjsd3y3bjayrcw9";
      };
      packageRequires = [
        compat
@@ -9763,10 +9742,10 @@
    elpaBuild {
      pname = "use-package";
      ename = "use-package";
-      version = "2.4.6.0.20250524.65524";
+      version = "2.4.6.0.20250427.74855";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250524.65524.tar";
-        sha256 = "0zayaizp0d4sk1v4mrc4kfjgzlbxzsa2jrrdadis5al6x077jabx";
+        url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250427.74855.tar";
+        sha256 = "19x0hi00ychc2j18g323rkq7lghfc8p0g9kq3chwhqb46vmqr993";
      };
      packageRequires = [ bind-key ];
      meta = {
@@ -10003,10 +9982,10 @@
    elpaBuild {
      pname = "vertico";
      ename = "vertico";
-      version = "2.2.0.20250527.181301";
+      version = "2.1.0.20250516.184229";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-2.2.0.20250527.181301.tar";
-        sha256 = "1innhh4w5623d86b1y9a1llc0h240jvnfx4661yqgh62d7v47h94";
+        url = "https://elpa.gnu.org/devel/vertico-2.1.0.20250516.184229.tar";
+        sha256 = "07dmj8p760c13grz45fc1wvpy7li2xvqg6scy7jx3jc9j5gdqdk9";
      };
      packageRequires = [ compat ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -527,10 +527,10 @@
    elpaBuild {
      pname = "auth-source-xoauth2-plugin";
      ename = "auth-source-xoauth2-plugin";
-      version = "0.2.1";
+      version = "0.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.2.1.tar";
-        sha256 = "020sf13hiyx6g32vixdf65bdcf9sdkh12rixcln6zgm23pw5rdgl";
+        url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.2.tar";
+        sha256 = "18mmjcyqja46fkggghm45ln6gp1jjb68q4q4q93l3s2vx3hlk60y";
      };
      packageRequires = [ oauth2 ];
      meta = {
@@ -1084,10 +1084,10 @@
    elpaBuild {
      pname = "cape";
      ename = "cape";
-      version = "2.1";
+      version = "2.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/cape-2.1.tar";
-        sha256 = "10g0nxdg6cb2v08qip8dskh1zkdqv23vy8x2f0lyscbmwi72zkrd";
+        url = "https://elpa.gnu.org/packages/cape-2.0.tar";
+        sha256 = "0llcvbqbr296niag7z60kqxpahcv1809734j7d9vnwpl3kgcxg9v";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1298,10 +1298,10 @@
    elpaBuild {
      pname = "colorful-mode";
      ename = "colorful-mode";
-      version = "1.2.4";
+      version = "1.2.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/colorful-mode-1.2.4.tar";
-        sha256 = "18gymjgsa5hxzy502b7mi99d8sypnn07i9934k4bj1py1xwl8q2b";
+        url = "https://elpa.gnu.org/packages/colorful-mode-1.2.3.tar";
+        sha256 = "0y8bsmb27lxa87a9q9vk36dx914dl07np3bkyn019p2ak73wakgk";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1526,10 +1526,10 @@
    elpaBuild {
      pname = "consult";
      ename = "consult";
-      version = "2.4";
+      version = "2.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/consult-2.4.tar";
-        sha256 = "1jiqgh0f9dnh954hf3vql6l2crfarfnfc9bg7nvisqi3wywd35mf";
+        url = "https://elpa.gnu.org/packages/consult-2.3.tar";
+        sha256 = "0rmb5j0kv36lqy135rknfabbzaa7cpfqsgzkicsyzbq3rh3nmf1p";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1639,10 +1639,10 @@
    elpaBuild {
      pname = "corfu";
      ename = "corfu";
-      version = "2.2";
+      version = "2.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/corfu-2.2.tar";
-        sha256 = "17armdh7369fyvxjbj7sv6vawy6mw72vsw4sqf21ra7q2m3h2vca";
+        url = "https://elpa.gnu.org/packages/corfu-2.1.tar";
+        sha256 = "07ffi16b2ay1rcc8bdryg1h901pjbhfaq1qqsm463iis490rzm81";
      };
      packageRequires = [ compat ];
      meta = {
@@ -2609,27 +2609,6 @@
      };
    }
  ) { };
-  doric-themes = callPackage (
-    {
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "doric-themes";
-      ename = "doric-themes";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/doric-themes-0.1.0.tar";
-        sha256 = "12aj50hs7yydr40fj5wlzc8k7a1r2pl6r6gsmd5629bmhd8albmr";
-      };
-      packageRequires = [ ];
-      meta = {
-        homepage = "https://elpa.gnu.org/packages/doric-themes.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
  drepl = callPackage (
    {
      comint-mime,
@@ -3394,10 +3373,10 @@
    elpaBuild {
      pname = "expreg";
      ename = "expreg";
-      version = "1.4.1";
+      version = "1.3.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/expreg-1.4.1.tar";
-        sha256 = "1m30d8yp46al7g1hakq95icmgjz0crcvj1h1yd6bj887v1nrnvkk";
+        url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar";
+        sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6";
      };
      packageRequires = [ ];
      meta = {
@@ -4194,10 +4173,10 @@
    elpaBuild {
      pname = "gtags-mode";
      ename = "gtags-mode";
-      version = "1.8.6";
+      version = "1.8.5";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/gtags-mode-1.8.6.tar";
-        sha256 = "0kmqndl7h6q4k7ziasfp4pi1lnskr394qia1msxsbz1cqcay1cqh";
+        url = "https://elpa.gnu.org/packages/gtags-mode-1.8.5.tar";
+        sha256 = "0pia7ivd11hw9ngdghvcbrapndkpq5ra0jx566f7vgrdxxl73ynm";
      };
      packageRequires = [ ];
      meta = {
@@ -4792,10 +4771,10 @@
    elpaBuild {
      pname = "jinx";
      ename = "jinx";
-      version = "2.2";
+      version = "2.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/jinx-2.2.tar";
-        sha256 = "17f7p7q21f0l8zzr2z05y6mzrh6pw036cnp1375hbssnpsrh3wc1";
+        url = "https://elpa.gnu.org/packages/jinx-2.1.tar";
+        sha256 = "1v4a00bgs6qcpim861kky1i2w0qfn2hza9vj0inn7lh1sic82rkm";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5233,7 +5212,6 @@
  ) { };
  llm = callPackage (
    {
-      compat,
      elpaBuild,
      fetchurl,
      lib,
@@ -5244,13 +5222,12 @@
    elpaBuild {
      pname = "llm";
      ename = "llm";
-      version = "0.26.0";
+      version = "0.25.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/llm-0.26.0.tar";
-        sha256 = "0ihfppwqwxkmv63irca3r0wkp3vsf5imk8gk222vi1dviyqx5q0x";
+        url = "https://elpa.gnu.org/packages/llm-0.25.0.tar";
+        sha256 = "0ykzx0g6w3b9hlxyx41rkbj2n5pjkpf3y0jqiwl012j7zxg1ay6w";
      };
      packageRequires = [
-        compat
        plz
        plz-event-source
        plz-media-type
@@ -6497,20 +6474,16 @@
      elpaBuild,
      fetchurl,
      lib,
-      org,
    }:
    elpaBuild {
      pname = "org-modern";
      ename = "org-modern";
-      version = "1.8";
+      version = "1.7";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-modern-1.8.tar";
-        sha256 = "0ibn6xwssg2llb6hgpbg0p62995skc6g1g469cr58wlb6xb2qxvl";
+        url = "https://elpa.gnu.org/packages/org-modern-1.7.tar";
+        sha256 = "0f1i28x7a9m69xjl3n4bb91pjxm21xw1byhqilyw524y8s22j3wm";
      };
-      packageRequires = [
-        compat
-        org
-      ];
+      packageRequires = [ compat ];
      meta = {
        homepage = "https://elpa.gnu.org/packages/org-modern.html";
        license = lib.licenses.free;
@@ -9187,10 +9160,10 @@
    elpaBuild {
      pname = "tramp";
      ename = "tramp";
-      version = "2.7.2.4";
+      version = "2.7.2.3.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tramp-2.7.2.4.tar";
-        sha256 = "0crlnb421z99vnbvzbq63cqhfy62q96j45qhrzx2v3kajijv77ha";
+        url = "https://elpa.gnu.org/packages/tramp-2.7.2.3.1.tar";
+        sha256 = "171jmgb9sdj1iqq6a77kxin15yik952vvavhpvdr0wxhdq095mgg";
      };
      packageRequires = [ ];
      meta = {
@@ -9830,10 +9803,10 @@
    elpaBuild {
      pname = "vertico";
      ename = "vertico";
-      version = "2.2";
+      version = "2.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/vertico-2.2.tar";
-        sha256 = "1mb2j32wkcv7j310xwhf9pjddf0b85ffna84ywbbnyn9x1xb8qyf";
+        url = "https://elpa.gnu.org/packages/vertico-2.1.tar";
+        sha256 = "03xkl8df90gs26cy00qbk0w23192bkaj32fgaf1w3ajq7mdvfd6p";
      };
      packageRequires = [ compat ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -54,10 +54,10 @@
    elpaBuild {
      pname = "aidermacs";
      ename = "aidermacs";
-      version = "1.4.0.20250529.13102";
+      version = "1.3.0.20250515.132734";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.4.0.20250529.13102.tar";
-        sha256 = "0hsmzp9axsaiqvsw6y75s5yjn9imwhbl609py2xf8lys4jfj8xzg";
+        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.3.0.20250515.132734.tar";
+        sha256 = "010sxd4k7xqkpf2jyyffrkxkgn1cq6wq0mkmmh56xpj3mrrxchyp";
      };
      packageRequires = [
        compat
@@ -572,10 +572,10 @@
    elpaBuild {
      pname = "cider";
      ename = "cider";
-      version = "1.19.0snapshot0.20250530.85125";
+      version = "1.18.0.0.20250512.132717";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.19.0snapshot0.20250530.85125.tar";
-        sha256 = "1mnafkqypqc01ggqa91gxr4m1q8l4hz9i2n8mbqwck4c72zph6k9";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.18.0.0.20250512.132717.tar";
+        sha256 = "0xg81szscjzi8acq96frknpsqqpqwy4lrjs0xjd96smfdz22l47c";
      };
      packageRequires = [
        clojure-mode
@@ -601,10 +601,10 @@
    elpaBuild {
      pname = "clojure-mode";
      ename = "clojure-mode";
-      version = "5.20.0.0.20250528.61040";
+      version = "5.20.0snapshot0.20250406.154328";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0.0.20250528.61040.tar";
-        sha256 = "071zs4y4ishjkzwr0dsmd3280vpl92vdpy8f1hwa85lz6i4kyr4r";
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20250406.154328.tar";
+        sha256 = "16m89nva2wrin5pbn3iskv43clc9vmvvzc3m2ldyy2vl08lkzbbd";
      };
      packageRequires = [ ];
      meta = {
@@ -622,10 +622,10 @@
    elpaBuild {
      pname = "clojure-ts-mode";
      ename = "clojure-ts-mode";
-      version = "0.5.0snapshot0.20250530.85704";
+      version = "0.4.0.0.20250516.71256";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.5.0snapshot0.20250530.85704.tar";
-        sha256 = "13iwffh76x4463kjsg1kxbvaainq7ikn5idj03az9r8gdijbwz3g";
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.4.0.0.20250516.71256.tar";
+        sha256 = "1r8r0ym20qc791svcz560m2ir0p4siid7q98y7mn23yfw9kakz81";
      };
      packageRequires = [ ];
      meta = {
@@ -716,10 +716,10 @@
    elpaBuild {
      pname = "crux";
      ename = "crux";
-      version = "0.6.0snapshot0.20250525.163240";
+      version = "0.6.0snapshot0.20250421.93605";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20250525.163240.tar";
-        sha256 = "07rdz5ns0bh8qgndz7q0xqymcpyvcgl3c1h4f2hajr2jqjbhhdv2";
+        url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20250421.93605.tar";
+        sha256 = "1kzscg15rb237q0y9brl9xbb5z5ygfq6malzhr3axlx2r20xgdi4";
      };
      packageRequires = [ ];
      meta = {
@@ -1227,10 +1227,10 @@
    elpaBuild {
      pname = "emacsql";
      ename = "emacsql";
-      version = "4.3.0.0.20250529.95634";
+      version = "4.3.0.0.20250509.141847";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.0.0.20250529.95634.tar";
-        sha256 = "1q5jf8fbh7kj7lfm7qh2n6v3admqcdi7mgjbf9lr0j5zzfyz3bbc";
+        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.0.0.20250509.141847.tar";
+        sha256 = "140mzggvkfjgfx52q4zahbbskcqcbv6vxpw7k9ky9hawr30gbq0a";
      };
      packageRequires = [ ];
      meta = {
@@ -1723,10 +1723,10 @@
    elpaBuild {
      pname = "flycheck";
      ename = "flycheck";
-      version = "35.0.0.20250527.90754";
+      version = "35.0.0.20250424.133949";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0.0.20250527.90754.tar";
-        sha256 = "05d9fbd4hv57jcfsjphdzlmnl4wrfawy7q006sca33wljscpyqr1";
+        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0.0.20250424.133949.tar";
+        sha256 = "1k54zvcrl3wms2bsza44h56kxbwjqpaym4p70a6dxxw3ac60jlfq";
      };
      packageRequires = [ ];
      meta = {
@@ -2270,10 +2270,10 @@
    elpaBuild {
      pname = "gnuplot";
      ename = "gnuplot";
-      version = "0.9.0.20250530.193710";
+      version = "0.8.1.0.20240914.153054";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.9.0.20250530.193710.tar";
-        sha256 = "1wbdpa3w8zsqzlhi28kcczxjrxw3jmysm0i1frbzkmw01cgpqjzp";
+        url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20240914.153054.tar";
+        sha256 = "0pv7ql14d7srb98nidw6fr4mwgssqyv95yskflz27dbbwjlycmn6";
      };
      packageRequires = [ ];
      meta = {
@@ -2377,10 +2377,10 @@
    elpaBuild {
      pname = "gptel";
      ename = "gptel";
-      version = "0.9.8.0.20250529.230850";
+      version = "0.9.8.0.20250515.225537";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.8.0.20250529.230850.tar";
-        sha256 = "1xza3riy1799sbqy2f5h1q5d1lpr8rl6xvbknxv51zmp74mnajkg";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.8.0.20250515.225537.tar";
+        sha256 = "0wcy7qq8d1pnpjf6fqwcff8r4gbl08azlayyxabqsakgr3498p5d";
      };
      packageRequires = [
        compat
@@ -2508,10 +2508,10 @@
    elpaBuild {
      pname = "haskell-mode";
      ename = "haskell-mode";
-      version = "17.5.0.20250519.115454";
+      version = "17.5.0.20250401.174200";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250519.115454.tar";
-        sha256 = "17si5n0mdaij4kx19rhzy1p3asczkgcd5bhc1fsspi60kzwsmmi8";
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250401.174200.tar";
+        sha256 = "1dxfwd4yhwzy59d55hnz0z23dg5vh1fzkrpicdaz93m9yvfzy1aa";
      };
      packageRequires = [ ];
      meta = {
@@ -2551,10 +2551,10 @@
    elpaBuild {
      pname = "haskell-ts-mode";
      ename = "haskell-ts-mode";
-      version = "1.2.0.0.20250518.53811";
+      version = "1.1.4.0.20250516.134138";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.2.0.0.20250518.53811.tar";
-        sha256 = "1n5rnyd02mfp77r8h71dpi18q7kayf4dh9rz8aglsx1087mrfm3g";
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.1.4.0.20250516.134138.tar";
+        sha256 = "15d4bc5i7p7r9psqdaljyvhxvzlwigzy8sb4iv0wxhbv7wwgwv37";
      };
      packageRequires = [ ];
      meta = {
@@ -2574,10 +2574,10 @@
    elpaBuild {
      pname = "helm";
      ename = "helm";
-      version = "4.0.3.0.20250529.40054";
+      version = "4.0.3.0.20250515.54814";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.3.0.20250529.40054.tar";
-        sha256 = "05da9val6w0q3s0662625jp8f2s76mfrayfwpvj00zbvqbavw4i7";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.3.0.20250515.54814.tar";
+        sha256 = "0q6scri31v9pjbjkf8sf969aqal228yx66hsahb77gcpvfx0ribg";
      };
      packageRequires = [
        helm-core
@@ -2599,10 +2599,10 @@
    elpaBuild {
      pname = "helm-core";
      ename = "helm-core";
-      version = "4.0.3.0.20250529.40054";
+      version = "4.0.3.0.20250515.54814";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.3.0.20250529.40054.tar";
-        sha256 = "0xa2qp95wswlcqkmg3hngfkqk2mm78z0j2fms89kxm5sg2jkcf7d";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.3.0.20250515.54814.tar";
+        sha256 = "0f66yi42zqccv8i7mlqclvy6c3a5xqc58j54lc4qqr826wmmizbf";
      };
      packageRequires = [ async ];
      meta = {
@@ -2856,10 +2856,10 @@
    elpaBuild {
      pname = "inf-clojure";
      ename = "inf-clojure";
-      version = "3.3.0.0.20250525.205532";
+      version = "3.2.1.0.20230909.44557";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/inf-clojure-3.3.0.0.20250525.205532.tar";
-        sha256 = "1q4cibg107pcg1cirqmmzhvbyyzlm76aqfyqad8m6ds76jv3kkcg";
+        url = "https://elpa.nongnu.org/nongnu-devel/inf-clojure-3.2.1.0.20230909.44557.tar";
+        sha256 = "0ncdqbz8z8wrcf3s1y3n1b11b7k3mwxdk4w5v7pr0j6jn3yfnbby";
      };
      packageRequires = [ clojure-mode ];
      meta = {
@@ -3252,10 +3252,10 @@
    elpaBuild {
      pname = "magit";
      ename = "magit";
-      version = "4.3.5.0.20250520.83537";
+      version = "4.3.2.0.20250401.175331";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.5.0.20250520.83537.tar";
-        sha256 = "14x7qvkpgjyhf5wcc26gq4plrysd61dr8i4yywxyf09d67xmam8q";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.2.0.20250401.175331.tar";
+        sha256 = "1way4hifyj0p5ly2p84as1amivv67qr22ph292rgwizrj0d5j60y";
      };
      packageRequires = [
        compat
@@ -3283,10 +3283,10 @@
    elpaBuild {
      pname = "magit-section";
      ename = "magit-section";
-      version = "4.3.5.0.20250520.83537";
+      version = "4.3.2.0.20250401.175331";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.5.0.20250520.83537.tar";
-        sha256 = "1c0n0cdgc7mf910pdpxp75wsan7772k5iw307lybf465maabjx1i";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.2.0.20250401.175331.tar";
+        sha256 = "1wif3d5vb04f39g38w2nbamqcbb89ivh2w5b0w362k3pk0vq2a70";
      };
      packageRequires = [
        compat
@@ -3448,10 +3448,10 @@
    elpaBuild {
      pname = "moe-theme";
      ename = "moe-theme";
-      version = "1.1.0.0.20250527.61144";
+      version = "1.1.0.0.20250203.180833";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20250527.61144.tar";
-        sha256 = "056w9sg4nq75rbcl73l86l79s9qzjp9kdiqrmcydicpdk40dm115";
+        url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20250203.180833.tar";
+        sha256 = "1vazqmwvn0cpzni1hyjilcdq2zynl4gijkrkhdgaqnskzqp437rm";
      };
      packageRequires = [ ];
      meta = {
@@ -3716,10 +3716,10 @@
    elpaBuild {
      pname = "org-journal";
      ename = "org-journal";
-      version = "2.2.0.0.20250525.35745";
+      version = "2.2.0.0.20250425.93636";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20250525.35745.tar";
-        sha256 = "0b00a6sn1ykqzz4f9zqi3z0n586n6q9swf92af3kxc9157av9wq5";
+        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20250425.93636.tar";
+        sha256 = "0si4zircvmqkh1rk46gs102w0a6kaqx1jc5pr5zk90bgah54jy8f";
      };
      packageRequires = [ org ];
      meta = {
@@ -3852,10 +3852,10 @@
    elpaBuild {
      pname = "orgit";
      ename = "orgit";
-      version = "2.0.2.0.20250527.133058";
+      version = "2.0.2.0.20250509.121824";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.2.0.20250527.133058.tar";
-        sha256 = "14k8qa0i895fqqqb62njyb0i1kd627gbq68jaamscpwwzw7km66y";
+        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.2.0.20250509.121824.tar";
+        sha256 = "0spqa4zm3k4dnnkns9p9fbji2qryrzlf272a64lhc2l4p5kl5s5d";
      };
      packageRequires = [
        compat
@@ -3899,10 +3899,10 @@
    elpaBuild {
      pname = "package-lint";
      ename = "package-lint";
-      version = "0.26.0.20250527.184516";
+      version = "0.26.0.20250418.142545";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20250527.184516.tar";
-        sha256 = "0nm3z8cirwvhls4ihckfnydw11qczrgps1mc1h56q3gsyr901z43";
+        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20250418.142545.tar";
+        sha256 = "0qpsyimq3i6p8s03ax2grnzn474ngmx2lcvsvf5db6fryhw9qxj3";
      };
      packageRequires = [ let-alist ];
      meta = {
@@ -4099,10 +4099,10 @@
    elpaBuild {
      pname = "php-mode";
      ename = "php-mode";
-      version = "1.26.1.0.20250528.130625";
+      version = "1.26.1.0.20250422.172013";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250528.130625.tar";
-        sha256 = "19zzmhak462xygriknnh3y83xfl2jrqvh4gz129vnwysnmb13lx3";
+        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250422.172013.tar";
+        sha256 = "1d2ahw3vd7r9ylwb5cm5rjdd70cvfp7zy82rkx1ix2ddamfmbqya";
      };
      packageRequires = [ ];
      meta = {
@@ -4162,10 +4162,10 @@
    elpaBuild {
      pname = "projectile";
      ename = "projectile";
-      version = "2.9.1.0.20250527.53156";
+      version = "2.9.1.0.20250402.71553";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.1.0.20250527.53156.tar";
-        sha256 = "0gnig1w4w3sjlvhkc66kbv6hp5bf4bp35iqkhz902qs565sdsxzk";
+        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.1.0.20250402.71553.tar";
+        sha256 = "0cnidaysnma7bvzzw5vbkggy3z9zq51zlg4k2kd5b1f8dagjlzv7";
      };
      packageRequires = [ ];
      meta = {
@@ -4183,10 +4183,10 @@
    elpaBuild {
      pname = "proof-general";
      ename = "proof-general";
-      version = "4.6snapshot0.20250527.143946";
+      version = "4.6snapshot0.20250516.91308";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250527.143946.tar";
-        sha256 = "1xkk7hspy0zn4sm1j05j253fima73q0nbzma57vv1k8v68j933y9";
+        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250516.91308.tar";
+        sha256 = "0fkl0zm8wm6snp0baab0hbabzsli7jw8pq13kzvng2mj8djsm8l2";
      };
      packageRequires = [ ];
      meta = {
@@ -4227,10 +4227,10 @@
    elpaBuild {
      pname = "racket-mode";
      ename = "racket-mode";
-      version = "1.0.20250522.142050";
+      version = "1.0.20250514.102731";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250522.142050.tar";
-        sha256 = "19zc9y704b9naqgx9cs9j40q0z402jp02f83l1fpcpyq3gbhmi1y";
+        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250514.102731.tar";
+        sha256 = "1da7v2w83kn7q07nb3pili3hsiymxa9h2l7nhf7y8sskq8j1sscc";
      };
      packageRequires = [ compat ];
      meta = {
@@ -4311,10 +4311,10 @@
    elpaBuild {
      pname = "recomplete";
      ename = "recomplete";
-      version = "0.2.0.20250528.3825";
+      version = "0.2.0.20250119.115844";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20250528.3825.tar";
-        sha256 = "1cip3dy8klcy1hsw2w3wx9lhzpf6inya430japh798drn0k3vi7j";
+        url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20250119.115844.tar";
+        sha256 = "0sij91c5p5lqbj3p7f0iprzvzrgvg37bn16jgh93byxwpr8cwpik";
      };
      packageRequires = [ ];
      meta = {
@@ -4612,10 +4612,10 @@
    elpaBuild {
      pname = "slime";
      ename = "slime";
-      version = "2.31snapshot0.20250520.4450";
+      version = "2.31snapshot0.20250417.201511";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250520.4450.tar";
-        sha256 = "0b1kxhimlx73nmhgkidjpz3dm1nsyikqhflz2c7mhmdii50nramy";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250417.201511.tar";
+        sha256 = "0pbm04m0wzr63vs45xs624xgkjskpcvprwgizqmh84bvqg6g4zvh";
      };
      packageRequires = [ macrostep ];
      meta = {
@@ -4633,10 +4633,10 @@
    elpaBuild {
      pname = "sly";
      ename = "sly";
-      version = "1.0.43.0.20250522.230625";
+      version = "1.0.43.0.20250501.191827";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250522.230625.tar";
-        sha256 = "13y1h93bf4bmz0mwrwhk6nd4skvcpjw9x0jl1ga2xx1ja6wf81s5";
+        url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250501.191827.tar";
+        sha256 = "026z57k7bg8brvgi8pngdxrb0djski7ryj9mlrzbjwr1r5z5c1z4";
      };
      packageRequires = [ ];
      meta = {
@@ -4846,10 +4846,10 @@
    elpaBuild {
      pname = "swift-mode";
      ename = "swift-mode";
-      version = "9.3.0.0.20250524.53009";
+      version = "9.3.0.0.20250412.62413";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.3.0.0.20250524.53009.tar";
-        sha256 = "0dcr8d4d4bn6grxycc89bm14i4vq4z8vvhi9548v0iz5fh1bjwgs";
+        url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.3.0.0.20250412.62413.tar";
+        sha256 = "0mgjswp1ldqcwicgxa3rr6nv8g2yi6pgqlxi9m2pvzihy9x70b53";
      };
      packageRequires = [ seq ];
      meta = {
@@ -5108,10 +5108,10 @@
    elpaBuild {
      pname = "treesit-fold";
      ename = "treesit-fold";
-      version = "0.2.1.0.20250521.182836";
+      version = "0.2.1.0.20250422.155540";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20250521.182836.tar";
-        sha256 = "0d1a2fqm2j60cz3ssqnmdvp0qd906i7wnxvn6nxmq6ny77lvhk0y";
+        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20250422.155540.tar";
+        sha256 = "02svdk7sas6xy2acqsm2d0qmafxp16qhb2p8n2mchg6aa3yldk9b";
      };
      packageRequires = [ ];
      meta = {
@@ -5477,10 +5477,10 @@
    elpaBuild {
      pname = "with-editor";
      ename = "with-editor";
-      version = "3.4.3.0.20250521.153138";
+      version = "3.4.3.0.20250509.145538";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.3.0.20250521.153138.tar";
-        sha256 = "0i1912zgn5v06pbbyw03vxhn329d58p39li6b8jxrniz74si3h7x";
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.3.0.20250509.145538.tar";
+        sha256 = "1chrmrlxx61q1n2kqghka8vq2mj7rnk2slx8rfp7nkcsja4b6nz7";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5587,10 +5587,10 @@
    elpaBuild {
      pname = "xah-fly-keys";
      ename = "xah-fly-keys";
-      version = "26.12.20250517213917.0.20250517.214741";
+      version = "26.12.20250503115607.0.20250503.115753";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.12.20250517213917.0.20250517.214741.tar";
-        sha256 = "1wihfan7mxi1d4qxwdqwpfzdi0zjmwwq3ssiscg9i39mqnlyn93s";
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.12.20250503115607.0.20250503.115753.tar";
+        sha256 = "1vn45rxy14ij4w7iswcwlkgvgjnjbgana2v2a34k71xn392gsf32";
      };
      packageRequires = [ ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -54,10 +54,10 @@
    elpaBuild {
      pname = "aidermacs";
      ename = "aidermacs";
-      version = "1.4";
+      version = "1.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.4.tar";
-        sha256 = "0432v40yr0yjma7lhd53dn7rlfsh8fampw9j2wvmcqpw6dhny4jy";
+        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.3.tar";
+        sha256 = "03s08h5xp57l228gn9lay4a7h19zk6wyn777r2icsn1a1ii63l82";
      };
      packageRequires = [
        compat
@@ -601,10 +601,10 @@
    elpaBuild {
      pname = "clojure-mode";
      ename = "clojure-mode";
-      version = "5.20.0";
+      version = "5.19.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.20.0.tar";
-        sha256 = "16myla7yfknxf36w0n09xg2rr4z4374gs6iqb9spf9hmw0d6z800";
+        url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
+        sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
      };
      packageRequires = [ ];
      meta = {
@@ -2287,10 +2287,10 @@
    elpaBuild {
      pname = "gnuplot";
      ename = "gnuplot";
-      version = "0.9";
+      version = "0.8.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/gnuplot-0.9.tar";
-        sha256 = "019cvjh4cqn6y5y2kxw8sy1y23jkh9mmi38wpg3mqayq4xfxdlyv";
+        url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar";
+        sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx";
      };
      packageRequires = [ ];
      meta = {
@@ -2567,10 +2567,10 @@
    elpaBuild {
      pname = "haskell-ts-mode";
      ename = "haskell-ts-mode";
-      version = "1.2.0";
+      version = "1.1.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.2.0.tar";
-        sha256 = "016722wrs24i5kzirlc5mzs12m4g6wg4aba6fda2q1ghmf41g8pp";
+        url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.1.4.tar";
+        sha256 = "1430hddrj9lkfxapxa5d13q800awqxhg84r87abmry9skn35jfs7";
      };
      packageRequires = [ ];
      meta = {
@@ -2872,10 +2872,10 @@
    elpaBuild {
      pname = "inf-clojure";
      ename = "inf-clojure";
-      version = "3.3.0";
+      version = "3.2.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.3.0.tar";
-        sha256 = "1z81gk1w2mvas0qlfxg0i2af6d93kylsn3lwiq0xymzlcp0rjjdj";
+        url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
+        sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb";
      };
      packageRequires = [ clojure-mode ];
      meta = {
@@ -3268,10 +3268,10 @@
    elpaBuild {
      pname = "magit";
      ename = "magit";
-      version = "4.3.5";
+      version = "4.3.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-4.3.5.tar";
-        sha256 = "04hybghzplgdk4vlyss221lvlvny16i9g1043l7gds1iib8875pc";
+        url = "https://elpa.nongnu.org/nongnu/magit-4.3.2.tar";
+        sha256 = "1pi69z1h5h6qlwmvwl2i2n5gcv9anp9zpgv9knqwrq8j2d5ialgr";
      };
      packageRequires = [
        compat
@@ -3299,10 +3299,10 @@
    elpaBuild {
      pname = "magit-section";
      ename = "magit-section";
-      version = "4.3.5";
+      version = "4.3.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.5.tar";
-        sha256 = "1rik2sh3v6y6qsyjnqiy5vbf5ls0gnc32lhsnrkyaryfc3kis7cf";
+        url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.2.tar";
+        sha256 = "0dnmwciz26wrsmp48h9axmj6qjgzhz9i7g3bvlpsq3i8y32xwdf6";
      };
      packageRequires = [
        compat
@@ -4250,10 +4250,10 @@
    elpaBuild {
      pname = "racket-mode";
      ename = "racket-mode";
-      version = "1.0.20250522.142050";
+      version = "1.0.20250514.102731";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250522.142050.tar";
-        sha256 = "0af5m48mjnyqyrpcb09g59w6jxlm7917b6xm62zliv0bns9k9irm";
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250514.102731.tar";
+        sha256 = "0d5q08q3bm2ws0g0cys1xzjvznrqxhwxikjrkdri9js8y14z50l3";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5601,10 +5601,10 @@
    elpaBuild {
      pname = "xah-fly-keys";
      ename = "xah-fly-keys";
-      version = "26.12.20250517213917";
+      version = "26.12.20250503115607";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.12.20250517213917.tar";
-        sha256 = "19wandxd82i2v3qm4njhvvmdd36rmf2d28nn5cp8ain71zx6vk4a";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.12.20250503115607.tar";
+        sha256 = "1mh6rssi7g6dfl2glpivfixpdfk0kdlsbilszazmhzc6bh34blj5";
      };
      packageRequires = [ ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5316,8 +5316,8 @@ let
        mktplcRef = {
          name = "vim";
          publisher = "vscodevim";
-          version = "1.30.1";
-          hash = "sha256-cKdVQTGj7R37YefQAaTspF1RVul/9wv7u9b5TpGZN5k=";
+          version = "1.29.2";
+          hash = "sha256-RBh4yQxOoUpwNKedFjEeu6hO0tU9AAPlDrt2LhgZT50=";
        };
        meta = {
          license = lib.licenses.mit;
--- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix
@@ -2,8 +2,8 @@
  jq,
  lib,
  moreutils,
-  prettier,
  vscode-utils,
+  nodePackages,
 }:

 vscode-utils.buildVscodeMarketplaceExtension {
@@ -19,11 +19,11 @@ vscode-utils.buildVscodeMarketplaceExtension {
    moreutils
  ];

-  buildInputs = [ prettier ];
+  buildInputs = [ nodePackages.prettier ];

  postInstall = ''
    cd "$out/$installPrefix"
-    jq '.contributes.configuration.properties."prettier.prettierPath".default = "${prettier}/lib/node_modules/prettier"' package.json | sponge package.json
+    jq '.contributes.configuration.properties."prettier.prettierPath".default = "${nodePackages.prettier}/lib/node_modules/prettier"' package.json | sponge package.json
  '';

  meta = {
--- 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-05-28";
+  version = "0-unstable-2025-05-19";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "fbneo";
-    rev = "60d812a5a25b7f6cc7df2842264b67847e51122b";
-    hash = "sha256-4HJZXsgUp0do7T0bwPPuuyoN7XIII3DSzk6LsLqZQeQ=";
+    rev = "d2cf158e9ba82fc7dfec592452e6113121665c19";
+    hash = "sha256-dO1R0iIXEo2lrMSOJXlZBw2yXBfyB/1yFfRPYEEAojo=";
  };

  makefile = "Makefile";
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "puae";
-  version = "0-unstable-2025-05-24";
+  version = "0-unstable-2025-05-14";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "libretro-uae";
-    rev = "f1c248602abb58e7c570feec3f59f4677407b252";
-    hash = "sha256-CmdMeAntu+uFp1HowBz3UgMiqFbRrNuMyevTlKxga/M=";
+    rev = "fad7beb42c90a1a04829d465bed951a69cd36f8b";
+    hash = "sha256-pO45/IvgT2q5k0sBhSNZ6srJx4h2lYSjG/mKFJesGbc=";
  };

  makefile = "Makefile";
--- a/pkgs/applications/misc/blucontrol/wrapper.nix
+++ b/pkgs/applications/misc/blucontrol/wrapper.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {

  # trivial derivation
  preferLocalBuild = true;
-  allowSubstitutes = false;
+  allowSubstitues = false;

  meta = with lib; {
    description = "Configurable blue light filter";
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -16,13 +16,13 @@

 mkDerivation rec {
  pname = "klayout";
-  version = "0.30.2";
+  version = "0.30.1";

  src = fetchFromGitHub {
    owner = "KLayout";
    repo = "klayout";
    rev = "v${version}";
-    hash = "sha256-x6eg5SoPTcxSggonI1OdbTo/BCjqaV7bXHnEG90o2J8=";
+    hash = "sha256-5e697uEuH2r/k/5qSuluJ2qvgCqM/Z+O0fZ7Lygdvz4=";
  };

  postPatch = ''
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -10,14 +10,14 @@

 rofi-unwrapped.overrideAttrs (oldAttrs: rec {
  pname = "rofi-wayland-unwrapped";
-  version = "1.7.9+wayland1";
+  version = "1.7.8+wayland1";

  src = fetchFromGitHub {
    owner = "lbonn";
    repo = "rofi";
    rev = version;
    fetchSubmodules = true;
-    hash = "sha256-tLSU0Q221Pg3JYCT+w9ZT4ZbbB5+s8FwsZa/ehfn00s=";
+    hash = "sha256-6hQfy0c73z1Oi2mGjuhKLZQIBpG1u06v40dmlc5fL/w=";
  };

  depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ];
--- 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.0";
+      version = "3.29.3";

      src = fetchFromGitHub {
        owner = "projectcalico";
        repo = "calico";
        rev = "v${version}";
-        hash = "sha256-twq0Yp2M1f9qtcAQ+kcZoBxXXtw1VrV9ZrtEnEPv+Ks=";
+        hash = "sha256-JK/iKVLXT8h+xZpkjVBEI8vfgRuoTHwWaoKikjBsJgI=";
      };

-      vendorHash = "sha256-hvAFSr64YsGaSbbG3aEsSO+gprtQy51/BsdYAhAgH3Q=";
+      vendorHash = "sha256-dkBOhuX/tf+emLLeZ+7fI+z1pKwZLD0ZqZNxUMS32NE=";

      inherit doCheck subPackages;

--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "helm-secrets";
-  version = "4.6.5";
+  version = "4.6.4";

  src = fetchFromGitHub {
    owner = "jkroepke";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-gSWavqvKdVBRF182fzEiRqEVg8douzEcpKiOdmSZ9hg=";
+    hash = "sha256-PvWHxcxNSCI5RX830+b61fiyi0WX8ujEJzjyUOXp+iA=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "helmfile";
-  version = "1.1.1";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "helmfile";
    repo = "helmfile";
    rev = "v${version}";
-    hash = "sha256-UGmthYbm0uMuWfUpXpTQUtZ71yXPRvmTZUJ2PLqjUrA=";
+    hash = "sha256-xLVUyzRl6Q9GJOoYJCo1pbYxheVjEvnQIa4BMJVR9PY=";
  };

-  vendorHash = "sha256-Sil18yyhEbITTEmU5IiqEXpip1GUgCaKQO3IOGsgX54=";
+  vendorHash = "sha256-biFRdHnOvxd2hgTGPotZtlmbyqNrkW8f158kjAuLkuA=";

  proxyVendor = true; # darwin/linux hash mismatch

--- a/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/pkgs/applications/networking/cluster/linkerd/edge.nix
@@ -2,7 +2,7 @@

 (callPackage ./generic.nix { }) {
  channel = "edge";
-  version = "25.5.4";
-  sha256 = "0hyjhcb36qbsigc0knf4spyal0djijln1w5cdjrrpwx58jzjhzj8";
-  vendorHash = "sha256-DNR2qLTai7BOOovbd9MfQ1ZUUehkD9WQ/UJo+MDdjSg=";
+  version = "25.5.1";
+  sha256 = "0wnj2v08j71aq8p3qx3k71xkbnr84vxgd3cidka7lxrj21hcbk0q";
+  vendorHash = "sha256-dxTTxTwDWvcDJiwMtqg814oUx0TsUcon7Wx0sVIq26A=";
 }
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1,13 +1,4 @@
 {
-  "_assert": {
-    "hash": "sha256-ngHxzV7lRg6pOtyNTdCv3ToRK/vO016Vp2mlh7QT8Rc=",
-    "homepage": "https://registry.terraform.io/providers/hashicorp/assert",
-    "owner": "hashicorp",
-    "repo": "terraform-provider-assert",
-    "rev": "v0.16.0",
-    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-nHaBNYCKfTvaDnz2SeexM2cyNVK5ThPYn4rnGEw7Wi0="
-  },
  "aci": {
    "hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=",
    "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
@@ -117,11 +108,11 @@
    "vendorHash": "sha256-2NSP0jGFchh3roqSKxCRbkQ+8lNiGRo4JivvBj6wqdg="
  },
  "aviatrix": {
-    "hash": "sha256-sk0AU0Gqynpl1z+AXRqW1/F56pV4uTrO332622NrzX0=",
+    "hash": "sha256-t19AY2TWOEZpJNbqZevZ6pdzAdUARjmmB8fJjW/LGKM=",
    "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
    "owner": "AviatrixSystems",
    "repo": "terraform-provider-aviatrix",
-    "rev": "v8.0.0",
+    "rev": "v3.2.1",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -144,11 +135,11 @@
    "vendorHash": null
  },
  "azurerm": {
-    "hash": "sha256-dd/PAMkdnVlcjOk8Q5i4TsfmSWJgG25FgI/lF0OrVXI=",
+    "hash": "sha256-u9rcky6sIFEfPI5WqyqQ0Z+p4wXuV6mv+mHtHbI8Zbc=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
    "owner": "hashicorp",
    "repo": "terraform-provider-azurerm",
-    "rev": "v4.31.0",
+    "rev": "v4.29.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -162,20 +153,20 @@
    "vendorHash": null
  },
  "baiducloud": {
-    "hash": "sha256-rWLmDopC6m2tzh2NEYvclp0QVH0r/5toA+3jBUkcBaY=",
+    "hash": "sha256-n+vKQ6IE1PV/09OCeYj28o1YKVP0cCDCTYLLq/4PClg=",
    "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
    "owner": "baidubce",
    "repo": "terraform-provider-baiducloud",
-    "rev": "v1.21.16",
+    "rev": "v1.21.13",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
  "bigip": {
-    "hash": "sha256-TZDIJE2iBNcd505e+gfFvTr6vRqfwAm/nqlxVeT8gM0=",
+    "hash": "sha256-MVnqTt9Hsc2wqKbCK+mEpNnNf1mKU6NgTPxO/8LZbaw=",
    "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
    "owner": "F5Networks",
    "repo": "terraform-provider-bigip",
-    "rev": "v1.22.10",
+    "rev": "v1.22.9",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -399,13 +390,13 @@
    "vendorHash": "sha256-WZqwBkVXoFmDikIyt9GWszLA/9YBoQHAdBuWbGKZBZw="
  },
  "docker": {
-    "hash": "sha256-sPeX1bupACBSmt8ppyxQKyD+FXIPdCBWn8cnOAvNHwQ=",
+    "hash": "sha256-vpgvEDcmUpumCNvahijb7lkkEQUeaHH0a+CSzPspIyM=",
    "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
    "owner": "kreuzwerker",
    "repo": "terraform-provider-docker",
-    "rev": "v3.6.0",
+    "rev": "v3.5.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bQM6bAtTqAzrIqvCnpfxYefiTmTKaJq8okAgOVls5jk="
+    "vendorHash": "sha256-b2N/m85aUbD93ATbqdqU/7HHQz2JKW7Cj96JnjLVq20="
  },
  "doppler": {
    "hash": "sha256-TPWHqRpvyk1dtSbQySMOecq0AhN2VlSB+2naPIbvMHI=",
@@ -507,13 +498,13 @@
    "vendorHash": null
  },
  "gitlab": {
-    "hash": "sha256-VOmBHM5h/ZEkCPbsVRRM/Ygkfv7Dom41nlqJ/5+aZ4M=",
+    "hash": "sha256-tZJuXYRD6+E6Bhrn+cjeSCRAePgj/g+E8YTStwjZiSM=",
    "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
    "owner": "gitlabhq",
    "repo": "terraform-provider-gitlab",
-    "rev": "v18.0.0",
+    "rev": "v17.11.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-X0vbtUIKYzCeRD/BbMj3VPVAwx6d7gkbHV8j9JXlaFM="
+    "vendorHash": "sha256-3URc3A1kkcVQ/riB2/THuIEiCq9MrifxgRL73cjsbDA="
  },
  "google": {
    "hash": "sha256-q/BFHpA3ig0QfB0mhJGqr/uQYs/SH5YX8QgWCyjcSio=",
@@ -543,11 +534,11 @@
    "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
  },
  "grafana": {
-    "hash": "sha256-Nz+6l/sJog7Snzady4qQCooBwv6IZ+12RkFZ55Hka9w=",
+    "hash": "sha256-ZPejLOzShIW7BDlyYcFSV48uiA8XU15ziobHqtS7LW8=",
    "homepage": "https://registry.terraform.io/providers/grafana/grafana",
    "owner": "grafana",
    "repo": "terraform-provider-grafana",
-    "rev": "v3.25.1",
+    "rev": "v3.25.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-G5CiuQ0GPsJ7D+wlWQUAktT3DSgb2X7NL66c6U+9APU="
  },
@@ -570,11 +561,11 @@
    "vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE="
  },
  "hcloud": {
-    "hash": "sha256-/BcK9K/jNEU4r7mFc4rrhNnPlyH98UrDUCgIluY52fA=",
+    "hash": "sha256-DSTxn4t6YWxRBimMlqkP1VLqqxk1Kox+h0u9i9rSdhc=",
    "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
    "owner": "hetznercloud",
    "repo": "terraform-provider-hcloud",
-    "rev": "v1.51.0",
+    "rev": "v1.50.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-jbNkhNSSO9jT20J6dVhBEbN9cwtNrvx5EUcyOZcMd4Y="
  },
@@ -651,13 +642,13 @@
    "vendorHash": null
  },
  "ibm": {
-    "hash": "sha256-5AYTRuZ9hhi5AgAT3woHTv3vMmqUUXUjZKZjaBRf9H8=",
+    "hash": "sha256-MMVZnGQ8MWczkbMC9VUoRcplmIk4TdiahZ/ZSYhbQlM=",
    "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
    "owner": "IBM-Cloud",
    "repo": "terraform-provider-ibm",
-    "rev": "v1.78.4",
+    "rev": "v1.78.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ug5TAuOJCk2wmhhwLQLYXVL3xxODUum6oEK/8A6ojIA="
+    "vendorHash": "sha256-8P5GnDXY8n/NhSY0Oo/7CP7U7pH7f0Z0GfiFnicCxdo="
  },
  "icinga2": {
    "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@@ -696,13 +687,13 @@
    "vendorHash": "sha256-Dd02Ikt51eh/FBEtswe8Qr6P5tgQFZJTKgO01gxPX3s="
  },
  "kafka": {
-    "hash": "sha256-xFuNCHUE2r+NGsvLmD2W+d9oB6RjV/2o4sAxqTOJUtE=",
+    "hash": "sha256-O8fD974eEmIgMAbLsENBkHiS1+2onx7OOrhnwv+cGoo=",
    "homepage": "https://registry.terraform.io/providers/Mongey/kafka",
    "owner": "Mongey",
    "repo": "terraform-provider-kafka",
-    "rev": "v0.10.1",
+    "rev": "v0.9.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-wnyCBxqvmWfgR/MLRVcA/cXeq08qcuhSVIsSWYPTJGc="
+    "vendorHash": "sha256-fp4r3Eh4EcMHK1F9mGr1iEQ/ZmI4+PbzsDjEK0AqXk8="
  },
  "kafka-connect": {
    "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=",
@@ -822,13 +813,13 @@
    "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
  },
  "migadu": {
-    "hash": "sha256-WD9i0i8Jkl3aROcWHflc+FP4xOtBMsRvaHM+V40+Me0=",
+    "hash": "sha256-k9qpSxww6zXemEWDqjlrjFmeeMtKK9kR1hj9+gUq9VI=",
    "homepage": "https://registry.terraform.io/providers/metio/migadu",
    "owner": "metio",
    "repo": "terraform-provider-migadu",
-    "rev": "2025.5.22",
+    "rev": "2025.5.15",
    "spdx": "0BSD",
-    "vendorHash": "sha256-c3rg9n3JL14kEZJTe3oIPiNM7AvG1QqtTnpX0P0JuMY="
+    "vendorHash": "sha256-MjRVd/JlmHppdFG7k3pgNVWbCaEZuh5E591x/P6cT5o="
  },
  "minio": {
    "hash": "sha256-loUcdsr5zFoOXIu0CLYKvutIVLYG0+DsuwPCxAeVMF8=",
@@ -922,20 +913,20 @@
    "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
  },
  "oci": {
-    "hash": "sha256-aV69aOYkHQwD8JVFC9zD+pV0Wwjx5ZqG1PoP20aED8o=",
+    "hash": "sha256-fLeI4YdHZmRPILHeoEjwcNN9mVOq2zvdjSoQkIiwvdc=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v7.2.0",
+    "rev": "v7.0.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
  "okta": {
-    "hash": "sha256-8dFl39q8GTLGFR2O7ZIstA957x6gkAxL0qauXUxVMcI=",
+    "hash": "sha256-vsOes4rBULwQ3JX5A7GBKTMvTpjb0CEOWqd6OaO3ujI=",
    "homepage": "https://registry.terraform.io/providers/okta/okta",
    "owner": "okta",
    "repo": "terraform-provider-okta",
-    "rev": "v4.19.0",
+    "rev": "v4.18.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-5BkKjne3r3V8T+SkqjfHVEpXXK8sKTYMc23g1EaLoOE="
  },
@@ -976,13 +967,13 @@
    "vendorHash": "sha256-HQVKblAm8H0Q5pbJdIVSMc5FLi3O9TV475yass6BraY="
  },
  "opentelekomcloud": {
-    "hash": "sha256-v7nJcnVbxwf7khyjlSfVAyz0ZZEuIJNjjXpsIynNPZk=",
+    "hash": "sha256-nCtltzYV9yDYEkAuOJVdBlk11nSpdQtk/zlKEn81srs=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.39",
+    "rev": "v1.36.38",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-rTyx5FuBzO4RZ3IefsWaVTSW5YtTBT95ZtP8aZJgoD8="
+    "vendorHash": "sha256-Q02AnTFzEO5NES5rMQABuhwiLi5uZlzX4c06HQ+d9/A="
  },
  "openwrt": {
    "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
@@ -1147,13 +1138,13 @@
    "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE="
  },
  "scaleway": {
-    "hash": "sha256-rAbCLMA4u+bOXbmGDdM5wHIzPytwuX8HTOUgYQwLAdg=",
+    "hash": "sha256-17BjGoIkKdMVVQMetx+ksQhLbTl/cCdC05HaB7Sai/4=",
    "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
    "owner": "scaleway",
    "repo": "terraform-provider-scaleway",
-    "rev": "v2.55.0",
+    "rev": "v2.53.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-SP92c/UhVpkThVWL4N2tTZjhwHjEo73/IJa0roXZKlE="
+    "vendorHash": "sha256-1N9HByEI0TwI7rdg/OmMObwnb4Hx8oigv5A6hpF0TrY="
  },
  "secret": {
    "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@@ -1246,13 +1237,13 @@
    "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20="
  },
  "spotinst": {
-    "hash": "sha256-ip+HG6nPd4sYyKDzggR5cfwaQQZI/C9GzT+PvGDO3Dk=",
+    "hash": "sha256-gRR0Ie27Wsc8Hf4u5gto2tkuZp/VoPbKBfDcJYN4W9A=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.220.0",
+    "rev": "v1.219.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-w3Bg1FpMki8EhkVe1R8QWD91n8tooT+xIvlM50gbcSA="
+    "vendorHash": "sha256-M6MkqX8iVeP9IpLSLfkl7cMDDtO1VLw1YpODd0zPJvU="
  },
  "ssh": {
    "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
@@ -1282,20 +1273,20 @@
    "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
  },
  "sumologic": {
-    "hash": "sha256-gTBgX1QHZz6qpizt2BP7BvE3j92q+dKhKHhP4bCTfvo=",
+    "hash": "sha256-P/icRnqd24To3n/WCS666n3slQwt7eNUpt9aD7c9GGU=",
    "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
    "owner": "SumoLogic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v3.0.12",
+    "rev": "v3.0.10",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc="
  },
  "sysdig": {
-    "hash": "sha256-oJ51syzDKX7ZO8EJ3Ug1JNRO34N0t4Y8CzAszc5apOM=",
+    "hash": "sha256-fkMVPPKqUQdp/JSPByV3yuMaY3SKVy75u1ljAL9bEZc=",
    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
    "owner": "sysdiglabs",
    "repo": "terraform-provider-sysdig",
-    "rev": "v1.56.3",
+    "rev": "v1.56.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s="
  },
--- a/pkgs/applications/networking/discordo/default.nix
+++ b/pkgs/applications/networking/discordo/default.nix
@@ -10,13 +10,13 @@

 buildGoModule rec {
  pname = "discordo";
-  version = "0-unstable-2025-05-23";
+  version = "0-unstable-2025-05-11";

  src = fetchFromGitHub {
    owner = "ayn2op";
    repo = pname;
-    rev = "af2b0995ba6f6f2df8937cf6a6d5bee3adbc0d0c";
-    hash = "sha256-eBdPnpO9fZP7uq2/wVmeMu8Bf9UympsjUHTQlX2XKYw=";
+    rev = "232f4d469b67d746b9db067c0c73686dac87e938";
+    hash = "sha256-k02oX7HAQ39UCm/hiS0cjibuZ/51sBTG1CnoP80e/mA=";
  };

  vendorHash = "sha256-gEwTpt/NPN1+YpTBmW8F34UotowrOcA0mfFgBdVFiTA=";
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -11,9 +11,9 @@ in
  } { };

  sublime-merge-dev = common {
-    buildVersion = "2108";
+    buildVersion = "2105";
    dev = true;
-    aarch64sha256 = "v81Xvp0tsXfbBkf8W53iC1YIcT5XJUYmXl6CWNdz6Hw=";
-    x64sha256 = "nIwJIWMecBZgfaCFs0/iFHJG9k/3lAqsliCsfvnhpKY=";
+    aarch64sha256 = "PpiY2nD4fexo9zmKeHQ9KYnzB8sWkVa4YqO2q3C/abE=";
+    x64sha256 = "sUyI6ukNZjvszuKDL5fKvIpf3llZn+qQRg7WSdjw4rs=";
  } { };
 }
--- a/pkgs/applications/video/mpv/scripts/uosc.nix
+++ b/pkgs/applications/video/mpv/scripts/uosc.nix
@@ -9,14 +9,14 @@

 buildLua (finalAttrs: {
  pname = "uosc";
-  version = "5.9.2";
+  version = "5.8.0";
  scriptPath = "src/uosc";

  src = fetchFromGitHub {
    owner = "tomasklaen";
    repo = "uosc";
    rev = finalAttrs.version;
-    hash = "sha256-tBSMLzwiKAXdbvyI80ihl0x/ZcDrNd4e7r1g7+CrLgQ=";
+    hash = "sha256-O8GLYsFoDQmYvHWLwfWo1zcQvCsV2RqAe/m+R5cOITI=";
  };
  passthru.updateScript = gitUpdater { };

--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-move-transition";
-  version = "3.1.3";
+  version = "3.1.2";

  src = fetchFromGitHub {
    owner = "exeldro";
    repo = "obs-move-transition";
    rev = version;
-    sha256 = "sha256-8H0CJvJDrB7aP52VXsZ/GuTHQw/QJKLSHnKzhT1drU4=";
+    sha256 = "sha256-BCivYK18T4b+lRo6Qf9qFwmjAyjCPZDekQVi03QBLHc=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -0,0 +1,88 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchurl,
+  pkg-config,
+  cmake,
+  python3,
+  mkDerivation,
+  libX11,
+  libXrandr,
+  qtbase,
+  qtwebchannel,
+  qtwebengine,
+  qtx11extras,
+  libvdpau,
+  SDL2,
+  mpv,
+  libGL,
+}:
+let
+  # During compilation, a CMake bundle is downloaded from `artifacts.plex.tv`,
+  # which then downloads a handful of web client-related files. To enable
+  # sandboxed builds, we manually download them and save them so these files
+  # are fetched ahead-of-time instead of during the CMake build. To update
+  # plex-media-player use the update.sh script, so the versions and hashes
+  # for these files are also updated!
+  depSrcs = import ./deps.nix { inherit fetchurl; };
+in
+mkDerivation rec {
+  pname = "plex-media-player";
+  version = "2.58.1";
+  vsnHash = "ae73e074";
+
+  src = fetchFromGitHub {
+    owner = "plexinc";
+    repo = "plex-media-player";
+    rev = "v${version}-${vsnHash}";
+    sha256 = "1q20fdp5d0blb0q6p2357bwdc2g65cadkgdp4w533ij2nyaxydjd";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    python3
+  ];
+  buildInputs = [
+    libX11
+    libXrandr
+    qtbase
+    qtwebchannel
+    qtwebengine
+    qtx11extras
+    libvdpau
+    SDL2
+    mpv
+    libGL
+  ];
+
+  preConfigure = with depSrcs; ''
+    mkdir -p build/dependencies
+    ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake
+    ln -s ${webClientDesktopHash} build/dependencies/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1
+    ln -s ${webClientDesktop} build/dependencies/web-client-desktop-${webClientDesktopBuildId}.tar.xz
+    ln -s ${webClientTvHash} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz.sha1
+    ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz
+  '';
+
+  cmakeBuildType = "RelWithDebInfo";
+
+  cmakeFlags = [ "-DQTROOT=${qtbase}" ];
+
+  # plexmediaplayer currently segfaults under wayland
+  qtWrapperArgs = [
+    "--set"
+    "QT_QPA_PLATFORM"
+    "xcb"
+  ];
+
+  passthru.updateScript = ./update.sh;
+
+  meta = with lib; {
+    description = "Streaming media player for Plex";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ b4dm4n ];
+    homepage = "https://plex.tv";
+    mainProgram = "plexmediaplayer";
+  };
+}
--- a/pkgs/applications/video/plex-media-player/deps.nix
+++ b/pkgs/applications/video/plex-media-player/deps.nix
@@ -0,0 +1,28 @@
+{ fetchurl }:
+
+rec {
+  webClientBuildId = "183-045db5be50e175";
+  webClientDesktopBuildId = "4.29.2-e50e175";
+  webClientTvBuildId = "4.29.6-045db5b";
+
+  webClient = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
+    sha256 = "1xsacy1xb8a9rfdrd7lvx7n3hd0cf2c3mgmg9wl18jvwnqxyac83";
+  };
+  webClientDesktopHash = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
+    sha256 = "07spxyhrg45ppa2zjn3ri4qvi6qimlmq6wmh492r3jkrwd71rxgf";
+  };
+  webClientDesktop = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
+    sha256 = "1zll79hpgx8fghx228li9qairfd637yf8rhvjzdgpq4dvn21fv65";
+  };
+  webClientTvHash = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
+    sha256 = "1zzfw2g76wqrxrx9kck5q79if78z91wn3awj703kz9sgxi4bkjsk";
+  };
+  webClientTv = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
+    sha256 = "1f1zvrr3c0w37gvl78blg9rgxxi64nc4iv5vd87qbysfh1vpsjz0";
+  };
+}
--- a/pkgs/applications/video/plex-media-player/update.sh
+++ b/pkgs/applications/video/plex-media-player/update.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq
+
+set -xeuo pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+
+oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; plex-media-player.version or (builtins.parseDrvName plex-media-player.name).version" | tr -d '"')"
+latestTag="$(curl -s https://api.github.com/repos/plexinc/plex-media-player/tags  | jq -r '.[] | .name' | sort --version-sort | tail -1)"
+latestVersion="$(expr $latestTag : 'v\(.*\)-.*')"
+latestHash="$(expr $latestTag : 'v.*-\(.*\)')"
+
+if [ ! "$oldVersion" = "$latestVersion" ]; then
+  # update default.nix with the new version and hash
+  expectedHash=$(nix-prefetch-git --url https://github.com/plexinc/plex-media-player.git --rev $latestTag --quiet | jq -r '.sha256')
+  update-source-version plex-media-player --version-key=vsnHash "${latestHash}" 0000
+  update-source-version plex-media-player "${latestVersion}" $expectedHash
+
+  # extract the webClientBuildId from the source folder
+  src="$(nix-build --no-out-link $nixpkgs -A plex-media-player.src)"
+  webClientBuildId="$(grep 'set(WEB_CLIENT_BUILD_ID' $src/CMakeModules/WebClient.cmake | cut -d' ' -f2 | tr -d ')')"
+
+  # retreive the included cmake file and hash
+  { read -r webClientBuildIdHash; read -r webClientBuildIdPath; } < \
+    <(nix-prefetch-url --print-path "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake")
+  webClientDesktopBuildId="$(grep 'set(DESKTOP_VERSION' $webClientBuildIdPath | cut -d' ' -f2 | tr -d ')')"
+  webClientTvBuildId="$(grep 'set(TV_VERSION' $webClientBuildIdPath | cut -d' ' -f2 | tr -d ')')"
+
+  # get the hashes for the other files
+  webClientDesktopHash="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1")"
+  webClientDesktop="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz")"
+  webClientTvHash="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1")"
+  webClientTv="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz")"
+
+  # update deps.nix
+  cat > $nixpkgs/pkgs/applications/video/plex-media-player/deps.nix <<EOF
+{ fetchurl }:
+
+rec {
+  webClientBuildId = "${webClientBuildId}";
+  webClientDesktopBuildId = "${webClientDesktopBuildId}";
+  webClientTvBuildId = "${webClientTvBuildId}";
+
+  webClient = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/buildid.cmake";
+    sha256 = "${webClientBuildIdHash}";
+  };
+  webClientDesktopHash = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-desktop-\${webClientDesktopBuildId}.tar.xz.sha1";
+    sha256 = "${webClientDesktopHash}";
+  };
+  webClientDesktop = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-desktop-\${webClientDesktopBuildId}.tar.xz";
+    sha256 = "${webClientDesktop}";
+  };
+  webClientTvHash = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-tv-\${webClientTvBuildId}.tar.xz.sha1";
+    sha256 = "${webClientTvHash}";
+  };
+  webClientTv = fetchurl {
+    url = "https://artifacts.plex.tv/web-client-pmp/\${webClientBuildId}/web-client-tv-\${webClientTvBuildId}.tar.xz";
+    sha256 = "${webClientTv}";
+  };
+}
+EOF
+
+  git add "$nixpkgs"/pkgs/applications/video/plex-media-player/{default,deps}.nix
+  git commit -m "plex-media-player: ${oldVersion} -> ${latestVersion}"
+else
+  echo "plex-media-player is already up-to-date"
+fi
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,13 +17,13 @@

 buildGoModule rec {
  pname = "cri-o";
-  version = "1.33.0";
+  version = "1.32.4";

  src = fetchFromGitHub {
    owner = "cri-o";
    repo = "cri-o";
    rev = "v${version}";
-    hash = "sha256-SM+68ZQjmEkDNW+KSHpxDJ3ADAk+euIkbQokp86Fm+I=";
+    hash = "sha256-zMSGXRJvFPlbJAnrdHMQYLPkS138r5/2/gyJhhoytgs=";
  };
  vendorHash = null;

--- a/pkgs/by-name/ad/adaptivecpp/package.nix
+++ b/pkgs/by-name/ad/adaptivecpp/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "adaptivecpp";
-  version = "25.02.0";
+  version = "24.10.0";

  src = fetchFromGitHub {
    owner = "AdaptiveCpp";
    repo = "AdaptiveCpp";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-vXfw8+xn3/DYxUKp3QGdQ8sEbDwyk+8jDCyuvQOXigc=";
+    sha256 = "sha256-ZwHDiwv1ybC+2UhiOe2f7fnfqcul+CD9Uta8PT9ICr4=";
  };

  # do not use old FindCUDA cmake module
--- a/pkgs/by-name/af/afterburn/package.nix
+++ b/pkgs/by-name/af/afterburn/package.nix
@@ -8,40 +8,38 @@

 rustPlatform.buildRustPackage rec {
  pname = "afterburn";
-  version = "5.8.2";
+  version = "5.7.0";

  src = fetchFromGitHub {
    owner = "coreos";
    repo = "afterburn";
    rev = "v${version}";
-    sha256 = "sha256-hlcUtEc0uWFolCt+mZd7f68PJPa+i/mv+2aJh4Vhmsw=";
+    sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-Wn4Np1rwHh2sL1sqKalJrIDgMffxJgD1C2QOAR8bDRo=";
+  cargoHash = "sha256-xA5hp7a4DFMh8Xrh2ft94s6aNjORKtyCuNy4GgJbSsw=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ];

  postPatch = ''
-    substituteInPlace \
-      ./systemd/afterburn-checkin.service \
-      ./systemd/afterburn-firstboot-checkin.service \
-      ./systemd/afterburn-sshkeys@.service.in \
-      ./systemd/afterburn.service \
-      --replace-fail /usr/bin "$out/bin"
+    substituteInPlace ./systemd/afterburn-checkin.service --replace /usr/bin $out/bin
+    substituteInPlace ./systemd/afterburn-firstboot-checkin.service --replace /usr/bin $out/bin
+    substituteInPlace ./systemd/afterburn-sshkeys@.service.in --replace /usr/bin $out/bin
+    substituteInPlace ./systemd/afterburn.service --replace /usr/bin $out/bin
  '';

  postInstall = ''
    DEFAULT_INSTANCE=root PREFIX= DESTDIR=$out make install-units
  '';

-  meta = {
-    homepage = "https://github.com/coreos/afterburn";
+  meta = with lib; {
+    homepage = "https://github.com/coreos/ignition";
    description = "One-shot cloud provider agent";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ arianvp ];
-    platforms = lib.platforms.linux;
+    license = licenses.asl20;
+    maintainers = [ maintainers.arianvp ];
+    platforms = platforms.linux;
    mainProgram = "afterburn";
  };
 }
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "air";
-  version = "1.62.0";
+  version = "1.61.7";

  src = fetchFromGitHub {
    owner = "air-verse";
    repo = "air";
    rev = "v${version}";
-    hash = "sha256-egduQyC/f8La39pWvVfDuQ2l5oRz5ZPiCqH8wAAS1OA=";
+    hash = "sha256-+PgJR9+adeko86jUs6/mvkZLgVuIMyd6fv8xxOZB4tE=";
  };

-  vendorHash = "sha256-ESrIn06Uhmq4qP1fdgIcao6ha1ZCqeu3cxJ1vvjRNKk=";
+  vendorHash = "sha256-tct0bWTvZhHslqPAe8uOwBx4z6gLAq57igcbV1tg9OU=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/al/alpine-make-vm-image/package.nix
+++ b/pkgs/by-name/al/alpine-make-vm-image/package.nix
@@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "alpine-make-vm-image";
-  version = "0.13.3";
+  version = "0.13.2";

  src = fetchFromGitHub {
    owner = "alpinelinux";
    repo = "alpine-make-vm-image";
    rev = "v${version}";
-    hash = "sha256-AIwT2JAGnMeMXUXZ0FRJthf22FvFfTTw/2LtZKPSj6g=";
+    hash = "sha256-N7S9MlTpLIL5Od+buS7q64v8fmN+wbYK1FH/YW+nMP8=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- 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.300056.0";
+  version = "1.300055.2";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "amazon-cloudwatch-agent";
    tag = "v${version}";
-    hash = "sha256-SqXu9CjkSXN0pQwmm+oc2u/MihsfgNWFl++PUn49ohA=";
+    hash = "sha256-af+bU57fGzenojHdyXcmtLuBHT6Lo5M5dgZRtu/zFQ8=";
  };

-  vendorHash = "sha256-UU8o2kCRCY0FdoqsBovTsu42DFy7VD1kdI+tOA3l/Ac=";
+  vendorHash = "sha256-WDEShkYNwrZgPT0v/9gZaL+4sQ8f4AhEEtaDvgMhuEM=";

  # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
  subPackages = [
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -81,13 +81,13 @@ let
 in
 stdenv.mkDerivation {
  pname = "ansel";
-  version = "0-unstable-2025-05-31";
+  version = "0-unstable-2025-03-27";

  src = fetchFromGitHub {
    owner = "aurelienpierreeng";
    repo = "ansel";
-    rev = "b5d5f5ee7a3d4b68994a7bcfef4429a80cc2f287";
-    hash = "sha256-gb/Mp3YUeDLRxZQ7t55+FaxcfQDKdrNFZSV2uHhZ8Xo=";
+    rev = "62f9a4c56b02deca9fda4aff4392e4f44dea379c";
+    hash = "sha256-T9go14/wMJbOzKjOnRzzmeklFPQMbrTUnXyPlVahpkQ=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/an/ansible-navigator/package.nix
+++ b/pkgs/by-name/an/ansible-navigator/package.nix
@@ -7,7 +7,7 @@
 }:
 python3Packages.buildPythonApplication rec {
  pname = "ansible-navigator";
-  version = "25.5.0";
+  version = "25.4.1";
  pyproject = true;

  disabled = python3Packages.pythonOlder "3.10";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchPypi {
    inherit version;
    pname = "ansible_navigator";
-    hash = "sha256-fGFu1AmcFIzMUL/r7SvK7jsskTQianS6Yy6xubNdmNk=";
+    hash = "sha256-ygX7rPqd63PpLHm0XqOh5vvwN9h6KivMZQco9XdyUog=";
  };

  build-system = with python3Packages; [
--- a/pkgs/by-name/an/antidote/package.nix
+++ b/pkgs/by-name/an/antidote/package.nix
@@ -5,14 +5,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "1.9.10";
+  version = "1.9.8";
  pname = "antidote";

  src = fetchFromGitHub {
    owner = "mattmc3";
    repo = "antidote";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-+hp8L1Pcqx/Jly1H6F23U4WD6MkVAAZZpPrbc/VSurM=";
+    hash = "sha256-74bajVwbsfbibOIqETrewHZbbzceOHD6d1OEh+LYh7o=";
  };

  dontPatch = true;
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -34,14 +34,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "apt";
-  version = "3.1.0";
+  version = "3.0.1";

  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "apt-team";
    repo = "apt";
    rev = finalAttrs.version;
-    hash = "sha256-Yw72q6o1Q6HPEMbgd/WE6erPqMDfyn2Ax5n1O9BVmRU=";
+    hash = "sha256-pWOXwcZBhr2kOZuP0IEg/PazF8bIN0qvsHOz8SY+Xr8=";
  };

  # cycle detection; lib can't be split
--- a/pkgs/by-name/ar/argbash/package.nix
+++ b/pkgs/by-name/ar/argbash/package.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "argbash";
-  version = "2.11.0";
+  version = "2.10.0";

  src = fetchFromGitHub {
    owner = "matejak";
    repo = "argbash";
    rev = finalAttrs.version;
-    hash = "sha256-B8581sA3dxmHiJqQhmXSChiWaPIFqiLLFUMnwAlCLJs=";
+    hash = "sha256-G739q6OhsXEldpIxiyOU51AmG4RChMqaN1t2wOy6sPU=";
  };

  postPatch = ''
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -12,7 +12,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "arti";
-  version = "1.4.3";
+  version = "1.4.2";

  src = fetchFromGitLab {
    domain = "gitlab.torproject.org";
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "core";
    repo = "arti";
    tag = "arti-v${finalAttrs.version}";
-    hash = "sha256-uQUq3cDyCuATeBK0rDLyP3ymMj8ALCPoqpghWIxsfU0=";
+    hash = "sha256-dryW7znckIsa7O2H0U7p1urBXtANU6B9Pv11A+pBiho=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-W/CRwnv0BgVQQIpEFRxeYDlS0Cud5CVH5QUJfw17a/I=";
+  cargoHash = "sha256-o4he+WVsXf5GymTOvbBIsdhnGrvDtD8AMWmRMQMNiOw=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];

--- a/pkgs/by-name/au/autocorrect/Cargo.lock
+++ b/pkgs/by-name/au/autocorrect/Cargo.lock
@@ -90,18 +90,18 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
 name = "auto_impl"
-version = "1.3.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
+checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -112,7 +112,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "autocorrect"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
 "autocorrect-derive 0.3.0",
 "criterion",
@@ -133,9 +133,9 @@ dependencies = [

 [[package]]
 name = "autocorrect"
-version = "2.14.0"
+version = "2.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099d51844c065a26792dc4b994e80eaa9105aadfac55ed8ccd6db58d59b749fc"
+checksum = "8d3233bd0fc45f3bb1227ad0ab58dcdfac43b3a435199ef91e1259d342dc345f"
 dependencies = [
 "autocorrect-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "diff",
@@ -153,9 +153,9 @@ dependencies = [

 [[package]]
 name = "autocorrect-cli"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
- "autocorrect 2.14.0",
+ "autocorrect 2.13.3",
 "autocorrect-lsp",
 "clap",
 "ignore",
@@ -189,9 +189,9 @@ dependencies = [

 [[package]]
 name = "autocorrect-java"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
- "autocorrect 2.14.0",
+ "autocorrect 2.13.3",
 "jni",
 ]

@@ -199,16 +199,16 @@ dependencies = [
 name = "autocorrect-lsp"
 version = "2.9.4"
 dependencies = [
- "autocorrect 2.14.0",
+ "autocorrect 2.13.3",
 "tokio",
 "tower-lsp",
 ]

 [[package]]
 name = "autocorrect-node"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
- "autocorrect 2.14.0",
+ "autocorrect 2.13.3",
 "autocorrect-cli",
 "napi",
 "napi-build",
@@ -217,25 +217,25 @@ dependencies = [

 [[package]]
 name = "autocorrect-py"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
- "autocorrect 2.14.0",
+ "autocorrect 2.13.3",
 "pyo3",
 ]

 [[package]]
 name = "autocorrect-rb"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
- "autocorrect 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocorrect 2.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "magnus",
 ]

 [[package]]
 name = "autocorrect-wasm"
-version = "2.14.0"
+version = "2.13.3"
 dependencies = [
- "autocorrect 2.14.0",
+ "autocorrect 2.13.3",
 "serde_json",
 "wasm-bindgen",
 ]
@@ -278,7 +278,7 @@ dependencies = [
 "regex",
 "rustc-hash",
 "shlex",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -304,9 +304,9 @@ dependencies = [

 [[package]]
 name = "bstr"
-version = "1.12.0"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
 "memchr",
 "serde",
@@ -332,9 +332,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.2.21"
+version = "1.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0"
+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
 dependencies = [
 "shlex",
 ]
@@ -400,9 +400,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.37"
+version = "4.5.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -410,9 +410,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.37"
+version = "4.5.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489"
 dependencies = [
 "anstream",
 "anstyle",
@@ -429,7 +429,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -593,7 +593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -633,7 +633,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -665,9 +665,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
 "libc",
 "windows-sys 0.59.0",
@@ -693,9 +693,9 @@ dependencies = [

 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
 dependencies = [
 "crc32fast",
 "miniz_oxide",
@@ -760,7 +760,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -805,9 +805,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if",
 "libc",
@@ -872,9 +872,9 @@ dependencies = [

 [[package]]
 name = "half"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
 dependencies = [
 "cfg-if",
 "crunchy",
@@ -888,9 +888,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"

 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"

 [[package]]
 name = "heck"
@@ -1097,7 +1097,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1139,12 +1139,12 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.2",
 ]

 [[package]]
@@ -1262,9 +1262,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"

 [[package]]
 name = "libloading"
@@ -1289,9 +1289,9 @@ dependencies = [

 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"

 [[package]]
 name = "litemap"
@@ -1348,7 +1348,7 @@ checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1380,9 +1380,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
 "adler2",
 ]
@@ -1429,7 +1429,7 @@ dependencies = [
 "napi-derive-backend",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1444,7 +1444,7 @@ dependencies = [
 "quote",
 "regex",
 "semver",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1502,9 +1502,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"

 [[package]]
 name = "oorandom"
@@ -1578,7 +1578,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1609,7 +1609,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1664,9 +1664,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
 "unicode-ident",
 ]
@@ -1796,7 +1796,7 @@ dependencies = [
 "quote",
 "regex",
 "shell-words",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -1807,9 +1807,9 @@ checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"

 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
 dependencies = [
 "bitflags 2.9.0",
 ]
@@ -1892,7 +1892,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
 "cc",
 "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
 "libc",
 "untrusted",
 "windows-sys 0.52.0",
@@ -1912,9 +1912,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
 dependencies = [
 "bitflags 2.9.0",
 "errno",
@@ -2040,7 +2040,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2063,7 +2063,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2093,9 +2093,9 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
 "cfg-if",
 "cpufeatures",
@@ -2125,15 +2125,15 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"

 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
 "libc",
 "windows-sys 0.52.0",
@@ -2174,9 +2174,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2191,13 +2191,13 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"

 [[package]]
 name = "synstructure"
-version = "0.13.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2277,7 +2277,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2288,7 +2288,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2322,9 +2322,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
 dependencies = [
 "backtrace",
 "bytes",
@@ -2344,7 +2344,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2359,9 +2359,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.15"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
 dependencies = [
 "bytes",
 "futures-core",
@@ -2421,7 +2421,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2449,7 +2449,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]

 [[package]]
@@ -2603,7 +2603,7 @@ dependencies = [
 "log",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 "wasm-bindgen-shared",
 ]

@@ -2638,7 +2638,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -2892,7 +2892,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 "synstructure",
 ]

@@ -2913,7 +2913,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 "synstructure",
 ]

@@ -2936,5 +2936,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn 2.0.100",
 ]
--- a/pkgs/by-name/au/autocorrect/package.nix
+++ b/pkgs/by-name/au/autocorrect/package.nix
@@ -6,13 +6,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "autocorrect";
-  version = "2.14.0";
+  version = "2.13.3";

  src = fetchFromGitHub {
    owner = "huacnlee";
    repo = "autocorrect";
    rev = "v${version}";
-    sha256 = "sha256-Tqg0awxRtzqAVTTVrmN0RDTQvYJllejx8V94jTreZyI=";
+    sha256 = "sha256-fwq+Q2GpPXWfIQjfSACBjdyjrmYwVKSSZxCy3+NIKNI=";
  };

  cargoLock = {
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "automatic-timezoned";
-  version = "2.0.76";
+  version = "2.0.75";

  src = fetchFromGitHub {
    owner = "maxbrunet";
    repo = "automatic-timezoned";
    rev = "v${version}";
-    sha256 = "sha256-fObJL4AOVGW/b050kh0/zpAg/BLzLpgop70SgvGqW6E=";
+    sha256 = "sha256-DEHnMgHJTpf2t7iqaYC7AvG8Su4dTCCalnEwP75T8rA=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-msoYCTrBgq4xdQiKRvyyQ5seWceyRBM7StFvJ/8MDJ4=";
+  cargoHash = "sha256-b6f6BDIPygXvXKEXxzy2KW/khk5RuUIhgBfcB30IqQc=";

  meta = with lib; {
    description = "Automatically update system timezone based on location";
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "avbroot";
-  version = "3.16.1";
+  version = "3.16.0";

  src = fetchFromGitHub {
    owner = "chenxiaolong";
    repo = "avbroot";
    tag = "v${version}";
-    hash = "sha256-LasI6DmTQ7gOYyE7k5Aj22OtZnnD4hYbm0KDwVdqBRw=";
+    hash = "sha256-9tHDkKzqEynHsdzKGL0Ten2FccsqLOsKFBxqeisGGAU=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-BfOmfosBZp/7EhbqHDiBUE3wUx5dcFdQw/i0adtUFko=";
+  cargoHash = "sha256-GGqrxnFkmzFtoi9Tl5QcbZJwa7ZWYexF205nrxZ+57Q=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/aw/aws-lc/package.nix
+++ b/pkgs/by-name/aw/aws-lc/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "aws-lc";
-  version = "1.52.0";
+  version = "1.51.2";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "aws-lc";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-C9xtkE0aUtvhRzsN7T7zeQKX7TwA5E+bFq6qSmU2+C8=";
+    hash = "sha256-Of4zXFO2+2uvu5xi4tmzUK9F5pJ+VyKQOrLpdYPvhSA=";
  };

  outputs = [
--- a/pkgs/by-name/aw/aws-nuke/package.nix
+++ b/pkgs/by-name/aw/aws-nuke/package.nix
@@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "aws-nuke";
-  version = "3.55.0";
+  version = "3.54.0";

  src = fetchFromGitHub {
    owner = "ekristen";
    repo = "aws-nuke";
    tag = "v${version}";
-    hash = "sha256-wqUKI8FvQrSs0Lz6YXdieh6I5QccQEtXUMEOtB8angs=";
+    hash = "sha256-BicxJhisCmUXWaBGA/VZSKkh7F3PUjArJC75n1G5jpE=";
  };

-  vendorHash = "sha256-QbZuOnlN9GC1cMMoOrUcFxkJx8y4Iz+JpeBtkpv1s4s=";
+  vendorHash = "sha256-6BIPF4bBEBnMHLjnH1rSCrh+cbwWjcpBKxHeQcTbEPk=";

  overrideModAttrs = _: {
    preBuild = ''
--- a/pkgs/by-name/aw/aws-signing-helper/package.nix
+++ b/pkgs/by-name/aw/aws-signing-helper/package.nix
@@ -6,15 +6,15 @@
 }:
 buildGoModule rec {
  pname = "aws-signing-helper";
-  version = "1.6.0";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "rolesanywhere-credential-helper";
    rev = "v${version}";
-    hash = "sha256-QOuumJSKrqkhSXvprefSkRFiC9LrjzD5g560VJKHCWc=";
+    hash = "sha256-aWSOSGv7JpRii/xYzLF1K58Lcvwywzw9AN9dNUZni/I=";
  };
-  vendorHash = "sha256-jKX0hmtMDPEnsey4RN7FgvQg1ZdQx/6c44OZuexuknQ=";
+  vendorHash = "sha256-8YkLeGtf8Il7V5rVk+YJgH03lx+Ivq6kcqZNXcUnyrc=";

  checkPhase = ''
    runHook preCheck
--- a/pkgs/by-name/aw/aws-sso-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sso-cli/package.nix
@@ -2,7 +2,6 @@
  buildGoModule,
  fetchFromGitHub,
  getent,
-  installShellFiles,
  lib,
  makeWrapper,
  stdenv,
@@ -20,27 +19,17 @@ buildGoModule rec {
  };
  vendorHash = "sha256-SNMU7qDfLRGUSLjzrJHtIMgbcRc2DxXwWEUaUEY6PME=";

-  nativeBuildInputs = [
-    makeWrapper
-    installShellFiles
-  ];
+  nativeBuildInputs = [ makeWrapper ];

  ldflags = [
    "-X main.Version=${version}"
    "-X main.Tag=nixpkgs"
  ];

-  postInstall =
-    ''
-      wrapProgram $out/bin/aws-sso \
-        --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd aws-sso \
-        --bash <($out/bin/aws-sso setup completions --source --shell=bash) \
-        --fish <($out/bin/aws-sso setup completions --source --shell=fish) \
-        --zsh <($out/bin/aws-sso setup completions --source --shell=zsh)
-    '';
+  postInstall = ''
+    wrapProgram $out/bin/aws-sso \
+      --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
+  '';

  nativeCheckInputs = [ getent ];

--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "azpainter";
-  version = "3.0.12";
+  version = "3.0.11";

  src = fetchFromGitLab {
    owner = "azelpg";
    repo = "azpainter";
    rev = "v${version}";
-    hash = "sha256-cUq1UmS0k5eib0aJI1zOJbJRzErezfAAXOOIFrgUS6E=";
+    hash = "sha256-5rNLGF/mkW+rBH9vuIPCJHciyf4NhG17Es+X6l4xIoQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ba/batik/package.nix
+++ b/pkgs/by-name/ba/batik/package.nix
@@ -10,11 +10,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "batik";
-  version = "1.19";
+  version = "1.18";

  src = fetchurl {
    url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1KuzhFSEv+GJqA83QZuUx35mvUuLueW/cs5wvIZe2yI=";
+    hash = "sha256-k2kC/441o0qizY9nwbWJh3Hv45FJeuDgrhynPhvZg0Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "bazarr";
-  version = "1.5.2";
+  version = "1.5.1";

  src = fetchzip {
    url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    hash = "sha256-A6fm5zqlrml7iT3jS9r/XJbCyL+lr/V6WCisxtTKDjA=";
+    hash = "sha256-G/vYVBlwFsRbIgCNfsb8sh1a07Ldo3Z0M7XQ/bcbhTw=";
    stripRoot = false;
  };

--- 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.0.732";
+  version = "4.0.710";
  src = fetchurl {
    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-8HcWEMrMpq+QCnkCf7Yn79fADy98KFqL/m1erXtM8XU=";
+    hash = "sha256-8NwntTrxxWScww0i2DlbVUg5KBlE3WcCVq5P1so8/ig=";
  };
  appimageContents = appimageTools.extract {
    inherit pname version src;
--- a/pkgs/by-name/bf/bfr/configure-log-compiler-errors-to-stderr.patch
+++ b/pkgs/by-name/bf/bfr/configure-log-compiler-errors-to-stderr.patch
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 53e90a7..4afeb58 100755
--- a/configure
-+++ b/configure
-@@ -411,7 +411,7 @@ if test "$silent" = yes; then
- else
-   exec 6>&1
- fi
-exec 5>./config.log
-+exec 5>&2
- 
- echo "\
- This file contains any messages produced by compilers while
--- a/pkgs/by-name/bf/bfr/fix-gcc-complaining-about-invalid-configure-example-code.patch
+++ b/pkgs/by-name/bf/bfr/fix-gcc-complaining-about-invalid-configure-example-code.patch
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 53e90a7..cc80615 100755
--- a/configure
-+++ b/configure
-@@ -908,7 +908,7 @@ cat > conftest.$ac_ext << EOF
- #line 909 "configure"
- #include "confdefs.h"
- 
-main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
--- a/pkgs/by-name/bf/bfr/package.nix
+++ b/pkgs/by-name/bf/bfr/package.nix
@@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
  };

  patches = [
-    ./configure-log-compiler-errors-to-stderr.patch
-    ./fix-gcc-complaining-about-invalid-configure-example-code.patch
-
    (fetchurl {
      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
      sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj";
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -18,14 +18,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "binary";
-  version = "5.3";
+  version = "5.2";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "fizzyizzy05";
    repo = "binary";
    tag = version;
-    hash = "sha256-kJLEDE/jHKc/VDGa0lcm4eM7nEMam0fbEW8YJVfc7OY=";
+    hash = "sha256-0pVQMPwy/XXJl2fHQ/gIi+e/cJY87CA9G+GPkdYFQBc=";
  };

  strictDeps = true;
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
  pname = "bitrise";
-  version = "2.31.2";
+  version = "2.31.1";

  src = fetchFromGitHub {
    owner = "bitrise-io";
    repo = "bitrise";
    rev = "v${version}";
-    hash = "sha256-WMvk5VEXc0cEWVdop50mSlAJKP8RhRijCia0fgBG79M=";
+    hash = "sha256-mSlN+7V25HFyTE5glz8vRzv2OplzsiEybBj71DThcSk=";
  };

  # many tests rely on writable $HOME/.bitrise and require network access
--- a/pkgs/by-name/bl/blocky/package.nix
+++ b/pkgs/by-name/bl/blocky/package.nix
@@ -7,20 +7,20 @@

 buildGoModule rec {
  pname = "blocky";
-  version = "0.26.2";
+  version = "0.25";

  src = fetchFromGitHub {
    owner = "0xERR0R";
    repo = "blocky";
    rev = "v${version}";
-    hash = "sha256-yo21f12BLINXb8HWdR3ZweV5+cTZN07kxCxO1FMJq/4=";
+    hash = "sha256-yd9qncTuzf7p1hIYHzzXyxAx1C1QiuQAIYSKcjCiF0E=";
  };

  # needs network connection and fails at
  # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
  doCheck = false;

-  vendorHash = "sha256-cIDKUzOAs6XsyuUbnR2MRIeH3LI4QuohUZovh/DVJzA=";
+  vendorHash = "sha256-Ck80ym64RIubtMHKkXsbN1kFrB6F9G++0U98jPvyoHw=";

  ldflags = [
    "-s"
--- a/Show More
+++ b/Show More