Merge master into staging-nixos

2026-09-19 22:30:23 +00:00 · 2026-08-11 06:20:17 +00:00
parent 4d964ed51d 8877e8d36a
commit 91bcd3af3e
102 changed files with 855 additions and 636 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,15 +23,15 @@ insert_final_newline = false

 # see https://nixos.org/nixpkgs/manual/#chap-conventions

-[*.{bash,css,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
+[*.{bash,css,js,json,lock,md,nix,pl,pm,py,rb,sh,ts,xml}]
 indent_style = space

 # Match docbook files, set indent width of one
 [*.xml]
 indent_size = 1

-# Match json/lockfiles/markdown/nix/ruby files, set indent width of two
-[*.{js,json,lock,md,nix,rb}]
+# Match js/json/lockfiles/markdown/nix/ruby/ts files, set indent width of two
+[*.{js,json,lock,md,nix,rb,ts}]
 indent_size = 2

 # Match all the Bash code in Nix files, set indent width of two
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -375,7 +375,7 @@ jobs:
        with:
          github-token: ${{ steps.app-token.outputs.token || github.token }}
          script: |
-            require('./nixpkgs/trusted/ci/github-script/check-target-branch.js')({
+            require('./nixpkgs/trusted/ci/github-script/check-target-branch.ts')({
              github,
              context,
              core,
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,7 +77,7 @@ jobs:
              '.github/workflows/pull-request-target.yml',
              '.github/workflows/test.yml',
              'ci/github-script/bot.js',
-              'ci/github-script/check-target-branch.js',
+              'ci/github-script/check-target-branch.ts',
              'ci/github-script/commits.js',
              'ci/github-script/get-pr-commit-details.js',
              'ci/github-script/lint-commits.js',
--- a/ci/github-script/.gitignore
+++ b/ci/github-script/.gitignore
@@ -1,2 +1,4 @@
+comparison
+comparison.zip
 node_modules
 step-summary.md
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 module.exports = async ({ github, context, core, dry }) => {
  const path = require('node:path')
  const { DefaultArtifactClient } = await import('@actions/artifact')
--- a/ci/github-script/check-target-branch.ts
+++ b/ci/github-script/check-target-branch.ts
@@ -1,4 +1,6 @@
-/// @ts-check
+import type * as actionsCore from '@actions/core'
+import type { context as actionsContext } from '@actions/github'
+import type { GitHub } from '@actions/github/lib/utils'

 // TODO: should this be combined with the branch checks in prepare.js?
 // They do seem quite similar, but this needs to run after eval,
@@ -9,39 +11,47 @@ const { readFile } = require('node:fs/promises')
 const { postReview, dismissReviews } = require('./reviews.js')

 const reviewKey = 'check-target-branch'
-/**
- * @param {{
- *  github: InstanceType<import('@actions/github/lib/utils').GitHub>,
- *  context: typeof import('@actions/github').context
- *  core: import('@actions/core')
- *  dry: boolean
- * }} CheckTargetBranchProps
- */
-async function checkTargetBranch({ github, context, core, dry }) {
-  /**
-   * @type {{
-   *  attrdiff: {
-   *   added: string[],
-   *   changed: string[],
-   *   removed: string[],
-   *  },
-   *  attrdiffByKernel: Record<string, {
-   *   added: string[],
-   *   changed: string[],
-   *   removed: string[],
-   *  }>,
-   *  attrdiffByPlatform: Record<string, {
-   *   added: string[],
-   *   changed: string[],
-   *   removed: string[],
-   *  }>,
-   *  labels: Record<string, boolean>,
-   *  rebuildCountByKernel: Record<string, number>,
-   *  rebuildsByKernel: Record<string, string[]>,
-   *  rebuildsByPlatform: Record<string, string[]>,
-   * }}
-   */
-  const changed = JSON.parse(
+
+type ChangedPaths = {
+  attrdiff: {
+    added: string[]
+    changed: string[]
+    removed: string[]
+  }
+  attrdiffByKernel: Record<
+    string,
+    {
+      added: string[]
+      changed: string[]
+      removed: string[]
+    }
+  >
+  attrdiffByPlatform: Record<
+    string,
+    {
+      added: string[]
+      changed: string[]
+      removed: string[]
+    }
+  >
+  labels: Record<string, boolean>
+  rebuildCountByKernel: Record<string, number>
+  rebuildsByKernel: Record<string, string[]>
+  rebuildsByPlatform: Record<string, string[]>
+}
+
+async function checkTargetBranch({
+  github,
+  context,
+  core,
+  dry,
+}: {
+  github: InstanceType<typeof GitHub>
+  context: typeof actionsContext
+  core: typeof actionsCore
+  dry: boolean
+}) {
+  const changed: ChangedPaths = JSON.parse(
    await readFile('comparison/changed-paths.json', 'utf-8'),
  )
  const pull_number = context.payload.pull_request?.number
@@ -155,7 +165,7 @@ async function checkTargetBranch({ github, context, core, dry }) {
      reviewKey,
    })
  } else if (rebuildsAllTests && !isExemptKernelUpdate) {
-    let branchText
+    let branchText: string
    if (base === 'master' && maxRebuildCount >= 500) {
      branchText = '(probably either `staging-nixos` or `staging`)'
    } else if (base === 'master') {
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 module.exports = async ({ github, context, core, dry, cherryPicks }) => {
  const { execFileSync } = require('node:child_process')
  const { classify } = require('../supportedBranches.js')
--- a/ci/github-script/get-pr-commit-details.js
+++ b/ci/github-script/get-pr-commit-details.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 const { promisify } = require('node:util')
 const execFile = promisify(require('node:child_process').execFile)

@@ -16,7 +16,7 @@ const execFile = promisify(require('node:child_process').execFile)
 /**
 * @param {{
 *  args: string[]
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 *  quiet?: boolean,
 *  repoPath?: string,
 * }} RunGitProps
@@ -40,7 +40,7 @@ async function runGit({ args, repoPath, core, quiet }) {
 * of 250 commits and doesn't return the changed files.
 *
 * @param {{
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 *  pr: Awaited<ReturnType<InstanceType<import('@actions/github/lib/utils').GitHub>["rest"]["pulls"]["get"]>>["data"]
 *  repoPath?: string,
 * }} GetCommitMessagesForPRProps
--- a/ci/github-script/get-teams.js
+++ b/ci/github-script/get-teams.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 const excludeTeams = [
  /^voters.*$/,
  /^nixpkgs-maintainers$/,
--- a/ci/github-script/lint-commits.js
+++ b/ci/github-script/lint-commits.js
@@ -1,4 +1,3 @@
-// @ts-check
 const { classify } = require('../supportedBranches.js')
 const { getCommitDetailsForPR } = require('./get-pr-commit-details.js')

@@ -6,9 +5,9 @@ const { getCommitDetailsForPR } = require('./get-pr-commit-details.js')

 /**
 * @param {{
- *  github: InstanceType<import('@actions/github/lib/utils').GitHub>,
+ *  github: InstanceType<typeof import('@actions/github/lib/utils').GitHub>,
 *  context: typeof import('@actions/github').context,
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 *  repoPath?: string,
 * }} LintCommitsProps
 */
@@ -57,7 +56,7 @@ async function lintCommits({ github, context, core, repoPath }) {
 /**
 * @param {{
 *  commits: Commit[],
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 * }} CheckCommitMessagesProps
 */
 async function checkCommitMessages({ commits, core }) {
@@ -170,7 +169,7 @@ async function checkCommitMessages({ commits, core }) {
 /**
 * @param {{
 *  commits: Commit[],
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 * }} CheckGitFieldsProps
 */
 async function checkCommitMetadata({ commits, core }) {
--- a/ci/github-script/manual-file-edits.js
+++ b/ci/github-script/manual-file-edits.js
@@ -1,12 +1,11 @@
-// @ts-check
 const { classify } = require('../supportedBranches.js')
 const { getCommitDetailsForPR } = require('./get-pr-commit-details')

 /**
 * @param {{
- *  github: InstanceType<import('@actions/github/lib/utils').GitHub>,
+ *  github: InstanceType<typeof import('@actions/github/lib/utils').GitHub>,
 *  context: typeof import('@actions/github').context,
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 *  repoPath?: string,
 *  dry: boolean,
 * }} CheckManualFileEditsProps
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 const { classify } = require('../supportedBranches.js')

 function runChecklist({
--- a/ci/github-script/package-lock.json
+++ b/ci/github-script/package-lock.json
@@ -10,6 +10,11 @@
        "@actions/github": "9.1.0",
        "bottleneck": "2.19.5",
        "commander": "14.0.3"
+      },
+      "devDependencies": {
+        "@tsconfig/node24": "24.0.4",
+        "@types/node": "24.13.3",
+        "typescript": "7.0.2"
      }
    },
    "node_modules/@actions/artifact": {
@@ -588,6 +593,19 @@
        "protoc-gen-ts": "bin/protoc-gen-ts"
      }
    },
+    "node_modules/@protobuf-ts/plugin/node_modules/typescript": {
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
+      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
    "node_modules/@protobuf-ts/protoc": {
      "version": "2.11.1",
      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.11.1.tgz",
@@ -612,6 +630,343 @@
        "@protobuf-ts/runtime": "^2.11.1"
      }
    },
+    "node_modules/@tsconfig/node24": {
+      "version": "24.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node24/-/node24-24.0.4.tgz",
+      "integrity": "sha512-2A933l5P5oCbv6qSxHs7ckKwobs8BDAe9SJ/Xr2Hy+nDlwmLE1GhFh/g/vXGRZWgxBg9nX/5piDtHR9Dkw/XuA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "24.13.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.3.tgz",
+      "integrity": "sha512-Dh8vAsV36ig5wa9OX4pXvMc9D3Veibfw2wix0CUwYODLD8nkj9UsLjASr49nPg+2eKzxhBV+v7L8pXvT4e639Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.18.0"
+      }
+    },
+    "node_modules/@typescript/typescript-aix-ppc64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-aix-ppc64/-/typescript-aix-ppc64-7.0.2.tgz",
+      "integrity": "sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-darwin-arm64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-darwin-arm64/-/typescript-darwin-arm64-7.0.2.tgz",
+      "integrity": "sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-darwin-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-darwin-x64/-/typescript-darwin-x64-7.0.2.tgz",
+      "integrity": "sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-freebsd-arm64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-freebsd-arm64/-/typescript-freebsd-arm64-7.0.2.tgz",
+      "integrity": "sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-freebsd-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-freebsd-x64/-/typescript-freebsd-x64-7.0.2.tgz",
+      "integrity": "sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-arm": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-arm/-/typescript-linux-arm-7.0.2.tgz",
+      "integrity": "sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-arm64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-arm64/-/typescript-linux-arm64-7.0.2.tgz",
+      "integrity": "sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-loong64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-loong64/-/typescript-linux-loong64-7.0.2.tgz",
+      "integrity": "sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-mips64el": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-mips64el/-/typescript-linux-mips64el-7.0.2.tgz",
+      "integrity": "sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-ppc64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-ppc64/-/typescript-linux-ppc64-7.0.2.tgz",
+      "integrity": "sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-riscv64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-riscv64/-/typescript-linux-riscv64-7.0.2.tgz",
+      "integrity": "sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-s390x": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-s390x/-/typescript-linux-s390x-7.0.2.tgz",
+      "integrity": "sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-linux-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-x64/-/typescript-linux-x64-7.0.2.tgz",
+      "integrity": "sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-netbsd-arm64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-netbsd-arm64/-/typescript-netbsd-arm64-7.0.2.tgz",
+      "integrity": "sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-netbsd-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-netbsd-x64/-/typescript-netbsd-x64-7.0.2.tgz",
+      "integrity": "sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-openbsd-arm64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-openbsd-arm64/-/typescript-openbsd-arm64-7.0.2.tgz",
+      "integrity": "sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-openbsd-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-openbsd-x64/-/typescript-openbsd-x64-7.0.2.tgz",
+      "integrity": "sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-sunos-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-sunos-x64/-/typescript-sunos-x64-7.0.2.tgz",
+      "integrity": "sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-win32-arm64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-win32-arm64/-/typescript-win32-arm64-7.0.2.tgz",
+      "integrity": "sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/@typescript/typescript-win32-x64": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@typescript/typescript-win32-x64/-/typescript-win32-x64-7.0.2.tgz",
+      "integrity": "sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
    "node_modules/@typescript/vfs": {
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.6.1.tgz",
@@ -1657,16 +2012,37 @@
      }
    },
    "node_modules/typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-7.0.2.tgz",
+      "integrity": "sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==",
      "license": "Apache-2.0",
      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
+        "tsc": "bin/tsc"
      },
      "engines": {
-        "node": ">=4.2.0"
+        "node": ">=16.20.0"
+      },
+      "optionalDependencies": {
+        "@typescript/typescript-aix-ppc64": "7.0.2",
+        "@typescript/typescript-darwin-arm64": "7.0.2",
+        "@typescript/typescript-darwin-x64": "7.0.2",
+        "@typescript/typescript-freebsd-arm64": "7.0.2",
+        "@typescript/typescript-freebsd-x64": "7.0.2",
+        "@typescript/typescript-linux-arm": "7.0.2",
+        "@typescript/typescript-linux-arm64": "7.0.2",
+        "@typescript/typescript-linux-loong64": "7.0.2",
+        "@typescript/typescript-linux-mips64el": "7.0.2",
+        "@typescript/typescript-linux-ppc64": "7.0.2",
+        "@typescript/typescript-linux-riscv64": "7.0.2",
+        "@typescript/typescript-linux-s390x": "7.0.2",
+        "@typescript/typescript-linux-x64": "7.0.2",
+        "@typescript/typescript-netbsd-arm64": "7.0.2",
+        "@typescript/typescript-netbsd-x64": "7.0.2",
+        "@typescript/typescript-openbsd-arm64": "7.0.2",
+        "@typescript/typescript-openbsd-x64": "7.0.2",
+        "@typescript/typescript-sunos-x64": "7.0.2",
+        "@typescript/typescript-win32-arm64": "7.0.2",
+        "@typescript/typescript-win32-x64": "7.0.2"
      }
    },
    "node_modules/undici": {
@@ -1681,6 +2057,13 @@
        "node": ">=14.0"
      }
    },
+    "node_modules/undici-types": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/universal-user-agent": {
      "version": "7.0.3",
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
--- a/ci/github-script/package.json
+++ b/ci/github-script/package.json
@@ -10,5 +10,10 @@
    "@actions/github": "9.1.0",
    "bottleneck": "2.19.5",
    "commander": "14.0.3"
+  },
+  "devDependencies": {
+    "@tsconfig/node24": "24.0.4",
+    "@types/node": "24.13.3",
+    "typescript": "7.0.2"
  }
 }
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 const { classify } = require('../supportedBranches.js')
 const { postReview, dismissReviews } = require('./reviews.js')
 const reviewKey = 'prepare'
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 async function handleReviewers({
  github,
  context,
--- a/ci/github-script/reviews.js
+++ b/ci/github-script/reviews.js
@@ -1,5 +1,3 @@
-// @ts-check
-
 const eventToState = {
  COMMENT: 'COMMENTED',
  REQUEST_CHANGES: 'CHANGES_REQUESTED',
@@ -16,7 +14,7 @@ const reviewUsers = [
 ]

 /**
- * @typedef {InstanceType<import('@actions/github/lib/utils').GitHub>} GitHub
+ * @typedef {InstanceType<typeof import('@actions/github/lib/utils').GitHub>} GitHub
 * @typedef {typeof import('@actions/github').context} Context
 *
 * @typedef {Awaited<ReturnType<GitHub['rest']['pulls']['listReviews']>>['data'][number]} Review
@@ -27,7 +25,7 @@ const reviewUsers = [
 * @param {{
 *  github: GitHub,
 *  context: Context,
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 *  dry: boolean,
 *  reviewKey?: string,
 * }} DismissReviewsProps
@@ -165,10 +163,10 @@ async function dismissReviews({ github, context, core, dry, reviewKey }) {
 * @param {{
 *  github: GitHub,
 *  context: Context,
- *  core: import('@actions/core'),
+ *  core: typeof import('@actions/core'),
 *  dry: boolean,
 *  body: string,
- *  event: keyof eventToState,
+ *  event: keyof typeof eventToState,
 *  reviewKey: string,
 * }} PostReviewProps
 */
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -112,8 +112,8 @@ program
  .argument('<repo>', 'Name of the GitHub repository to run on (Example: nixpkgs)')
  .argument('<pr>', 'Number of the Pull Request to run on')
  .action(async (owner, repo, pr, options) => {
-    const checkCommitMessages = (await import('./check-target-branch.js')).default
-    await run(checkCommitMessages, owner, repo, pr, options)
+    const checkTargetBranch = (await import('./check-target-branch.ts')).default
+    await run(checkTargetBranch, owner, repo, pr, options)
  })

 program
--- a/ci/github-script/supportedSystems.js
+++ b/ci/github-script/supportedSystems.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 module.exports = async ({ github, context, targetSha }) => {
  const { content, encoding } = (
    await github.rest.repos.getContent({
--- a/ci/github-script/tsconfig.json
+++ b/ci/github-script/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "es2024",
+      "ESNext.Array",
+      "ESNext.Collection",
+      "ESNext.Error",
+      "ESNext.Iterator",
+      "ESNext.Promise"
+    ],
+    "module": "nodenext",
+    "target": "es2024",
+
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "moduleResolution": "node16",
+
+    "allowImportingTsExtensions": true,
+    "allowJs": true,
+    "checkJs": true,
+    "erasableSyntaxOnly": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+  }
+}
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 module.exports = async ({ github, core, maxConcurrent = 1 }, callback) => {
  const Bottleneck = require('bottleneck')

--- a/ci/supportedBranches.js
+++ b/ci/supportedBranches.js
@@ -2,6 +2,7 @@
 /*
 #!nix-shell -i node -p nodejs
 */
+// @ts-nocheck

 const typeConfig = {
  master: ['development', 'primary'],
--- a/nixos/modules/programs/ioquake3.nix
+++ b/nixos/modules/programs/ioquake3.nix
@@ -27,7 +27,7 @@ let
    paths = [ cfg.package ];
    nativeBuildInputs = [ pkgs.makeWrapper ];
    postBuild = ''
-      wrapProgram "$out/bin/ioquake3" --add-flags  "+set fs_basepath ${fsBasepath} +exec settings.cfg"
+      wrapProgram "$out/bin/ioquake3" --add-flags "+set fs_basepath ${cfg.baseq3} +set fs_cdpath ${fsBasepath} +exec settings.cfg"
    '';
  };
 in
@@ -37,6 +37,32 @@ in

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

+    baseq3 = lib.mkOption {
+      type = with lib.types; (either package path);
+      default = pkgs.symlinkJoin {
+        name = "quake3-demo-content";
+        paths = [
+          pkgs.quake3demodata
+          pkgs.quake3pointrelease
+        ];
+      };
+      defaultText = "Freely redistributable Quake 3 demo data (`pak0`) plus the 1.32 point release files (`pak1`-`pak8`), merged together.";
+      example = "/var/lib/quake3";
+      description = ''
+        Path to the directory containing the baseq3 files (pak*.pk3).
+
+        Defaults to the freely redistributable demo data (pak0) merged
+        with the 1.32 point release files (pak1-pak8), so the game runs
+        out of the box without owning a retail copy.
+
+        This value is passed directly as fs_basepath, so pak files are
+        searched for in `''${baseq3}/baseq3/`, e.g. a value of
+        `/var/lib/quake3` expects `/var/lib/quake3/baseq3/pak0.pk3` and
+        so on. To use a full retail install instead, point this at the
+        directory containing its `baseq3` folder.
+      '';
+    };
+
    settings = lib.mkOption {
      type = lib.types.attrsOf (
        lib.types.oneOf [
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -19,7 +19,7 @@
  gtksourceview,
  kakasi,
  keybinder3,
-  libappindicator-gtk3,
+  libappindicator,
  libmodplug,
  librsvg,
  libsoup_3,
@@ -92,7 +92,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
    gtksourceview
    kakasi
    keybinder3
-    libappindicator-gtk3
+    libappindicator
    libmodplug
    libsoup_3
  ]
--- a/pkgs/applications/editors/jetbrains/builder/linux.nix
+++ b/pkgs/applications/editors/jetbrains/builder/linux.nix
@@ -23,6 +23,26 @@
  libGL,
  libx11,

+  # bundled jcef-plugin
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  libgbm,
+  libxcb,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxkbcommon,
+  libxrandr,
+  nspr,
+  nss,
+  pango,
+
  jdk,
  vmopts ? null,
  forceWayland ? null,
@@ -88,6 +108,24 @@ lib.extendMkDerivation {
        libx11
        # required for the bundled jcef-plugin
        udev
+        alsa-lib
+        at-spi2-atk
+        at-spi2-core
+        atk
+        cairo
+        cups
+        dbus
+        libgbm
+        libxcb
+        libxcomposite
+        libxdamage
+        libxext
+        libxfixes
+        libxkbcommon
+        libxrandr
+        nspr
+        nss
+        pango
      ];

      nativeBuildInputs = nativeBuildInputs ++ [
@@ -106,6 +144,19 @@ lib.extendMkDerivation {
          patch -F3 -p1 < ${../patches/jetbrains-remote-dev.patch}
        fi

+        # The bundled libraries of the remote dev server are not used (see the patch above),
+        # so drop them. This has to happen before autoPatchelfHook runs, otherwise their
+        # directory ends up in the RPATH of unrelated binaries, see below.
+        rm -rf plugins/remote-dev-server/selfcontained
+
+        # libjcef.so has "." in its RPATH. autoPatchelfHook follows the RPATHs of the
+        # libraries it indexes and resolves that "." against the build directory, which
+        # makes it prefer bundled copies of libraries over the ones from nixpkgs and
+        # bake build-time-only paths into the RPATHs it writes.
+        if [ -e plugins/jcef-plugin/jcef/libjcef.so ]; then
+          patchelf --set-rpath '$ORIGIN' plugins/jcef-plugin/jcef/libjcef.so
+        fi
+
        vmopts_file=bin/linux/${vmoptsName}
        if [[ ! -f $vmopts_file ]]; then
          vmopts_file=bin/${vmoptsName}
@@ -179,7 +230,6 @@ lib.extendMkDerivation {
        fi

        ln -s "$launcher" $out/bin/$pname
-        rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/
        echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh
        chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh
        ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -5,18 +5,28 @@
  callPackage,

  python3,
+  jetbrains,

-  jdk,
  vmopts ? null,
  forceWayland ? false,
 }:

 let
-  mkJetBrainsProduct = callPackage ./builder/default.nix { inherit jdk forceWayland vmopts; };
-  mkJetBrainsSource = callPackage ./source/build.nix { };
+  jetbrainsBuilder =
+    jdk:
+    callPackage ./builder/default.nix {
+      inherit jdk forceWayland vmopts;
+    };

  mkSrcIde =
-    path: extras: callPackage path ({ inherit mkJetBrainsProduct mkJetBrainsSource; } // extras);
+    path: extras:
+    callPackage path (
+      {
+        mkJetBrainsProduct = jetbrainsBuilder jetbrains.jdk;
+        mkJetBrainsSource = callPackage ./source/build.nix { };
+      }
+      // extras
+    );

  _idea-oss = mkSrcIde ./ides/idea-oss.nix { };

@@ -25,7 +35,7 @@ let
    path: extras:
    callPackage path (
      {
-        inherit mkJetBrainsProduct;
+        mkJetBrainsProduct = jetbrainsBuilder jetbrains.jdk-no-jcef;
        libdbm = _idea-oss.libdbm;
        fsnotifier = _idea-oss.fsnotifier;
      }
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -209,13 +209,13 @@
    "vendorHash": "sha256-rCWeetM6nhNb1I1PmB66E5K1ku9ODRqN87MU9y6W/dc="
  },
  "cloudflare_cloudflare": {
-    "hash": "sha256-qy/bW3CnsSXoiCLPW+LVuBb7OQLhxIpCDNTyAdjU5rM=",
+    "hash": "sha256-5ff27VUJ6Cht0nhOjfuOsPiM4VkL6tB8HBHt2zjBCj0=",
    "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
    "owner": "cloudflare",
    "repo": "terraform-provider-cloudflare",
-    "rev": "v5.22.0",
+    "rev": "v5.23.0",
    "spdx": "Apache-2.0",
-    "vendorHash": "sha256-IwklxMtQ6pOO/066SKx298ANoh0i/DiGtgqamenMi+s="
+    "vendorHash": "sha256-nFvqShhjMiFzJXLG1BYZld0D5N2jdsa05A740k/nw3I="
  },
  "cloudfoundry-community_cloudfoundry": {
    "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@@ -1085,11 +1085,11 @@
    "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
  },
  "pagerduty_pagerduty": {
-    "hash": "sha256-+0edUEoaJCg8iDZxRQVQMiP3pLROTi19djEhS5LiRHw=",
+    "hash": "sha256-7GwmZMffN1XdS2cvcnQJxfKx5ZsLb7Bk1o8JPcN2zyY=",
    "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
    "owner": "PagerDuty",
    "repo": "terraform-provider-pagerduty",
-    "rev": "v3.34.0",
+    "rev": "v3.35.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -76,7 +76,7 @@
  libxkbcommon,
  pango,
  pipewire,
-  libappindicator-gtk3,
+  libappindicator,
  libdbusmenu,
  wayland,
  speechd-minimal,
@@ -134,7 +134,7 @@ let
        pango
        pipewire
        libxscrnsaver
-        libappindicator-gtk3
+        libappindicator
        libdbusmenu
        wayland
        ;
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -35,7 +35,7 @@
  xdg-utils,
  libgbm,
  libglvnd,
-  libappindicator-gtk3,
+  libappindicator,
  pipewire,
  libpulseaudio,
 }:
@@ -119,7 +119,7 @@ stdenv.mkDerivation (
      (lib.getLib stdenv.cc.cc)
      (lib.getLib udev)
      libnotify
-      libappindicator-gtk3
+      libappindicator
      pipewire
      libpulseaudio
    ];
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
@@ -20,8 +20,6 @@ lib.makeScope newScope (

    pidginPackages = self;

-    pidgin-indicator = callPackage ./pidgin-indicator { };
-
    pidgin-latex = callPackage ./pidgin-latex {
      texLive = texliveBasic;
    };
@@ -55,6 +53,7 @@ lib.makeScope newScope (
  }
  // lib.optionalAttrs config.allowAliases {
    tdlib-purple = throw "'pidginPackages.tdlib-purple' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
+    pidgin-indicator = throw "'pidginPackages.pidgin-indicator' has been removed as it depended on libappindicator-gtk2, which was removed for depending on the deprecated GTK 2 engine."; # Added 2026-08-10
    purple-matrix = throw "'pidginPackages.purple-matrix' has been unmaintained since April 2022, so it was removed.";
    pidgin-skypeweb = throw "'pidginPackages.pidgin-skypeweb' has been removed since Skype was shut down in May 2025.";
    purple-hangouts = throw "'pidginPackages.purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat.";
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
@@ -1,42 +0,0 @@
-{
-  autoreconfHook,
-  fetchFromGitHub,
-  glib,
-  intltool,
-  lib,
-  libappindicator-gtk2,
-  libtool,
-  pidgin,
-  stdenv,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pidgin-indicator";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "philipl";
-    repo = "pidgin-indicator";
-    rev = version;
-    sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    intltool
-  ];
-  buildInputs = [
-    glib
-    libappindicator-gtk2
-    libtool
-    pidgin
-  ];
-
-  meta = {
-    description = "AppIndicator and KStatusNotifierItem Plugin for Pidgin";
-    homepage = "https://github.com/philipl/pidgin-indicator";
-    maintainers = with lib.maintainers; [ imalison ];
-    license = lib.licenses.gpl2;
-    platforms = with lib.platforms; linux;
-  };
-}
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -5,7 +5,7 @@
  libtorrent-rasterbar,
  python3Packages,
  gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  glib,
  gobject-introspection,
  librsvg,
@@ -58,7 +58,7 @@ let
          gtk3
          gobject-introspection
          pygobject3
-          libappindicator-gtk3
+          libappindicator
        ];

      nativeBuildInputs = [
--- a/pkgs/by-name/_1/_1password-gui/linux.nix
+++ b/pkgs/by-name/_1/_1password-gui/linux.nix
@@ -29,7 +29,7 @@
  libxkbcommon,
  libxshmfence,
  libGL,
-  libappindicator-gtk3,
+  libappindicator,
  libgbm,
  nspr,
  nss,
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
          libxkbcommon
          libxshmfence
          libGL
-          libappindicator-gtk3
+          libappindicator
          libgbm
          nspr
          nss
--- a/pkgs/by-name/_3/_3beans/package.nix
+++ b/pkgs/by-name/_3/_3beans/package.nix
@@ -12,7 +12,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "3beans";
-  version = "0-unstable-2026-06-17";
+  version = "0-unstable-2026-08-05";

  strictDeps = true;
  __structuredAttrs = true;
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "Hydr8gon";
    repo = "3Beans";
-    rev = "2fc156ca6e2067ac8e66fcb17052f05b163c36d8";
-    hash = "sha256-DwzHZ/hM+dJUzKT4DGxD50vK+a54JbYyusO2LtpJATo=";
+    rev = "c5ce9ee29635ba229ba40a534842cf6675533bb1";
+    hash = "sha256-d+vAfNAPOqV0/9RAca25TIRjHWUYH3gM99AgAPLmpo0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ai/airtame/package.nix
+++ b/pkgs/by-name/ai/airtame/package.nix
@@ -30,7 +30,7 @@
  libxcomposite,
  lib,
  libnotify,
-  libappindicator-gtk3,
+  libappindicator,
  systemd,
  pciutils,
 }:
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
  runtimeDependencies = [
    (lib.getLib systemd)
    libnotify
-    libappindicator-gtk3
+    libappindicator
    pulseaudio
    pciutils
  ];
--- a/pkgs/by-name/at/atuin-desktop/package.nix
+++ b/pkgs/by-name/at/atuin-desktop/package.nix
@@ -14,7 +14,7 @@

  alsa-lib,
  glib-networking,
-  libappindicator-gtk3,
+  libappindicator,
  openssl,
  webkitgtk_4_1,
 }:
@@ -99,7 +99,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
    glib-networking
-    libappindicator-gtk3
+    libappindicator
    openssl
    webkitgtk_4_1
  ];
--- a/pkgs/by-name/au/autokey/package.nix
+++ b/pkgs/by-name/au/autokey/package.nix
@@ -6,7 +6,7 @@
  gobject-introspection,
  imagemagick,
  gtksourceview3,
-  libappindicator-gtk3,
+  libappindicator,
  libnotify,
  xautomation,
  xwd,
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: {

  buildInputs = [
    gtksourceview3
-    libappindicator-gtk3
+    libappindicator
    libnotify
  ];

--- a/pkgs/by-name/bl/bloodhound/package.nix
+++ b/pkgs/by-name/bl/bloodhound/package.nix
@@ -17,7 +17,7 @@
  glib,
  gtk3,
  libGL,
-  libappindicator-gtk3,
+  libappindicator,
  libdrm,
  libnotify,
  libpulseaudio,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gtk3
    libGL
-    libappindicator-gtk3
+    libappindicator
    libdrm
    libnotify
    libpulseaudio
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -26,7 +26,7 @@
  krb5,
  lcms2,
  libGL,
-  libappindicator-gtk3,
+  libappindicator,
  libcanberra-gtk3,
  libcap,
  libcxx,
@@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
  runtimeDependencies = [
    glib
    glib-networking
-    libappindicator-gtk3
+    libappindicator
    libGL
    pcsclite

--- a/pkgs/by-name/de/deej/package.nix
+++ b/pkgs/by-name/de/deej/package.nix
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  pkg-config,
  gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  webkitgtk_4_1,
 }:

@@ -29,7 +29,7 @@ buildGoModule {

  buildInputs = [
    gtk3
-    libappindicator-gtk3
+    libappindicator
    webkitgtk_4_1
  ];

--- a/pkgs/by-name/dr/droidcam/package.nix
+++ b/pkgs/by-name/dr/droidcam/package.nix
@@ -8,7 +8,7 @@
  alsa-lib,
  speex,
  libusbmuxd,
-  libappindicator-gtk3,
+  libappindicator,
  pkg-config,
 }:

@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
    alsa-lib
    speex
    libusbmuxd
-    libappindicator-gtk3
+    libappindicator
  ];

  postPatch = ''
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
    inherit steamDisplayName;

    pname = "dwproton-bin";
-    version = "dwproton-11.0-9";
+    version = "dwproton-11.0-11";

    src = fetchzip {
      url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-kWMYlF0H9iYjRcKmq/G4Ws4sTl+gN8nSFgfYvAOd754=";
+      hash = "sha256-p1x1UAuXLG0MpYcyrssudKwpCRlKAPPxrv7UFyPe2lI=";
    };

    preFixup = ''
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -62,7 +62,7 @@ let

    extraPkgs = pkgs: [
      pkgs.libsecret
-      pkgs.libappindicator-gtk3
+      pkgs.libappindicator
    ];

    passthru.updateScript = nix-update-script { };
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -31,7 +31,7 @@
  libxrandr,
  libxrender,
  libxtst,
-  libappindicator-gtk3,
+  libappindicator,
  libcxx,
  libdbusmenu,
  libdrm,
@@ -106,7 +106,7 @@ let
    libxrandr
    libxrender
    libxtst
-    libappindicator-gtk3
+    libappindicator
    libcxx
    libdbusmenu
    libdrm
--- a/pkgs/by-name/ga/gajim/package.nix
+++ b/pkgs/by-name/ga/gajim/package.nix
@@ -27,7 +27,7 @@
  enableUPnP ? true,
  gupnp-igd,
  enableAppIndicator ? true,
-  libappindicator-gtk3,
+  libappindicator,
  enableSoundNotifications ? true,
  gsound,
  extraPythonPackages ? ps: [ ],
@@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
  ++ lib.optional enableSecrets libsecret
  ++ lib.optional enableSpelling libspelling
  ++ lib.optional enableUPnP gupnp-igd
-  ++ lib.optional enableAppIndicator libappindicator-gtk3
+  ++ lib.optional enableAppIndicator libappindicator
  ++ lib.optional enableSoundNotifications gsound;

  nativeBuildInputs = [
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@@ -8,7 +8,7 @@
  intltool,
  adwaita-icon-theme,
  gdk-pixbuf,
-  libappindicator-gtk3,
+  libappindicator,
  fetchurl,
  lib,
  writeScript,
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    libnotify
    adwaita-icon-theme
    gdk-pixbuf
-    libappindicator-gtk3
+    libappindicator
  ];

  propagatedBuildInputs = with python3Packages; [
--- a/pkgs/by-name/gi/gittype/package.nix
+++ b/pkgs/by-name/gi/gittype/package.nix
@@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gittype";
-  version = "0.10.1";
+  version = "0.10.2";

  src = fetchFromGitHub {
    owner = "unhappychoice";
    repo = "gittype";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9FzmL+52cOmaYR6sZYC9+rme7wAqtf6aHZHWs1cy/Y4=";
+    hash = "sha256-343lPlLrfHHZEfhFEZGAXwzxGg1I2YpGQERcFU2bJZY=";
  };

-  cargoHash = "sha256-XMcLJ2aD1QUoQt0F3szWfHSX0zQ4k9V8yJPLtv8ljj4=";
+  cargoHash = "sha256-tca8fV7KWd/Ab0+J3eymhjXZfGUsF6LXhgP4HKYisq4=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/gl/glances/package.nix
+++ b/pkgs/by-name/gl/glances/package.nix
@@ -11,7 +11,7 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "glances";
-  version = "4.5.5";
+  version = "4.5.6";
  pyproject = true;

  disabled = python3Packages.isPyPy;
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    owner = "nicolargo";
    repo = "glances";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RiAt797YS468lmwH68O9/KlbV46DAqd25O8J0wNIDsU=";
+    hash = "sha256-ygXPInfs3jw0Uw3G8DK9llyCpzrtK2/szmKersxCTSI=";
  };

  build-system = with python3Packages; [ setuptools ];
--- a/pkgs/by-name/gr/grok-build/package.nix
+++ b/pkgs/by-name/gr/grok-build/package.nix
@@ -10,7 +10,7 @@
  grok-build,
 }:
 let
-  version = "0.2.118";
+  version = "1.0.0";

  throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";

@@ -26,9 +26,9 @@ let
      url = "https://x.ai/cli/grok-${version}-${upstreamPlatform}";
      hash =
        {
-          x86_64-linux = "sha256-wZIoLmKr0kqb5kdQNj/4J9gGumE5GDmajGnIFbHaCPY=";
-          aarch64-linux = "sha256-VAEOM1qs5rXe3QIlOeznvIPzglPoY2qvB5ZWKu7LLmc=";
-          aarch64-darwin = "sha256-LeW5YJoDSS3WueTMqWN9ZR/pmLuDcb+fhS57KLOMA04=";
+          x86_64-linux = "sha256-KNvJZ6WEPa4jdLaDTa26uVNU5oXH5cjcdQuSpOX8fD4=";
+          aarch64-linux = "sha256-u3xREWVkoiGfakmFCBUGD0FpGKxAfx8rqCxTwLDUOD8=";
+          aarch64-darwin = "sha256-E8f08LmrsAvzghYwLqS6sx8D4TVV41dmIOyh3lcqjSE=";
        }
        .${system};
    }
--- a/pkgs/by-name/gr/gromit-mpx/package.nix
+++ b/pkgs/by-name/gr/gromit-mpx/package.nix
@@ -6,7 +6,7 @@
  pkg-config,
  gtk3,
  glib,
-  libappindicator-gtk3,
+  libappindicator,
  libpthread-stubs,
  libxdmcp,
  libxkbcommon,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    gtk3
    glib
-    libappindicator-gtk3
+    libappindicator
    libpthread-stubs
    libxdmcp
    libxkbcommon
--- a/pkgs/by-name/gs/gspeech/package.nix
+++ b/pkgs/by-name/gs/gspeech/package.nix
@@ -12,7 +12,7 @@
  librsvg,
  atk,
  libnotify,
-  libappindicator-gtk3,
+  libappindicator,
  gst_all_1,
  makeWrapper,
  picotts,
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
    atk
    gettext
    libnotify
-    libappindicator-gtk3
+    libappindicator
    gst_all_1.gstreamer
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
--- a/pkgs/by-name/gt/gtkimageview/package.nix
+++ b/pkgs/by-name/gt/gtkimageview/package.nix
@@ -1,46 +0,0 @@
-{
-  fetchurl,
-  lib,
-  stdenv,
-  pkg-config,
-  gtk2,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gtkimageview";
-  version = "1.6.4";
-
-  src = fetchurl {
-    url = "https://sources.archlinux.org/other/packages/gtkimageview/gtkimageview-${finalAttrs.version}.tar.gz";
-    sha256 = "1wj63af9j9p5i067lpwi9lxvwalamakrmklvl983kvi7s4w1ss2c";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 ];
-
-  preConfigure = ''
-    sed '/DEPRECATED_FLAGS/d' -i configure
-    sed 's/-Wall -Werror//' -i configure
-  '';
-
-  doCheck = true;
-
-  meta = {
-    homepage = "https://gitlab.gnome.org/Archive/gtkimageview";
-
-    description = "Image viewer widget for GTK";
-
-    longDescription = ''
-      GtkImageView is a simple image viewer widget for GTK.  Similar to
-      the image viewer panes in gThumb or Eye of Gnome.  It makes writing
-      image viewing and editing applications easy.  Among its features
-      are: mouse and keyboard zooming; scrolling and dragging; adjustable
-      interpolation; GIF animation support.
-    '';
-
-    license = lib.licenses.lgpl2Plus;
-
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-})
--- a/pkgs/by-name/gw/gwe/package.nix
+++ b/pkgs/by-name/gw/gwe/package.nix
@@ -12,7 +12,7 @@
  python3,
  gtk3,
  libdazzle,
-  libappindicator-gtk3,
+  libappindicator,
  libnotify,
  linuxPackages,
 }:
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    gtk3
    libdazzle
-    libappindicator-gtk3
+    libappindicator
    libnotify
  ];

--- a/pkgs/by-name/ha/handbrake/package.nix
+++ b/pkgs/by-name/ha/handbrake/package.nix
@@ -75,7 +75,7 @@
  intltool,
  glib,
  gtk4,
-  libappindicator-gtk3,
+  libappindicator,
  libnotify,
  gst_all_1,
  dbus-glib,
@@ -310,7 +310,7 @@ let
      gst_all_1.gstreamer
      gtk4
      hicolor-icon-theme
-      libappindicator-gtk3
+      libappindicator
      libgudev
      libnotify
      udev
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  python3,
+  python3Packages,
  fetchFromGitHub,
  nix-update-script,
  glibcLocales,
@@ -11,60 +11,36 @@
  withBigQueryAdapter ? true,
 }:

-let
-  python = python3.override {
-    packageOverrides = _final: prev: {
-      # throws a runtime error with textual 8.2.5:
-      # KeyError: 'textual-ansi'
-      textual = prev.textual.overridePythonAttrs (old: rec {
-        version = "8.2.4";
-        src = old.src.override {
-          tag = "v${version}";
-          hash = "sha256-827cm9pcj1o1FYeaoWKCJ6dEyXeDop4kYd205cySTfg=";
-        };
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-in
 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "harlequin";
-  version = "2.6.0";
+  version = "2.8.1";
  pyproject = true;
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "tconbeer";
    repo = "harlequin";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-jZGQ6t6djiKK9B+R8TYMPwXKkLPk7Z+dXuUcVQuZMfU=";
+    hash = "sha256-gDK+QpAJzyjIBH1YcoYy7CXSy8yn0OxAc2V1jI/DAUs=";
  };

-  pythonRelaxDeps = [
-    "click"
-    "numpy"
-    "pyarrow"
-    "questionary"
-    "rich-click"
-    "textual"
-    "tomlkit"
-    "tree-sitter"
-    "tree-sitter-sql"
-  ];
-
  build-system = with python3Packages; [ hatchling ];

  nativeBuildInputs = [ glibcLocales ];

+  pythonRelaxDeps = [
+    "questionary"
+    "tomlkit"
+  ];
  dependencies =
    with python3Packages;
    [
      click
      duckdb
-      importlib-metadata
-      numpy
-      packaging
+      pandas
      platformdirs
      pyarrow
+      pyperclip
      questionary
      rich-click
      sqlfmt
@@ -72,7 +48,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
      textual-fastdatatable
      textual-textarea
      tomlkit
-      tree-sitter-sql
+      wcwidth
    ]
    ++ lib.optionals withPostgresAdapter [ harlequin-postgres ]
    ++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ];
@@ -89,7 +65,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
  };

  nativeCheckInputs = with python3Packages; [
+    flaky
    pytest-asyncio
+    pytest-textual-snapshot
    pytest-xdist
    pytestCheckHook
    versionCheckHook
@@ -100,10 +78,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
    # Tests require network access
    "test_connect_extensions"
    "test_connect_prql"
-
-    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
-    # AssertionError
-    "test_bad_adapter_opt"
  ]
  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
    # Test incorrectly tries to load a dylib/so compiled for x86_64
--- a/pkgs/by-name/he/hey-mail/package.nix
+++ b/pkgs/by-name/he/hey-mail/package.nix
@@ -14,7 +14,7 @@
  libvpx,
  libxslt,
  libnotify,
-  libappindicator-gtk3,
+  libappindicator,
  libxkbcommon,
  libGL,
  wrapGAppsHook3,
@@ -57,7 +57,7 @@ let
    libvpx
    libxslt
    libnotify
-    libappindicator-gtk3
+    libappindicator
    libxkbcommon
    libGL
    atk
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -21,7 +21,7 @@
  libnotify,
  glib,
  gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  curl,
  writeShellScript,
  common-updater-scripts,
@@ -50,7 +50,7 @@ let
    libnotify
    glib
    gtk3
-    libappindicator-gtk3
+    libappindicator
    curl
    libxfixes
    libxscrnsaver
--- a/pkgs/by-name/in/indicator-application-gtk2/package.nix
+++ b/pkgs/by-name/in/indicator-application-gtk2/package.nix
@@ -1,73 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  lib,
-  file,
-  pkg-config,
-  autoconf,
-  glib,
-  dbus-glib,
-  json-glib,
-  gtk2,
-  libindicator-gtk2,
-  libdbusmenu-gtk2,
-  libappindicator-gtk2,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "indicator-application-gtk2";
-  version = "12.10.0.1";
-
-  src = fetchurl {
-    url = "${finalAttrs.meta.homepage}/indicator-application-gtk2/i-a-${finalAttrs.version}/+download/indicator-application-${finalAttrs.version}.tar.gz";
-    sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoconf
-    dbus-glib # dbus-binding-tool
-  ];
-
-  buildInputs = [
-    glib
-    dbus-glib
-    json-glib
-    gtk2
-    libindicator-gtk2
-    libdbusmenu-gtk2
-    libappindicator-gtk2
-  ];
-
-  postPatch = ''
-    substituteInPlace configure.ac \
-      --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \
-                "DBUSSERVICEDIR=$out/share/dbus-1/services"
-    autoconf
-    for f in {configure,ltmain.sh,m4/libtool.m4}; do
-      substituteInPlace $f \
-        --replace /usr/bin/file ${file}/bin/file
-    done
-    substituteInPlace src/Makefile.in \
-      --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
-  '';
-
-  configureFlags = [
-    "CFLAGS=-Wno-error"
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-  ];
-
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "localstatedir=\${TMPDIR}"
-  ];
-
-  meta = {
-    description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)";
-    homepage = "https://launchpad.net/indicators-gtk2";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.msteen ];
-  };
-})
--- a/pkgs/by-name/in/indicator-application-gtk3/package.nix
+++ b/pkgs/by-name/in/indicator-application-gtk3/package.nix
@@ -9,9 +9,9 @@
  dbus-glib,
  json-glib,
  gtk3,
-  libindicator-gtk3,
+  libindicator,
  libdbusmenu-gtk3,
-  libappindicator-gtk3,
+  libappindicator,
 }:

 stdenv.mkDerivation rec {
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
    json-glib
    systemd
    gtk3
-    libindicator-gtk3
+    libindicator
    libdbusmenu-gtk3
-    libappindicator-gtk3
+    libappindicator
  ];

  postPatch = ''
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -88,7 +88,7 @@ selectKernel {
        with pkgs;
        [
          icu
-          libappindicator-gtk3
+          libappindicator
        ]
        ++ appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
      runScript = "${src}/bin/jetbrains-toolbox --update-failed";
--- a/pkgs/by-name/ka/kazam/package.nix
+++ b/pkgs/by-name/ka/kazam/package.nix
@@ -11,7 +11,7 @@
  keybinder3,
  intltool,
  libcanberra-gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  libpulseaudio,
  libgudev,
 }:
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    gtk3
    libwnck
    keybinder3
-    libappindicator-gtk3
+    libappindicator
    libgudev
  ];

--- a/pkgs/by-name/ke/keybase-gui/package.nix
+++ b/pkgs/by-name/ke/keybase-gui/package.nix
@@ -16,7 +16,7 @@
  gdk-pixbuf,
  glib,
  gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  libnotify,
  nspr,
  nss,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gsettings-desktop-schemas
    gtk3
-    libappindicator-gtk3
+    libappindicator
    libnotify
    nspr
    nss
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {

  runtimeDependencies = [
    (lib.getLib udev)
-    libappindicator-gtk3
+    libappindicator
  ];

  dontBuild = true;
--- a/pkgs/by-name/li/libappindicator/package.nix
+++ b/pkgs/by-name/li/libappindicator/package.nix
@@ -6,31 +6,22 @@
  autoreconfHook,
  glib,
  dbus-glib,
-  gtkVersion ? "3",
-  gtk2,
-  libindicator-gtk2,
-  libdbusmenu-gtk2,
  gtk3,
-  libindicator-gtk3,
+  libindicator,
  libdbusmenu-gtk3,
  gtk-doc,
  vala,
  gobject-introspection,
  monoSupport ? false,
  mono,
-  gtk-sharp-2_0,
  gtk-sharp-3_0,
  testers,
 }:

-let
-  throwBadGtkVersion = throw "unknown GTK version ${gtkVersion}";
-in
-
 stdenv.mkDerivation (finalAttrs: {
  pname =
    let
-      postfix = if monoSupport then "sharp" else "gtk${gtkVersion}";
+      postfix = if monoSupport then "sharp" else "gtk3";
    in
    "libappindicator-${postfix}";
  version = "12.10.1+20.10.20200706.1";
@@ -54,35 +45,19 @@ stdenv.mkDerivation (finalAttrs: {
    gtk-doc
  ];

-  propagatedBuildInputs =
-    {
-      "2" = [
-        gtk2
-        libdbusmenu-gtk2
-      ];
-      "3" = [
-        gtk3
-        libdbusmenu-gtk3
-      ];
-    }
-    .${gtkVersion} or throwBadGtkVersion;
+  propagatedBuildInputs = [
+    gtk3
+    libdbusmenu-gtk3
+  ];

  buildInputs = [
    glib
    dbus-glib
-    {
-      "2" = libindicator-gtk2;
-      "3" = libindicator-gtk3;
-    }
-    .${gtkVersion} or throwBadGtkVersion
+    libindicator
  ]
  ++ lib.optionals monoSupport [
    mono
-    {
-      "2" = gtk-sharp-2_0;
-      "3" = gtk-sharp-3_0;
-    }
-    .${gtkVersion} or throwBadGtkVersion
+    gtk-sharp-3_0
  ];

  preAutoreconf = ''
@@ -93,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
    "CFLAGS=-Wno-error"
    "--sysconfdir=/etc"
    "--localstatedir=/var"
-    "--with-gtk=${gtkVersion}"
+    "--with-gtk=3"
  ];

  doCheck = false; # generates shebangs in check phase, too lazy to fix
@@ -112,12 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
      lgpl21
      lgpl3
    ];
-    pkgConfigModules =
-      {
-        "2" = [ "appindicator-0.1" ];
-        "3" = [ "appindicator3-0.1" ];
-      }
-      .${gtkVersion} or throwBadGtkVersion;
+    pkgConfigModules = [ "appindicator3-0.1" ];
+
    platforms = lib.platforms.linux;
    maintainers = [ lib.maintainers.msteen ];
    # TODO: Resolve the issues with the Mono bindings.
--- a/pkgs/by-name/li/libdbusmenu/package.nix
+++ b/pkgs/by-name/li/libdbusmenu/package.nix
@@ -10,14 +10,13 @@
  json-glib,
  gobject-introspection,
  vala,
-  gtkVersion ? null,
-  gtk2,
+  withGtk3 ? false,
  gtk3,
  testers,
 }:

 stdenv.mkDerivation (finalAttrs: {
-  pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}";
+  pname = "libdbusmenu-${if withGtk3 then "gtk3" else "glib"}";
  version = "16.04.0";

  src =
@@ -41,13 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
    dbus-glib
    json-glib
  ]
-  ++
-    lib.optional (gtkVersion != null)
-      {
-        "2" = gtk2;
-        "3" = gtk3;
-      }
-      .${gtkVersion} or (throw "unknown GTK version ${gtkVersion}");
+  ++ lib.optional withGtk3 gtk3;

  patches = [
    ./requires-glib.patch
@@ -70,11 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
    "CFLAGS=-Wno-error"
    "--sysconfdir=/etc"
    "--localstatedir=/var"
-    # TODO use `lib.withFeatureAs`
-    (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}")
+    (if withGtk3 then "--with-gtk=3" else "--disable-gtk")
+    "--disable-dumper"
    "--disable-scrollkeeper"
-  ]
-  ++ lib.optional (gtkVersion != "2") "--disable-dumper";
+  ];

  doCheck = false; # generates shebangs in check phase, too lazy to fix

@@ -98,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
      "dbusmenu-glib-0.4"
      "dbusmenu-jsonloader-0.4"
    ]
-    ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4";
+    ++ lib.optional withGtk3 "dbusmenu-gtk3-0.4";
    platforms = lib.platforms.unix;
    maintainers = [ lib.maintainers.msteen ];
  };
--- a/pkgs/by-name/li/libindicator/package.nix
+++ b/pkgs/by-name/li/libindicator/package.nix
@@ -5,13 +5,11 @@
  file,
  pkg-config,
  glib,
-  gtkVersion ? "3",
-  gtk2,
  gtk3,
 }:

 stdenv.mkDerivation (finalAttrs: {
-  pname = "libindicator-gtk${gtkVersion}";
+  pname = "libindicator";
  version = "12.10.1";

  src = fetchurl {
@@ -26,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
  ];

-  buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ];
+  buildInputs = [ gtk3 ];

  postPatch = ''
    substituteInPlace configure \
@@ -41,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    "CFLAGS=-Wno-error"
    "--sysconfdir=/etc"
    "--localstatedir=/var"
-    "--with-gtk=${gtkVersion}"
+    "--with-gtk=3"
  ];

  installFlags = [
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -37,7 +37,6 @@
  runtimeShell,
  stdenv,
  replaceVars,
-  xhtml1,
  json_c,
  writeScript,
  writeShellApplication,
@@ -121,14 +120,14 @@ assert enableZfs -> isLinux;
 stdenv.mkDerivation rec {
  pname = "libvirt";
  # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "12.4.0";
+  version = "12.6.0";

  src = fetchFromGitLab {
    owner = "libvirt";
    repo = "libvirt";
    tag = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-xgXbgZ8UDdiKPJSGEHB5PasGws5VvCgd+DpoOxwceEA=";
+    hash = "sha256-SEscELXhiEoFnDDcxV7Jb2LjyheNJbgPp7AnXix2GVU=";
  };

  patches = [
@@ -233,7 +232,6 @@ stdenv.mkDerivation rec {
    libxml2
    python3
    readline
-    xhtml1
    json_c
  ]
  ++ lib.optionals isLinux [
@@ -350,6 +348,7 @@ stdenv.mkDerivation rec {
      (feat "tests" true)
      (feat "udev" isLinux)
      (feat "json_c" true)
+      (feat "libvirtd" true)

      (driver "ch" (isLinux && (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64)))
      (driver "esx" true)
--- a/pkgs/by-name/mu/murmure/package.nix
+++ b/pkgs/by-name/mu/murmure/package.nix
@@ -25,7 +25,7 @@
  pango,
  # linux-only:
  alsa-lib,
-  libappindicator-gtk3,
+  libappindicator,
  libx11,
  libxi,
  libxkbcommon,
@@ -99,7 +99,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    alsa-lib
-    libappindicator-gtk3
+    libappindicator
    libx11
    libxi
    libxkbcommon
--- a/pkgs/by-name/mu/music-assistant-desktop/package.nix
+++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix
@@ -23,7 +23,7 @@
  atk,
  dbus,
  glib-networking,
-  libappindicator-gtk3,
+  libappindicator,
  llvmPackages,
  pulseaudio,
  gtk3,
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    atk
    dbus
    glib-networking
-    libappindicator-gtk3
+    libappindicator
    pulseaudio
    gtk3
    webkitgtk_4_1
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
    gappsWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}"
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator ]}"
    )
  '';

--- a/pkgs/by-name/on/onboard/package.nix
+++ b/pkgs/by-name/on/onboard/package.nix
@@ -17,7 +17,7 @@
  hunspellDicts,
  intltool,
  isocodes,
-  libappindicator-gtk3,
+  libappindicator,
  libcanberra-gtk3,
  mousetweaks,
  udev,
@@ -88,7 +88,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
    gtk3
    hunspell
    isocodes
-    libappindicator-gtk3
+    libappindicator
    libcanberra-gtk3
    libxkbcommon
    mousetweaks
--- a/pkgs/by-name/os/os-agent/package.nix
+++ b/pkgs/by-name/os/os-agent/package.nix
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "os-agent";
-  version = "1.10.0";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "home-assistant";
    repo = "os-agent";
    tag = finalAttrs.version;
-    hash = "sha256-jO7TE4lBqyxUYcy3ZsZAFO98orGJ6hTM97+G/ueawNg=";
+    hash = "sha256-6dosIr12myPb6DKkf5focFwqToTDx84dPNqiaSDdEis=";
  };

-  vendorHash = "sha256-WC251fHO3XRICP7q7RdHCTnf8WfqNKnueCp36uEtrIg=";
+  vendorHash = "sha256-Kn3kEFCYWv/tVKVfIhhrgXU+ZTzHoseiQA2MiqfO0DU=";

  ldFlags = [
    "-X main.version="
--- a/pkgs/by-name/os/osdlyrics/package.nix
+++ b/pkgs/by-name/os/osdlyrics/package.nix
@@ -12,7 +12,6 @@
  glib,
  gtk2,
  dbus-glib,
-  libappindicator-gtk2,
  libnotify,
  python3,
  runtimeShell,
@@ -41,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gtk2
    dbus-glib
-    libappindicator-gtk2
    libnotify
    python3.pkgs.wrapPython
    (python3.withPackages (
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -3,10 +3,11 @@
  stdenv,
  fetchFromGitHub,
  fetchPnpmDeps,
+  pnpm_11,
  pnpmConfigHook,
-  pnpm_10,
+  pnpmBuildHook,
  nodejs_24,
-  nodejs-slim,
+  nodejs-slim_24,
  rustPlatform,
  cargo,
  rustc,
@@ -16,43 +17,50 @@
  rust-jemalloc-sys,
  tsgolint,
  versionCheckHook,
+  darwin,
 }:

+let
+  pnpm = pnpm_11;
+in
 # Build with pnpm instead of buildRustPackage because the upstream npm CLI is the
 # JS-plugin-capable runtime. The standalone Rust `oxlint` binary intentionally
 # runs without an external linter, which leaves `jsPlugins` configs inert.
 stdenv.mkDerivation (finalAttrs: {
  pname = "oxlint";
-  version = "1.77.0";
+  version = "1.78.0";

  src = fetchFromGitHub {
    owner = "oxc-project";
    repo = "oxc";
    tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-9l0E4S7xx5UkaPY06Qy21maJiWnwzNAlg/oJDZThqi4=";
+    hash = "sha256-55IzeYx7Bfs40gvfyvbog+QKab5DoXNI1ydc/mcvQDQ=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-AJHfTJe1oyflsjqx128FfZJlqVH1hX2ityAoR9E3rXM=";
+    hash = "sha256-mVk2thsSITIQ6vCQkxBlBvQpPRS0jpWoN+wZ3WJLoJw=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
-    pnpm = pnpm_10;
-    fetcherVersion = 3;
-    hash = "sha256-CjhQyPY9Bsj8g+tVVqfd5i/wKDSeU+geEssEzDsSi1A=";
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-buM8gRuxi9rrcUVYXHEOnjWpbD4godiNQHAXAUTP7C0=";
  };

  dontUseCmakeConfigure = true;

+  pnpmWorkspaces = [ "oxlint-app" ];
+
  nativeBuildInputs = [
    cargo
    cmake
    makeBinaryWrapper
    nodejs_24
    pnpmConfigHook
-    pnpm_10
+    pnpmBuildHook
+    pnpm
    rustPlatform.cargoSetupHook
    rustc
  ];
@@ -61,12 +69,17 @@ stdenv.mkDerivation (finalAttrs: {

  env.OXC_VERSION = finalAttrs.version;

-  buildPhase = ''
-    runHook preBuild
-
-    pnpm --workspace-concurrency=1 --filter oxlint-app run build
-
-    runHook postBuild
+  # @napi-rs/cli >= 3.8 reads the process start time via `/bin/ps` while
+  # acquiring its filesystem reconciliation lock. The Darwin build sandbox
+  # denies that exec; Node raises it as a synchronous `spawn EPERM` from
+  # execFile, which escapes napi's callback-based error handling. Point the
+  # lookup at a store `ps` so the sandbox allows it. The result is only used
+  # to detect stale lock files.
+  preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for cli in node_modules/.pnpm/@napi-rs+cli@*/node_modules/@napi-rs/cli/dist/cli.js; do
+      substituteInPlace "$cli" \
+        --replace-fail '"/bin/ps"' '"${darwin.adv_cmds}/bin/ps"'
+    done
  '';

  installPhase = ''
@@ -81,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {

    chmod +x "$packageRoot/bin/oxlint"

-    makeBinaryWrapper "${lib.getExe nodejs-slim}" "$out/bin/oxlint" \
+    makeBinaryWrapper "${lib.getExe nodejs-slim_24}" "$out/bin/oxlint" \
      --add-flags "$packageRoot/bin/oxlint" \
      --prefix PATH : "${lib.makeBinPath [ tsgolint ]}"

@@ -94,79 +107,39 @@ stdenv.mkDerivation (finalAttrs: {
  installCheckPhase = ''
    runHook preInstallCheck

-    pluginTestDir="$(mktemp -d)"
-    cat > "$pluginTestDir/plugin.mjs" <<'EOF'
-    const plugin = {
+    expectFail() {
+      local needle="$1"; shift
+      local output
+      output="$("$@" 2>&1)" && {
+        printf 'expected `%s` to fail\n%s\n' "$*" "$output" >&2
+        exit 1
+      }
+      grep -Fq "$needle" <<<"$output"
+    }
+
+    cd "$(mktemp -d)"
+
+    cat >plugin.mjs <<'EOF'
+    export default {
      meta: { name: "smoke-plugin" },
      rules: {
        "always-error": {
-          create(context) {
-            return {
-              Program(node) {
-                context.report({ node, message: "plugin-smoke-ok" });
-              },
-            };
-          },
+          create: (context) => ({
+            Program(node) {
+              context.report({ node, message: "plugin-smoke-ok" });
+            },
+          }),
        },
      },
    };
-    export default plugin;
    EOF
-    cat > "$pluginTestDir/.oxlintrc.jsonc" <<'EOF'
-    {
-      "jsPlugins": ["./plugin.mjs"],
-      "rules": {
-        "smoke-plugin/always-error": "error"
-      }
-    }
-    EOF
-    printf 'const value = 1;\n' > "$pluginTestDir/input.js"
+    echo '{"jsPlugins":["./plugin.mjs"],"rules":{"smoke-plugin/always-error":"error"}}' >plugin.jsonc
+    echo 'void 0;' >plugin.js
+    expectFail plugin-smoke-ok "$out/bin/oxlint" -c plugin.jsonc plugin.js

-    (
-      cd "$pluginTestDir"
-      set +e
-      pluginOutput="$($out/bin/oxlint input.js 2>&1)"
-      pluginStatus=$?
-      set -e
-      test "$pluginStatus" -ne 0
-      printf '%s\n' "$pluginOutput" | grep -F "plugin-smoke-ok" > /dev/null
-    )
-
-    typeAwareTestDir="$(mktemp -d)"
-    cat > "$typeAwareTestDir/.oxlintrc.jsonc" <<'EOF'
-    {
-      "rules": {
-        "typescript/no-unnecessary-type-assertion": "error"
-      }
-    }
-    EOF
-    cat > "$typeAwareTestDir/tsconfig.json" <<'EOF'
-    {
-      "compilerOptions": {
-        "target": "es2024",
-        "lib": ["ES2024", "DOM"],
-        "module": "es2022",
-        "strict": true,
-        "skipLibCheck": true
-      }
-    }
-    EOF
-    cat > "$typeAwareTestDir/input.ts" <<'EOF'
-    const str: string = "hello";
-    const redundant = str as string;
-
-    export {};
-    EOF
-
-    (
-      cd "$typeAwareTestDir"
-      set +e
-      typeAwareOutput="$($out/bin/oxlint --type-aware input.ts 2>&1)"
-      typeAwareStatus=$?
-      set -e
-      test "$typeAwareStatus" -ne 0
-      printf '%s\n' "$typeAwareOutput" | grep -F "no-unnecessary-type-assertion" > /dev/null
-    )
+    echo 'const s: string = ""; const _: string = s as string;' >type-aware.ts
+    expectFail no-unnecessary-type-assertion \
+      "$out/bin/oxlint" -D typescript/no-unnecessary-type-assertion --type-aware type-aware.ts

    runHook postInstallCheck
  '';
@@ -182,6 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ iamanaws ];
    mainProgram = "oxlint";
-    inherit (nodejs-slim.meta) platforms;
+    inherit (nodejs-slim_24.meta) platforms;
  };
 })
--- a/pkgs/by-name/pr/proton-vpn/linux.nix
+++ b/pkgs/by-name/pr/proton-vpn/linux.nix
@@ -4,7 +4,7 @@
  python3Packages,
  fetchFromGitHub,
  gobject-introspection,
-  libappindicator-gtk3,
+  libappindicator,
  libayatana-appindicator,
  libnotify,
  wrapGAppsHook4,
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
  ]
  ++ lib.optionals withIndicator [
    # Adds AppIndicator3 namespace
-    libappindicator-gtk3
+    libappindicator
    # Adds AyatanaAppIndicator3 namespace
    libayatana-appindicator
  ];
--- a/pkgs/by-name/qb/qbz/package.nix
+++ b/pkgs/by-name/qb/qbz/package.nix
@@ -7,7 +7,6 @@
  glib-networking,
  lib,
  libappindicator,
-  libappindicator-gtk3,
  libayatana-appindicator,
  llvmPackages,
  makeWrapper,
@@ -60,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  buildInputs = [
    alsa-lib
-    libappindicator-gtk3
+    libappindicator
    openssl
    webkitgtk_4_1
  ];
--- a/pkgs/by-name/ra/radiotray-ng/package.nix
+++ b/pkgs/by-name/ra/radiotray-ng/package.nix
@@ -15,7 +15,7 @@
  glibmm,
  gsettings-desktop-schemas,
  hicolor-icon-theme,
-  libappindicator-gtk3,
+  libappindicator,
  libnotify,
  libxdg_basedir,
  wxwidgets_3_2,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
    glibmm
    hicolor-icon-theme
    gsettings-desktop-schemas
-    libappindicator-gtk3
+    libappindicator
    libnotify
    libxdg_basedir
    lsb-release
--- a/pkgs/by-name/re/regreet/package.nix
+++ b/pkgs/by-name/re/regreet/package.nix
@@ -11,23 +11,22 @@
  gtk4,
  pango,
  librsvg,
+  libseccomp,
  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "regreet";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "rharish101";
    repo = "ReGreet";
    rev = finalAttrs.version;
-    hash = "sha256-WLngdmv5qrHaJ5P2mN/KO3YijwWOs1wKSliaAf3okvs=";
+    hash = "sha256-fJZqEcsqorTJA5qFhJ8wcNZKAC3q/KKFFIEZlrnkGHQ=";
  };

-  cargoHash = "sha256-Jt8vGJzCYtpIPWxHHIc4x8zwjTF9tiM4YbBy9o9pxX4=";
-
-  buildFeatures = [ "gtk4_8" ];
+  cargoHash = "sha256-vWZ5lF5VKAPJTamvU/EavMHZsp4Gu2JvH4kbAvOqWTY=";

  nativeBuildInputs = [
    pkg-config
@@ -43,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    gst_all_1.gst-plugins-base
    pango
    librsvg
+    libseccomp
  ];

  passthru.updateScript = nix-update-script { };
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -21,7 +21,7 @@
  gnutls,
  pcre2,
  libdbusmenu-gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  libvncserver,
  libpthread-stubs,
  libxdmcp,
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    fuse3
-    libappindicator-gtk3
+    libappindicator
    libdbusmenu-gtk3
    wayland
  ]
--- a/pkgs/by-name/sc/sc-controller/package.nix
+++ b/pkgs/by-name/sc/sc-controller/package.nix
@@ -6,7 +6,7 @@
  wrapGAppsHook3,
  gtk3,
  gobject-introspection,
-  libappindicator-gtk3,
+  libappindicator,
  librsvg,
  bluez,
  linuxHeaders,
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication (finalAttrs: {

  buildInputs = [
    gtk3
-    libappindicator-gtk3
+    libappindicator
    librsvg
  ];

--- a/pkgs/by-name/sc/screenkey/package.nix
+++ b/pkgs/by-name/sc/screenkey/package.nix
@@ -6,7 +6,7 @@
  libx11,
  gobject-introspection,
  gtk3,
-  libappindicator-gtk3,
+  libappindicator,
  slop,
  python3,
 }:
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {

  buildInputs = [
    gtk3
-    libappindicator-gtk3
+    libappindicator
  ];

  build-system = with python3.pkgs; [ setuptools ];
--- a/pkgs/by-name/sh/shutter/package.nix
+++ b/pkgs/by-name/sh/shutter/package.nix
@@ -10,7 +10,7 @@
  hicolor-icon-theme,
  procps,
  libwnck,
-  libappindicator-gtk3,
+  libappindicator,
  xdg-utils,
 }:

@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
    gdk-pixbuf
    librsvg
    libwnck
-    libappindicator-gtk3
+    libappindicator
    hicolor-icon-theme
  ]
  ++ perlModules;
--- a/pkgs/by-name/si/simplenote/package.nix
+++ b/pkgs/by-name/si/simplenote/package.nix
@@ -32,7 +32,7 @@ appimageTools.wrapType2 {
    pkgs: with pkgs; [
      libsecret
      libnotify
-      libappindicator-gtk3
+      libappindicator
    ];

  desktopItems = [
--- a/pkgs/by-name/sl/slack/linux.nix
+++ b/pkgs/by-name/sl/slack/linux.nix
@@ -25,7 +25,7 @@
  glib,
  gtk3,
  libGL,
-  libappindicator-gtk3,
+  libappindicator,
  libdrm,
  libnotify,
  libpulseaudio,
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
      glib
      gtk3
      libGL
-      libappindicator-gtk3
+      libappindicator
      libdrm
      libnotify
      libpulseaudio
--- a/pkgs/by-name/sy/systrayhelper/package.nix
+++ b/pkgs/by-name/sy/systrayhelper/package.nix
@@ -1,7 +1,7 @@
 {
  lib,
  pkg-config,
-  libappindicator-gtk3,
+  libappindicator,
  buildGoModule,
  fetchFromGitHub,
 }:
@@ -32,9 +32,9 @@ buildGoModule rec {

  nativeBuildInputs = [
    pkg-config
-    libappindicator-gtk3
+    libappindicator
  ];
-  buildInputs = [ libappindicator-gtk3 ];
+  buildInputs = [ libappindicator ];

  doCheck = false; # Display required

--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -10,7 +10,7 @@

 buildGoModule (finalAttrs: {
  pname = "telegraf";
-  version = "1.39.2";
+  version = "1.39.3";

  subPackages = [ "cmd/telegraf" ];

@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
    owner = "influxdata";
    repo = "telegraf";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-yWWjlCAc5xJh4IwszVRTGIM5DMXKHyfAHEa1jSVi/mk=";
+    hash = "sha256-2Pt5lTRo8twIVoKP8BxJr8LIylZjFAdHYGc2vINyGNo=";
  };

-  vendorHash = "sha256-j/yGDEXNOrMAq4ArMjqTxZHfvQZkjmDpZQ3LAUe8BJ0=";
+  vendorHash = "sha256-Y+FHFWq6eVycNci/Br9WWfJUrBPTLG5xCp/WrA6uzR4=";
  proxyVendor = true;

  ldflags = [
--- a/pkgs/by-name/te/tetrd/package.nix
+++ b/pkgs/by-name/te/tetrd/package.nix
@@ -17,7 +17,6 @@
  re2,
  snappy,
  libnotify,
-  libappindicator-gtk3,
  libappindicator,
  udev,
  libgbm,
@@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
    re2
    snappy
    libnotify
-    libappindicator-gtk3
    libappindicator
    udev
    libgbm
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -6,7 +6,7 @@
  buildNpmPackage,
  nodejs_24,
  wrapGAppsHook3,
-  libappindicator-gtk3,
+  libappindicator,
 }:
 let
  version = "8.2.3-unstable-2025-10-14";
@@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication {
    sphinx-rtd-theme
    astroid
    # tray icon deps
-    libappindicator-gtk3
+    libappindicator
    # test phase requirements
    pytestCheckHook
  ];
@@ -120,7 +120,7 @@ python3.pkgs.buildPythonApplication {

  preFixup = ''
    gappsWrapperArgs+=(
-      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ libappindicator-gtk3 ]}"
+      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ libappindicator ]}"
    )
  '';

--- a/pkgs/by-name/tr/trillian-im/package.nix
+++ b/pkgs/by-name/tr/trillian-im/package.nix
@@ -17,7 +17,7 @@
  librsvg,
  libzip,
  openssl,
-  libappindicator-gtk3,
+  libappindicator,
 }:

 stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    librsvg
    libzip
    openssl
-    libappindicator-gtk3
+    libappindicator
  ];

  dontUnpack = true;
--- a/pkgs/by-name/tu/tuxbox/package.nix
+++ b/pkgs/by-name/tu/tuxbox/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "tuxbox";
-  version = "3.1.6";
+  version = "3.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "AndyCappDev";
    repo = "tuxbox";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-BZUo02q2szaxnJYx8UvYvfCErJX4KFzToCvZLuBRJKQ=";
+    hash = "sha256-ZPfZ/0UtwZp0HdDc99EZx+Z0drmk0yPx1taoIXcHP+g=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -36,6 +36,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
    mkdir -p $out/lib/udev/rules.d/
    echo 'KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"' > $out/lib/udev/rules.d/99-tuxbox-uinput.rules
    chmod 0744 $out/lib/udev/rules.d/99-tuxbox-uinput.rules
+
+    # Keep ModemManager off the TourBox serial port
+    cat > $out/lib/udev/rules.d/99-tuxbox-modemmanager.rules <<'EOF'
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="c251", ATTRS{idProduct}=="2005", ENV{ID_MM_DEVICE_IGNORE}="1"
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="5740", ENV{ID_MM_DEVICE_IGNORE}="1"
+    EOF
  '';

  meta = {
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -6,7 +6,7 @@
  gtk3,
  installShellFiles,
  keyutils,
-  libappindicator-gtk3,
+  libappindicator,
  libnotify,
  librsvg,
  python3Packages,
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication (finalAttrs: {

  buildInputs = [
    gtk3
-    libappindicator-gtk3
+    libappindicator
    libnotify
    librsvg # SVG icons
    udisks
--- a/pkgs/by-name/ug/uget/package.nix
+++ b/pkgs/by-name/ug/uget/package.nix
@@ -7,7 +7,7 @@
  openssl,
  curl,
  libnotify,
-  libappindicator-gtk3,
+  libappindicator,
  gst_all_1,
  gtk3,
  dconf,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    openssl
    curl
    libnotify
-    libappindicator-gtk3
+    libappindicator
    gtk3
    (lib.getLib dconf)
  ]
--- a/pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix
+++ b/pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix
@@ -10,7 +10,7 @@
  vala,
  gtk3,
  libgee,
-  libindicator-gtk3,
+  libindicator,
  pantheon,
  indicator-application-gtk3,
 }:
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
  buildInputs = [
    gtk3
    libgee
-    libindicator-gtk3
+    libindicator
    pantheon.granite
    pantheon.wingpanel
  ];
--- a/pkgs/by-name/xh/xhtml1/package.nix
+++ b/pkgs/by-name/xh/xhtml1/package.nix
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  libxml2,
-}:
-
-stdenv.mkDerivation {
-  pname = "xhtml1";
-  version = "0-unstable-2002-08-01";
-
-  src = fetchzip {
-    url = "https://www.w3.org/TR/xhtml1/xhtml1.tgz";
-    hash = "sha256-Y/IZqFAPjRl5ol5hekCEmv6l4LEP0HUIuyxU/SPfC28=";
-  };
-
-  nativeBuildInputs = [ libxml2 ];
-
-  installPhase = ''
-    mkdir -p $out/xml/dtd/xhtml1
-    cp DTD/*.ent DTD/*.dtd $out/xml/dtd/xhtml1
-
-    # Generate an XML catalog.
-    cat=$out/xml/dtd/xhtml1/catalog.xml
-    xmlcatalog --noout --create $cat
-    grep PUBLIC DTD/*.soc | while read x; do
-        eval a=($x)
-        xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat
-    done
-  '';
-
-  meta = {
-    homepage = "https://www.w3.org/TR/xhtml1/";
-    description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language";
-    platforms = lib.platforms.unix;
-    license = lib.licenses.w3c-19980720;
-  };
-}
--- a/pkgs/by-name/ya/yad/package.nix
+++ b/pkgs/by-name/ya/yad/package.nix
@@ -9,7 +9,7 @@
  gspell,
  gtk3,
  gtksourceview,
-  libappindicator-gtk3,
+  libappindicator,
  netpbm,
  webkitgtk_4_1,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
    gspell
    gtk3
    gtksourceview
-    libappindicator-gtk3
+    libappindicator
    webkitgtk_4_1
  ];

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -295144,7 +295144,7 @@ self: {
      license = lib.licenses.lgpl21Only;
      hydraPlatforms = lib.platforms.none;
    }
-  ) { inherit (pkgs) gtkimageview; };
+  ) { gtkimageview = null; };

  gtkrsync = callPackage (
    {
@@ -304694,7 +304694,7 @@ self: {
      hydraPlatforms = lib.platforms.none;
      broken = true;
    }
-  ) { inherit (pkgs) libappindicator-gtk2; };
+  ) { libappindicator-gtk2 = null; };

  happindicator3 = callPackage (
    {
@@ -304721,7 +304721,7 @@ self: {
      hydraPlatforms = lib.platforms.none;
      broken = true;
    }
-  ) { inherit (pkgs) libappindicator-gtk3; };
+  ) { libappindicator-gtk3 = null; };

  happlets = callPackage (
    {
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -12,6 +12,7 @@
  google-cloud-core,
  google-resumable-media,
  grpcio,
+  packaging,
  proto-plus,
  protobuf,
  python-dateutil,
@@ -54,6 +55,7 @@ buildPythonPackage rec {
    google-cloud-core
    google-resumable-media
    grpcio
+    packaging
    proto-plus
    protobuf
    python-dateutil
--- a/pkgs/development/python-modules/libvirt-python/default.nix
+++ b/pkgs/development/python-modules/libvirt-python/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "libvirt-python";
-  version = "12.4.0";
+  version = "12.6.0";
  pyproject = true;

  src = fetchFromGitLab {
    owner = "libvirt";
    repo = "libvirt-python";
    tag = "v${version}";
-    hash = "sha256-8+o3ji7b0PCGxnHbsUJTUn1oudeN3rV+ehUILmufD1M=";
+    hash = "sha256-BJGXIc3Oggwod4d+JT7ag///oQIErqHVnORhn9CUUr0=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/textual-fastdatatable/default.nix
+++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix
@@ -2,38 +2,43 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+
+  # build-system
  hatchling,
-  pandas,
+
+  # dependencies
  pyarrow,
-  pytz,
  textual,
-  tzdata,
+  typing-extensions,
+
+  # optional-dependencies
  polars,
+
+  # tests
  pytest-asyncio,
  pytest-textual-snapshot,
  pytestCheckHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "textual-fastdatatable";
-  version = "0.14.0";
+  version = "0.17.0";
  pyproject = true;
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "tconbeer";
    repo = "textual-fastdatatable";
-    tag = "v${version}";
-    hash = "sha256-gm1h+r8rZO1/9sXoNwqVuBbv7CpZm2a3YAMHRHGg5uo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-aDbYwPISsmk9af3yQWh4ClHj3SRljzBMVxvYgWk61rM=";
  };

  build-system = [ hatchling ];

  dependencies = [
-    pandas
    pyarrow
-    pytz
    textual
-    tzdata
+    typing-extensions
  ]
  ++ textual.optional-dependencies.syntax;

@@ -46,13 +51,7 @@ buildPythonPackage rec {
    pytest-textual-snapshot
    pytestCheckHook
  ]
-  ++ lib.concatAttrValues optional-dependencies;
-
-  pythonRelaxDeps = [
-    "numpy"
-    "pandas"
-    "pyarrow"
-  ];
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;

  pythonImportsCheck = [ "textual_fastdatatable" ];

@@ -64,8 +63,8 @@ buildPythonPackage rec {
  meta = {
    description = "Performance-focused reimplementation of Textual's DataTable widget, with a pluggable data storage backend";
    homepage = "https://github.com/tconbeer/textual-fastdatatable";
-    changelog = "https://github.com/tconbeer/textual-fastdatatable/releases/tag/${src.tag}";
+    changelog = "https://github.com/tconbeer/textual-fastdatatable/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ pcboy ];
  };
-}
+})
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -20,22 +20,19 @@

 buildPythonPackage (finalAttrs: {
  pname = "textual-textarea";
-  version = "0.17.3";
+  version = "0.18.1";
  pyproject = true;
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "tconbeer";
    repo = "textual-textarea";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-m3aXTUKOklk6TJgxRV+KqxeHBL+Y7XDNCJaW12SLj0E=";
+    hash = "sha256-ixSzT6Mxh7n7pLlXnb9y2XJoSUwcETpJ9qylON0NxIo=";
  };

  build-system = [ hatchling ];

-  pythonRelaxDeps = [
-    "textual"
-  ];
-
  dependencies = [
    pyperclip
    textual
@@ -62,7 +59,7 @@ buildPythonPackage (finalAttrs: {
  meta = {
    description = "Text area (multi-line input) with syntax highlighting for Textual";
    homepage = "https://github.com/tconbeer/textual-textarea";
-    changelog = "https://github.com/tconbeer/textual-textarea/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/tconbeer/textual-textarea/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ pcboy ];
  };
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1062,6 +1062,7 @@ mapAliases {
  gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
  gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
  gtkgnutella = gtk-gnutella; # Added 2026-05-21
+  gtkimageview = throw "'gtkimageview' has been removed, as it depended on GTK 2."; # Added 2026-08-10
  gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22
  gtkradiant = throw "'gtkradiant' has been removed, as it relies on gtk2"; # Added 2026-06-18
  gtkspell2 = throw "'gtkspell2' has been removed as it depended on the deprecated GTK2 engine. Consider using 'gtkspell3' instead"; # Added 2026-07-23
@@ -1120,6 +1121,7 @@ mapAliases {
  immersed-vr = throw "'immersed-vr' has been renamed to/replaced by 'immersed'"; # Converted to throw 2025-10-27
  inconsolata-nerdfont = throw "'inconsolata-nerdfont' has been renamed to/replaced by 'nerd-fonts.inconsolata'"; # Converted to throw 2025-10-27
  incrtcl = throw "'incrtcl' has been renamed to/replaced by 'tclPackages.incrtcl'"; # Converted to throw 2025-10-27
+  indicator-application-gtk2 = throw "'indicator-application-gtk2' has been removed as it depended on the deprecated GTK 2 engine. Consider using 'indicator-application-gtk3' instead."; # Added 2026-08-10
  infamousPlugins = infamousplugins; # Added 2026-02-08
  inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2025-10-27
  insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
@@ -1255,6 +1257,8 @@ mapAliases {
  lexical = throw "'lexical' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24
  lfe = warnAlias "'lfe' is deprecated in favor of using the beamPackages sets. Use 'beam27Packages.lfe' instead." beam27Packages.lfe; # added 2026-06-15
  lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
+  libappindicator-gtk2 = throw "'libappindicator-gtk2' has been removed as it depended on the deprecated GTK 2 engine."; # Added 2026-08-10
+  libappindicator-gtk3 = libappindicator; # Added 2026-08-10
  libAppleWM = libapplewm; # Added 2026-02-04
  libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
  libayatana-appindicator-gtk3 = throw "'libayatana-appindicator-gtk3' has been renamed to/replaced by 'libayatana-appindicator'"; # Converted to throw 2025-10-27
@@ -1269,6 +1273,7 @@ mapAliases {
  libclc = throw "'libclc' has been removed, as no packages use it; reach out to LLVM/Mesa maintainers if you need this back."; # Added 2026-08-06
  libdbiDrivers = warnAlias "'libdbiDrivers' has been renamed to 'libdbi-drivers'" libdbi-drivers; # Added 2026-02-08
  libdbiDriversBase = warnAlias "'libdbiDriversBase' has been renamed to 'libdbi-drivers-base'" libdbi-drivers-base; # Added 2026-02-08
+  libdbusmenu-gtk2 = throw "'libdbusmenu-gtk2' has been removed as it depended on the deprecated GTK 2 engine."; # Added 2026-08-10
  libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
  libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
  libdisplay-info_0_2 = throw "`libdisplay-info_0_2` has been removed as it is was unused in Nixpkgs. Consider upgrading to `libdisplay-info_0_3` or `libdisplay-info` instead"; # Added 2026-08-04
@@ -1293,6 +1298,8 @@ mapAliases {
  libHX = libhx; # Added 2026-02-08
  libICE = libice; # Added 2026-02-04
  libiconv-darwin = throw "'libiconv-darwin' has been renamed to/replaced by 'darwin.libiconv'"; # Converted to throw 2025-10-27
+  libindicator-gtk2 = throw "'libindicator-gtk2' has been removed as it depended on the deprecated GTK 2 engine."; # Added 2026-08-10
+  libindicator-gtk3 = libindicator; # Added 2026-08-10
  libixp_hg = throw "'libixp_hg' has been renamed to/replaced by 'libixp'"; # Converted to throw 2025-10-27
  libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # Added 2025-08-28
  libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
@@ -2653,6 +2660,7 @@ mapAliases {
  xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
  xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
  xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
+  xhtml1 = throw "'xhtml1' has been removed because it was superseded in 2018"; # Added 2026-07-24
  xinput_calibrator = xinput-calibrator; # Added 2025-08-28
  xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
  xkeyboardconfig = xkeyboard-config; # Added 2026-02-04
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5924,9 +5924,6 @@ with pkgs;

  lcms = lcms2;

-  libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
-  libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
-
  libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
  libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
  libbassmidi = (callPackage ../development/libraries/audio/libbass { }).bassmidi;
@@ -5951,8 +5948,7 @@ with pkgs;
    withSqlite = false;
  };

-  libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
-  libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
+  libdbusmenu-gtk3 = libdbusmenu.override { withGtk3 = true; };

  libdisplay-info_0_3 = callPackage ../by-name/li/libdisplay-info/0.3.nix { };

@@ -5973,8 +5969,6 @@ with pkgs;
    genPosixLockObjOnly = true;
  };

-  libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
-  libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
  inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5;
  libliftoff = libliftoff_0_5;

@@ -8705,7 +8699,6 @@ with pkgs;
    recurseIntoAttrs (
      callPackages ../applications/editors/jetbrains {
        vmopts = config.jetbrains.vmopts or null;
-        jdk = jetbrains.jdk;
      }
    )
    // {
@@ -9164,7 +9157,7 @@ with pkgs;
  quodlibet = callPackage ../applications/audio/quodlibet {
    kakasi = null;
    keybinder3 = null;
-    libappindicator-gtk3 = null;
+    libappindicator = null;
    libmodplug = null;
  };

@@ -9183,7 +9176,7 @@ with pkgs;
    inherit gtksourceview;
    kakasi = kakasi;
    keybinder3 = keybinder3;
-    libappindicator-gtk3 = libappindicator-gtk3;
+    libappindicator = libappindicator;
    libmodplug = libmodplug;
    tag = "-full";
    withDbusPython = true;
--- a/Show More
+++ b/Show More