Merge master into staging-next

kokkos: 5.2.0 -> 5.2.2 (#556063 )
terraform-providers.oracle_oci: 8.28.0 -> 9.1.0 (#559730 )
2026-09-15 03:40:22 +00:00 · 2026-09-15 00:25:21 +00:00 · 2026-09-15 00:08:50 +00:00 · 2026-09-15 00:08:01 +00:00 · 2026-09-15 00:04:57 +00:00 · 2026-09-15 00:01:39 +00:00
350 changed files with 10445 additions and 5827 deletions
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -97,8 +97,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 # Contributor documentation
 /CONTRIBUTING.md
 /.github/PULL_REQUEST_TEMPLATE.md
-/doc/contributing/
-/doc/contributing/contributing-to-documentation.chapter.md @jtojnar
+/doc/contributing.md @infinisil
 /lib/README.md
 /doc/README.md
 /nixos/README.md
@@ -106,10 +105,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 /pkgs/by-name/README.md
 /maintainers/README.md

-# User-facing development documentation
-/doc/development.md @infinisil
-/doc/development @infinisil
-
 # NixOS Internals
 /nixos/default.nix                                    @infinisil
 /nixos/lib/from-env.nix                               @infinisil
--- a/doc/contributing.md
+++ b/doc/contributing.md
@@ -1 +1,84 @@
-# Contributing to Nixpkgs {#part-contributing}
+# Contributing {#part-contributing}
+
+<!--
+    Legacy anchors. The sections behind these ids used to live in this manual and are
+    now maintained elsewhere. We keep these invisible anchor ids so external URIs would link to this page.
+-->
+<!-- moved to CONTRIBUTING.md -->
+[]{#chap-conventions}
+[]{#sec-syntax}
+[]{#sec-organisation}
+[]{#chap-submitting-changes}
+[]{#submitting-changes-submitting-changes}
+[]{#submitting-changes-pull-request-template}
+[]{#submitting-changes-tested-with-sandbox}
+[]{#submitting-changes-platform-diversity}
+[]{#submitting-changes-nixos-tests}
+[]{#submitting-changes-tested-compilation}
+[]{#submitting-changes-tested-execution}
+[]{#submitting-changes-contribution-standards}
+[]{#submitting-changes-hotfixing-pull-requests}
+[]{#submitting-changes-commit-policy}
+[]{#submitting-changes-branches}
+[]{#submitting-changes-master-branch}
+[]{#submitting-changes-staging-branch}
+[]{#submitting-changes-staging-next-branch}
+[]{#submitting-changes-stable-release-branches}
+[]{#submitting-changes-stable-release-branches-automatic-backports}
+[]{#submitting-changes-stable-release-branches-manual-backports}
+[]{#acceptable-backport-criteria}
+[]{#chap-reviewing-contributions}
+[]{#reviewing-contributions-other-submissions}
+[]{#reviewing-contributions--merging-pull-requests}
+[]{#part-development}
+
+<!-- moved to pkgs/README.md -->
+[]{#chap-quick-start}
+[]{#sec-package-naming}
+[]{#sec-versioning}
+[]{#sec-sources}
+[]{#sec-source-hashes}
+[]{#sec-source-hashes-security}
+[]{#sec-patches}
+[]{#sec-package-tests}
+[]{#ssec-inline-package-tests-writing}
+[]{#ssec-package-tests-writing}
+[]{#ssec-package-tests-running}
+[]{#ssec-package-tests-examples}
+[]{#ssec-nixos-tests-linking}
+[]{#ssec-import-from-derivation}
+[]{#submitting-changes-submitting-security-fixes}
+[]{#submitting-changes-deprecating-packages}
+[]{#steps-to-remove-a-package-from-nixpkgs}
+[]{#chap-vulnerability-roundup}
+[]{#vulnerability-roundup-issues}
+[]{#vulnerability-roundup-triaging-and-fixing}
+[]{#reviewing-contributions-package-updates}
+[]{#reviewing-contributions-new-packages}
+
+<!-- moved to nixos/README.md -->
+[]{#reviewing-contributions-module-updates}
+[]{#reviewing-contributions-new-modules}
+
+<!-- moved to maintainers/README.md -->
+[]{#reviewing-contributions-individual-maintainer-list}
+[]{#reviewing-contributions-maintainer-teams}
+
+<!-- moved to doc/README.md -->
+[]{#chap-contributing}
+
+Contribution documentation lives along the repository scope it applies to:
+
+- [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): coding conventions, file organisation, submitting changes, commit policy, branches and backports, reviewing contributions.
+- [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md): adding and updating packages, package naming and versioning, source fetching and hashes, patches, package tests, deprecating packages, security fixes.
+- [nixos/README.md](https://github.com/NixOS/nixpkgs/blob/master/nixos/README.md): NixOS modules and reviewing module changes.
+- [maintainers/README.md](https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md): maintainer entries and maintainer teams.
+- [doc/README.md](https://github.com/NixOS/nixpkgs/blob/master/doc/README.md): writing and building this manual.
+
+## Opening issues {#sec-opening-issues}
+
+- Make sure you have a [GitHub account](https://github.com/signup/free)
+- Make sure there is no open issue on the topic
+- [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and filling out the template
+
+<!-- In the future this section could also include more detailed information on the issue templates -->
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@@ -1,63 +0,0 @@
-# Coding conventions {#chap-conventions}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Syntax {#sec-syntax}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Package naming {#sec-package-naming}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## File naming and organisation {#sec-organisation}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Versioning {#sec-versioning}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Fetching Sources {#sec-sources}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Obtaining source hash {#sec-source-hashes}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Obtaining hashes securely {#sec-source-hashes-security}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Patches {#sec-patches}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Package tests {#sec-package-tests}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Writing inline package tests {#ssec-inline-package-tests-writing}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Writing larger package tests {#ssec-package-tests-writing}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Running package tests {#ssec-package-tests-running}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Examples of package tests {#ssec-package-tests-examples}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Linking NixOS module tests to a package {#ssec-nixos-tests-linking}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Import From Derivation {#ssec-import-from-derivation}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
--- a/doc/contributing/contributing-to-documentation.chapter.md
+++ b/doc/contributing/contributing-to-documentation.chapter.md
@@ -1,3 +0,0 @@
-# Contributing to Nixpkgs documentation {#chap-contributing}
-
-This section has been moved to [doc/README.md](https://github.com/NixOS/nixpkgs/blob/master/doc/README.md).
--- a/doc/contributing/quick-start.chapter.md
+++ b/doc/contributing/quick-start.chapter.md
@@ -1,3 +0,0 @@
-# Quick Start to Adding a Package {#chap-quick-start}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
--- a/doc/contributing/reviewing-contributions.chapter.md
+++ b/doc/contributing/reviewing-contributions.chapter.md
@@ -1,35 +0,0 @@
-# Reviewing contributions {#chap-reviewing-contributions}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Package updates {#reviewing-contributions-package-updates}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## New packages {#reviewing-contributions-new-packages}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Module updates {#reviewing-contributions-module-updates}
-
-This section has been moved to [nixos/README.md](https://github.com/NixOS/nixpkgs/blob/master/nixos/README.md).
-
-## New modules {#reviewing-contributions-new-modules}
-
-This section has been moved to [nixos/README.md](https://github.com/NixOS/nixpkgs/blob/master/nixos/README.md#new-modules).
-
-## Individual maintainer list {#reviewing-contributions-individual-maintainer-list}
-
-This section has been moved to [maintainers/README.md](https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md).
-
-## Maintainer teams {#reviewing-contributions-maintainer-teams}
-
-This section has been moved to [maintainers/README.md](https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md).
-
-## Other submissions {#reviewing-contributions-other-submissions}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Merging pull requests {#reviewing-contributions--merging-pull-requests}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -1,88 +0,0 @@
-# Submitting changes {#chap-submitting-changes}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Submitting changes {#submitting-changes-submitting-changes}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Submitting security fixes {#submitting-changes-submitting-security-fixes}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Deprecating/removing packages {#submitting-changes-deprecating-packages}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-### Steps to remove a package from Nixpkgs {#steps-to-remove-a-package-from-nixpkgs}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Pull Request Template {#submitting-changes-pull-request-template}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Tested using sandboxing {#submitting-changes-tested-with-sandbox}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Built on platform(s) {#submitting-changes-platform-diversity}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) {#submitting-changes-nixos-tests}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Tested compilation of all pkgs that depend on this change using `nixpkgs-review` {#submitting-changes-tested-compilation}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Tested execution of all binary files (usually in `./result/bin/`) {#submitting-changes-tested-execution}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-## Commit policy {#submitting-changes-commit-policy}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-### Branches {#submitting-changes-branches}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Master branch {#submitting-changes-master-branch}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Staging branch {#submitting-changes-staging-branch}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Staging-next branch {#submitting-changes-staging-next-branch}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Stable release branches {#submitting-changes-stable-release-branches}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Automatically backporting a Pull Request {#submitting-changes-stable-release-branches-automatic-backports}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Manually backporting changes {#submitting-changes-stable-release-branches-manual-backports}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-#### Acceptable backport criteria {#acceptable-backport-criteria}
-
-This section has been moved to [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
--- a/doc/contributing/vulnerability-roundup.chapter.md
+++ b/doc/contributing/vulnerability-roundup.chapter.md
@@ -1,11 +0,0 @@
-# Vulnerability Roundup {#chap-vulnerability-roundup}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Issues {#vulnerability-roundup-issues}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
-
-## Triaging and Fixing {#vulnerability-roundup-triaging-and-fixing}
-
-This section has been moved to [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md).
--- a/doc/development.md
+++ b/doc/development.md
@@ -1,6 +0,0 @@
-# Development of Nixpkgs {#part-development}
-
-This section shows you how Nixpkgs is developed and how you can interact with the contributors and the latest updates.
-If you are interested in contributing yourself, see [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
-
-<!-- In the future this section should also include: How to test pull requests, how to know if pull requests are available in channels, etc. -->
--- a/doc/development/opening-issues.chapter.md
+++ b/doc/development/opening-issues.chapter.md
@@ -1,7 +0,0 @@
-# Opening issues {#sec-opening-issues}
-
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Make sure there is no open issue on the topic
-* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and filling out the template
-
-<!-- In the future this section could also include more detailed information on the issue templates -->
--- a/doc/languages-frameworks/chicken.section.md
+++ b/doc/languages-frameworks/chicken.section.md
@@ -1,8 +1,32 @@
 # CHICKEN {#sec-chicken}

-[CHICKEN](https://call-cc.org/) is a
-[R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme
-compiler. It includes an interactive mode and a custom package format, "eggs".
+[CHICKEN](https://call-cc.org/) is a Scheme compiler. It includes an
+interactive mode and a custom package format, "eggs". CHICKEN 5 is
+[R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant, whereas
+CHICKEN 6 targets
+[R⁷RS](https://standards.scheme.org/official/r7rs.pdf).
+
+## Package Sets {#sec-chicken-package-sets}
+
+Each major release of CHICKEN has its own package set, because eggs are
+compiled against a specific binary version of the compiler and cannot be shared
+between releases:
+
+* `chickenPackages_5` — CHICKEN 5, and the set the unversioned attributes
+  (`chicken`, `chickenPackages`, `eggDerivation`, `fetchegg`) point at.
+* `chickenPackages_6` — CHICKEN 6.
+* `chickenPackages_4` — CHICKEN 4; kept for the few packages that still need
+  it and maintained on a best-effort basis.
+
+Each set provides `chicken`, `eggDerivation`, `fetchegg` and an `chickenEggs`
+attrset of eggs published for that release. Note that upstream has not ported
+every egg to CHICKEN 6 yet, so `chickenPackages_6.chickenEggs` is considerably
+smaller than its CHICKEN 5 counterpart.
+
+CHICKEN 5 and 6 are built from the same expressions, in
+`pkgs/development/compilers/chicken/common/`; the release directories next to
+it hold only what differs between releases, which is the compiler's version and
+its egg set. CHICKEN 4 predates that arrangement and stands on its own.

 ## Using Eggs {#sec-chicken-using}

@@ -26,29 +50,43 @@ variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`.

 ## Updating Eggs {#sec-chicken-updating-eggs}

-Nixpkgs only knows about a subset of all published eggs. It uses
-[egg2nix](https://github.com/the-kenny/egg2nix) to generate a
-package set from a list of eggs to include.
-
-The package set is regenerated by running the following shell commands:
+For CHICKEN 5 and 6, the egg set is generated from upstream's list of latest
+egg releases, so there is no list of eggs to curate in Nixpkgs: every egg
+published for that release is included. The generated metadata lives in the
+release directory's `deps.toml`, and is regenerated by running the shared
+`update.sh` script with the release to update:

 ```
-$ nix-shell -p chickenPackages.egg2nix
-$ cd pkgs/development/compilers/chicken/5/
-$ egg2nix eggs.scm > eggs.nix
+$ cd pkgs/development/compilers/chicken/common/
+$ ./update.sh 6
 ```

+This clones upstream's `eggs-<major>-latest` repository, prefetches each egg
+tarball and converts the egg metadata into `deps.toml`. Do not edit
+`deps.toml` by hand.
+
+Eggs that need extra native dependencies or other fixups are patched up in
+`overrides.nix` in the release directory; the entries there are keyed by egg
+name and applied automatically by `eggDerivation`.
+
 ## Adding Eggs {#sec-chicken-adding-eggs}

-When we run `egg2nix`, we obtain one collection of eggs with
-mutually-compatible versions. This means that when we add new eggs, we may
-need to update existing eggs. To keep those separate, follow the procedure for
-updating eggs before including more eggs.
+CHICKEN 4 predates the workflow above: its much smaller set is generated with
+[egg2nix](https://github.com/the-kenny/egg2nix) from a hand-written list of
+eggs, so eggs have to be added explicitly. The list is
+`pkgs/development/compilers/chicken/4/eggs.scm`; the first section lists eggs
+which are required by `egg2nix` itself, all other eggs go into the second
+section. After editing, regenerate the set:

-To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`.
-The first section of this file lists eggs which are required by `egg2nix`
-itself; all other eggs go into the second section. After editing, follow the
-procedure for updating eggs.
+```
+$ nix-shell -p chickenPackages_4.egg2nix
+$ cd pkgs/development/compilers/chicken/4/
+$ egg2nix eggs.scm > eggs.nix
+```
+
+`egg2nix` resolves one collection of eggs with mutually-compatible versions, so
+adding an egg may update existing ones. To keep those changes separate,
+regenerate the set before adding more eggs.

 ## Override Scope {#sec-chicken-override-scope}

--- a/doc/nav.json
+++ b/doc/nav.json
@@ -645,45 +645,6 @@
        },
        {
          "file": "module-system/module-system.chapter.md"
-        }
-      ]
-    },
-    {
-      "label": "Contributing to Nixpkgs",
-      "id": "part-contributing",
-      "children": [
-        {
-          "file": "contributing.md"
-        },
-        {
-          "file": "contributing/quick-start.chapter.md"
-        },
-        {
-          "label": "Development of Nixpkgs",
-          "id": "part-development",
-          "children": [
-            {
-              "file": "development.md"
-            },
-            {
-              "file": "development/opening-issues.chapter.md"
-            }
-          ]
-        },
-        {
-          "file": "contributing/coding-conventions.chapter.md"
-        },
-        {
-          "file": "contributing/submitting-changes.chapter.md"
-        },
-        {
-          "file": "contributing/vulnerability-roundup.chapter.md"
-        },
-        {
-          "file": "contributing/reviewing-contributions.chapter.md"
-        },
-        {
-          "file": "contributing/contributing-to-documentation.chapter.md"
        },
        {
          "label": "Interoperability Standards",
@@ -698,6 +659,9 @@
          ]
        }
      ]
+    },
+    {
+      "file": "contributing.md"
    }
  ]
 }
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -473,6 +473,9 @@
  "sec-building-packages-with-llvm-using-clang-stdenv": [
    "index.html#sec-building-packages-with-llvm-using-clang-stdenv"
  ],
+  "sec-chicken-package-sets": [
+    "index.html#sec-chicken-package-sets"
+  ],
  "sec-darwin-availability-checks": [
    "index.html#sec-darwin-availability-checks"
  ],
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1636,6 +1636,78 @@ let
    else
      f def;

+  /**
+    Consume the `options` metadata of the submodules typed by `attrsOf submodule`.
+
+    It also works with `lazyAttrsOf` and `attrsWith`.
+
+    # Inputs
+
+    1. A function that takes `name: { cfg, opt }:` and returns anything.
+       `name` is the attribute name at the level of `attrsOf`.
+       `cfg` is the corresponding option *value*, as typically found in `config`.
+       `opt` is the corresponding evaluated option, as typically found in `options`.
+
+    2. An `options` attribute value, e.g. `options.users.groups`.
+
+    # Output
+
+    An attribute set whose attribute names correspond to the definitions of the
+    option, and whose values are the return value of the passed function.
+
+    # Type
+
+    ```
+    mapAttrsOfSubmodule :: (String -> { cfg :: AttrSet, opt :: AttrSet } -> a) -> Option -> AttrSetOf a
+    ```
+
+    `Option` refers to an evaluated option,
+    retrievable from the `options` module argument
+    or the `options` configuration attribute returned by `evalModules`.
+    It carries attribute `_type = "option";`.
+
+    # Example
+
+    :::{.example}
+    ## Use `mapAttrsOfSubmodule` to distinguish which NixOS system services are explicitly enabled or disabled
+    ```nix
+    lib.modules.mapAttrsOfSubmodule
+      (name: { cfg, opt }:
+        {
+          isExplicit = opt.enable.highestPrio < (lib.mkOptionDefault null).priority;
+          value = cfg.enable;
+        })
+      (pkgs.nixos { }).options.systemd.services
+    =>
+    {
+      console-getty = {
+        isExplicit = true;
+        value = false;
+      };
+      "container-getty@" = {
+        isExplicit = false;
+        value = true;
+      };
+      # ...
+    }
+    ```
+
+    :::
+  */
+  mapAttrsOfSubmodule =
+    f: opt:
+    assert opt._type or null == "option";
+    assert opt.type.name == "attrsOf" || opt.type.name == "lazyAttrsOf";
+    assert opt.type.nestedTypes.elemType.name == "submodule";
+
+    mapAttrs (
+      name: attrMeta:
+      f name {
+        cfg = attrMeta.configuration.config;
+        opt = attrMeta.configuration.options;
+      }
+    ) opt.valueMeta.attrs;
+
  mkBefore = mkOrder 500;
  defaultOrderPriority = 1000;
  mkAfter = mkOrder 1500;
@@ -2340,6 +2412,7 @@ private
    importApply
    importJSON
    importTOML
+    mapAttrsOfSubmodule
    mapDefinitionValue
    mergeDefinitions
    mergeAttrDefinitionsWithPrio
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -865,6 +865,8 @@ checkConfigError 'the-defs-file\.nix' config.argv ./attrList-valueMeta-definitio
 # attrListOf does not support type merging
 checkConfigError 'The option .merged. in .*/declare-attrList-type-merge.nix. is already declared in .*/declare-attrList-type-merge.nix' config.merged ./declare-attrList-type-merge.nix

+checkConfigOutput '"ok"' config.result ./mapAttrsOfSubmodule.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
--- a/lib/tests/modules/mapAttrsOfSubmodule.nix
+++ b/lib/tests/modules/mapAttrsOfSubmodule.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  options,
+  ...
+}:
+let
+  inherit (lib) types mkOption;
+  inherit (types)
+    submodule
+    attrsOf
+    lazyAttrsOf
+    attrsWith
+    ;
+  def = (lib.mkDefault null).priority;
+  optdef = (lib.mkOptionDefault null).priority;
+
+  enabledModule = {
+    options.enable = mkOption { default = true; };
+  };
+in
+{
+  options.services = mkOption {
+    type = attrsOf (submodule enabledModule);
+  };
+  options.files = mkOption {
+    type = lazyAttrsOf (submodule enabledModule);
+  };
+  options.noDefs = mkOption {
+    type = attrsWith { elemType = submodule enabledModule; };
+  };
+  options.result = mkOption { };
+  config.services.empty = { };
+  config.services.default.enable = lib.mkDefault false;
+  config.files.empty = { };
+  config.files.default.enable = lib.mkDefault false;
+  config.files.quirk = lib.mkIf false { };
+  config.result =
+    assert
+      lib.modules.mapAttrsOfSubmodule (name: { cfg, opt }: {
+        inherit name cfg;
+        prio = opt.enable.highestPrio;
+      }) options.services == {
+        empty = {
+          name = "empty";
+          cfg.enable = true;
+          prio = optdef;
+        };
+        default = {
+          name = "default";
+          cfg.enable = false;
+          prio = def;
+        };
+      };
+    assert
+      lib.modules.mapAttrsOfSubmodule (name: { cfg, opt }: {
+        inherit name cfg;
+        prio = opt.enable.highestPrio;
+      }) options.files == {
+        empty = {
+          name = "empty";
+          cfg.enable = true;
+          prio = optdef;
+        };
+        default = {
+          name = "default";
+          cfg.enable = false;
+          prio = def;
+        };
+        quirk = {
+          name = "quirk";
+          cfg.enable = true; # unmitigated flaw; could add emptyValue to attrsWith
+          prio = optdef;
+        };
+      };
+    assert lib.modules.mapAttrsOfSubmodule (abort "unused") options.noDefs == { };
+    "ok";
+}
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -98,7 +98,9 @@
      "tomodachi94": 68489118,
      "tr3foil": 29682759
    },
-    "members": {},
+    "members": {
+      "l0b0": 168301
+    },
    "name": "Categorization"
  },
  "channel-updaters": {
@@ -193,6 +195,7 @@
      "Emin017": 99674037,
      "Et7f3": 29592775,
      "Guanran928": 68757440,
+      "KristijanZic": 10299892,
      "LnL7": 689294,
      "Mastermindaxe": 33257997,
      "Moraxyc": 69713071,
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -255,6 +255,12 @@
    github = "365tuwe";
    githubId = 10263091;
  };
+  _3j14 = {
+    name = "Jonas Drotleff";
+    github = "3j14";
+    githubId = 8471891;
+    matrix = "@sqrthalf:matrix.org";
+  };
  _3JlOy-PYCCKUi = {
    name = "3JlOy-PYCCKUi";
    email = "3jl0y_pycckui@riseup.net";
@@ -21280,6 +21286,12 @@
    githubId = 126072875;
    name = "nova madeline";
  };
+  novalkun = {
+    email = "novalkun@gmail.com";
+    github = "novalkun";
+    githubId = 43009254;
+    name = "novalkun";
+  };
  novaviper = {
    email = "code4nova@aluwux.me";
    github = "novaviper";
@@ -31754,6 +31766,12 @@
    githubId = 145775305;
    name = "Sergei Zimmerman";
  };
+  Xophmeister = {
+    name = "Christopher Harrison";
+    github = "Xophmeister";
+    githubId = 384987;
+    email = "nixpkgs@acc.xoph.co";
+  };
  xosnrdev = {
    email = "hello@xosnrdev.tech";
    github = "xosnrdev";
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -169,6 +169,8 @@
  Deployments running the server and worker in the same network namespace must also set at least the worker
  `AUTHENTIK_LISTEN__HTTP` address so that the server and worker do not bind to the same address.

+- `qt.platformTheme` no longer supports the `gtk2` option as GTK 2 had reached end-of-life and will be removed in Nixpkgs.
+
 - `services.paperless` has been updated to paperless-ngx 3.0, a major release; review the [upstream v3 migration guide](https://docs.paperless-ngx.com/migration-v3/) before upgrading.
  - paperless-ngx 3 requires a non-default `PAPERLESS_SECRET_KEY`. The module now generates one automatically, reusing the key from earlier NixOS releases so existing sessions keep working; a key set via `environmentFile` still takes precedence.
  - The full-text search backend changed from Whoosh to Tantivy. The search index is rebuilt automatically on the first start after upgrading, which can take a while for large document sets.
@@ -281,6 +283,8 @@
  of the [4.6 release](https://github.com/netbox-community/netbox/releases/tag/v4.6.0),
  make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_6;` in your configuration.

+- The COSMIC desktop module now enables by default `system76-power` and `system76-scheduler` following upstream recommended packages. The previous power managment service can be enabled back by setting `services.power-profiles-daemon.enable = true`.
+
 ## Other Notable Changes {#sec-release-26.11-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
--- a/nixos/modules/config/qt.nix
+++ b/nixos/modules/config/qt.nix
@@ -12,10 +12,6 @@ let
      qgnomeplatform
      qgnomeplatform-qt6
    ];
-    gtk2 = [
-      libsForQt5.qtstyleplugins
-      qt6Packages.qt6gtk2
-    ];
    kde = [
      kdePackages.kio
      kdePackages.plasma-integration
@@ -36,10 +32,6 @@ let
    bb10dark = [ libsForQt5.qtstyleplugins ];
    cde = [ libsForQt5.qtstyleplugins ];
    cleanlooks = [ libsForQt5.qtstyleplugins ];
-    gtk2 = [
-      libsForQt5.qtstyleplugins
-      qt6Packages.qt6gtk2
-    ];
    motif = [ libsForQt5.qtstyleplugins ];
    plastique = [ libsForQt5.qtstyleplugins ];

@@ -128,17 +120,12 @@ in
            "qt6Packages"
            "qt6ct"
          ]
-          [
-            "qt6Packages"
-            "qt6gtk2"
-          ]
        ];
        description = ''
          Selects the platform theme to use for Qt applications.

          The options are
          - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform)
-          - `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)
          - `kde`: Use Qt settings from Plasma.
          - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config)
             application.
@@ -162,10 +149,6 @@ in
            "libsForQt5"
            "qtstyleplugins"
          ]
-          [
-            "qt6Packages"
-            "qt6gtk2"
-          ]
          [
            "qt6Packages"
            "qtstyleplugin-kvantum"
@@ -180,7 +163,7 @@ in
            [adwaita](https://github.com/FedoraQt/adwaita-qt)
          - `breeze`: Use the Breeze style from
            [breeze](https://github.com/KDE/breeze)
-          - `bb10bright`, `bb10dark`, `cleanlooks`, `gtk2`, `motif`, `plastique`:
+          - `bb10bright`, `bb10dark`, `cleanlooks`, `motif`, `plastique`:
            Use styles from
            [qtstyleplugins](https://github.com/qt/qtstyleplugins)
          - `kvantum`: Use styles from
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -84,7 +84,7 @@ let
        # If you prefer a stable release instead, you can change the word unstable to the latest number shown here: https://nixos.org/download
        # i.e. nixos-24.11
        # Use `nix flake update` to update the flake to the latest revision of the chosen release channel.
-        nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+        nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst";
      };
      outputs = inputs\@{ self, nixpkgs, ... }: {
        # NOTE: '${options.networking.hostName.default}' is the default hostname
--- a/nixos/modules/profiles/perlless.nix
+++ b/nixos/modules/profiles/perlless.nix
@@ -11,6 +11,7 @@
  environment.defaultPackages = lib.mkDefault [ ];
  documentation.info.enable = lib.mkDefault false;
  documentation.nixos.enable = lib.mkDefault false;
+  programs.command-not-found.enable = lib.mkDefault false;

  # Check that the system does not contain a Nix store path that contains the
  # string "perl".
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -42,11 +42,16 @@ let
  # See https://github.com/fish-shell/fish-shell/issues/12079
  indentFishFile =
    name: text:
-    pkgs.runCommandLocal name {
-      nativeBuildInputs = [ cfg.package ];
-      inherit text;
-      passAsFile = [ "text" ];
-    } "fish --no-config -c 'fish_indent $textPath' > $out";
+    pkgs.runCommandLocal name
+      {
+        nativeBuildInputs = [ cfg.package ];
+        strictDeps = true;
+        inherit text;
+        __structuredAttrs = true;
+      }
+      ''
+        printf "%s" "$text" | fish --no-config -c fish_indent > $out
+      '';

  sourceEnv =
    file:
--- a/nixos/modules/programs/wayland/sway.nix
+++ b/nixos/modules/programs/wayland/sway.nix
@@ -204,5 +204,5 @@ in
    ]
  );

-  meta.maintainers = [ ];
+  meta.maintainers = with lib.maintainers; [ sotormd ];
 }
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -190,10 +190,11 @@ in
              ${config.users.defaultUserShell} = icnu
          '';
          footer = "${pkgs.apparmor-utils}/etc/apparmor/logprof.conf";
-          passAsFile = [ "header" ];
+          strictDeps = true;
+          __structuredAttrs = true;
        }
        ''
-          cp $headerPath $out
+          printf "%s" "$header" > $out
          sed '1,/\[qualifiers\]/d' $footer >> $out
        '';

--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -169,8 +169,9 @@ in
    services.gnome.gnome-keyring.enable = lib.mkDefault true;
    services.gvfs.enable = lib.mkDefault true;
    services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
-    services.power-profiles-daemon.enable = lib.mkDefault (
-      !config.hardware.system76.power-daemon.enable
+    services.system76-scheduler.enable = lib.mkDefault true;
+    hardware.system76.power-daemon.enable = lib.mkDefault (
+      !config.services.power-profiles-daemon.enable && !config.services.tuned.enable
    );

    warnings = lib.optionals (cfg.showExcludedPkgsWarning && excludedCorePkgs != [ ]) [
--- a/nixos/modules/services/networking/ifstate.nix
+++ b/nixos/modules/services/networking/ifstate.nix
@@ -20,11 +20,12 @@ let
            yq
            check-jsonschema
          ];
+          strictDeps = true;
          value = builtins.toJSON value;
-          passAsFile = [ "value" ];
+          __structuredAttrs = true;
        }
        ''
-          yq --yaml-output . $valuePath > $out
+          printf "%s" "$value" | yq --yaml-output . > $out
          check-jsonschema --schemafile "${cfg.package.passthru.jsonschema}" "$out"
          sed -i $'s|\'!include |!include \'|' $out
        '';
--- a/nixos/modules/services/networking/modemmanager.nix
+++ b/nixos/modules/services/networking/modemmanager.nix
@@ -64,10 +64,15 @@ in

    systemd.services.ModemManager = {
      aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
-      path = lib.optionals (cfg.fccUnlockScripts != [ ]) [
-        pkgs.libqmi
-        pkgs.libmbim
-      ];
+      path = lib.optionals (cfg.fccUnlockScripts != [ ]) (
+        with pkgs;
+        [
+          gawk
+          libmbim
+          libqmi
+          xxd
+        ]
+      );
    };

    /*
--- a/nixos/modules/services/networking/nordvpn.nix
+++ b/nixos/modules/services/networking/nordvpn.nix
@@ -166,6 +166,9 @@ in

  meta = {
    doc = ./nordvpn.md;
-    maintainers = with lib.maintainers; [ different-error ];
+    maintainers = with lib.maintainers; [
+      different-error
+      novalkun
+    ];
  };
 }
--- a/nixos/modules/services/web-apps/slskd.nix
+++ b/nixos/modules/services/web-apps/slskd.nix
@@ -32,6 +32,7 @@ in

      domain = mkOption {
        type = types.nullOr types.str;
+        default = null;
        description = ''
          If non-null, enables an nginx reverse proxy virtual host at this FQDN,
          at the path configurated with `services.slskd.web.url_base`.
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -893,6 +893,7 @@ in
        # Upstream config: https://github.com/systemd/systemd/blob/main/src/run/systemd-run0.in
        setLoginUid = true;
        pamMount = false;
+        startSession = true;
      };
    };

--- a/nixos/modules/virtualisation/incus-virtual-machine.nix
+++ b/nixos/modules/virtualisation/incus-virtual-machine.nix
@@ -47,6 +47,7 @@ in
    });

    image.repart = {
+      enable = true;
      name = "nixos";
      version = null;
      sectorSize = 512;
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -24,6 +24,8 @@ let

  hostPkgs = cfg.host.pkgs;

+  useVirtiofs = hostPkgs.stdenv.hostPlatform.isLinux;
+
  consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;

  driveOptions =
@@ -324,23 +326,25 @@ let
        ''
    )}

-    echo "Starting virtiofs daemons..."
-    NIX_VIRTIOFS_DIR=$(mktemp -d)
-    ${lib.concatLines (
-      lib.mapAttrsToList (tag: share: ''
-        ${lib.getExe hostPkgs.virtiofsd} \
-          --socket-path="$NIX_VIRTIOFS_DIR"/"${tag}" \
-          --shared-dir="${share.source}" \
-          ${if share.writable then "--writeback" else "--readonly"} \
-          --sandbox=none \
-          --seccomp=none \
-          --cache=always \
-          --no-announce-submounts \
-          --translate-uid=host:65534:0:1 \
-          --translate-gid=host:65534:0:1 \
-          &
-      '') cfg.sharedDirectories
-    )}
+    ${lib.optionalString useVirtiofs ''
+      echo "Starting virtiofs daemons..."
+      NIX_VIRTIOFS_DIR=$(mktemp -d)
+      ${lib.concatLines (
+        lib.mapAttrsToList (tag: share: ''
+          ${lib.getExe hostPkgs.virtiofsd} \
+            --socket-path="$NIX_VIRTIOFS_DIR"/"${tag}" \
+            --shared-dir="${share.source}" \
+            ${if share.writable then "--writeback" else "--readonly"} \
+            --sandbox=none \
+            --seccomp=none \
+            --cache=always \
+            --no-announce-submounts \
+            --translate-uid=host:65534:0:1 \
+            --translate-gid=host:65534:0:1 \
+            &
+        '') cfg.sharedDirectories
+      )}
+    ''}

    # Start QEMU.
    exec ${
@@ -437,11 +441,11 @@ in
    (mkRemovedOptionModule [
      "virtualisation"
      "msize"
-    ] "9p was replaced with virtiofs and thus this option is obsolete.")
+    ] "The 9p msize is no longer configurable.")
    (mkRemovedOptionModule [
      "virtualisation"
      "nixStore9pCache"
-    ] "9p was replaced with virtiofs and thus this option is obsolete.")
+    ] "The 9p cache mode for the Nix store is no longer configurable.")
  ];

  options = {
@@ -592,8 +596,9 @@ in
      };
      description = ''
        An attributes set of directories that will be shared with the
-        virtual machine using VirtFS (9P filesystem over VirtIO).
-        The attribute name will be used as the 9P mount tag.
+        virtual machine using virtiofs on Linux hosts and VirtFS (9P filesystem
+        over VirtIO) on other hosts. The attribute name will be used as the
+        mount tag.
      '';
    };

@@ -1278,10 +1283,20 @@ in
        "-machine memory-backend=mem0"
      ])
      (lib.flatten (
-        lib.mapAttrsToList (tag: share: [
-          "-chardev socket,id=${tag},path=$NIX_VIRTIOFS_DIR/${tag}"
-          "-device vhost-user-fs-pci,chardev=${tag},tag=${tag}"
-        ]) cfg.sharedDirectories
+        lib.mapAttrsToList (
+          tag: share:
+          if useVirtiofs then
+            [
+              "-chardev socket,id=${tag},path=$NIX_VIRTIOFS_DIR/${tag}"
+              "-device vhost-user-fs-pci,chardev=${tag},tag=${tag}"
+            ]
+          else
+            [
+              "-virtfs local,path=${share.source},security_model=none,mount_tag=${tag}${
+                lib.optionalString (!share.writable) ",readonly=on"
+              }"
+            ]
+        ) cfg.sharedDirectories
      ))
      (
        let
@@ -1373,9 +1388,20 @@ in
        name = share.target;
        value = {
          device = tag;
-          fsType = "virtiofs";
+          fsType = if useVirtiofs then "virtiofs" else "9p";
          neededForBoot = true;
-          options = lib.mkIf (!share.writable) [ "ro" ];
+          options =
+            if useVirtiofs then
+              lib.mkIf (!share.writable) [ "ro" ]
+            else
+              [
+                "trans=virtio"
+                "version=9p2000.L"
+                "msize=16384"
+                "x-systemd.requires=modprobe@9pnet_virtio.service"
+              ]
+              ++ lib.optional (tag == "nix-store") "cache=loose"
+              ++ lib.optional (!share.writable) "ro";
        };
      }) cfg.sharedDirectories)
      {
@@ -1488,8 +1514,6 @@ in
        (isEnabled "VIRTIO_PCI")
        (isEnabled "VIRTIO_NET")
        (isEnabled "EXT4_FS")
-        (isEnabled "NET_9P_VIRTIO")
-        (isEnabled "9P_FS")
        (isYes "BLK_DEV")
        (isYes "PCI")
        (isYes "NETDEVICES")
@@ -1497,6 +1521,15 @@ in
        (isYes "INET")
        (isYes "NETWORK_FILESYSTEMS")
      ]
+      ++ (
+        if useVirtiofs then
+          [ (isEnabled "VIRTIO_FS") ]
+        else
+          [
+            (isEnabled "NET_9P_VIRTIO")
+            (isEnabled "9P_FS")
+          ]
+      )
      ++ optionals (!cfg.graphics) [
        (isYes "SERIAL_8250_CONSOLE")
        (isYes "SERIAL_8250")
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -585,6 +585,7 @@ in
  druid = handleTestOn [ "x86_64-linux" ] ./druid { };
  drupal = runTest ./drupal.nix;
  dublin-traceroute = runTest ./dublin-traceroute.nix;
+  duplicity = runTest ./duplicity.nix;
  dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix;
  e57inspector = import ./e57inspector.nix { inherit pkgs runTest; };
  early-mount-options = runTest ./early-mount-options.nix;
--- a/nixos/tests/duplicity.nix
+++ b/nixos/tests/duplicity.nix
@@ -0,0 +1,106 @@
+{ pkgs, lib, ... }:
+
+let
+  inherit (import ./ssh-keys.nix pkgs)
+    snakeOilPrivateKey
+    snakeOilPublicKey
+    snakeOilEd25519PrivateKey
+    snakeOilEd25519PublicKey
+    ;
+
+  keepFile = "keep.txt";
+  keepFileData = "This file should be backed up.";
+  excludedFile = "secret.txt";
+  excludedFileData = "Should not be backed up!";
+in
+{
+  name = "duplicity";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  containers.client =
+    let
+      dataDir = "/data";
+    in
+    {
+      systemd.tmpfiles.settings."10-duplicity-test" = {
+        ${dataDir}.d.mode = "0600";
+        "${dataDir}/${keepFile}".f = {
+          mode = "0644";
+          argument = keepFileData;
+        };
+        "${dataDir}/${excludedFile}".f = {
+          mode = "0644";
+          argument = excludedFileData;
+        };
+      };
+
+      programs.ssh = {
+        systemd-ssh-proxy.enable = false;
+        knownHosts.server = {
+          hostNames = [ "server" ];
+          publicKey = snakeOilPublicKey;
+        };
+        extraConfig = ''
+          Host server
+            IdentityFile ${snakeOilEd25519PrivateKey}
+        '';
+      };
+
+      services.duplicity = {
+        enable = true;
+        root = dataDir;
+        exclude = [ "${dataDir}/${excludedFile}" ];
+        targetUrl = "scp://root@server//root/backup";
+        frequency = null; # triggered manually in the test script
+        fullIfOlderThan = "always";
+        extraFlags = [
+          "--no-encryption"
+          "--volsize"
+          "1"
+        ];
+      };
+    };
+
+  containers.server =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.duplicity ];
+
+      systemd.tmpfiles.settings."10-duplicity-test" = {
+        "/root/backup".d.mode = "0700";
+        "/root/restore".d.mode = "0700";
+      };
+
+      services.openssh = {
+        enable = true;
+        hostKeys = [
+          {
+            type = "ecdsa";
+            path = "${snakeOilPrivateKey}";
+          }
+        ];
+      };
+
+      users.users.root.openssh.authorizedKeys.keys = [ snakeOilEd25519PublicKey ];
+    };
+
+  testScript = ''
+    start_all()
+
+    client.wait_for_unit("multi-user.target")
+    server.wait_for_unit("multi-user.target")
+    server.wait_for_open_port(22)
+
+    client.systemctl("start --wait duplicity.service")
+    client.fail("systemctl is-failed duplicity.service")
+
+    server.succeed(
+        "duplicity --no-encryption --volsize 1 restore file:///root/backup /root/restore"
+    )
+
+    server.succeed("test -f /root/restore/${keepFile}")
+    assert "${keepFileData}" in server.succeed("cat /root/restore/${keepFile}")
+
+    server.fail("test -e /root/restore/${excludedFile}")
+  '';
+}
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -461,10 +461,10 @@
    elpaBuild {
      pname = "auctex";
      ename = "auctex";
-      version = "14.1.2.0.20260807.58";
+      version = "14.1.2.0.20260911.81";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auctex-14.1.2.0.20260807.58.tar";
-        sha256 = "1d8x0vj5ln78j1g4m0wlpax079qxmp28a4mv41zd11wa2pssxb5z";
+        url = "https://elpa.gnu.org/devel/auctex-14.1.2.0.20260911.81.tar";
+        sha256 = "1wa9jhagw28q6ffcmjdcfknqs4xs7ymx77s8vpvkc3h2plvs4a6f";
      };
      packageRequires = [ ];
      meta = {
@@ -719,10 +719,10 @@
    elpaBuild {
      pname = "beframe";
      ename = "beframe";
-      version = "1.5.0.0.20260605.5";
+      version = "1.5.0.0.20260828.18";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260605.5.tar";
-        sha256 = "1i4dmcxbjd73gpkbj82qw6r95hc2dqm4zvcmkmka9ymwxdjamwi1";
+        url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260828.18.tar";
+        sha256 = "0871lrhvys4f7f1wxag6g8i8x21a0zab75nzz4wabkha079i13kp";
      };
      packageRequires = [ ];
      meta = {
@@ -740,10 +740,10 @@
    elpaBuild {
      pname = "bicep-ts-mode";
      ename = "bicep-ts-mode";
-      version = "0.1.4.0.20260720.83";
+      version = "0.1.4.0.20260825.88";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20260720.83.tar";
-        sha256 = "19k83fn4i2vvvad6pz865ns165vpd9msa1cnjhmlcfv5cxsa7wk3";
+        url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20260825.88.tar";
+        sha256 = "1dyy30m69isncwj1366944s5lvi85gq5604canmnbvizw4jay1y0";
      };
      packageRequires = [ ];
      meta = {
@@ -1106,10 +1106,10 @@
    elpaBuild {
      pname = "cape";
      ename = "cape";
-      version = "2.8.0.20260804.1";
+      version = "2.9.0.20260905.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-2.8.0.20260804.1.tar";
-        sha256 = "0p4s8md9wrxfgl1qmx231dcx8yg72xmbx9sx8zm4v9vhn12ffhc3";
+        url = "https://elpa.gnu.org/devel/cape-2.9.0.20260905.2.tar";
+        sha256 = "084ydlrcd5gqpkv7bbjbmwsvbia6i64x017a8mdp8gyv2n490pri";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1509,10 +1509,10 @@
    elpaBuild {
      pname = "compat";
      ename = "compat";
-      version = "31.0.0.2.0.20260716.2";
+      version = "31.0.0.2.0.20260909.7";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/compat-31.0.0.2.0.20260716.2.tar";
-        sha256 = "179w1zim5nfj1crvc2qm9ipvwwh2yr9q3rs8wjffcvsfjipnym5d";
+        url = "https://elpa.gnu.org/devel/compat-31.0.0.2.0.20260909.7.tar";
+        sha256 = "19hb51wrkg3v49kd46h2xgcs12zajq0qyjp2pj341r68z11gwhjl";
      };
      packageRequires = [ ];
      meta = {
@@ -1573,10 +1573,10 @@
    elpaBuild {
      pname = "consult";
      ename = "consult";
-      version = "3.7.0.20260805.0";
+      version = "3.8.0.20260910.16";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-3.7.0.20260805.0.tar";
-        sha256 = "1m61xnp074dpx0syffklnrzznjw8f5g0cld4idji7j89kidkhy4r";
+        url = "https://elpa.gnu.org/devel/consult-3.8.0.20260910.16.tar";
+        sha256 = "0w6zaprkqkp4vmkr6wcysd63ykqigyalcls2jrap5n42diidx01y";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1686,10 +1686,10 @@
    elpaBuild {
      pname = "corfu";
      ename = "corfu";
-      version = "2.12.0.20260802.4";
+      version = "2.15.0.20260905.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-2.12.0.20260802.4.tar";
-        sha256 = "0fvkvfjkf4c0p02q5rvpxhln86smilis7c6mi4gm3p1s0d7pkwnj";
+        url = "https://elpa.gnu.org/devel/corfu-2.15.0.20260905.2.tar";
+        sha256 = "1jm2la1i7mrqnzqwrl1748vgvh311zn0cwjg893yhcs9z32nvmy5";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1746,6 +1746,27 @@
      };
    }
  ) { };
+  cperl-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cperl-mode";
+      ename = "cperl-mode";
+      version = "33.0.0.0.20260828.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cperl-mode-33.0.0.0.20260828.0.tar";
+        sha256 = "1x93900axwv57ng48cck402gffc0zvd5yfwz3xl7qs8qwmr6dcjl";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/cperl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  cpio-mode = callPackage (
    {
      elpaBuild,
@@ -1861,10 +1882,10 @@
    elpaBuild {
      pname = "csv-mode";
      ename = "csv-mode";
-      version = "1.27.0.20260505.161621";
+      version = "1.27.0.20260907.5";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/csv-mode-1.27.0.20260505.161621.tar";
-        sha256 = "0g166wcxh7fl8ixnbc1ap2dl5mrq9ahzkx3b5fzfcx7f6b3aw8ym";
+        url = "https://elpa.gnu.org/devel/csv-mode-1.27.0.20260907.5.tar";
+        sha256 = "0s66ydfafaff0r0fz7fn0df8z8v1g8pbi9c49wz1k9d25ac5hcyj";
      };
      packageRequires = [ cl-lib ];
      meta = {
@@ -2010,10 +2031,10 @@
    elpaBuild {
      pname = "dash";
      ename = "dash";
-      version = "2.20.0.0.20260221.134621";
+      version = "2.20.0.0.20260810.9";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dash-2.20.0.0.20260221.134621.tar";
-        sha256 = "09829jmfnlchyqqmisiy6j4jkzm8vv05mmzyyfhm6vy0rymfxdc0";
+        url = "https://elpa.gnu.org/devel/dash-2.20.0.0.20260810.9.tar";
+        sha256 = "0n7247cs8zsqxkf3b7my238sz3l1aqjkgxqy5q43xb91iflvr2b5";
      };
      packageRequires = [ ];
      meta = {
@@ -2054,10 +2075,10 @@
    elpaBuild {
      pname = "debbugs";
      ename = "debbugs";
-      version = "0.47.0.20260804.3";
+      version = "0.47.0.20260824.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/debbugs-0.47.0.20260804.3.tar";
-        sha256 = "0a2hyfxshjx66mhni0b6swpzwrvqg7q5vgmzc056w5qmdxxc1121";
+        url = "https://elpa.gnu.org/devel/debbugs-0.47.0.20260824.4.tar";
+        sha256 = "1lgicrysj0dhymnlyffdkvi2jndyxbmj31mxs4v18prmp0zhcfcs";
      };
      packageRequires = [ soap-client ];
      meta = {
@@ -2101,10 +2122,10 @@
    elpaBuild {
      pname = "denote";
      ename = "denote";
-      version = "4.2.3.0.20260729.11";
+      version = "4.2.3.0.20260909.27";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-4.2.3.0.20260729.11.tar";
-        sha256 = "0i8m15ilqf9hnbvdbvdi85lfgj491v7dx0rkfwjz2vlq2b7r7gd5";
+        url = "https://elpa.gnu.org/devel/denote-4.2.3.0.20260909.27.tar";
+        sha256 = "02axlax19wlcnhrj1k0dnr217ir3f99r4v53razrhknf0rfjygql";
      };
      packageRequires = [ ];
      meta = {
@@ -2189,10 +2210,10 @@
    elpaBuild {
      pname = "denote-org";
      ename = "denote-org";
-      version = "0.3.0.0.20260520.123505";
+      version = "0.3.0.0.20260904.5";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-org-0.3.0.0.20260520.123505.tar";
-        sha256 = "12g38pk2vg1g1p9b847r4aisxxr9l36rsbgg1s4aqavd2cd3b00g";
+        url = "https://elpa.gnu.org/devel/denote-org-0.3.0.0.20260904.5.tar";
+        sha256 = "0mfza1g4s1qdyd248d2pqf8nln880bhypi01iakz1n4qhcsi1v0n";
      };
      packageRequires = [ denote ];
      meta = {
@@ -2363,10 +2384,10 @@
    elpaBuild {
      pname = "dicom";
      ename = "dicom";
-      version = "1.5.0.20260704.4";
+      version = "1.6.0.20260821.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dicom-1.5.0.20260704.4.tar";
-        sha256 = "0b5mm81wfskhls44w951igz2y5yf4lx3g61fswyk9hjhm4sccgz5";
+        url = "https://elpa.gnu.org/devel/dicom-1.6.0.20260821.0.tar";
+        sha256 = "1sicw18rpym8v8d65nwfp52dphj73absb6gvx1nlz5zp1zmqy2b4";
      };
      packageRequires = [ compat ];
      meta = {
@@ -2413,10 +2434,10 @@
    elpaBuild {
      pname = "diff-hl";
      ename = "diff-hl";
-      version = "1.10.0.0.20260723.188";
+      version = "1.11.1.0.20260909.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20260723.188.tar";
-        sha256 = "01mf33088i984y0npw7vff9zav1ph6879821cnbkvdc56dkrkv2n";
+        url = "https://elpa.gnu.org/devel/diff-hl-1.11.1.0.20260909.3.tar";
+        sha256 = "1y7nx4bwkap2jflk51aqkizvflnm7kl7b2gpspmvfmq95wrp2hwk";
      };
      packageRequires = [ cl-lib ];
      meta = {
@@ -2455,10 +2476,10 @@
    elpaBuild {
      pname = "diminish";
      ename = "diminish";
-      version = "0.46.0.20220909.84745";
+      version = "0.47.0.20260904.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar";
-        sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9";
+        url = "https://elpa.gnu.org/devel/diminish-0.47.0.20260904.0.tar";
+        sha256 = "0i7hs6kk7mka04xyzjlri0gh9sl8xhadcwn46pb6jw3s15v4aixl";
      };
      packageRequires = [ ];
      meta = {
@@ -2774,10 +2795,10 @@
    elpaBuild {
      pname = "doric-themes";
      ename = "doric-themes";
-      version = "1.2.1.0.20260802.15";
+      version = "1.3.0.0.20260904.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/doric-themes-1.2.1.0.20260802.15.tar";
-        sha256 = "0sfvgg4shmc6sv4jsahv9aisn4jrafkgx11qkqy4v3yh1svxfwy4";
+        url = "https://elpa.gnu.org/devel/doric-themes-1.3.0.0.20260904.0.tar";
+        sha256 = "0imfb8g35rq9q6973k1mj2m9jvxk7yq3mh0c17d3h8vywznfvgns";
      };
      packageRequires = [ ];
      meta = {
@@ -2976,10 +2997,10 @@
    elpaBuild {
      pname = "eev";
      ename = "eev";
-      version = "20260126.0.20260126.21331";
+      version = "20260903.0.20260910.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eev-20260126.0.20260126.21331.tar";
-        sha256 = "03mqjza8y86cf9s8lav26digybz3wy1h0b73lp6a0vfngbc8i796";
+        url = "https://elpa.gnu.org/devel/eev-20260903.0.20260910.3.tar";
+        sha256 = "1xzqdgd1ni6dksxcpg8z5wlr1189ncc6q30ksdvl4ggxsff95smm";
      };
      packageRequires = [ ];
      meta = {
@@ -2998,10 +3019,10 @@
    elpaBuild {
      pname = "ef-themes";
      ename = "ef-themes";
-      version = "2.2.0.0.20260621.0";
+      version = "2.2.1.0.20260814.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ef-themes-2.2.0.0.20260621.0.tar";
-        sha256 = "0l4qcn558wwwq29n0kf5ws8xbw834dp5n8kzdn225kg9x6h9a5dd";
+        url = "https://elpa.gnu.org/devel/ef-themes-2.2.1.0.20260814.0.tar";
+        sha256 = "055g6fci2afg9v6crc8sw1s3cx7c87dhy240z7286w1nzcn2m6wz";
      };
      packageRequires = [ modus-themes ];
      meta = {
@@ -3026,10 +3047,10 @@
    elpaBuild {
      pname = "eglot";
      ename = "eglot";
-      version = "1.24.0.20260802.2";
+      version = "1.24.0.20260912.20";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.24.0.20260802.2.tar";
-        sha256 = "1i7yzaf6lxmhpq6py2shmrfwl2yqb2gv60y06xmqhjgb7770153p";
+        url = "https://elpa.gnu.org/devel/eglot-1.24.0.20260912.20.tar";
+        sha256 = "03973sk18jmpj0lpwlfhad7avn04bdivjknapm260zi7bj9mpvhh";
      };
      packageRequires = [
        eldoc
@@ -3200,10 +3221,10 @@
    elpaBuild {
      pname = "ellama";
      ename = "ellama";
-      version = "1.31.0.0.20260720.1";
+      version = "1.32.1.0.20260812.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ellama-1.31.0.0.20260720.1.tar";
-        sha256 = "0c5laxw6y24aygckbr2jqwhriwr72m040xg44npkj14i5n2n40vx";
+        url = "https://elpa.gnu.org/devel/ellama-1.32.1.0.20260812.1.tar";
+        sha256 = "1k5y4ljkd4plfyji4a0rihzr7yf6zwdmnln2gjpykr3slq4cm87l";
      };
      packageRequires = [
        compat
@@ -3269,10 +3290,10 @@
    elpaBuild {
      pname = "emacs-lisp-intro-nl";
      ename = "emacs-lisp-intro-nl";
-      version = "0.0.20260702.44";
+      version = "0.0.20260909.47";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260702.44.tar";
-        sha256 = "1xsnp0pfsvs20wscbqcqsigl56ig5vacmkl86f3ljp338ka90d5f";
+        url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260909.47.tar";
+        sha256 = "0cydapq7bfssbfk6ii5ls8v136hj3hdwmlajccb8r3sb2981q09w";
      };
      packageRequires = [ ];
      meta = {
@@ -3291,10 +3312,10 @@
    elpaBuild {
      pname = "embark";
      ename = "embark";
-      version = "1.2.0.20260609.21";
+      version = "1.2.0.20260812.23";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/embark-1.2.0.20260609.21.tar";
-        sha256 = "1b4gkqrsjv21gxz6padf27wmzj46rryfy0pp662xf0fz9fab2ngp";
+        url = "https://elpa.gnu.org/devel/embark-1.2.0.20260812.23.tar";
+        sha256 = "09hy15vkw7s27w3prd87naqcgfw80jhfp1ifsfn0llcrkbyi8l7f";
      };
      packageRequires = [ compat ];
      meta = {
@@ -3315,10 +3336,10 @@
    elpaBuild {
      pname = "embark-consult";
      ename = "embark-consult";
-      version = "1.2.0.20260609.20";
+      version = "1.2.0.20260812.22";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/embark-consult-1.2.0.20260609.20.tar";
-        sha256 = "0507mv73swsdymlxqmqx40pr723jlrwmnwiy9qq294ihdk60npgd";
+        url = "https://elpa.gnu.org/devel/embark-consult-1.2.0.20260812.22.tar";
+        sha256 = "1y8pc6v275sifvgz07j8r22fyp92bwvywxwzf4r4g9899d9gdvvp";
      };
      packageRequires = [
        compat
@@ -3468,10 +3489,10 @@
    elpaBuild {
      pname = "erc";
      ename = "erc";
-      version = "5.7snapshot0.20260723.21";
+      version = "5.7snapshot0.20260821.27";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/erc-5.7snapshot0.20260723.21.tar";
-        sha256 = "012azyvqjzwcng0vczxkvs212d035nfz9lm3lbm5pd8qmqzsksfa";
+        url = "https://elpa.gnu.org/devel/erc-5.7snapshot0.20260821.27.tar";
+        sha256 = "15v751rvawzvmkj89acqy33bzjf91b0dnxi4s5r4gmdqads99vv3";
      };
      packageRequires = [ compat ];
      meta = {
@@ -3491,10 +3512,10 @@
    elpaBuild {
      pname = "ergoemacs-mode";
      ename = "ergoemacs-mode";
-      version = "5.16.10.12.0.20240828.210215";
+      version = "5.16.10.12.0.20260811.462";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240828.210215.tar";
-        sha256 = "1n87f2si44hyyiy3nj3hr0pjxkjdb419pkybs7vawi27k59dd8rw";
+        url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20260811.462.tar";
+        sha256 = "09q7ilawb0apgf3h2z6fqchz5frpcx7v36hg9qiqin3bql33gdz0";
      };
      packageRequires = [
        cl-lib
@@ -3515,10 +3536,10 @@
    elpaBuild {
      pname = "ess";
      ename = "ess";
-      version = "26.5.0.0.20260723.1";
+      version = "26.5.0.0.20260908.5";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ess-26.5.0.0.20260723.1.tar";
-        sha256 = "19555g9wf92hnp2gyf7gjinqi6s4qr0a7dirnd7sa68yhjch0ki6";
+        url = "https://elpa.gnu.org/devel/ess-26.5.0.0.20260908.5.tar";
+        sha256 = "08yqhlxwlilnyvjwad58i19jxwf6i4n6qqxmz1dr2770w7mjxc3k";
      };
      packageRequires = [ ];
      meta = {
@@ -3587,10 +3608,10 @@
    elpaBuild {
      pname = "expreg";
      ename = "expreg";
-      version = "1.4.1.0.20260619.7";
+      version = "1.4.1.0.20260907.11";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/expreg-1.4.1.0.20260619.7.tar";
-        sha256 = "0dxdr7ahhj17fvsvpb0w6ylh20qkgrvy53pc9a0r6m8pv97i6mx0";
+        url = "https://elpa.gnu.org/devel/expreg-1.4.1.0.20260907.11.tar";
+        sha256 = "0aw41vp4crjd3x2pm9phacjv2p7j7yq9jd56nkdncry0y83rn7hf";
      };
      packageRequires = [ ];
      meta = {
@@ -3786,10 +3807,10 @@
    elpaBuild {
      pname = "flymake";
      ename = "flymake";
-      version = "1.4.5.0.20260702.3";
+      version = "1.4.7.0.20260912.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/flymake-1.4.5.0.20260702.3.tar";
-        sha256 = "1fddbgjlqkdr6kml7mbwhv1y6imkp5a73v6ynqhr7wkjh65vhryg";
+        url = "https://elpa.gnu.org/devel/flymake-1.4.7.0.20260912.3.tar";
+        sha256 = "1l75sh68cqinmjfn1g1415r8avw5dxk6lla6dxpyqb9lixpbkna0";
      };
      packageRequires = [
        eldoc
@@ -3844,6 +3865,27 @@
      };
    }
  ) { };
+  flymake-harper = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-harper";
+      ename = "flymake-harper";
+      version = "0.1.1.0.20260821.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/flymake-harper-0.1.1.0.20260821.0.tar";
+        sha256 = "071f6a648hg2zyrgj02l0igf20ms8v9ahsmra9g63vlrzmzhy9c0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/flymake-harper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  flymake-proselint = callPackage (
    {
      elpaBuild,
@@ -3853,10 +3895,10 @@
    elpaBuild {
      pname = "flymake-proselint";
      ename = "flymake-proselint";
-      version = "0.3.0.0.20260704.11";
+      version = "0.3.0.0.20260906.12";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20260704.11.tar";
-        sha256 = "0n619yab8s9lr00b7zcbgywvm5phwrh19iww8rwm0sf1qhmg3azf";
+        url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20260906.12.tar";
+        sha256 = "05gs7595sch4l484r4bka0yjr7mqr64317zrwh9ag9qk7bfwh5p0";
      };
      packageRequires = [ ];
      meta = {
@@ -4007,10 +4049,10 @@
    elpaBuild {
      pname = "futur";
      ename = "futur";
-      version = "1.7.0.20260731.12";
+      version = "2.0.0.20260822.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/futur-1.7.0.20260731.12.tar";
-        sha256 = "083d3rj048nq5cyimyx8s5mqlxxzprsg2f6g6q7jm6mm4nliksdl";
+        url = "https://elpa.gnu.org/devel/futur-2.0.0.20260822.4.tar";
+        sha256 = "1v1gamlig0flcj7chya18nv3vy9iyrph8gr53l6l5i5sf78xdi6h";
      };
      packageRequires = [ ];
      meta = {
@@ -4675,10 +4717,10 @@
    elpaBuild {
      pname = "hyperbole";
      ename = "hyperbole";
-      version = "9.1.0.0.20260804.10";
+      version = "9.1.0.0.20260912.59";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.1.0.0.20260804.10.tar";
-        sha256 = "057arsp3xs514xmy7hrzz3iqyz0j6q87s32dy24dy17fbfmbw9zd";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.1.0.0.20260912.59.tar";
+        sha256 = "19jsr9n2ybxzd0mnh3irvfh1zfl8winsb1vywn6qmhk5kzy8dqvf";
      };
      packageRequires = [ ];
      meta = {
@@ -4760,10 +4802,10 @@
    elpaBuild {
      pname = "indent-bars";
      ename = "indent-bars";
-      version = "1.0.0.0.20260418.90339";
+      version = "1.0.1.0.20260904.5";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/indent-bars-1.0.0.0.20260418.90339.tar";
-        sha256 = "0jrdzw4yr1ldcsvc5jix8ay1wfv7fmphc2q82alhv4in247c5sna";
+        url = "https://elpa.gnu.org/devel/indent-bars-1.0.1.0.20260904.5.tar";
+        sha256 = "02gyy6705a1r98iw8cm96igda3k8qr81zmvy3qkmx8f91167ghgq";
      };
      packageRequires = [ compat ];
      meta = {
@@ -4845,10 +4887,10 @@
    elpaBuild {
      pname = "iso-date";
      ename = "iso-date";
-      version = "1.2.0.0.20250822.220102";
+      version = "1.2.0.0.20260908.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/iso-date-1.2.0.0.20250822.220102.tar";
-        sha256 = "00x25a6rfck3dmsxir62j6zp433jl1mamk7w5vgnd69s883x95vp";
+        url = "https://elpa.gnu.org/devel/iso-date-1.2.0.0.20260908.1.tar";
+        sha256 = "1fljljs1ncghq43qjkxbwp47ray6qs8sxjizn469jyrm8l1cj4hk";
      };
      packageRequires = [ ];
      meta = {
@@ -5094,10 +5136,10 @@
    elpaBuild {
      pname = "jinx";
      ename = "jinx";
-      version = "2.9.0.20260806.2";
+      version = "2.10.0.20260813.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jinx-2.9.0.20260806.2.tar";
-        sha256 = "07m73f585hyj7gsmzgy4xgjhh8y00q9sqdmmn3bjgpz05vl6gdmg";
+        url = "https://elpa.gnu.org/devel/jinx-2.10.0.20260813.1.tar";
+        sha256 = "1yxnfs8q4nn9cx06hzyhrccdzd3mlicrnsfgrs8wfcsqpd0fzqz6";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5222,10 +5264,10 @@
    elpaBuild {
      pname = "keymap-popup";
      ename = "keymap-popup";
-      version = "0.4.2.0.20260807.0";
+      version = "0.4.3.0.20260904.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/keymap-popup-0.4.2.0.20260807.0.tar";
-        sha256 = "01g70v4497dfqwsjrzhqz01d9ynp48vl910dk3lq8baa864mcijw";
+        url = "https://elpa.gnu.org/devel/keymap-popup-0.4.3.0.20260904.4.tar";
+        sha256 = "18cgikxkg8s3w27hkcvblvfaxmbwjkx7rc81qngambl3ipgsay91";
      };
      packageRequires = [ ];
      meta = {
@@ -5266,10 +5308,10 @@
    elpaBuild {
      pname = "kiwix";
      ename = "kiwix";
-      version = "1.1.5.0.20220316.84759";
+      version = "1.1.5.0.20260815.16";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar";
-        sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna";
+        url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20260815.16.tar";
+        sha256 = "10s1654wjky8id5d1phddllw1a5xpr2z6713rcdqkhq29bkav5sf";
      };
      packageRequires = [ request ];
      meta = {
@@ -5308,10 +5350,10 @@
    elpaBuild {
      pname = "kubed";
      ename = "kubed";
-      version = "0.7.1.0.20260619.0";
+      version = "0.7.1.0.20260817.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/kubed-0.7.1.0.20260619.0.tar";
-        sha256 = "0lgdl06lv66zxy5qcdnhrc118hxllaj7zjr7aphdm755lckd3f3i";
+        url = "https://elpa.gnu.org/devel/kubed-0.7.1.0.20260817.4.tar";
+        sha256 = "080f0xymw8qhmw396089mcqmrpac44qx95ac5m8rcq1y4d0lk2yy";
      };
      packageRequires = [ ];
      meta = {
@@ -5514,10 +5556,10 @@
    elpaBuild {
      pname = "lisp-ts-mode";
      ename = "lisp-ts-mode";
-      version = "0.3.2.0.20260731.0";
+      version = "0.3.4.0.20260830.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/lisp-ts-mode-0.3.2.0.20260731.0.tar";
-        sha256 = "0l9g2jcij18cv7gbs40f26pna8g0p0ylzq6rgriz5a1jp2yz2knh";
+        url = "https://elpa.gnu.org/devel/lisp-ts-mode-0.3.4.0.20260830.2.tar";
+        sha256 = "157zhr5d3d7bxkxv0i32l1id6bywz8x2l8yfmvs5n67mbqkmsr10";
      };
      packageRequires = [
        compat
@@ -5593,10 +5635,10 @@
    elpaBuild {
      pname = "llm";
      ename = "llm";
-      version = "0.31.3.0.20260801.3";
+      version = "0.32.1.0.20260906.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.31.3.0.20260801.3.tar";
-        sha256 = "0vg58rxlgr1hgwn9cgh40i8pn7f3c2qr4fac5ajqwy3ch2z2mvpa";
+        url = "https://elpa.gnu.org/devel/llm-0.32.1.0.20260906.1.tar";
+        sha256 = "0jhmyfd9ww6w4251qmr2rfwfbz6la0ja068d9i4a8sv8nafa35z6";
      };
      packageRequires = [
        compat
@@ -5833,10 +5875,10 @@
    elpaBuild {
      pname = "marginalia";
      ename = "marginalia";
-      version = "2.11.0.20260724.2";
+      version = "2.12.0.20260907.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/marginalia-2.11.0.20260724.2.tar";
-        sha256 = "06if9mzp750qjbh2q1bgzqz0k0xraqxq1f8508zkbafki8adnw49";
+        url = "https://elpa.gnu.org/devel/marginalia-2.12.0.20260907.2.tar";
+        sha256 = "1qrv729saqg7yj4s3w0aaxa49phmmaz937f1c288lij0j8gydpxc";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5960,10 +6002,10 @@
    elpaBuild {
      pname = "mct";
      ename = "mct";
-      version = "1.1.1.0.20260629.0";
+      version = "1.1.1.0.20260903.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/mct-1.1.1.0.20260629.0.tar";
-        sha256 = "1dff7gm1cw1ljvsdw7j43laamhpck598c7f5r6679gf9zqm3bdfv";
+        url = "https://elpa.gnu.org/devel/mct-1.1.1.0.20260903.2.tar";
+        sha256 = "007mcb7b44c3qjyy002q5j5k2q6yy86rd657w60zcljfmr6mvl3l";
      };
      packageRequires = [ ];
      meta = {
@@ -6158,10 +6200,10 @@
    elpaBuild {
      pname = "minuet";
      ename = "minuet";
-      version = "0.9.0.0.20260807.6";
+      version = "0.10.0.0.20260825.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/minuet-0.9.0.0.20260807.6.tar";
-        sha256 = "1kvn88vn5zk9kj51l0vahny3ldbfv35q7yppgfi1zz3719vnydxm";
+        url = "https://elpa.gnu.org/devel/minuet-0.10.0.0.20260825.1.tar";
+        sha256 = "1h6fnnbb5ixjxi4bmd5aykcc15svjqqpsc5i34r5z2d03ni33xg0";
      };
      packageRequires = [
        dash
@@ -6225,10 +6267,10 @@
    elpaBuild {
      pname = "modus-themes";
      ename = "modus-themes";
-      version = "5.3.0.0.20260730.29";
+      version = "5.3.0.0.20260911.55";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-5.3.0.0.20260730.29.tar";
-        sha256 = "0jjy3hwa1ymd986mmy026rfl1zwckxlgvjwpp0sk1i6q572mpaw8";
+        url = "https://elpa.gnu.org/devel/modus-themes-5.3.0.0.20260911.55.tar";
+        sha256 = "1pyacpnrx6q0z84r65gs0739y7hvn41zb7a9lkl2a7m2nqshbkhy";
      };
      packageRequires = [ ];
      meta = {
@@ -6759,10 +6801,10 @@
    elpaBuild {
      pname = "orderless";
      ename = "orderless";
-      version = "1.7.0.20260628.2";
+      version = "1.7.0.20260909.7";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/orderless-1.7.0.20260628.2.tar";
-        sha256 = "12xwkskpbwh6aav9zpl1f8alkv0bsh7aaw9q3hciab6ai6v6x723";
+        url = "https://elpa.gnu.org/devel/orderless-1.7.0.20260909.7.tar";
+        sha256 = "15bmkp75nxdcd2qbji25lad1h2ljqzzp67wadw4788c4qwcxh4s3";
      };
      packageRequires = [ compat ];
      meta = {
@@ -6780,10 +6822,10 @@
    elpaBuild {
      pname = "org";
      ename = "org";
-      version = "10.0pre0.20260804.407";
+      version = "10.0pre0.20260912.549";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260804.407.tar";
-        sha256 = "0l1b03cf5giqm6mph31nr5pandb06sqkga4737r1adac2p5lp6qx";
+        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260912.549.tar";
+        sha256 = "0qr1b7argyzmfvn0ah3a6i91gxnhby3qxnwakghfv43kjwlvr4js";
      };
      packageRequires = [ ];
      meta = {
@@ -6802,10 +6844,10 @@
    elpaBuild {
      pname = "org-contacts";
      ename = "org-contacts";
-      version = "1.3.0.20260221.85240";
+      version = "1.3.0.20260905.13";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-contacts-1.3.0.20260221.85240.tar";
-        sha256 = "1kvz0lhcq7mscraqb1np2r6sh8hincxr5k2n1iz037x8w5wdfqh9";
+        url = "https://elpa.gnu.org/devel/org-contacts-1.3.0.20260905.13.tar";
+        sha256 = "1wy1q9838kb31axyqsv1lwvkjlxsdlqamjw6s2igkh1i8gx4i57r";
      };
      packageRequires = [ org ];
      meta = {
@@ -6927,10 +6969,10 @@
    elpaBuild {
      pname = "org-modern";
      ename = "org-modern";
-      version = "1.15.0.20260722.0";
+      version = "1.15.0.20260818.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-modern-1.15.0.20260722.0.tar";
-        sha256 = "1a4bqavr0kr74j60pkax6273gcqcbxd2gh4dlhwvibrqf85qi9dv";
+        url = "https://elpa.gnu.org/devel/org-modern-1.15.0.20260818.3.tar";
+        sha256 = "1n24h8ipgk8fwz92rrbdnadmbki307rybjh0minamw0m3f8j138b";
      };
      packageRequires = [
        compat
@@ -7107,10 +7149,10 @@
    elpaBuild {
      pname = "osm";
      ename = "osm";
-      version = "2.5.0.20260801.0";
+      version = "2.5.0.20260811.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/osm-2.5.0.20260801.0.tar";
-        sha256 = "0n9a2lx1v21mh2r1mhk0aavz65a75q7h8yrpsy7zm9hrg1b5d1j2";
+        url = "https://elpa.gnu.org/devel/osm-2.5.0.20260811.2.tar";
+        sha256 = "02fpfdla0ywilwl13jff8ga3mmkngf5dxf0s84nw13jcdcafh47k";
      };
      packageRequires = [ compat ];
      meta = {
@@ -7235,10 +7277,10 @@
    elpaBuild {
      pname = "parser-generator";
      ename = "parser-generator";
-      version = "0.2.9.0.20260105.101345";
+      version = "0.2.9.0.20260817.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/parser-generator-0.2.9.0.20260105.101345.tar";
-        sha256 = "1mrlx47ivqv3wswpb83547mfb6i6mfk9i8v98yx1xr2ycyhhivf5";
+        url = "https://elpa.gnu.org/devel/parser-generator-0.2.9.0.20260817.2.tar";
+        sha256 = "1y2bwvvml4za0gl71pljgcaamkcqw6bqywc29midl5pmifs8fkik";
      };
      packageRequires = [ ];
      meta = {
@@ -7384,10 +7426,10 @@
    elpaBuild {
      pname = "phps-mode";
      ename = "phps-mode";
-      version = "0.4.52.0.20260109.100035";
+      version = "0.4.52.0.20260817.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/phps-mode-0.4.52.0.20260109.100035.tar";
-        sha256 = "0la7152a0abgdn3kh9rz6xgn46k1r70aglia4k490nyih7ypdy7p";
+        url = "https://elpa.gnu.org/devel/phps-mode-0.4.52.0.20260817.2.tar";
+        sha256 = "00rsi6pmqm0k11ly6ymkqxxnsxl3ybp45d2v7f8wrp9b9rgrdarm";
      };
      packageRequires = [ ];
      meta = {
@@ -7555,10 +7597,10 @@
    elpaBuild {
      pname = "poke-mode";
      ename = "poke-mode";
-      version = "3.1.0.20231014.222558";
+      version = "3.1.0.20260809.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar";
-        sha256 = "1aqw9rn17n7ywnys6dlwykrf63l4kgapqsk1fay5qjj0y1nkq167";
+        url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20260809.1.tar";
+        sha256 = "0bgh8xwhwzwxfv055w3qvy4gz86vykgrlpns7mlsxzzx0g16v7kx";
      };
      packageRequires = [ ];
      meta = {
@@ -7639,10 +7681,10 @@
    elpaBuild {
      pname = "posframe";
      ename = "posframe";
-      version = "1.5.2.0.20260527.0";
+      version = "1.5.2.0.20260908.6";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/posframe-1.5.2.0.20260527.0.tar";
-        sha256 = "1gjj04a8sbngcvmkr9kfnx335k5z0knclabl6jz8rcnswj531ac6";
+        url = "https://elpa.gnu.org/devel/posframe-1.5.2.0.20260908.6.tar";
+        sha256 = "001pqajgzckg8rk97s1n37k1lifd7pd3452jziy1l0dmxxj0awzs";
      };
      packageRequires = [ ];
      meta = {
@@ -7810,10 +7852,10 @@
    elpaBuild {
      pname = "pulsar";
      ename = "pulsar";
-      version = "1.4.1.0.20260723.2";
+      version = "1.4.1.0.20260904.7";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/pulsar-1.4.1.0.20260723.2.tar";
-        sha256 = "1pbm31izvnzn7f3jilwwz39dg8fs5qcwy5288xjpxbn6f2bq3cqn";
+        url = "https://elpa.gnu.org/devel/pulsar-1.4.1.0.20260904.7.tar";
+        sha256 = "1sgdknjqkn8g4dk88dh74zdc36h227y5vgafi3jjwzyfr5i7h7ig";
      };
      packageRequires = [ ];
      meta = {
@@ -7836,7 +7878,7 @@
      version = "5.3.6.0.20251230.80953";
      src = fetchurl {
        url = "https://elpa.gnu.org/devel/pyim-5.3.6.0.20251230.80953.tar";
-        sha256 = "0vqy4vxsw6inghfjmk7bqry8zw9rm9yaz1zffr19a8nwqiwbvszc";
+        sha256 = "1208kcy1c4h07pcwhw9dkg35g417ras089ar3b2m5j3zzqkga5sv";
      };
      packageRequires = [
        async
@@ -7901,10 +7943,10 @@
    elpaBuild {
      pname = "qrencode";
      ename = "qrencode";
-      version = "1.5beta3.0.20260802.0";
+      version = "1.5beta4.0.20260906.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/qrencode-1.5beta3.0.20260802.0.tar";
-        sha256 = "0d79py57mynwy5bz6cz14dz7ilgfgydxhb14wxwhmh9cs2b4yvsb";
+        url = "https://elpa.gnu.org/devel/qrencode-1.5beta4.0.20260906.0.tar";
+        sha256 = "0j2439ixyvv10lzzb84k428xn920k84alz41wsd0h515013s6lgs";
      };
      packageRequires = [ ];
      meta = {
@@ -7965,10 +8007,10 @@
    elpaBuild {
      pname = "rainbow-mode";
      ename = "rainbow-mode";
-      version = "1.0.6.0.20231215.171141";
+      version = "1.0.7.0.20260905.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar";
-        sha256 = "0qr0yl8fszrrdnl8x3d8lnndr5s9g3bf708qilb3f6i5ahkqhq7l";
+        url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.7.0.20260905.0.tar";
+        sha256 = "0by49vn0arg6hbfcidyakwnmy5rc8kdifrf3247lvn7mgq5x7dj0";
      };
      packageRequires = [ ];
      meta = {
@@ -8094,10 +8136,10 @@
    elpaBuild {
      pname = "realgud";
      ename = "realgud";
-      version = "1.6.0.0.20260725.14";
+      version = "1.6.0.0.20260821.16";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260725.14.tar";
-        sha256 = "19vzdrvk0fxhxyg2knzi0g5drv16c99n6d71b5hg7khy780g3mi9";
+        url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260821.16.tar";
+        sha256 = "189x6bia0faz3n53d7j6cqzh8czpq6x0g34v94qm8p09psk1apyc";
      };
      packageRequires = [
        load-relative
@@ -8974,10 +9016,10 @@
    elpaBuild {
      pname = "so-long";
      ename = "so-long";
-      version = "1.1.2.0.20260101.125434";
+      version = "1.1.2.0.20260816.24";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20260101.125434.tar";
-        sha256 = "060z86ks3dckap8wppyalh7c75d125jw3np4khya1974sw58wfrm";
+        url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20260816.24.tar";
+        sha256 = "1fnaglqs73x4q05hwc7xm9hv7w4k7544chqwcaa04g8qsjsb931w";
      };
      packageRequires = [ ];
      meta = {
@@ -9235,10 +9277,10 @@
    elpaBuild {
      pname = "ssh-deploy";
      ename = "ssh-deploy";
-      version = "3.1.16.0.20241117.185025";
+      version = "3.1.16.0.20260817.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20241117.185025.tar";
-        sha256 = "03slq2jz6npx33n8ygs761mgqzbain6gqyyl38581gsl8kawx9zs";
+        url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20260817.4.tar";
+        sha256 = "1jhjh26hnighz9wlfb6yrwmn4hf9jln93vyhq31m3m9wdbmksqq2";
      };
      packageRequires = [ ];
      meta = {
@@ -9299,10 +9341,10 @@
    elpaBuild {
      pname = "substitute";
      ename = "substitute";
-      version = "0.6.1.0.20260728.0";
+      version = "0.6.1.0.20260825.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/substitute-0.6.1.0.20260728.0.tar";
-        sha256 = "1y2hxshh3mbwqci9v4wh2r9hvpfc3dgxjx9q20hbw7l06fqsnzys";
+        url = "https://elpa.gnu.org/devel/substitute-0.6.1.0.20260825.3.tar";
+        sha256 = "1j91c8sg9zqm0lzriv1i5n9msby1544flngd17r3isz4ph8079a7";
      };
      packageRequires = [ ];
      meta = {
@@ -9630,10 +9672,10 @@
    elpaBuild {
      pname = "tempel";
      ename = "tempel";
-      version = "1.14.0.20260705.0";
+      version = "1.14.0.20260814.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tempel-1.14.0.20260705.0.tar";
-        sha256 = "0bxj1qkxy9sd5js36rnvjlgxhvb8nza38l4ccbnnrj4p7h72n9hl";
+        url = "https://elpa.gnu.org/devel/tempel-1.14.0.20260814.3.tar";
+        sha256 = "0s0p192mpxihsqa3vxiidqk237p02sx192w61csxc05mjjbwhbx2";
      };
      packageRequires = [ compat ];
      meta = {
@@ -9821,10 +9863,10 @@
    elpaBuild {
      pname = "tmr";
      ename = "tmr";
-      version = "1.4.0.0.20260807.1";
+      version = "1.4.0.0.20260823.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tmr-1.4.0.0.20260807.1.tar";
-        sha256 = "0lw3sd1g6g8aasla3jxww9dwl5x474zffmqqdnllb9jfjvwib9w9";
+        url = "https://elpa.gnu.org/devel/tmr-1.4.0.0.20260823.2.tar";
+        sha256 = "1lywrq0v5lfadd7ygrf70vyb4p55xi9zsdc78qjhln8ljaf996f1";
      };
      packageRequires = [ ];
      meta = {
@@ -9910,10 +9952,10 @@
    elpaBuild {
      pname = "tramp";
      ename = "tramp";
-      version = "2.8.2.1.0.20260802.2";
+      version = "2.8.2.2.0.20260830.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tramp-2.8.2.1.0.20260802.2.tar";
-        sha256 = "1igh09ja5hdjfqr8nwkpiq9n2y8nnj4s64c9d7d5lv5rrww2yzhr";
+        url = "https://elpa.gnu.org/devel/tramp-2.8.2.2.0.20260830.0.tar";
+        sha256 = "1nx5n6ywk5ly28vgwfdq9phbksvw3xhmr7n94k55m3km89f89pyr";
      };
      packageRequires = [ ];
      meta = {
@@ -10020,10 +10062,10 @@
    elpaBuild {
      pname = "transient";
      ename = "transient";
-      version = "0.13.7.0.20260806.0";
+      version = "0.13.8.0.20260909.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.13.7.0.20260806.0.tar";
-        sha256 = "01xk8l5pq4kxlfz3y12v55q7xhfsdmmbpryh1164cijzrp6azj0a";
+        url = "https://elpa.gnu.org/devel/transient-0.13.8.0.20260909.1.tar";
+        sha256 = "12d0npxpnyhqr328a1a1kg8ccwkk34rk4gd2a9rsknid6f7hlb52";
      };
      packageRequires = [
        compat
@@ -10352,10 +10394,10 @@
    elpaBuild {
      pname = "use-package";
      ename = "use-package";
-      version = "2.4.6.0.20260316.172337";
+      version = "2.4.6.0.20260912.42";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20260316.172337.tar";
-        sha256 = "122bhaa7p7ylrpd00a52cynshl7w07snmyjklc9wl6v3w9sff2km";
+        url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20260912.42.tar";
+        sha256 = "19r77k9cbfp74zcdkx4is6qh4c4npwbsys5q4k1g8p7c7swdj7ap";
      };
      packageRequires = [ bind-key ];
      meta = {
@@ -10600,10 +10642,10 @@
    elpaBuild {
      pname = "verilog-mode";
      ename = "verilog-mode";
-      version = "2026.4.14.10117132.0.20260621.0";
+      version = "2026.4.14.10117132.0.20260816.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/verilog-mode-2026.4.14.10117132.0.20260621.0.tar";
-        sha256 = "1c5jkwxv3bpc9mpsbja9dzycz8zpccsjc7wg5ws5zxlzqbi2p46q";
+        url = "https://elpa.gnu.org/devel/verilog-mode-2026.4.14.10117132.0.20260816.1.tar";
+        sha256 = "0hh06k0aa9f47y4ril1c6yifwilqzi74pfw9hnkmqiyzwj3r7sx7";
      };
      packageRequires = [ ];
      meta = {
@@ -10622,10 +10664,10 @@
    elpaBuild {
      pname = "vertico";
      ename = "vertico";
-      version = "2.12.0.20260805.0";
+      version = "2.14.0.20260907.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-2.12.0.20260805.0.tar";
-        sha256 = "02zgcnjf43hkmvy1h15ry8a1vimyra8lgfx1pn55aabk6sppabzn";
+        url = "https://elpa.gnu.org/devel/vertico-2.14.0.20260907.4.tar";
+        sha256 = "0303a89xngpggqdllsgxl2kp9avscck16nk57ffa8iy6m91rpfkk";
      };
      packageRequires = [ compat ];
      meta = {
@@ -10645,10 +10687,10 @@
    elpaBuild {
      pname = "vertico-posframe";
      ename = "vertico-posframe";
-      version = "0.9.2.0.20260201.41512";
+      version = "0.9.2.0.20260906.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-posframe-0.9.2.0.20260201.41512.tar";
-        sha256 = "1alirwmf1x1m9h8amsbjvx6x1hh0cc0f83r2nay8vp2rr20jrgvp";
+        url = "https://elpa.gnu.org/devel/vertico-posframe-0.9.2.0.20260906.2.tar";
+        sha256 = "0m95ysj942fh0ajzzbm4d06xzkb8mzx728l9gf6dfjbcagyl7a6j";
      };
      packageRequires = [
        posframe
@@ -10753,10 +10795,10 @@
    elpaBuild {
      pname = "vundo";
      ename = "vundo";
-      version = "2.4.0.0.20251218.210411";
+      version = "2.4.0.0.20260905.15";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vundo-2.4.0.0.20251218.210411.tar";
-        sha256 = "0z3cazr0l2pzjq8bypqi52kzy9nc5z2prv2yjlm5v2j7srbashd1";
+        url = "https://elpa.gnu.org/devel/vundo-2.4.0.0.20260905.15.tar";
+        sha256 = "0llf0hsxj66rdwflpw06qfvm1pjcjkygf233982gjyk5iq7142qc";
      };
      packageRequires = [ ];
      meta = {
@@ -11209,10 +11251,10 @@
    elpaBuild {
      pname = "xref";
      ename = "xref";
-      version = "1.7.0.0.20260403.13314";
+      version = "1.7.0.0.20260906.47";
      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20260403.13314.tar";
-        sha256 = "0kqvbp3z7srgx7aypjdqw7rrd7dcnsfhwwvg3kyqjyzjpqqhwhwh";
+        url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20260906.47.tar";
+        sha256 = "0kpnir8837rh3x1hlf2m6px9mp7b9b1w2xflqy4rcpqsny8ab3fq";
      };
      packageRequires = [ ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -1085,10 +1085,10 @@
    elpaBuild {
      pname = "cape";
      ename = "cape";
-      version = "2.8";
+      version = "2.9";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/cape-2.8.tar";
-        sha256 = "1hf9rpp6g1q461i1najncs8si4igyyih4vkcfrbb465hal4whf4m";
+        url = "https://elpa.gnu.org/packages/cape-2.9.tar";
+        sha256 = "0faqmh9lx8ybsnm77a9allgp4jgr8c90123sgg61k16yn5sa9a75";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1549,10 +1549,10 @@
    elpaBuild {
      pname = "consult";
      ename = "consult";
-      version = "3.7";
+      version = "3.8";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/consult-3.7.tar";
-        sha256 = "19xivcldaqpqx0kzp5sb6xs7fr1xy4nfy6jy66mvqzzs513p5wb3";
+        url = "https://elpa.gnu.org/packages/consult-3.8.tar";
+        sha256 = "1zi33mf8bs70igsdy1s8qj1arpgi8ih3hly986nkiqhz9yzw1fjd";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1662,10 +1662,10 @@
    elpaBuild {
      pname = "corfu";
      ename = "corfu";
-      version = "2.12";
+      version = "2.15";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/corfu-2.12.tar";
-        sha256 = "02d1qpnpcc7pqa4lq8ynwvn2bklgylnndqv9amx5qdkr01gbg214";
+        url = "https://elpa.gnu.org/packages/corfu-2.15.tar";
+        sha256 = "1p4f18lvh22v32lsam80mq57iyipn0240bvqvv7rri05j9sdmp6c";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1722,6 +1722,27 @@
      };
    }
  ) { };
+  cperl-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cperl-mode";
+      ename = "cperl-mode";
+      version = "33.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cperl-mode-33.0.0.tar";
+        sha256 = "0bpa8398j81pnsmyn6p4n2vh7sv6if80b22aifpg5h9kvcaz563n";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cperl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  cpio-mode = callPackage (
    {
      elpaBuild,
@@ -2318,10 +2339,10 @@
    elpaBuild {
      pname = "dicom";
      ename = "dicom";
-      version = "1.5";
+      version = "1.6";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/dicom-1.5.tar";
-        sha256 = "02i90769952g80f8fjj9phwwm7ln8q6w65pc065r5vln1knjm7gd";
+        url = "https://elpa.gnu.org/packages/dicom-1.6.tar";
+        sha256 = "1xjdy2vhy922c10kmcv8fa5d0ynvhzh0gi0j455ljxbky50axzf5";
      };
      packageRequires = [ compat ];
      meta = {
@@ -2368,10 +2389,10 @@
    elpaBuild {
      pname = "diff-hl";
      ename = "diff-hl";
-      version = "1.10.0";
+      version = "1.11.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/diff-hl-1.10.0.tar";
-        sha256 = "0v8nm2sx3v405fj6i5v7nnar47j6na0q5cm5za9y33n6xaw3v2yh";
+        url = "https://elpa.gnu.org/packages/diff-hl-1.11.1.tar";
+        sha256 = "10c6iji6yhb1c20a94n7inmf12fwwn0a7yyna3yyx0j5fvb8c393";
      };
      packageRequires = [ cl-lib ];
      meta = {
@@ -2410,10 +2431,10 @@
    elpaBuild {
      pname = "diminish";
      ename = "diminish";
-      version = "0.46";
+      version = "0.47";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/diminish-0.46.tar";
-        sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r";
+        url = "https://elpa.gnu.org/packages/diminish-0.47.tar";
+        sha256 = "15vksm780hgwqg5izidjzkzpk9w41bq879mfmlii2k9ila3ia1d1";
      };
      packageRequires = [ ];
      meta = {
@@ -2707,10 +2728,10 @@
    elpaBuild {
      pname = "doric-themes";
      ename = "doric-themes";
-      version = "1.2.1";
+      version = "1.3.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/doric-themes-1.2.1.tar";
-        sha256 = "0p7qvn8g0hw7h1r3b0m2iif5f4739jmkqn0zih90qw5lbbjf4i86";
+        url = "https://elpa.gnu.org/packages/doric-themes-1.3.0.tar";
+        sha256 = "0g2izcjb25mbnsjn2sl9xakj0db03js2b2vh2afb7n9bp9g9x1vn";
      };
      packageRequires = [ ];
      meta = {
@@ -2909,10 +2930,10 @@
    elpaBuild {
      pname = "eev";
      ename = "eev";
-      version = "20260126";
+      version = "20260903";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/eev-20260126.tar";
-        sha256 = "10n8fs61casjx7p64jvghwc15b09mmwp06af9s32z9bj73r4hyfk";
+        url = "https://elpa.gnu.org/packages/eev-20260903.tar";
+        sha256 = "15k4dmj4brcx0kwrbgp57k7bv148vc0gvhnk8wwif4645zrwq4hg";
      };
      packageRequires = [ ];
      meta = {
@@ -2931,10 +2952,10 @@
    elpaBuild {
      pname = "ef-themes";
      ename = "ef-themes";
-      version = "2.2.0";
+      version = "2.2.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ef-themes-2.2.0.tar";
-        sha256 = "0jm3hqg53cq0dfvmszmwzwrfi9n2mgdbz176qzxhjqm16rw2bwds";
+        url = "https://elpa.gnu.org/packages/ef-themes-2.2.1.tar";
+        sha256 = "1wf4836jd22qx37aw716nba31w2z8ya2hmv5c4jvwhd78bffmajm";
      };
      packageRequires = [ modus-themes ];
      meta = {
@@ -3133,10 +3154,10 @@
    elpaBuild {
      pname = "ellama";
      ename = "ellama";
-      version = "1.31.0";
+      version = "1.32.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ellama-1.31.0.tar";
-        sha256 = "14haiqm3x0dys8jynl56qizl3ymr6h2y6b9a467yl9ac2lfpkxk3";
+        url = "https://elpa.gnu.org/packages/ellama-1.32.1.tar";
+        sha256 = "1j24ksrc7nhfzj7y3mg671c3zm0dvb4c5ximfa8niw4knajlhjw7";
      };
      packageRequires = [
        compat
@@ -3696,10 +3717,10 @@
    elpaBuild {
      pname = "flymake";
      ename = "flymake";
-      version = "1.4.5";
+      version = "1.4.7";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/flymake-1.4.5.tar";
-        sha256 = "0jga23hdjl0kllxsdjwlqm488fscjlyipf98w5379qiajkhqxlzz";
+        url = "https://elpa.gnu.org/packages/flymake-1.4.7.tar";
+        sha256 = "11i5v483k70la6v48ljar54n6rhi8p7w2xnci5w5wvn11cmffrwz";
      };
      packageRequires = [
        eldoc
@@ -3754,6 +3775,27 @@
      };
    }
  ) { };
+  flymake-harper = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-harper";
+      ename = "flymake-harper";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/flymake-harper-0.1.1.tar";
+        sha256 = "09bsw51whmyhgz7csagrk25na14vk2cxwlsrz3vhbcczw456g1b2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-harper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  flymake-proselint = callPackage (
    {
      elpaBuild,
@@ -3917,10 +3959,10 @@
    elpaBuild {
      pname = "futur";
      ename = "futur";
-      version = "1.7";
+      version = "2.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/futur-1.7.tar";
-        sha256 = "1zb533jkhsi6p0ikx9jc7igz4yfq7b35apz9b8w7g0yrvq5jcl4i";
+        url = "https://elpa.gnu.org/packages/futur-2.0.tar";
+        sha256 = "06dpsis282z6zyq7g5lccq8r2dqcwbg7jbsc6zf0vv49wnsqd3sr";
      };
      packageRequires = [ ];
      meta = {
@@ -4674,10 +4716,10 @@
    elpaBuild {
      pname = "indent-bars";
      ename = "indent-bars";
-      version = "1.0.0";
+      version = "1.0.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/indent-bars-1.0.0.tar";
-        sha256 = "0iifmipmbry7r2xsq4i2q1k2awcy4z7v3bd509r50i3mc5002ssf";
+        url = "https://elpa.gnu.org/packages/indent-bars-1.0.1.tar";
+        sha256 = "1dc5wssg0ahd95876wg129j2k3ygqr4lc1hfkv2dg4ssb185vds9";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5008,10 +5050,10 @@
    elpaBuild {
      pname = "jinx";
      ename = "jinx";
-      version = "2.9";
+      version = "2.10";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/jinx-2.9.tar";
-        sha256 = "028f8vypa1dkrjbkwgdg7ijb1yqiwgg35yylykipdcy0acyphawa";
+        url = "https://elpa.gnu.org/packages/jinx-2.10.tar";
+        sha256 = "0pxk67m4bzw18cdlw8iq6jf0zv3n876rwf6qc684a9z28g644ldv";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5136,10 +5178,10 @@
    elpaBuild {
      pname = "keymap-popup";
      ename = "keymap-popup";
-      version = "0.4.2";
+      version = "0.4.3";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/keymap-popup-0.4.2.tar";
-        sha256 = "1pl3pmv8qvn1rkiziwyyr9iyj5hfw6bcccz8d0k18zah2h8q0pz0";
+        url = "https://elpa.gnu.org/packages/keymap-popup-0.4.3.tar";
+        sha256 = "1zrfgcrk4fpky24dajc8gxrs1iqda1gs1744z7mv77m8m36z17nm";
      };
      packageRequires = [ ];
      meta = {
@@ -5428,10 +5470,10 @@
    elpaBuild {
      pname = "lisp-ts-mode";
      ename = "lisp-ts-mode";
-      version = "0.3.2";
+      version = "0.3.4";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/lisp-ts-mode-0.3.2.tar";
-        sha256 = "0kkvcj9cn3s2ybsgf0ga1613bj1xkw5gzr9vn6dh2k2ljbjdhmcf";
+        url = "https://elpa.gnu.org/packages/lisp-ts-mode-0.3.4.tar";
+        sha256 = "1888ckzq2j6rd7564z7ks1aj86axasf5mndwmvbiw006q87wxrj6";
      };
      packageRequires = [
        compat
@@ -5507,10 +5549,10 @@
    elpaBuild {
      pname = "llm";
      ename = "llm";
-      version = "0.31.3";
+      version = "0.32.1";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/llm-0.31.3.tar";
-        sha256 = "1m6ghdswyp0sfrnz7fhrjpzfy5gwf3yw3b7rznlxw5si08dbnbm4";
+        url = "https://elpa.gnu.org/packages/llm-0.32.1.tar";
+        sha256 = "1hk4bhghdvwfnifz5df09kkq8ar9jn5r2jbim8pa1y500wmqgfz7";
      };
      packageRequires = [
        compat
@@ -5745,10 +5787,10 @@
    elpaBuild {
      pname = "marginalia";
      ename = "marginalia";
-      version = "2.11";
+      version = "2.12";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/marginalia-2.11.tar";
-        sha256 = "0h7jqgx95f5km90qc4g06ib3mi4acwggvx9yiwwirxj2mqwivifk";
+        url = "https://elpa.gnu.org/packages/marginalia-2.12.tar";
+        sha256 = "0g222n9fx93d3m5q6jaiw58iw8n533wa87w4ynrvpjs923ldk1fz";
      };
      packageRequires = [ compat ];
      meta = {
@@ -6070,10 +6112,10 @@
    elpaBuild {
      pname = "minuet";
      ename = "minuet";
-      version = "0.9.0";
+      version = "0.10.0";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/minuet-0.9.0.tar";
-        sha256 = "1qp1ic9hnx36zdbkgvr1x9qdh62w1yk8rjglk8l0y1m68wxi10wp";
+        url = "https://elpa.gnu.org/packages/minuet-0.10.0.tar";
+        sha256 = "1jfqwvnmizd3p4x35pj4mbpm9j41r0pmzz6iq494p08v2sj4c54q";
      };
      packageRequires = [
        dash
@@ -6689,10 +6731,10 @@
    elpaBuild {
      pname = "org";
      ename = "org";
-      version = "9.8.8";
+      version = "9.8.10";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-9.8.8.tar";
-        sha256 = "0rmpf3cdk8gxynyx750366kjrs5dlna0qx91ga93z6mxfcgj0px0";
+        url = "https://elpa.gnu.org/packages/org-9.8.10.tar";
+        sha256 = "079z8vn3n5fdcnka4wfwgz5sqskr1mki0g8bxpv7klpiqkars2l9";
      };
      packageRequires = [ ];
      meta = {
@@ -7839,10 +7881,10 @@
    elpaBuild {
      pname = "rainbow-mode";
      ename = "rainbow-mode";
-      version = "1.0.6";
+      version = "1.0.7";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar";
-        sha256 = "0xv39jix1gbwq6f8laj93sqkf2j5hwda3l7mjqc7vsqjw1lkhmjv";
+        url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.7.tar";
+        sha256 = "13i5cl1pdp6372cgbqh9qy60prd462hbqnagpg0ck6p94pv5r5cw";
      };
      packageRequires = [ ];
      meta = {
@@ -9691,10 +9733,10 @@
    elpaBuild {
      pname = "tramp";
      ename = "tramp";
-      version = "2.8.2.1";
+      version = "2.8.2.2";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tramp-2.8.2.1.tar";
-        sha256 = "121xc75dpdyqcq94bqgmx7yq7xmy885ms3jd6x93yp8iaabi2np8";
+        url = "https://elpa.gnu.org/packages/tramp-2.8.2.2.tar";
+        sha256 = "1ci3yr79dic248b40iisgkp2vbq2yl5va20rwv9px4h20n8k70k8";
      };
      packageRequires = [ ];
      meta = {
@@ -9801,10 +9843,10 @@
    elpaBuild {
      pname = "transient";
      ename = "transient";
-      version = "0.13.7";
+      version = "0.13.8";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-0.13.7.tar";
-        sha256 = "0lmc0cagnlp1ybjvdksygg1km6bbm83qsxrgs64lvlvv1grd40wv";
+        url = "https://elpa.gnu.org/packages/transient-0.13.8.tar";
+        sha256 = "1gdyl4ghpydmhsrpi0yvffcwkghs5ndnxy4wrmdd6byfwxffx8hg";
      };
      packageRequires = [
        compat
@@ -10403,10 +10445,10 @@
    elpaBuild {
      pname = "vertico";
      ename = "vertico";
-      version = "2.12";
+      version = "2.14";
      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/vertico-2.12.tar";
-        sha256 = "1fsa086bwq53xk6fsllk7c6kl9i1qbcwjrq0qc6k54xx62q84xcp";
+        url = "https://elpa.gnu.org/packages/vertico-2.14.tar";
+        sha256 = "1v99jqqas9y5l14f5486clr2blh16yp50jkxd7bdjiqzyax6rad5";
      };
      packageRequires = [ compat ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -1370,9 +1370,19 @@ let
            }
          );

-          # https://github.com/abo-abo/lispy/pull/683
-          # missing optional dependencies
-          lispy = addPackageRequires (mkHome super.lispy) [ self.indium ];
+          lispy = addPackageRequires (mkHome super.lispy) [
+            # MELPA no longer reads lispy-pkg.el, the only place lispy
+            # declares its dependencies
+            # https://github.com/melpa/melpa/commit/ce48c8475144800fc1150607353df958afadf2ed
+            self.ace-window
+            self.hydra
+            self.iedit
+            self.swiper
+            self.zoutline
+            # https://github.com/abo-abo/lispy/pull/683
+            # missing optional dependencies
+            self.indium
+          ];

          lsp-origami = ignoreCompilationError super.lsp-origami; # elisp error

@@ -1401,6 +1411,8 @@ let

          mu4e-alert = addPackageRequires super.mu4e-alert [ self.mu4e ];

+          mu4e-autotask = addPackageRequires super.mu4e-autotask [ self.mu4e ];
+
          mu4e-column-faces = addPackageRequires super.mu4e-column-faces [ self.mu4e ];

          mu4e-conversation = addPackageRequires super.mu4e-conversation [ self.mu4e ];
@@ -1514,6 +1526,9 @@ let

          org-pdftools = mkHome super.org-pdftools;

+          # elisp error when loading elnode
+          org-present-remote = ignoreCompilationError super.org-present-remote;
+
          org-projectile = super.org-projectile.overrideAttrs (
            finalAttrs: previousAttrs: {
              # https://github.com/melpa/melpa/pull/9150
@@ -1576,6 +1591,8 @@ let
              '';
          });

+          peek-mode = ignoreCompilationError super.peek-mode; # elisp error when loading elnode
+
          pgdevenv = ignoreCompilationError super.pgdevenv; # elisp error

          pinot = ignoreCompilationError super.pinot; # elisp error
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -75,10 +75,10 @@
    elpaBuild {
      pname = "aidermacs";
      ename = "aidermacs";
-      version = "1.11.0.20260804.5";
+      version = "1.13.0.20260908.5";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.11.0.20260804.5.tar";
-        sha256 = "1aj0f19hxcqk6z69jxamfvq1kj5s9g6pvf5r6bfxsdmb79gwnp0l";
+        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.13.0.20260908.5.tar";
+        sha256 = "1an4b7nsni5mlp0d73wzy5irpy018n3zkh335vl0asy1lrq29l8r";
      };
      packageRequires = [
        compat
@@ -291,10 +291,10 @@
    elpaBuild {
      pname = "autothemer";
      ename = "autothemer";
-      version = "0.2.18.0.20260620.7";
+      version = "0.2.19.0.20260911.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20260620.7.tar";
-        sha256 = "1awdmkxy2gdrk20j63k8fjclfsmnkx33hm55x636fmcrh2niqcg7";
+        url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.19.0.20260911.0.tar";
+        sha256 = "1jwiq06lxkjm9z9y4q8idzai7piaxn49inbg73m06629kxcd3jpg";
      };
      packageRequires = [ dash ];
      meta = {
@@ -566,10 +566,10 @@
    elpaBuild {
      pname = "casual";
      ename = "casual";
-      version = "2.17.1.0.20260718.0";
+      version = "3.0.2.0.20260831.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/casual-2.17.1.0.20260718.0.tar";
-        sha256 = "031vpnhf498lic2ngh9bmg0917561dsnrn3apsdv0id3rl7vsd35";
+        url = "https://elpa.nongnu.org/nongnu-devel/casual-3.0.2.0.20260831.0.tar";
+        sha256 = "1rby91bcy386fgjqcag790020g6x95ss4km43ib1i8sp6k7bn5z4";
      };
      packageRequires = [
        csv-mode
@@ -619,10 +619,10 @@
    elpaBuild {
      pname = "cider";
      ename = "cider";
-      version = "2.1.0snapshot0.20260807.59";
+      version = "2.1.0snapshot0.20260912.129";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-2.1.0snapshot0.20260807.59.tar";
-        sha256 = "0jfryag22sckkhkk5mp9ssqxx7c9nhvv3jk88v73hwahv3fs3s00";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-2.1.0snapshot0.20260912.129.tar";
+        sha256 = "03lxizzngr7fs9gcjc0sladmfbwc3dm1ls64344gw9k0v0pka5mc";
      };
      packageRequires = [
        clojure-mode
@@ -670,10 +670,10 @@
    elpaBuild {
      pname = "clojure-ts-mode";
      ename = "clojure-ts-mode";
-      version = "0.6.0.0.20260709.48";
+      version = "0.6.0.0.20260823.53";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.6.0.0.20260709.48.tar";
-        sha256 = "0ia909an1q6zig3ysvnjf6nrv0gyz7jm7k3xzqfnqb0idm0sllx7";
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.6.0.0.20260823.53.tar";
+        sha256 = "02siy3da3yjjqgddnmrqd6x455b33zgx6lsziipbr38zva1kdg9d";
      };
      packageRequires = [ ];
      meta = {
@@ -682,6 +682,34 @@
      };
    }
  ) { };
+  codex-ide = callPackage (
+    {
+      compat,
+      eat,
+      elpaBuild,
+      fetchurl,
+      keymap-popup,
+      lib,
+    }:
+    elpaBuild {
+      pname = "codex-ide";
+      ename = "codex-ide";
+      version = "0.1.3.0.20260904.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/codex-ide-0.1.3.0.20260904.7.tar";
+        sha256 = "0z8iqlrgb2gxmw3xc3ja729hlvk92fmnkxa73ag1hxigky3sfb2l";
+      };
+      packageRequires = [
+        compat
+        eat
+        keymap-popup
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/codex-ide.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  coffee-mode = callPackage (
    {
      elpaBuild,
@@ -712,10 +740,10 @@
    elpaBuild {
      pname = "cond-let";
      ename = "cond-let";
-      version = "1.1.3.0.20260701.0";
+      version = "1.1.4.0.20260901.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cond-let-1.1.3.0.20260701.0.tar";
-        sha256 = "1swmpvpx2437js3vn93vnfj5aqnwaf1xxw1ynyr0i2g4nr27qc7s";
+        url = "https://elpa.nongnu.org/nongnu-devel/cond-let-1.1.4.0.20260901.0.tar";
+        sha256 = "01sb4fzq4xs1jrqaknn29qacc9mszwxd5q726mf4y4kp6401m6j1";
      };
      packageRequires = [ ];
      meta = {
@@ -981,7 +1009,7 @@
      version = "0.7.0beta3.0.20240129.11";
      src = fetchurl {
        url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.0beta3.0.20240129.11.tar";
-        sha256 = "174wkr002wif8h62dlj34c5h7a1a52zs097n8flncm014l6m3y3i";
+        sha256 = "1mr4kp0a0il4ll8a8nf4yah8vb5if4h8ihz2qzqarwfywm43iqik";
      };
      packageRequires = [ ];
      meta = {
@@ -1024,7 +1052,7 @@
      version = "2.3.0.0.20260725.12";
      src = fetchurl {
        url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.3.0.0.20260725.12.tar";
-        sha256 = "09d7jx6m1mvpk953v1svj2942845bkg2iivavmd2rvks16izf15h";
+        sha256 = "01d8fh1sxvcnvq1gi2zshf5d338nfv7bg9346si8rk1qg5b32fqd";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1075,6 +1103,27 @@
      };
    }
  ) { };
+  doom-game = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "doom-game";
+      ename = "doom-game";
+      version = "0.4.0.20260825.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/doom-game-0.4.0.20260825.1.tar";
+        sha256 = "1rqszf301qxwpys28w9kjwz5xknz6ag2xw2nvcrc2g76f0nznm5w";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/doom-game.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  dracula-theme = callPackage (
    {
      elpaBuild,
@@ -1084,10 +1133,10 @@
    elpaBuild {
      pname = "dracula-theme";
      ename = "dracula-theme";
-      version = "1.8.3.0.20260701.10";
+      version = "1.8.3.0.20260907.17";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.3.0.20260701.10.tar";
-        sha256 = "0m26r1swffj2ax3rl3yikgqi2rq796y8vwazisfsb1lsx06hwyyn";
+        url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.3.0.20260907.17.tar";
+        sha256 = "1yxmxryw756qj66jnxzc5kdr0vhr11l7h5s6v73wviscqffrga28";
      };
      packageRequires = [ ];
      meta = {
@@ -1256,10 +1305,10 @@
    elpaBuild {
      pname = "eldoc-mouse";
      ename = "eldoc-mouse";
-      version = "3.0.8.0.20260612.0";
+      version = "3.0.10.0.20260910.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/eldoc-mouse-3.0.8.0.20260612.0.tar";
-        sha256 = "0w0c30vxqbca8zgj6zql4lxqfj2nz1xh9lcllzz09k2pydki0f4n";
+        url = "https://elpa.nongnu.org/nongnu-devel/eldoc-mouse-3.0.10.0.20260910.0.tar";
+        sha256 = "022l8nympdbdpp9110qv2fr7qwv78c25fqd2wmzl2zh1ayl4mv9y";
      };
      packageRequires = [
        eglot
@@ -1307,10 +1356,10 @@
    elpaBuild {
      pname = "elfeed";
      ename = "elfeed";
-      version = "4.1.1.0.20260805.1";
+      version = "4.2.0.0.20260909.8";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/elfeed-4.1.1.0.20260805.1.tar";
-        sha256 = "07ms1xrx4yhzi9zhzwg3v77zkihmh46lv63c3vcisfpnwd8hszja";
+        url = "https://elpa.nongnu.org/nongnu-devel/elfeed-4.2.0.0.20260909.8.tar";
+        sha256 = "0hbzpd69l57asapwm7px00dy64cr3734bayd106a6ml9myj9ak5s";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1331,10 +1380,10 @@
    elpaBuild {
      pname = "elfeed-web";
      ename = "elfeed-web";
-      version = "4.0.0.0.20260628.4";
+      version = "4.1.0.0.20260821.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/elfeed-web-4.0.0.0.20260628.4.tar";
-        sha256 = "0vwd5k1h47xcj6jz5wqcppm9cv2ywiliq4x3mszbharqklw83wmx";
+        url = "https://elpa.nongnu.org/nongnu-devel/elfeed-web-4.1.0.0.20260821.0.tar";
+        sha256 = "1l0niic37zhzbhy5bdngf6m8zxl411svj98x9h6k3p6rd5597lms";
      };
      packageRequires = [
        compat
@@ -1560,10 +1609,10 @@
    elpaBuild {
      pname = "evil-collection";
      ename = "evil-collection";
-      version = "3.0.1.0.20260729.0";
+      version = "3.0.3.0.20260910.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-collection-3.0.1.0.20260729.0.tar";
-        sha256 = "1dfgr6b664f2agfk0m78dl88wfgjfnxd1dklbs4srgxd5s822zis";
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-collection-3.0.3.0.20260910.2.tar";
+        sha256 = "0khhxx1xdgzyrdyjx498l56f5wiqw1k4dvzli2xhznk7r8jvl6ar";
      };
      packageRequires = [ evil ];
      meta = {
@@ -1963,10 +2012,10 @@
    elpaBuild {
      pname = "fj";
      ename = "fj";
-      version = "0.37.0.20260509.74153";
+      version = "0.42.0.20260909.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/fj-0.37.0.20260509.74153.tar";
-        sha256 = "0fwklcgc11lynkfp00wwjrsbdkxsdhi5vis2qcmlcnh5l4lwmi7y";
+        url = "https://elpa.nongnu.org/nongnu-devel/fj-0.42.0.20260909.0.tar";
+        sha256 = "0yrlpijy3l6p8lg629la43k05nxrmcw03csma85mcdszr5n1q1wk";
      };
      packageRequires = [
        fedi
@@ -2011,10 +2060,10 @@
    elpaBuild {
      pname = "flx";
      ename = "flx";
-      version = "0.6.2.0.20240204.195634";
+      version = "0.6.3.0.20260821.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/flx-0.6.2.0.20240204.195634.tar";
-        sha256 = "0k2irlx6v1mn23qvpsq1p6mdy8a78sx9xbnvy9ah1hnsq2z9x4ay";
+        url = "https://elpa.nongnu.org/nongnu-devel/flx-0.6.3.0.20260821.0.tar";
+        sha256 = "1dzins71lirv6g1b423695mncmvz21z0i197jgvp9l18j1wqljvv";
      };
      packageRequires = [ cl-lib ];
      meta = {
@@ -2034,10 +2083,10 @@
    elpaBuild {
      pname = "flx-ido";
      ename = "flx-ido";
-      version = "0.6.2.0.20240204.195634";
+      version = "0.6.3.0.20260821.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/flx-ido-0.6.2.0.20240204.195634.tar";
-        sha256 = "1d9hg8pryf30bz9rnpb081vhw2axvbk62i9wiyfq0n0zwi23dwhj";
+        url = "https://elpa.nongnu.org/nongnu-devel/flx-ido-0.6.3.0.20260821.0.tar";
+        sha256 = "0y7b31k8aqsa3zv6rbg3dfhc68y8qmw8pk983fjgn1xi21a7y4rp";
      };
      packageRequires = [
        cl-lib
@@ -2059,10 +2108,10 @@
    elpaBuild {
      pname = "flycheck";
      ename = "flycheck";
-      version = "39.0snapshot0.20260807.96";
+      version = "40.0snapshot0.20260902.86";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-39.0snapshot0.20260807.96.tar";
-        sha256 = "04nxxlp39f568a4w73r2kfi7739g432ws7jf4zxza8dvy45ac3p1";
+        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-40.0snapshot0.20260902.86.tar";
+        sha256 = "014c0k1kidv2zvqcy783cg5qf4r0iyq275zanr0danmzahm4jrms";
      };
      packageRequires = [ seq ];
      meta = {
@@ -2260,10 +2309,10 @@
    elpaBuild {
      pname = "geiser";
      ename = "geiser";
-      version = "0.33.1.0.20260727.7";
+      version = "0.33.2.0.20260905.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.33.1.0.20260727.7.tar";
-        sha256 = "0ilmj01mg917a0ysimg31inpv0vl98splqshd3vkp0yiccwd7h17";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.33.2.0.20260905.2.tar";
+        sha256 = "04cmzrmbq36mnppn7fmxpb3jnvk6b91ihcyhsrxsghjsd27g59rg";
      };
      packageRequires = [ project ];
      meta = {
@@ -2326,10 +2375,10 @@
    elpaBuild {
      pname = "geiser-chicken";
      ename = "geiser-chicken";
-      version = "0.17.0.20260727.8";
+      version = "0.17.0.20260819.10";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20260727.8.tar";
-        sha256 = "1cng6dyqbxvb0vvfjla27k86jdr9hh1kxjyargs3j8g8mav4a069";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20260819.10.tar";
+        sha256 = "1x8fjwn056dnr9j9aqp81hln84w4m09c4pl5dd8r3bc53p3rvcdn";
      };
      packageRequires = [ geiser ];
      meta = {
@@ -2630,10 +2679,10 @@
    elpaBuild {
      pname = "gnuplot";
      ename = "gnuplot";
-      version = "0.12.0.20260628.3";
+      version = "0.12.0.20260825.7";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.12.0.20260628.3.tar";
-        sha256 = "1gmivwm8xv4x3gab3xnlxnjsqxivb9xdkk6gb8nc6a3rl87py19w";
+        url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.12.0.20260825.7.tar";
+        sha256 = "1fq0vz1jv5p0530d06bndvsfcrxrcczrhds6xcad5mvacxylf26h";
      };
      packageRequires = [ compat ];
      meta = {
@@ -2737,10 +2786,10 @@
    elpaBuild {
      pname = "gptel";
      ename = "gptel";
-      version = "0.9.9.5.0.20260804.79";
+      version = "0.9.9.6.0.20260910.5";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.5.0.20260804.79.tar";
-        sha256 = "1rkzlcadldm2j83dmnyc2zkh6x21znk8cw02l90agqgjg1dis1xp";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.6.0.20260910.5.tar";
+        sha256 = "1qmkwg4cvzwj5g0klfy6g629sm85bmq0nbvgz1lw9ivq4glmp2nb";
      };
      packageRequires = [
        compat
@@ -2761,10 +2810,10 @@
    elpaBuild {
      pname = "graphql-mode";
      ename = "graphql-mode";
-      version = "1.0.0.0.20260524.82344";
+      version = "1.0.0.0.20260904.38";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20260524.82344.tar";
-        sha256 = "0zr62g3jhf47d7cjjcx3a8m1kqp4h14k4k7jdqqiivg6hc1k43qv";
+        url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20260904.38.tar";
+        sha256 = "1nq4jry58b4ficsa3a1kzv5k2vvnn7hf9v9sshrkmvnm0kxhj0ci";
      };
      packageRequires = [ ];
      meta = {
@@ -2804,10 +2853,10 @@
    elpaBuild {
      pname = "gruvbox-theme";
      ename = "gruvbox-theme";
-      version = "1.30.1.0.20250117.22202";
+      version = "1.30.3.0.20260911.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme-1.30.1.0.20250117.22202.tar";
-        sha256 = "17cqq6yazkaclqa2p45ihrap2399vymbnaisi7c1syqxpyayz431";
+        url = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme-1.30.3.0.20260911.2.tar";
+        sha256 = "1vbigj949wsl8ih0krmhzqmzdx0m01hczfb5ry8krydzi7ldlwbp";
      };
      packageRequires = [ autothemer ];
      meta = {
@@ -2868,10 +2917,10 @@
    elpaBuild {
      pname = "haskell-mode";
      ename = "haskell-mode";
-      version = "17.5.0.20260619.67";
+      version = "17.5.0.20260904.72";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20260619.67.tar";
-        sha256 = "1v4ksswhi8d17did2fz3j3yqm30jd0yqj83h2093dqnhyphha9dl";
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20260904.72.tar";
+        sha256 = "0jli7hf1bym94c0kny0lgpdi4spjj9qgrc78v2g9775c63rrqk4q";
      };
      packageRequires = [ ];
      meta = {
@@ -2911,10 +2960,10 @@
    elpaBuild {
      pname = "haskell-ts-mode";
      ename = "haskell-ts-mode";
-      version = "1.3.5.0.20251204.182222";
+      version = "1.3.5.0.20260904.6";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.3.5.0.20251204.182222.tar";
-        sha256 = "0rlng6z7g6bbsrcjbggyms8sd06729dyb9qir7s2i1r2adrscwb5";
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.3.5.0.20260904.6.tar";
+        sha256 = "079r1amn2s1c5rqkcrv0aa0bgmsb3ad7irx8aba1r0kjbxf51096";
      };
      packageRequires = [ ];
      meta = {
@@ -2934,10 +2983,10 @@
    elpaBuild {
      pname = "helm";
      ename = "helm";
-      version = "4.0.7.0.20260806.41";
+      version = "4.0.7.0.20260912.54";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.7.0.20260806.41.tar";
-        sha256 = "1g0zny2k5a4c6v7hfvn3859hgydvz54zykbzcigbwy7x7jdd6fy8";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.7.0.20260912.54.tar";
+        sha256 = "1g9imap75am0aixcfax72l356yw9dkbsndmk8n4xy49l6414kzwp";
      };
      packageRequires = [
        helm-core
@@ -2959,10 +3008,10 @@
    elpaBuild {
      pname = "helm-core";
      ename = "helm-core";
-      version = "4.0.7.0.20260806.41";
+      version = "4.0.7.0.20260912.54";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.7.0.20260806.41.tar";
-        sha256 = "167pbpikba3cc92vny6c2r7rcgi5xy5dxpq6wnsr2kwi00vlq6qy";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.7.0.20260912.54.tar";
+        sha256 = "0479ahi6nxdvi15bnygl81bciwr28r6c0rk44qasn90gn92fss3b";
      };
      packageRequires = [ async ];
      meta = {
@@ -2971,6 +3020,34 @@
      };
    }
  ) { };
+  hermes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      keymap-popup,
+      lib,
+      markdown-mode,
+      websocket,
+    }:
+    elpaBuild {
+      pname = "hermes";
+      ename = "hermes";
+      version = "0.7.0.0.20260914.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/hermes-0.7.0.0.20260914.0.tar";
+        sha256 = "0py584fqw4qdvwjkn7dcsydnvc9b6hk08b627zb1fj01ysfvqnrm";
+      };
+      packageRequires = [
+        keymap-popup
+        markdown-mode
+        websocket
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/hermes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  hideshowvis = callPackage (
    {
      elpaBuild,
@@ -3349,10 +3426,10 @@
    elpaBuild {
      pname = "jabber";
      ename = "jabber";
-      version = "0.13.1.0.20260807.0";
+      version = "0.14.0.0.20260907.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.13.1.0.20260807.0.tar";
-        sha256 = "0vcfyq98g6ikq5sy71x34a68vyfgmh4gakfj1j4sq0nw0vgc121i";
+        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.14.0.0.20260907.4.tar";
+        sha256 = "07nxhcb82n9yb3jdw8zz5jf5mr8kpsv7jpx8kpjx1lxq09nxikry";
      };
      packageRequires = [
        fsm
@@ -3531,10 +3608,10 @@
    elpaBuild {
      pname = "llama";
      ename = "llama";
-      version = "1.0.5.0.20260601.0";
+      version = "1.0.5.0.20260909.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/llama-1.0.5.0.20260601.0.tar";
-        sha256 = "0fv7agjcfj59wbis1sw175j6v36zdg0qp84dkv1l3ql6fixcwqh1";
+        url = "https://elpa.nongnu.org/nongnu-devel/llama-1.0.5.0.20260909.1.tar";
+        sha256 = "0i9wbkvdbazrhy7772h7j0mwxs2sjjp5dsya6qpryblpfihrhvf6";
      };
      packageRequires = [ compat ];
      meta = {
@@ -3711,10 +3788,10 @@
    elpaBuild {
      pname = "magit";
      ename = "magit";
-      version = "4.7.0.0.20260731.0";
+      version = "4.7.1.0.20260911.5";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.7.0.0.20260731.0.tar";
-        sha256 = "1vcrvizgk7hbcqcimzn3mijg3d3bdg35rifh0d1yh5pk0d528ych";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.7.1.0.20260911.5.tar";
+        sha256 = "1bg4ffx07b1ah2qgxjnslaap0vvd7hn1734k1jfwd62if13rrbp4";
      };
      packageRequires = [
        compat
@@ -3744,10 +3821,10 @@
    elpaBuild {
      pname = "magit-section";
      ename = "magit-section";
-      version = "4.7.0.0.20260731.0";
+      version = "4.7.1.0.20260911.5";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.7.0.0.20260731.0.tar";
-        sha256 = "0cdws7b4xbsxfqaas38x4j50qw48yn8v52sxdi8j09d86i9nrsf9";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.7.1.0.20260911.5.tar";
+        sha256 = "1rbvwxykj03zknff7l6w6kzajslf2b62klx06ydkpksldydl9l6l";
      };
      packageRequires = [
        compat
@@ -3770,10 +3847,10 @@
    elpaBuild {
      pname = "markdown-mode";
      ename = "markdown-mode";
-      version = "2.9alpha0.20260722.13";
+      version = "2.9alpha0.20260827.20";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260722.13.tar";
-        sha256 = "0bgm2vs9b9wrxqzblraw475b46bp79qvsr2arfwl558lxjgvngxv";
+        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260827.20.tar";
+        sha256 = "0hksf5g5hx5wwbw7jvyjhvqi9jyyj923naikdy7fnrczcpvrwz36";
      };
      packageRequires = [ ];
      meta = {
@@ -3784,6 +3861,7 @@
  ) { };
  mastodon = callPackage (
    {
+      compat,
      elpaBuild,
      fetchurl,
      lib,
@@ -3793,12 +3871,13 @@
    elpaBuild {
      pname = "mastodon";
      ename = "mastodon";
-      version = "2.0.17.0.20260509.74935";
+      version = "2.1.4.0.20260911.77";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.17.0.20260509.74935.tar";
-        sha256 = "1i656xma6mw8fis91fwvzz9c1fpihxcgpwx78vm10k939j1ghhpg";
+        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.1.4.0.20260911.77.tar";
+        sha256 = "1499dy4dq6jg2qkwyf4rndyfiviy96j5c2sjm7ar7gr0ybp1xw1a";
      };
      packageRequires = [
+        compat
        persist
        tp
      ];
@@ -3910,10 +3989,10 @@
    elpaBuild {
      pname = "moe-theme";
      ename = "moe-theme";
-      version = "1.1.0.0.20260515.84137";
+      version = "1.1.0.0.20260819.13";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20260515.84137.tar";
-        sha256 = "0q8sdm7sd82xgas83z0i5rrjq26b9crvakr5iqdcms9pnckqkfl8";
+        url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20260819.13.tar";
+        sha256 = "0ldphv242q8nw2cs2zh91zny0z68sc74167fay25p3p0501a484v";
      };
      packageRequires = [ ];
      meta = {
@@ -4034,18 +4113,20 @@
      fetchurl,
      lib,
      magit-section,
+      reformatter,
      transient,
    }:
    elpaBuild {
      pname = "nix-mode";
      ename = "nix-mode";
-      version = "1.5.0.0.20230421.153655";
+      version = "1.5.0.0.20260810.58";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/nix-mode-1.5.0.0.20230421.153655.tar";
-        sha256 = "186c1xng3phn3m4jvazn114l1ch1jldfyjaihb32rb9c8bf3mfr9";
+        url = "https://elpa.nongnu.org/nongnu-devel/nix-mode-1.5.0.0.20260810.58.tar";
+        sha256 = "0lz7jisnrxrip5cn7abanpr8r31q6a8sszpjv9cvc6z4a8qikgpf";
      };
      packageRequires = [
        magit-section
+        reformatter
        transient
      ];
      meta = {
@@ -4190,6 +4271,27 @@
      };
    }
  ) { };
+  org-history = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-history";
+      ename = "org-history";
+      version = "0.5.2.0.20260803.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-history-0.5.2.0.20260803.0.tar";
+        sha256 = "1bna709cwy3k8xjvcqcbfy7a5mprw21fhjm61l2ngxjhylp8792b";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-history.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  org-journal = callPackage (
    {
      elpaBuild,
@@ -4387,10 +4489,10 @@
    elpaBuild {
      pname = "package-lint";
      ename = "package-lint";
-      version = "0.26.0.20260619.23";
+      version = "0.26.0.20260903.32";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20260619.23.tar";
-        sha256 = "1a1lbk0ypicqwx6afavwfqwibp0pvyry84372s441bmd89xp072k";
+        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20260903.32.tar";
+        sha256 = "1zkdbf1x7bdnqkkk1qkdjbnyn15in29j3fpzaf80jkbyq5l028rj";
      };
      packageRequires = [ let-alist ];
      meta = {
@@ -4430,10 +4532,10 @@
    elpaBuild {
      pname = "page-break-lines";
      ename = "page-break-lines";
-      version = "0.15.0.20260619.18";
+      version = "0.15.0.20260904.20";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20260619.18.tar";
-        sha256 = "0x9b97wgxjvm42k9910fyfyd6ddwkh3fiwc5g7ix7izzxvsx511g";
+        url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20260904.20.tar";
+        sha256 = "0zkx439sv4cagqah8ps779qf9pz8csjq8psabiq31wk2p4bba53y";
      };
      packageRequires = [ ];
      meta = {
@@ -4588,10 +4690,10 @@
    elpaBuild {
      pname = "pg";
      ename = "pg";
-      version = "0.68.0.20260727.2";
+      version = "0.69.0.20260812.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.68.0.20260727.2.tar";
-        sha256 = "0rl6ya6g2sbhd2qgy70m9ja8vib0dpvcisbmfwg0fdym25dqr8ni";
+        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.69.0.20260812.0.tar";
+        sha256 = "0sipq7xyxqlkzq9hzkz2gzn02rn5blqzl67pp1pfbw4i0m9jjkla";
      };
      packageRequires = [ peg ];
      meta = {
@@ -4609,10 +4711,10 @@
    elpaBuild {
      pname = "php-mode";
      ename = "php-mode";
-      version = "1.26.1.0.20260805.106";
+      version = "1.28.0.0.20260825.32";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20260805.106.tar";
-        sha256 = "1qad88kb0krmw7ck91q8fsc3vvzm9gdyk10xnys7sms0648mcqay";
+        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.28.0.0.20260825.32.tar";
+        sha256 = "02k37x3qin577vk9nb4jydyh3crmf7vdj2v9iqss3al6gr5z2zmk";
      };
      packageRequires = [ ];
      meta = {
@@ -4621,6 +4723,27 @@
      };
    }
  ) { };
+  pinyin-isearch = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pinyin-isearch";
+      ename = "pinyin-isearch";
+      version = "1.7.2.0.20260910.61";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/pinyin-isearch-1.7.2.0.20260910.61.tar";
+        sha256 = "0v0ylwy49dmy2rflss264wnn7wq0kw0hj5iwf1cl4zlyag2g1bfh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/pinyin-isearch.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  popon = callPackage (
    {
      elpaBuild,
@@ -4693,10 +4816,10 @@
    elpaBuild {
      pname = "project-nix-store";
      ename = "project-nix-store";
-      version = "0.11.0.0.20260907.0";
+      version = "0.11.0.0.20260912.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/project-nix-store-0.11.0.0.20260907.0.tar";
-        sha256 = "05mzkzwb45s5ls7b6jac7pnp9q6icrhi3cngkqd70rskphn8vfyb";
+        url = "https://elpa.nongnu.org/nongnu-devel/project-nix-store-0.11.0.0.20260912.1.tar";
+        sha256 = "0whycb961p73b5pxxi304zsihnnlrg9r7f719l5f5507vrrjhvy1";
      };
      packageRequires = [ ];
      meta = {
@@ -4715,10 +4838,10 @@
    elpaBuild {
      pname = "projectile";
      ename = "projectile";
-      version = "3.4.0snapshot0.20260807.37";
+      version = "3.5.0snapshot0.20260903.56";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/projectile-3.4.0snapshot0.20260807.37.tar";
-        sha256 = "1p18qrpxi7sphh91bsf3iixai82xngc2bcijn5hkkhrxi0yg8jy3";
+        url = "https://elpa.nongnu.org/nongnu-devel/projectile-3.5.0snapshot0.20260903.56.tar";
+        sha256 = "1iswg1wkyngg9qb53cvvlfbk9zncd6w56134smpn6wrzrfp9gn2x";
      };
      packageRequires = [ compat ];
      meta = {
@@ -4736,10 +4859,10 @@
    elpaBuild {
      pname = "proof-general";
      ename = "proof-general";
-      version = "4.6snapshot0.20260622.265";
+      version = "4.6snapshot0.20260825.269";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20260622.265.tar";
-        sha256 = "1w3xbgzq9ibhdb4b06f658lvg79c0gyacicmaljp8pz3548dcly8";
+        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20260825.269.tar";
+        sha256 = "0pzy3p4ny9mw0x98hz61hx6y3iz1spj0mjl3l0v1dq9x3751rb9k";
      };
      packageRequires = [ ];
      meta = {
@@ -4780,10 +4903,10 @@
    elpaBuild {
      pname = "racket-mode";
      ename = "racket-mode";
-      version = "1.0.20260726.0";
+      version = "1.0.20260908.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20260726.0.tar";
-        sha256 = "1yhnwgv534wskz3rp383v9qasmilpjyqcxpiskx3yx9548fwj0si";
+        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20260908.0.tar";
+        sha256 = "1im64sfy1bmbsbdhnj3ss5sm3caqy53c2g1m494zxxyxj2pz68af";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5004,6 +5127,28 @@
      };
    }
  ) { };
+  sapling = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "sapling";
+      ename = "sapling";
+      version = "0.3.2.0.20260830.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/sapling-0.3.2.0.20260830.1.tar";
+        sha256 = "1adiglg841r9a62xlhpdaz0ysnn4abid1jbvgdk30aa2xb9h65n9";
+      };
+      packageRequires = [ transient ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/sapling.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  sass-mode = callPackage (
    {
      cl-lib ? null,
@@ -5124,10 +5269,10 @@
    elpaBuild {
      pname = "selected-window-contrast";
      ename = "selected-window-contrast";
-      version = "0.4.1.0.20260406.62115";
+      version = "0.4.1.0.20260902.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/selected-window-contrast-0.4.1.0.20260406.62115.tar";
-        sha256 = "0mwkq192jb7k5nr3gclqpy37bivkw86xmm372whbsnhpap6zlhk5";
+        url = "https://elpa.nongnu.org/nongnu-devel/selected-window-contrast-0.4.1.0.20260902.4.tar";
+        sha256 = "18s2bk77hikyh83174ynbq63n45hmm2dfh71ww4201wq3hgd3ys0";
      };
      packageRequires = [ ];
      meta = {
@@ -5188,10 +5333,10 @@
    elpaBuild {
      pname = "simple-httpd";
      ename = "simple-httpd";
-      version = "1.6.0.20260709.3";
+      version = "1.7.0.20260904.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/simple-httpd-1.6.0.20260709.3.tar";
-        sha256 = "0fyl4r8x0k074cb5h7agfm9zdpny68n0sm24wb9mc089fx9j9q5c";
+        url = "https://elpa.nongnu.org/nongnu-devel/simple-httpd-1.7.0.20260904.0.tar";
+        sha256 = "187rqm9lyydni3zi48radvx86nw9l8ihpg1l6138nrfihdrq88c1";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5210,10 +5355,10 @@
    elpaBuild {
      pname = "slime";
      ename = "slime";
-      version = "2.32snapshot0.20260730.54";
+      version = "2.32snapshot0.20260911.71";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260730.54.tar";
-        sha256 = "05mvxs95agdy014zvfxs5jribx3wmgajfax68jckn9b2wixvsp8a";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260911.71.tar";
+        sha256 = "1nlaka8hgaii0hpsds7953rprgh4jfbkvd5j5jl8g9a3p20zg5vz";
      };
      packageRequires = [ macrostep ];
      meta = {
@@ -5274,10 +5419,10 @@
    elpaBuild {
      pname = "solarized-theme";
      ename = "solarized-theme";
-      version = "2.2.0.0.20260728.0";
+      version = "2.2.0.0.20260910.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.2.0.0.20260728.0.tar";
-        sha256 = "10kzrn8paswxziam6svzv1qq46prdq0d3q20asn9fx7a7nc6vw5s";
+        url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.2.0.0.20260910.4.tar";
+        sha256 = "1k6zyk6spwl8dar8jf0mf45vri4zwgm7yb9hzavc8b6gcla5nxd0";
      };
      packageRequires = [ ];
      meta = {
@@ -5295,10 +5440,10 @@
    elpaBuild {
      pname = "spacemacs-theme";
      ename = "spacemacs-theme";
-      version = "0.2.0.20260523.125627";
+      version = "0.2.0.20260906.51";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20260523.125627.tar";
-        sha256 = "0rxvvfcssxvgfi8djd3y5ncd5hhhbqclprp3529zw390m8qlcicd";
+        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20260906.51.tar";
+        sha256 = "1dbr8my2zm0s3cbdvh075m43a4ls9kjr7d9q4psax0xfiba5lgc9";
      };
      packageRequires = [ ];
      meta = {
@@ -5358,10 +5503,10 @@
    elpaBuild {
      pname = "standard-keys-mode";
      ename = "standard-keys-mode";
-      version = "1.0.0.0.20260105.112114";
+      version = "1.0.1.0.20260825.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/standard-keys-mode-1.0.0.0.20260105.112114.tar";
-        sha256 = "0haqds9h15rk61rnwrs0a37gwhm1gm4j6fj9a9i7fkvca2qfyb3d";
+        url = "https://elpa.nongnu.org/nongnu-devel/standard-keys-mode-1.0.1.0.20260825.0.tar";
+        sha256 = "0g3s4agfc2jsr8lc1ybx954q32x36kgaz1chwbn8yk8msg2jzb1i";
      };
      packageRequires = [ ];
      meta = {
@@ -5421,10 +5566,10 @@
    elpaBuild {
      pname = "subed";
      ename = "subed";
-      version = "1.5.1.0.20260618.1";
+      version = "1.5.2.0.20260910.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.5.1.0.20260618.1.tar";
-        sha256 = "1b74rndjdjawxl6fbksw7816135hyyk9sffijcrfyfd5c9k0c5zn";
+        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.5.2.0.20260910.0.tar";
+        sha256 = "1ai0dbba42bqhkzvprg9sikka2313gyh6fmccq40g6zlmm4qs3y4";
      };
      packageRequires = [ ];
      meta = {
@@ -5464,10 +5609,10 @@
    elpaBuild {
      pname = "swift-mode";
      ename = "swift-mode";
-      version = "10.0.0.0.20260801.20";
+      version = "10.0.0.0.20260902.39";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-10.0.0.0.20260801.20.tar";
-        sha256 = "0f23mpzzdnad6179h8ln7vy7b50alyk4zjj2lrif716qlbnfvq7l";
+        url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-10.0.0.0.20260902.39.tar";
+        sha256 = "1i0krxppl1xqvn3ivr986pixh2xs4q1c7m2qyr62sq50ab9hhr7s";
      };
      packageRequires = [ ];
      meta = {
@@ -5550,10 +5695,10 @@
    elpaBuild {
      pname = "tabspaces";
      ename = "tabspaces";
-      version = "1.10.1.0.20260804.1";
+      version = "1.11.0.0.20260908.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/tabspaces-1.10.1.0.20260804.1.tar";
-        sha256 = "08dbcnq881in2afk6lyk3p3aax3i728nm2da088f2gwa8h7i10q3";
+        url = "https://elpa.nongnu.org/nongnu-devel/tabspaces-1.11.0.0.20260908.2.tar";
+        sha256 = "133mgk5xc2h75klaalv7fd2348kpsvy845hqv93vmczy260mkq8i";
      };
      packageRequires = [ project ];
      meta = {
@@ -5949,6 +6094,28 @@
      };
    }
  ) { };
+  vc-sapling = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      sapling,
+    }:
+    elpaBuild {
+      pname = "vc-sapling";
+      ename = "vc-sapling";
+      version = "0.2.1.0.20260823.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/vc-sapling-0.2.1.0.20260823.1.tar";
+        sha256 = "1cdx1g3cajm8ixm46f9471hym3f7k16l8rknsxrsys8wlrvnfgsr";
+      };
+      packageRequires = [ sapling ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/vc-sapling.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  vcomplete = callPackage (
    {
      elpaBuild,
@@ -6022,10 +6189,10 @@
    elpaBuild {
      pname = "web-mode";
      ename = "web-mode";
-      version = "17.3.24.0.20260623.0";
+      version = "17.3.25.0.20260831.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.24.0.20260623.0.tar";
-        sha256 = "0k6p06qbcclc2hywplpk09iz266k80zhlw4031whrrrmij9700j6";
+        url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.25.0.20260831.3.tar";
+        sha256 = "0fgdyyjsm52f6ch6wy4ljf1nrn1phh3y5s43xw0s3v30gv12mhbr";
      };
      packageRequires = [ ];
      meta = {
@@ -6135,10 +6302,10 @@
    elpaBuild {
      pname = "with-editor";
      ename = "with-editor";
-      version = "3.5.3.0.20260731.0";
+      version = "3.5.4.0.20260901.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.5.3.0.20260731.0.tar";
-        sha256 = "0krl879xvsn8nm72z7vx05h5x4zcxz5lv154y3grinx763chkswj";
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.5.4.0.20260901.0.tar";
+        sha256 = "01diy9i4z27r3i528idwr0xgm94zd7xwiw48272wmgh85bggfqwl";
      };
      packageRequires = [
        compat
@@ -6249,10 +6416,10 @@
    elpaBuild {
      pname = "xah-fly-keys";
      ename = "xah-fly-keys";
-      version = "28.11.20260729193514.0.20260729.0";
+      version = "28.11.20260901082352.0.20260901.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260729193514.0.20260729.0.tar";
-        sha256 = "0n0xl7z9qz4qnf5h7qky1xwy02kzigyrf9nhn2jcqaf9msk2yqfr";
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260901082352.0.20260901.0.tar";
+        sha256 = "1cqsxw5ndlcrppcjayz9gsil6nhlzzhh4j04zsrqp27iljdr0h65";
      };
      packageRequires = [ ];
      meta = {
@@ -6313,10 +6480,10 @@
    elpaBuild {
      pname = "yaml-mode";
      ename = "yaml-mode";
-      version = "0.0.16.0.20260420.21817";
+      version = "0.0.16.0.20260830.20";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20260420.21817.tar";
-        sha256 = "1lbh8w21g897zvi9lys47kj5vkgpr9ifp8lgpr5jcxvsrj0xbayv";
+        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20260830.20.tar";
+        sha256 = "00wg2ynkjw76c0z4g1zy6inim7f3w1rs6vmf3amp4a49mydgdnf8";
      };
      packageRequires = [ ];
      meta = {
@@ -6356,10 +6523,10 @@
    elpaBuild {
      pname = "zenburn-theme";
      ename = "zenburn-theme";
-      version = "2.11.0.0.20260726.0";
+      version = "2.11.0.0.20260901.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.11.0.0.20260726.0.tar";
-        sha256 = "0466hc1fcfxfk74s0xblsw7ch2bj9wl585b19mzqx25cb9siq9ia";
+        url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.11.0.0.20260901.3.tar";
+        sha256 = "0sbm9n865klpggg6plmm3v7pb3082xgax3bxlv9b6mg2wifjiaim";
      };
      packageRequires = [ ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -75,10 +75,10 @@
    elpaBuild {
      pname = "aidermacs";
      ename = "aidermacs";
-      version = "1.11";
+      version = "1.13";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.11.tar";
-        sha256 = "1qkbl1hy85qrn9jfixbwmi3hqs91brw7rnxk3f9akydpr57xr07j";
+        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.13.tar";
+        sha256 = "0ikwyyfq67zqkd6kxgvgscbhdgmy8lwb86sq8bq1yw9xdrbj9mng";
      };
      packageRequires = [
        compat
@@ -291,10 +291,10 @@
    elpaBuild {
      pname = "autothemer";
      ename = "autothemer";
-      version = "0.2.18";
+      version = "0.2.19";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar";
-        sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d";
+        url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.19.tar";
+        sha256 = "0mx99y7ygf36a7kr89s04xzyjgrmbia457dw21kvhs6jwksgdl4x";
      };
      packageRequires = [ dash ];
      meta = {
@@ -566,10 +566,10 @@
    elpaBuild {
      pname = "casual";
      ename = "casual";
-      version = "2.17.1";
+      version = "3.0.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/casual-2.17.1.tar";
-        sha256 = "0wnr7lqb3c6wzcbjh19cj00jdh3rhplzyxq2khk009pfld861pa3";
+        url = "https://elpa.nongnu.org/nongnu/casual-3.0.2.tar";
+        sha256 = "1hiql2wqvqk3c9y2mxa19l9ns64f469k58ca5wpg5jjflq02hjyq";
      };
      packageRequires = [
        csv-mode
@@ -682,6 +682,34 @@
      };
    }
  ) { };
+  codex-ide = callPackage (
+    {
+      compat,
+      eat,
+      elpaBuild,
+      fetchurl,
+      keymap-popup,
+      lib,
+    }:
+    elpaBuild {
+      pname = "codex-ide";
+      ename = "codex-ide";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/codex-ide-0.1.3.tar";
+        sha256 = "104lgsm224d25rmxi79rf6z7w47c0x3224gyyxmyib2zsd8cp01a";
+      };
+      packageRequires = [
+        compat
+        eat
+        keymap-popup
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/codex-ide.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  coffee-mode = callPackage (
    {
      cl-lib ? null,
@@ -735,10 +763,10 @@
    elpaBuild {
      pname = "cond-let";
      ename = "cond-let";
-      version = "1.1.3";
+      version = "1.1.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/cond-let-1.1.3.tar";
-        sha256 = "0zxirrq3rps48irxab1m1hkvbxjfahibfaynl4qb0lrz0bv8dzcf";
+        url = "https://elpa.nongnu.org/nongnu/cond-let-1.1.4.tar";
+        sha256 = "1ycb83llj94d78v80l14snsk5ih748cw4q68fsmxwdrx77jvr492";
      };
      packageRequires = [ ];
      meta = {
@@ -1098,6 +1126,27 @@
      };
    }
  ) { };
+  doom-game = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "doom-game";
+      ename = "doom-game";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/doom-game-0.4.tar";
+        sha256 = "1174hrzng98sk2whnrm2ax37a4lfnm07yvm37iww919lv3mffpqf";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/doom-game.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  dracula-theme = callPackage (
    {
      elpaBuild,
@@ -1280,10 +1329,10 @@
    elpaBuild {
      pname = "eldoc-mouse";
      ename = "eldoc-mouse";
-      version = "3.0.8";
+      version = "3.0.10";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/eldoc-mouse-3.0.8.tar";
-        sha256 = "1snacbxjqp8ykic5z1nzhg0fnd5fnafsgwxmfd9vy4rsm0ag9mrl";
+        url = "https://elpa.nongnu.org/nongnu/eldoc-mouse-3.0.10.tar";
+        sha256 = "1jjp2iwgv2lj1b84yk66vm04rh3f34d84rkahyk37jdba1d7gfkh";
      };
      packageRequires = [
        eglot
@@ -1331,10 +1380,10 @@
    elpaBuild {
      pname = "elfeed";
      ename = "elfeed";
-      version = "4.1.1";
+      version = "4.2.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/elfeed-4.1.1.tar";
-        sha256 = "08zssaqkzmlg1rq678l76lf55fq22zanf0hrq3xxzngnsj9ib2ar";
+        url = "https://elpa.nongnu.org/nongnu/elfeed-4.2.0.tar";
+        sha256 = "1qk1f27cz3l2wxdpicc07f47h28dxnc0h42gpp7gv7xcwy35gmnw";
      };
      packageRequires = [ compat ];
      meta = {
@@ -1355,10 +1404,10 @@
    elpaBuild {
      pname = "elfeed-web";
      ename = "elfeed-web";
-      version = "4.0.0";
+      version = "4.1.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/elfeed-web-4.0.0.tar";
-        sha256 = "0ah6zjcihxfra34zglqrj6pnxqnakgc58dlkgjzgrxdamx4dxfwg";
+        url = "https://elpa.nongnu.org/nongnu/elfeed-web-4.1.0.tar";
+        sha256 = "0khkpw4cfwcaxc5h6xkvyag5zkimb0zwi71si6jyym8z5csfk4km";
      };
      packageRequires = [
        compat
@@ -1578,10 +1627,10 @@
    elpaBuild {
      pname = "evil-collection";
      ename = "evil-collection";
-      version = "3.0.1";
+      version = "3.0.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/evil-collection-3.0.1.tar";
-        sha256 = "1h7xb2vgpw1wgz6b7544d9yyhvcjmhwaqxrp21h9qyjd23vaj6vg";
+        url = "https://elpa.nongnu.org/nongnu/evil-collection-3.0.3.tar";
+        sha256 = "1zb34mlv5fqmh5nl0kphrfy1grz41b3wnk05l2z0y8k3v33ymbh8";
      };
      packageRequires = [ evil ];
      meta = {
@@ -1981,10 +2030,10 @@
    elpaBuild {
      pname = "fj";
      ename = "fj";
-      version = "0.37";
+      version = "0.42";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/fj-0.37.tar";
-        sha256 = "1kya5xif5ffiqv9fk4mxwx6x6gqshkpji21z0q84q438hfbxpwl9";
+        url = "https://elpa.nongnu.org/nongnu/fj-0.42.tar";
+        sha256 = "0k967nd2iky2simr4sh48f7v74ksw2irynrnp9k3xa7zcbyvy5xd";
      };
      packageRequires = [
        fedi
@@ -2029,10 +2078,10 @@
    elpaBuild {
      pname = "flx";
      ename = "flx";
-      version = "0.6.2";
+      version = "0.6.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar";
-        sha256 = "00d3q238grxcvnx6pshb7ajbz559gfp00pqaq56r2n5xqrvrxfnc";
+        url = "https://elpa.nongnu.org/nongnu/flx-0.6.3.tar";
+        sha256 = "01dpzw3ghfprrcn8ankbawxis3xc9ri6pw5s33kgam3gimyvn5ad";
      };
      packageRequires = [ cl-lib ];
      meta = {
@@ -2052,10 +2101,10 @@
    elpaBuild {
      pname = "flx-ido";
      ename = "flx-ido";
-      version = "0.6.2";
+      version = "0.6.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar";
-        sha256 = "1933d3dcwynzs5qnv3pl4xdybj5gg0sa8zb58j0ld9hyiacm6zn5";
+        url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.3.tar";
+        sha256 = "0j30638d3kakg8ms5l2yh05gd1i41kjs7lgq2ca32zx4m52vjf56";
      };
      packageRequires = [
        cl-lib
@@ -2077,10 +2126,10 @@
    elpaBuild {
      pname = "flycheck";
      ename = "flycheck";
-      version = "38.3";
+      version = "39.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/flycheck-38.3.tar";
-        sha256 = "0qpkgj5algs1l876sf9q64anfpc1dc86nbphx0jc208da00gl06i";
+        url = "https://elpa.nongnu.org/nongnu/flycheck-39.0.tar";
+        sha256 = "1gf0yz6jpxxfp7bicqy3a18ddrxhzwivgdz8k9ivmssbwjyn77fm";
      };
      packageRequires = [ seq ];
      meta = {
@@ -2278,10 +2327,10 @@
    elpaBuild {
      pname = "geiser";
      ename = "geiser";
-      version = "0.33.1";
+      version = "0.33.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/geiser-0.33.1.tar";
-        sha256 = "0mh701hp587ahiqf0znnc4jm46i49z85nwac4bxn7sxxjid3xffl";
+        url = "https://elpa.nongnu.org/nongnu/geiser-0.33.2.tar";
+        sha256 = "0qgkdz0jb5ra322pvpjfg4xps6jyv8pw052ay1gi6hmxiz4pn6jm";
      };
      packageRequires = [ project ];
      meta = {
@@ -2755,10 +2804,10 @@
    elpaBuild {
      pname = "gptel";
      ename = "gptel";
-      version = "0.9.9.5";
+      version = "0.9.9.6";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/gptel-0.9.9.5.tar";
-        sha256 = "1x1sd8g5fbgidj40ri9xg0rvyxdyjpxxnr45i0dj8d333nvssdq0";
+        url = "https://elpa.nongnu.org/nongnu/gptel-0.9.9.6.tar";
+        sha256 = "1pd5gjfwvambhbxl0dl5rh7fs2zy338a9zvcfn46gvvkwarq99ha";
      };
      packageRequires = [
        compat
@@ -2822,10 +2871,10 @@
    elpaBuild {
      pname = "gruvbox-theme";
      ename = "gruvbox-theme";
-      version = "1.30.1";
+      version = "1.30.3";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar";
-        sha256 = "1y30aahdxzdfmj021vbrz4zmdq6lr9k08hna9i1a8g4cywgbz8ri";
+        url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.3.tar";
+        sha256 = "1g2drp4gx7z5qaxpfira0xrc2mhrqbda0ag32zbdyrv1jcw6h9im";
      };
      packageRequires = [ autothemer ];
      meta = {
@@ -2988,6 +3037,34 @@
      };
    }
  ) { };
+  hermes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      keymap-popup,
+      lib,
+      markdown-mode,
+      websocket,
+    }:
+    elpaBuild {
+      pname = "hermes";
+      ename = "hermes";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/hermes-0.7.0.tar";
+        sha256 = "0g2rqq1r1np0z1f0kqqfnrnixq729v84gq0frhc6d3rmrp6lv0z1";
+      };
+      packageRequires = [
+        keymap-popup
+        markdown-mode
+        websocket
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/hermes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  hideshowvis = callPackage (
    {
      elpaBuild,
@@ -3366,10 +3443,10 @@
    elpaBuild {
      pname = "jabber";
      ename = "jabber";
-      version = "0.13.1";
+      version = "0.14.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/jabber-0.13.1.tar";
-        sha256 = "16w115nbbl4c381va1yrxp01hvc0ck944sj493ffivmgmha50sh9";
+        url = "https://elpa.nongnu.org/nongnu/jabber-0.14.0.tar";
+        sha256 = "1wbb1gn6xv0ag118ygys5f8rgkdq5b2lkhksiywfpsqqw9kf71yv";
      };
      packageRequires = [
        fsm
@@ -3728,10 +3805,10 @@
    elpaBuild {
      pname = "magit";
      ename = "magit";
-      version = "4.7.0";
+      version = "4.7.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-4.7.0.tar";
-        sha256 = "1b3n8y7ai7411cxiafdq6din84ka08451f6b168pc0s4bqpb2r1z";
+        url = "https://elpa.nongnu.org/nongnu/magit-4.7.1.tar";
+        sha256 = "1rgjrwx0ifkxb1hcfcq6h0zrk5ymvhirijxlhz695snxmqs8mlxj";
      };
      packageRequires = [
        compat
@@ -3761,10 +3838,10 @@
    elpaBuild {
      pname = "magit-section";
      ename = "magit-section";
-      version = "4.7.0";
+      version = "4.7.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-section-4.7.0.tar";
-        sha256 = "12d8pb8681bmbblbzb8g395hyc2jh209r6i5kx1apr9017mfh6r2";
+        url = "https://elpa.nongnu.org/nongnu/magit-section-4.7.1.tar";
+        sha256 = "1gsqcigjb8hr799faihhnxqa2pm93yzs0vc7qpy2acrra3x7qhk5";
      };
      packageRequires = [
        compat
@@ -3801,6 +3878,7 @@
  ) { };
  mastodon = callPackage (
    {
+      compat,
      elpaBuild,
      fetchurl,
      lib,
@@ -3810,12 +3888,13 @@
    elpaBuild {
      pname = "mastodon";
      ename = "mastodon";
-      version = "2.0.17";
+      version = "2.1.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.17.tar";
-        sha256 = "1yg1fylz1dp7my8zfnscnvd1sdhjhi45xw10sqn3rmqmmrwd87d9";
+        url = "https://elpa.nongnu.org/nongnu/mastodon-2.1.4.tar";
+        sha256 = "0zh8mskr7dzwl09cf1jza63skiq13xf84iqslww8scmyhhzmgnka";
      };
      packageRequires = [
+        compat
        persist
        tp
      ];
@@ -4214,6 +4293,27 @@
      };
    }
  ) { };
+  org-history = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-history";
+      ename = "org-history";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-history-0.5.2.tar";
+        sha256 = "0fnic45ppibjx5d576s5d3cxh4dc4jc66nxyx9m1b5jxik53a2wx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/org-history.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  org-journal = callPackage (
    {
      elpaBuild,
@@ -4612,10 +4712,10 @@
    elpaBuild {
      pname = "pg";
      ename = "pg";
-      version = "0.68";
+      version = "0.69";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/pg-0.68.tar";
-        sha256 = "0nnr5gz4bm0hfdwj8f0vkfwb2apbk5sv3l85q7b420nwcs7d546r";
+        url = "https://elpa.nongnu.org/nongnu/pg-0.69.tar";
+        sha256 = "1xmghf7wjcwc1gd780ycbadg24irr6xdjfwgjg1v6r96v62ss4mf";
      };
      packageRequires = [ peg ];
      meta = {
@@ -4633,10 +4733,10 @@
    elpaBuild {
      pname = "php-mode";
      ename = "php-mode";
-      version = "1.26.1";
+      version = "1.28.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/php-mode-1.26.1.tar";
-        sha256 = "151hk9kmwlaq243qfwh2s1vqk5xsyikl9gj5b65ywhhf326dirz1";
+        url = "https://elpa.nongnu.org/nongnu/php-mode-1.28.0.tar";
+        sha256 = "1vmwb391l67517iwkvf7fpy4jxpbdf7w7nk42m615i0gvbizvfym";
      };
      packageRequires = [ ];
      meta = {
@@ -4645,6 +4745,27 @@
      };
    }
  ) { };
+  pinyin-isearch = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pinyin-isearch";
+      ename = "pinyin-isearch";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/pinyin-isearch-1.7.2.tar";
+        sha256 = "05ikv89b8w3yhjmf97vgqnlppycfini2fivxl5cc25865pbi2dn3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/pinyin-isearch.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  popon = callPackage (
    {
      elpaBuild,
@@ -4739,10 +4860,10 @@
    elpaBuild {
      pname = "projectile";
      ename = "projectile";
-      version = "3.3.0";
+      version = "3.4.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/projectile-3.3.0.tar";
-        sha256 = "0hcrccqqyb4qlpxcd4l33ksj85186n9qg82738b3w9c4cbmwnnr0";
+        url = "https://elpa.nongnu.org/nongnu/projectile-3.4.0.tar";
+        sha256 = "14awc69qxq4xpz7k5hm4jsqsf9krgwf07w5k6yg5ibzk3x0prypn";
      };
      packageRequires = [ compat ];
      meta = {
@@ -4804,10 +4925,10 @@
    elpaBuild {
      pname = "racket-mode";
      ename = "racket-mode";
-      version = "1.0.20260726.0";
+      version = "1.0.20260908.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20260726.0.tar";
-        sha256 = "1c44jx4k8g41pkf7lpvpf1wz47nmf0s26153clkdgkfxp64p1bm0";
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20260908.0.tar";
+        sha256 = "11b9rh6bzqav9pbsrms4v9qip3vlsl3gzcaq0pq70y8zcd7zc4c1";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5026,6 +5147,28 @@
      };
    }
  ) { };
+  sapling = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "sapling";
+      ename = "sapling";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/sapling-0.3.2.tar";
+        sha256 = "05cs0mc1129bpffach5kl73kpd33a6lj5vvr33fggcspv9ddxbv4";
+      };
+      packageRequires = [ transient ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/sapling.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  sass-mode = callPackage (
    {
      elpaBuild,
@@ -5206,10 +5349,10 @@
    elpaBuild {
      pname = "simple-httpd";
      ename = "simple-httpd";
-      version = "1.6";
+      version = "1.7";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/simple-httpd-1.6.tar";
-        sha256 = "08rkqid2c11dl0sm8795jzkiilj02kbq6xy56b3bh83pc09wfmay";
+        url = "https://elpa.nongnu.org/nongnu/simple-httpd-1.7.tar";
+        sha256 = "10frydnqcgxmrbiy8aw4kaf9phfhrijl4286lx6krsmlxhf8vflc";
      };
      packageRequires = [ compat ];
      meta = {
@@ -5368,7 +5511,6 @@
  ) { };
  standard-keys-mode = callPackage (
    {
-      compat,
      elpaBuild,
      fetchurl,
      lib,
@@ -5376,12 +5518,12 @@
    elpaBuild {
      pname = "standard-keys-mode";
      ename = "standard-keys-mode";
-      version = "1.0.0";
+      version = "1.0.1";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/standard-keys-mode-1.0.0.tar";
-        sha256 = "1c673y9xaw3i09ihhx7qbixm7rvyynxkv304wafrv7aflrzqranj";
+        url = "https://elpa.nongnu.org/nongnu/standard-keys-mode-1.0.1.tar";
+        sha256 = "0a9gmgr1rzaggyskpxwq47f7fh6rv04qwp1h7mnapzz8004635x1";
      };
-      packageRequires = [ compat ];
+      packageRequires = [ ];
      meta = {
        homepage = "https://elpa.nongnu.org/nongnu/standard-keys-mode.html";
        license = lib.licenses.free;
@@ -5439,10 +5581,10 @@
    elpaBuild {
      pname = "subed";
      ename = "subed";
-      version = "1.5.1";
+      version = "1.5.2";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/subed-1.5.1.tar";
-        sha256 = "0gk9r2dvmrxpz4gpypnnzjgph6xasn5f9i51cx1hnd9r5zim2qy3";
+        url = "https://elpa.nongnu.org/nongnu/subed-1.5.2.tar";
+        sha256 = "1qgcq06nkabw0rqsr478pj8cnfp114q83i1w69gm1y5qhhvpnwyn";
      };
      packageRequires = [ ];
      meta = {
@@ -5590,10 +5732,10 @@
    elpaBuild {
      pname = "tabspaces";
      ename = "tabspaces";
-      version = "1.10.1";
+      version = "1.11.0";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/tabspaces-1.10.1.tar";
-        sha256 = "11dzyv2pi42dhdlb5vqfg3nslkirqvf078j45nrbagp7g28f43zk";
+        url = "https://elpa.nongnu.org/nongnu/tabspaces-1.11.0.tar";
+        sha256 = "1gfvykgg8ngrssb79fdlaqzcgvhhhlda28a3w77766w9gsvgcycr";
      };
      packageRequires = [ project ];
      meta = {
@@ -5989,6 +6131,28 @@
      };
    }
  ) { };
+  vc-sapling = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      sapling,
+    }:
+    elpaBuild {
+      pname = "vc-sapling";
+      ename = "vc-sapling";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/vc-sapling-0.2.1.tar";
+        sha256 = "03qwybz6b8zi2ky9b29fy0h5443v3sp4d7f8xn6v85r3694a38kd";
+      };
+      packageRequires = [ sapling ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/vc-sapling.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
  vcomplete = callPackage (
    {
      elpaBuild,
@@ -6062,10 +6226,10 @@
    elpaBuild {
      pname = "web-mode";
      ename = "web-mode";
-      version = "17.3.24";
+      version = "17.3.25";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.24.tar";
-        sha256 = "129hz6h2ygmqhn3bbjxx2gpdnvh0gifc4xaipsjz0716rj1s0k81";
+        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.25.tar";
+        sha256 = "1a52p408a99by7p1xdv1yy2m389c0l3s54mf2b44rqpskzgr6g3m";
      };
      packageRequires = [ ];
      meta = {
@@ -6175,10 +6339,10 @@
    elpaBuild {
      pname = "with-editor";
      ename = "with-editor";
-      version = "3.5.3";
+      version = "3.5.4";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/with-editor-3.5.3.tar";
-        sha256 = "1fvd0zfapw5yavlc8wy52xx4561z1zljcjy215371w6sk8ddw0c7";
+        url = "https://elpa.nongnu.org/nongnu/with-editor-3.5.4.tar";
+        sha256 = "09kzcfqm23yiqqf380y2122qadgbmhk1r2275vpfk6zczip1blvd";
      };
      packageRequires = [
        compat
@@ -6289,10 +6453,10 @@
    elpaBuild {
      pname = "xah-fly-keys";
      ename = "xah-fly-keys";
-      version = "28.11.20260729193514";
+      version = "28.11.20260901082352";
      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260729193514.tar";
-        sha256 = "1gdk8lrsmng615jhkf7k5csszwg92z7ph54a3975nk5sr5ygrjqz";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260901082352.tar";
+        sha256 = "1h4923fwqy45173pc8li6n78nd4arrb6p8q33c5zig4z4d17sv6b";
      };
      packageRequires = [ ];
      meta = {
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -262,8 +262,8 @@ let
        mktplcRef = {
          name = "ng-template";
          publisher = "Angular";
-          version = "22.1.0";
-          hash = "sha256-/PftUvaE9EjsKRc0TnF0lftOgp5fzKmR+KGhocXEMrk=";
+          version = "22.1.1";
+          hash = "sha256-tNhn+T9i8+zaGqK5Gio1zj3eUrwG2+RQgscErl+prtM=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@@ -1473,8 +1473,8 @@ let
        mktplcRef = {
          name = "protobuf-vsc";
          publisher = "DrBlury";
-          version = "1.6.9";
-          hash = "sha256-4Mas35dRrPaXvrlpe0HdCUp/1+XDwhLeUhnq7EvKsco=";
+          version = "1.6.14";
+          hash = "sha256-wup+gWozELTO6jcNF5HZR1oRRwnGMor/PuEtdpRGz8g=";
        };
        meta = {
          description = "Comprehensive Protocol Buffers support with syntax highlighting, IntelliSense, diagnostics and formatting";
@@ -1742,8 +1742,8 @@ let
        mktplcRef = {
          name = "dependi";
          publisher = "fill-labs";
-          version = "0.7.28";
-          hash = "sha256-aUmVt5zlDFt+c9BmfDkKHtdBMEumlG+Wupz8iW681Uw=";
+          version = "1.5.0";
+          hash = "sha256-LN1rW0IyC5BAdM6OynoHldm+adTYG8He6SaDh20fNbs=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog";
@@ -5552,8 +5552,8 @@ let
        mktplcRef = {
          name = "markdown-editor";
          publisher = "zaaack";
-          version = "0.1.20";
-          hash = "sha256-YewK36OeKWgTU/iFRVZHYjF2+ke6TXb6HIggRZt1/nk=";
+          version = "0.1.21";
+          hash = "sha256-P3AmPOq8G10JO8fhpHvvoh3VOFtJFyKF7JteFLkHmCE=";
        };
        meta = {
          description = "Visual Studio Code extension for WYSIWYG markdown editing";
--- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    publisher = "ms-pyright";
    name = "pyright";
-    version = "1.1.413";
-    hash = "sha256-LsN2T00fqPOOz5ZxknD2nmifIhy4lqcb11eu8hiQ1C4=";
+    version = "1.1.414";
+    hash = "sha256-bDi3kSRCQXZkZ/VX1/pq7F70y+/WvEtNm64MMoOjEU4=";
  };

  meta = {
--- a/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "explorer";
    publisher = "vitest";
-    version = "1.50.8";
-    hash = "sha256-LkfCnEELkdj1BRlHZpphM+bTSh/U7oE11U/E+Hx/8sU=";
+    version = "1.52.0";
+    hash = "sha256-umMYz17CGdqOtRAsGqtLpBElFteK2vkBsnlEnZPd5zc=";
  };
  meta = {
    changelog = "https://github.com/vitest-dev/vscode/releases";
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -853,59 +853,59 @@
    }
  },
  "ungoogled-chromium": {
-    "version": "152.0.7977.82",
+    "version": "153.0.8010.36",
    "deps": {
      "depot_tools": {
-        "rev": "38c391feba5fb96812f9028da12413ffc39df394",
-        "hash": "sha256-yOd+k4GJ/unOVCm2Fj1oDHOMKV87CuBO/z0li3owNQk="
+        "rev": "6411ed52842756261c66b6b8ece6b53ade2570f1",
+        "hash": "sha256-x08CgrvsdaP0+MY8ea0H8jWjgc7/B+ipRhpCLm41lBQ="
      },
      "gn": {
-        "version": "0-unstable-2026-07-23",
-        "rev": "641ace93dd9560e75e7add0d08f77b446fbb3b78",
-        "hash": "sha256-ovLx6KaORdXqnWgbsGEty10k2CHuCmTk3yEqy5//ovk="
+        "version": "0-unstable-2026-08-14",
+        "rev": "e8a8e0932a5e42a99e5896aa58e3b8290f4e5b8c",
+        "hash": "sha256-qvQ13Ws2tb4i2Hdu34kBHivYPAn8w06zjLdQgK4BIJg="
      },
      "ungoogled-patches": {
-        "rev": "152.0.7977.82-1",
-        "hash": "sha256-5KxsbzpRybc/ub6HJbN6QkJVL4iDdoAXE7vwjtjAJXA="
+        "rev": "153.0.8010.36-1",
+        "hash": "sha256-JyvizS0oJC8J6VhtnpTKUGVbc31KCvTvwa4TmO+CHaY="
      },
      "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
    },
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "d04cdb24d67b081f6cf80200ffc5233f44b61109",
-        "hash": "sha256-JiYTfMJBtUWMUSicQdSCXNUtgjLGeaMj4vCNpMvYACk=",
+        "rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
+        "hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
-        "rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11",
-        "hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0="
+        "rev": "70510081984cfcdb14a15b3e08dfe9776dc7ed37",
+        "hash": "sha256-IC5Dy3elgEezXmRyDbafx5i+V9wiDLMmnpi7O7BucdE="
      },
      "src/third_party/compiler-rt/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "e1c9323385b40780f574f440a8a9ad83855712b0",
-        "hash": "sha256-oxGL+ct1z5S9wduYINjiZrjJx1HlAJjyMPEoDyhIfvo="
+        "rev": "0ccff08262472b88b5d5d193342d84ba4f6fa3fa",
+        "hash": "sha256-+HdvQVqX5F0ylUccsk3H4nx6TEwMr53HCyAlKC4IQPk="
      },
      "src/third_party/libc++/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "b16984ce99c702355a5b2b4c52574e82cec41fb9",
-        "hash": "sha256-ZVgUAi5rYj17N3nAEvLQXZLCxnmvxIo2RpJ3geTSyWQ="
+        "rev": "97b436da4c33663581d394f4ee0a5977fc38c2f4",
+        "hash": "sha256-HMvG9asIDID5KHhQdScfVYx/7iU9+5o1BjOXf0Ev7JY="
      },
      "src/third_party/libc++abi/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "8f11bb1d4438d0239d0dfc1bd9456a9f31629dda",
-        "hash": "sha256-L5CUvhpOLS+NBNGssCv0pY9rsDFuAI0LlPjXQRfy62A="
+        "rev": "fc1897a2c12aa27e703c3ed48b62eba8abf4ce19",
+        "hash": "sha256-oH39u1eOso+gV3hHMJ9DFM8FzSbYMFJmWKVbOyX0VoU="
      },
      "src/third_party/libunwind/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "b2ff0e6b9ac002918d7a9ce982eee88dcc27a450",
-        "hash": "sha256-VK9w68Im896xi4cymhtfvh7xdRJZB78YEvUYyxqBu48="
+        "rev": "0790de42df7835816d95ce62c598f9fef5ef4e6c",
+        "hash": "sha256-XbJ5wvqLsRqkZzcvtE0XZjs0XLREaed1N8/nQF4esyw="
      },
      "src/third_party/llvm-libc/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "3ea89f4304312567e31a8eb45e0737577e65b676",
-        "hash": "sha256-g8ZtRI0yazHgli0/TMz/SeAJ5SoMZdir+/29GFQAczM="
+        "rev": "20fd93c3ba54634c545ae2045fb207e7e58bb648",
+        "hash": "sha256-KlYMGfOIIIFwsZPxXKPCA06PJW2+hO84ql5uow2ONRY="
      },
      "src/chrome/test/data/perf/canvas_bench": {
        "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -924,8 +924,8 @@
      },
      "src/docs/website": {
        "url": "https://chromium.googlesource.com/website.git",
-        "rev": "e9dfa88cee41c025709e79164ceb0758cfe76a67",
-        "hash": "sha256-mWAwegdaC7LEOYN5Y/xcJBv4R9dInK4VW35/U8rn7Wg="
+        "rev": "ebebad7d52ad3d28f5a21a75561e9bc2b496e472",
+        "hash": "sha256-QZ+SA3FYN0bbfmmLOKLqbxWW1oGN+IigsJrz8ZtTXRI="
      },
      "src/media/cdm/api": {
        "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -934,8 +934,8 @@
      },
      "src/net/third_party/quiche/src": {
        "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "1ba0d99a5c2fec4f4dbb7f98f251b05dcf4e2968",
-        "hash": "sha256-odzVQD9WyldgAv8QRvXABKaSLy1DL6DRhdVQSer4HVM="
+        "rev": "2c4a124642f095f995cd2e9e2fe10decc08df662",
+        "hash": "sha256-5lcY8lJ+nwRrNe9oycRE4C9FzmkqlWyBL4J/YYSiWiQ="
      },
      "src/testing/libfuzzer/fuzzers/wasm_corpus": {
        "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -944,8 +944,8 @@
      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "7df613367a1d4ca9aea9ece344d4580d32d132a9",
-        "hash": "sha256-bYGok5QvWJoCfliRPQqrDz0ttKf1r9HoFxoC4qwdI3o="
+        "rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
+        "hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -959,18 +959,13 @@
      },
      "src/third_party/angle/third_party/VK-GL-CTS/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "3b7cbad78e93bcda20ccf68efae2d71695dd0f65",
-        "hash": "sha256-bPgrkZ3my/tl+H2/YuAxmn83svPSw4l6lnz8zGHQtuk="
+        "rev": "0b04c470ed78569b0b778ece1262d88455ab2b00",
+        "hash": "sha256-PuB0CciB7Gp5f68f5lGxg7f3avOYIFTOJQ1ZKRkuUHc="
      },
      "src/third_party/anonymous_tokens/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "e07c92bc81cfd4203e6158cac115fc44c27b31b8",
-        "hash": "sha256-NY/RkTCl/7KBJuIS6pa3sjdgyccWDrSfrUwBqWgL/4I="
-      },
-      "src/third_party/aria-practices/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git",
-        "rev": "7b134ce6d19497cce8a67db4a9f59980baf853dc",
-        "hash": "sha256-POnvoO1KfzJj4CbcMPI0pUTRk5EtHLTOyKKmJCZdXOc="
+        "rev": "de00da44e56cf44f15d7aefe69e122e743e5a019",
+        "hash": "sha256-pV0ltk+MOZSgg92w2VYy2PCK8RLwkoG4hLWpeMxdMvk="
      },
      "src/third_party/readability/src": {
        "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -979,28 +974,28 @@
      },
      "src/third_party/content_analysis_sdk/src": {
        "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
-        "rev": "2a8191af30a4d1f591e2f758e595bdeea139e93a",
-        "hash": "sha256-EoEyau3eFcfnftdUSQuLiikIEwVZR7E4Th+qkCdk7kU="
+        "rev": "0a0e7ea516249e786d5a8884552bbd6e163d89cb",
+        "hash": "sha256-dRK4RDkoYcpmRKap6W6lUlP9yyzXj7c/DJlug1mjazc="
      },
      "src/third_party/dav1d/libdav1d": {
        "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "54706fc6bc0cdecab7e9593974a4039cc038fca7",
-        "hash": "sha256-L3a9MmPWJlxmRa19glWDLvkXHev5oiM5/fxtKOBPMxI="
+        "rev": "52b9d3d3ec525f5a20849145fa0e879d585f4911",
+        "hash": "sha256-WVsYrZcVQMCmfjFPFKzh5JZJY46+DnUquin9lsQclWI="
      },
      "src/third_party/dawn": {
        "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "ab8827bc57b176eeaa89f71324130c02d4d41145",
-        "hash": "sha256-Xd1FsdIBO6hzNECnNnXR0306woHl5/L+5WZ/pxTlYfA="
+        "rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
+        "hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
      },
      "src/third_party/dawn/third_party/glfw3/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
-        "rev": "463cf73610d911e8eff95ae345143137cf610be4",
-        "hash": "sha256-+WG+0KALV10B+1hOJzyiU4azlJIej/F5DtqtSkEN040="
+        "rev": "92dcf4ce74f2e2554a98fea09be7c705c17daa5a",
+        "hash": "sha256-8Hu8KQIw9SVRuQPzUbl907Xw+ImdX0bkBnqkA4DDmo4="
      },
      "src/third_party/dawn/third_party/directx-shader-compiler/src": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "1f8a14aecd4f2f25991fa9f7aad6c320fea91409",
-        "hash": "sha256-nesLgajCiFHwb2TKwzlCERFb6wOkwqpMT5z6nzj2Q9Y="
+        "rev": "4b537fd7a7f83373000dea9a3d1d308bf47c3d45",
+        "hash": "sha256-bRctHtMo0S4PoSoXJ8XV5D61+trCVBQ+L5kD3huj+ik="
      },
      "src/third_party/dawn/third_party/directx-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -1009,8 +1004,8 @@
      },
      "src/third_party/dawn/third_party/OpenGL-Registry/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
-        "rev": "9d527dbc81bb76e35ba284fe385ed8a5ddb90cbc",
-        "hash": "sha256-vNXA115a0tDvs7cyLobu/9cgCAPFrEYHUFVM8A/AX88="
+        "rev": "e8f7cd0e35ac8d6f5667a021ff83d04b1fec41ef",
+        "hash": "sha256-5muDTFLFRdz24czuBM9x7QIjJdRj3gzJEItP5A8Xypw="
      },
      "src/third_party/dawn/third_party/EGL-Registry/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry",
@@ -1019,13 +1014,13 @@
      },
      "src/third_party/dawn/third_party/webgpu-cts": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "499044af47ec2717e06e644d0943e6fcdb3f3538",
-        "hash": "sha256-M8TWqKdqoiZ01vbDpcRyPWIOaBPCPdSSflxcIpbYjFA="
+        "rev": "2959e1c3959aa55cd3f02726995ae68159d0e064",
+        "hash": "sha256-Z8hszmUjsRupyLk6LTit1R2rZyYfOakTJ75niMwl/Xs="
      },
      "src/third_party/dawn/third_party/webgpu-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "b3f67b89929c133403fd95638be4ef96b56ddca0",
-        "hash": "sha256-pLsvlbh1BCEtfQNejm2XilpelZmNg1/NuLq0agIGqQI="
+        "rev": "01addc4ba8a2915a061b7095a6768b512071ab96",
+        "hash": "sha256-E8SldE2oDNgkWX1CL1NoNSuZQvN6ffKDesWLovI+EGs="
      },
      "src/third_party/disarm/src": {
        "url": "https://chromium.googlesource.com/external/github.com/aengelke/disarm.git",
@@ -1054,13 +1049,13 @@
      },
      "src/third_party/boringssl/src": {
        "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "572a4c68475d284b34675f45ddbb9c158ef3c2ae",
-        "hash": "sha256-gW+Ksd/boITK5ZTDIwhIgPAdPQNi8MvP7ru6qMdtorI="
+        "rev": "defe5810ee8be430bcdeccf46a199bec0e93abdb",
+        "hash": "sha256-u+rYY4gO9oKrkKxSMl/2AnxtdfP2ca+yb+08rvL4qIY="
      },
      "src/third_party/breakpad/breakpad": {
        "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "69e9aada412e81575a95d0d94f4592fe1b8dfc15",
-        "hash": "sha256-v0Qw8nlXR6Dnkbt7I0Fe7HKv9mtf/9h0xl4HaCHPJjA="
+        "rev": "418aacd617897c19d960ec3e649f42ea95a6363a",
+        "hash": "sha256-/lUMLXbjhSzQYQuSBFKdrit2jiAv1oM4bhTyvpN5+bI="
      },
      "src/third_party/cast_core/public/src": {
        "url": "https://chromium.googlesource.com/cast_core/public",
@@ -1069,8 +1064,8 @@
      },
      "src/third_party/catapult": {
        "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "d810008022eeaefcbea50393ea5baa0930b27047",
-        "hash": "sha256-H2CpevfSmr6suNHkkO97u0Nmu1n3g9v36ea+M8JPpZo="
+        "rev": "1d18f6e11082de030c45fd55b556d15e3aa628a8",
+        "hash": "sha256-q2LYVudrEEudWHdoN6UagcoR3l9cx682IvfdB4GZMB8="
      },
      "src/third_party/ced/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1094,8 +1089,8 @@
      },
      "src/third_party/cpuinfo/src": {
        "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d",
-        "hash": "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc="
+        "rev": "66ee79c038d70dad9f08705b2c9b3e58f6d8f512",
+        "hash": "sha256-A+kTj3GthwmO2kKeG3gG/zjvvt45OmuEvAtRLzwfEyM="
      },
      "src/third_party/crc32c/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1104,34 +1099,39 @@
      },
      "src/third_party/cros_system_api": {
        "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "54e5484f94e59fdc31e7821293692a8bb47f88a3",
-        "hash": "sha256-TUW8y9as37owHYgg4mTs9ZUmZ4G+N1Njtrs6eyY5MDU="
+        "rev": "faf06f1112b67fead7dbd81cd9f769f1c9c22726",
+        "hash": "sha256-wdZzNbmtuUu/NhQz2eaNiSeUYiO6jtZ5RYUDQavrhdw="
      },
      "src/third_party/crossbench": {
        "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "eb6e4790f4fc6f2f66a20aba07de9a58985db46b",
-        "hash": "sha256-kEMKNDP57Q3m2eBjb0McScZTxrFpLTIE/9dSAupTOJ4="
+        "rev": "98b5ff69cfec93bbdb98695850e7a15cc82101de",
+        "hash": "sha256-SwjdB0nvdbfnKhCNPhjRpK70P3B5RfDx6KHb6Zjn0YM="
      },
      "src/third_party/crossbench-web-tests": {
        "url": "https://chromium.googlesource.com/chromium/web-tests.git",
-        "rev": "92d748acb154cb58c76ad1d509378d5aa8669755",
-        "hash": "sha256-vh6uX1jXhxDgqfXnme/nh8W+O4Qq+Fx33lSQ08LNunM="
+        "rev": "b9000ed38c9a012d961d72918b4b33000309bb06",
+        "hash": "sha256-3OZeEcJaxMFHUK5JzbhkHdFn1kBWDYsc9GgHCDHUKgg="
      },
      "src/third_party/depot_tools": {
        "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "38c391feba5fb96812f9028da12413ffc39df394",
-        "hash": "sha256-yOd+k4GJ/unOVCm2Fj1oDHOMKV87CuBO/z0li3owNQk="
+        "rev": "6411ed52842756261c66b6b8ece6b53ade2570f1",
+        "hash": "sha256-x08CgrvsdaP0+MY8ea0H8jWjgc7/B+ipRhpCLm41lBQ="
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "04db1f5240b636511ec4e9058a78f8274a7f65ee",
-        "hash": "sha256-vZxKC/QD2dHNnVm9OZI1Bo0Jdnn+AJhFpXYSXXF7JsA="
+        "rev": "511172b786248e29d7493bf954faa57f834dc5b3",
+        "hash": "sha256-jKXBklk5bjhwmJ9DlKmuI33y17JglrZuHejufeTm4t4="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
        "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
        "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw="
      },
+      "src/third_party/ds_store/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/dmgbuild/ds_store.git",
+        "rev": "5cf0b73afdaf6592666364c354501b51c5ce606e",
+        "hash": "sha256-o9oI002FqQHe15yZbv4I7bHMr1NkFghKnLaZKNHZswQ="
+      },
      "src/third_party/dragonbox/src": {
        "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git",
        "rev": "beeeef91cf6fef89a4d4ba5e95d47ca64ccb3a44",
@@ -1139,8 +1139,8 @@
      },
      "src/third_party/eigen3/src": {
        "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "d53ac33805ba0a23fa139adaf24227fb6707e6fa",
-        "hash": "sha256-+s/4HVUzKJR5OVcoxwiEzB8F89lov24g0HBPg3tp9Xs="
+        "rev": "76a7c53018c33cd39e0effeb697fa3295bbd3179",
+        "hash": "sha256-R5VxpUMkWwr41wYDA+8Z72aSg0q7+8PX9R7PFRanllg="
      },
      "src/third_party/farmhash/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1159,8 +1159,8 @@
      },
      "src/third_party/ffmpeg": {
        "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "2b68d2babae73714846961fb0ee47e3b3d2e39a9",
-        "hash": "sha256-Bl8lAM5sHLZ9BHSIaWr5+P/8s014SXsgSmdLya5gd64="
+        "rev": "53fa34a23be9054d25ac2500dbdae9a0e570bb5c",
+        "hash": "sha256-yQE2hS6iClqZQqXXRkzjrYZQh9PIkHhLOeQ8V/j7eKU="
      },
      "src/third_party/flac": {
        "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1189,8 +1189,8 @@
      },
      "src/third_party/freetype/src": {
        "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "656cb777798fa420a13faba3758779e9ed6c4798",
-        "hash": "sha256-i1X/ETNJTAL3A5pOiUcZRYpqjhPvZIm8FG1HMQreW6g="
+        "rev": "9e9d3b73f31367dbb4261f93c727a277f6632c77",
+        "hash": "sha256-NoXERTcn2SIddhYFtAdRlnikNtVR9GB48aMJqCRwP3E="
      },
      "src/third_party/fxdiv/src": {
        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1199,18 +1199,13 @@
      },
      "src/third_party/harfbuzz/src": {
        "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "28f4dc622fef010dab12f4275ac195b5d4a4a704",
-        "hash": "sha256-wqycfs0TITlLu0iJICjAqSX82u8LGrr/NaZ+pgPvycs="
+        "rev": "dfdc088c4d7c5d31dd5b13070b919b51f6c21ea8",
+        "hash": "sha256-DNWpvXkuTMc89lZTTrVWPMj9YQCw80gxOCh2Gmnlw70="
      },
      "src/third_party/ink/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "e781093cb91ad22a666f1880f5122fe2ed30ecfd",
-        "hash": "sha256-j9FIfGrrNEQB3wI2zMvjUksLBEdx8yrVf1NAbJSyjAI="
-      },
-      "src/third_party/instrumented_libs": {
-        "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
-        "rev": "e8cb570a9a2ee9128e2214c73417ad2a3c47780b",
-        "hash": "sha256-5cb9qhSEzb941pF5HH0Br+x9wEH7MiGwQttvErb2mZo="
+        "rev": "a4349e28c716c7baf0aba80d7602476ff9e65662",
+        "hash": "sha256-hgYJYb/6zwnW6vnuOmfzsFZD2x1a07jn9PO9OXY3hGI="
      },
      "src/third_party/emoji-segmenter/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git",
@@ -1244,18 +1239,18 @@
      },
      "src/third_party/icu": {
        "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "d578f2e8b7bd5938e21cfb6bf15c079e0aa5b738",
-        "hash": "sha256-DsktUjKFFbeSqlFZTBqbZgvuJLOKvssCym2M3tcOJtw="
+        "rev": "8cc91d9b6ab9991802fd208ee03a69714fd0251c",
+        "hash": "sha256-vIkKJ5YaSLJZCZ821hCDgceZQC/9JKPZbIHBEZpOUes="
      },
      "src/third_party/nlohmann_json/src": {
        "url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git",
-        "rev": "3565f40229515411177c196ec912a06307802ed6",
-        "hash": "sha256-kngBPCN5i+5kzJ95pJ5vY2RLa9P4JYs4e+7Qn3QWsc4="
+        "rev": "55f93686c01528224f448c19128836e7df245f72",
+        "hash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY="
      },
      "src/third_party/jsoncpp/source": {
        "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
-        "rev": "edc01ab10f52135ec80e3589b6b4e0a9c65b27fd",
-        "hash": "sha256-mdQo7AiS3DzTF8CqCRT9oL60AzGLQCFng7KUFaFEBIM="
+        "rev": "60de77f915ab08499032d6e5a63e05e974f85d01",
+        "hash": "sha256-mAIscGzXFVQxP8C2znDR6y/IXkGxq+p0gxdanJeyFME="
      },
      "src/third_party/leveldatabase/src": {
        "url": "https://chromium.googlesource.com/external/leveldb.git",
@@ -1264,13 +1259,13 @@
      },
      "src/third_party/libFuzzer/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
-        "rev": "3f386be62e362fa50284ebd24262966f1a93798e",
-        "hash": "sha256-vQBWi+4ynPBhZma/2+ApbhT9tbOCd8U+QrabC8GnqKQ="
+        "rev": "5811dc57603eac1fa0e76addedb77f72f62bfa2d",
+        "hash": "sha256-NfhWg32W2GB3zlDYX+4nrYFeka92tfg3XiGQO5vLDPo="
      },
      "src/third_party/fuzztest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "239bf6cc1ffcbad7d5c96e3b836b474654cbf96c",
-        "hash": "sha256-h268YPbMTgr5zd0bhTh1Xj/BcCxBhDD60o6+oelW/BQ="
+        "rev": "8bc765afc32fa8210cfe827ff4c94ab7db1c518b",
+        "hash": "sha256-J0HpOSEizCK23tr0D6+n3tFiKds2kEhfVIYhRNawiLw="
      },
      "src/third_party/domato/src": {
        "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1284,13 +1279,13 @@
      },
      "src/third_party/libaom/source/libaom": {
        "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "d08a82575de50dc99f3b3d324e7b8304836fe0ef",
-        "hash": "sha256-32WklYoVgBiMxnY+2nOckwmKjZBKZtgwKBmStoO8y/Q="
+        "rev": "7a210280be0986d63abae0661b71d0c342560b9d",
+        "hash": "sha256-fQ/zyAYCwZDAJfU6+7KmGcBe5iiBy1N9iZPPeHNhkcY="
      },
      "src/third_party/crabbyavif/src": {
        "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "61f5abadda7b179f90e557fed6ae7a3d78bd8231",
-        "hash": "sha256-N9YwO68d3CXPje43fWs9CoO5Sc3wIULta7n8cp+2Efs="
+        "rev": "a843d6269faf338da244b981cfeb7601007b4e6c",
+        "hash": "sha256-k8cFaQ5Y+Cglhk07IdQrhw+PZ5Ilu/nhnbYU9WnOX8k="
      },
      "src/third_party/nearby/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
@@ -1304,8 +1299,8 @@
      },
      "src/third_party/jetstream/main": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "b7babdf323e64e69bd2f6c376189c15825f5c73a",
-        "hash": "sha256-s6UMdUYWZqk/MbhyCi2zdQNgni98gGsYxcuUh/5AUy0="
+        "rev": "7769b693502fa80f28a97bbfacd3296e0513acc5",
+        "hash": "sha256-jh1FTtuS2NVPCmHrSG72lMITbsZlQj7VH2fh0l3NjLM="
      },
      "src/third_party/jetstream/v2.2": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1374,8 +1369,8 @@
      },
      "src/third_party/libphonenumber/src": {
        "url": "https://chromium.googlesource.com/external/libphonenumber.git",
-        "rev": "eee81630a337b9045c6db4577cf60bb1a2c6cbd1",
-        "hash": "sha256-voK+aAFzFGTXg6UVprNiD5Mbh6hW75EKbtzqIjPsxI0="
+        "rev": "17c9061a3af14f2e10907d73df92601b27785713",
+        "hash": "sha256-3p1NYvD5k5jOhxAJiOdijlsO3ca7YaQMQ5iCurbNp24="
      },
      "src/third_party/libprotobuf-mutator/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
@@ -1399,8 +1394,8 @@
      },
      "src/third_party/libvpx/source/libvpx": {
        "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "ade52487a37ef76a0f209bd39bea9fe67d6db4c4",
-        "hash": "sha256-Ke28x3c0Ssg2GFfHmFlfW8fex3jSuBcN0e6PXzH0b5g="
+        "rev": "8729fc25eaaace0736e6a2e1da3cd307f75446fc",
+        "hash": "sha256-sBTu4Rx1xkJIYoAc7jcrXcZbeDyfTrglyzag80lo0o4="
      },
      "src/third_party/libwebm/source": {
        "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1414,18 +1409,23 @@
      },
      "src/third_party/libyuv": {
        "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "26e56be0f984af3dae4d0c0ab7a0bac8ac20e1b0",
-        "hash": "sha256-Ievf2MXM7VX9+R85N3i2W+1jZSbt5mvy1SCNc0iqJYw="
+        "rev": "a0fa6329391922faca64955c1a7bf635ab87d833",
+        "hash": "sha256-8h+PCcocc4fZZWUZ4h1vCtTX4m91FCar6yJ2addm43g="
      },
      "src/third_party/lss": {
        "url": "https://chromium.googlesource.com/linux-syscall-support.git",
        "rev": "29164a80da4d41134950d76d55199ea33fbb9613",
        "hash": "sha256-89CdA7vBYudbko0nAIyHcpHMXqFZHC05kwRIUmeEWGo="
      },
+      "src/third_party/mac_alias/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/dmgbuild/mac_alias.git",
+        "rev": "caa30be84fa49efd0675c3864a18ae6ffac9f6db",
+        "hash": "sha256-phO7L5/cHoQTHxCq4465UZ0v43AV6U7enVIX3qOOM/I="
+      },
      "src/third_party/material_color_utilities/src": {
        "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git",
-        "rev": "6fd88eb3e95ba1d457842e2a2bf847d06b3a018a",
-        "hash": "sha256-il8qvhd9JDhu3Z03bTcYD30e7Lw9+WKzWZ71ncKPTSk="
+        "rev": "f05459ea2170f3be610f89a4ddeee8843c2deb61",
+        "hash": "sha256-EQozefgSHR9SM7So2oRgsu1tSPeeZkwjS7HxJYKgWjo="
      },
      "src/third_party/minigbm/src": {
        "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git",
@@ -1444,8 +1444,8 @@
      },
      "src/third_party/neon_2_sse/src": {
        "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
-        "rev": "ed59be8546632d5126ff69c87122ae5de20ffe4f",
-        "hash": "sha256-ydHSMPJS+axvW7KIR/9SLWNFq/lP67dpg9Yt7shLCng="
+        "rev": "183fc88bcb90dbfaefba33a292eae8a5ce94bd67",
+        "hash": "sha256-B81CNMxUdb4q2aHTmM7qBALIOawXS6SYBOIxtskKVuM="
      },
      "src/third_party/openh264/src": {
        "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
@@ -1454,8 +1454,8 @@
      },
      "src/third_party/openscreen/src": {
        "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "9732a5d77a01f05e7c4e8c79104d27f4f2358f9f",
-        "hash": "sha256-j3veVCbmV94YKBpVrtf4DGETWYXieW9lLNJZqLAs1MY="
+        "rev": "11e4e00008df90ce2914335869fbfbd572d24c77",
+        "hash": "sha256-FLyNF/F8d+kbqhrl+O6RAiRBwX8ok+4uxB7P0U/zT40="
      },
      "src/third_party/openscreen/src/buildtools": {
        "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1464,18 +1464,18 @@
      },
      "src/third_party/openscreen/src/third_party/tinycbor/src": {
        "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
-        "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
-        "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA="
+        "rev": "9441b2ca882f95849c93de03f2c754196db13154",
+        "hash": "sha256-MzMEB46pNRmIEbc/Vn1/bLyIlvPfxP+y76r+pk570j8="
      },
      "src/third_party/pdfium": {
        "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "8f3e90282ef137adf7d380079c3178b24407104a",
-        "hash": "sha256-4OhJcWZJ3UC/Mf4DJNzLLYQtrw0y0suO/wy0d1GYP4w="
+        "rev": "ae277bf214480d77ac74852969146655bf728a11",
+        "hash": "sha256-23Bl4gnmj7AJ539nFehZuknvlD+CQFUFavQmzNUuRFk="
      },
      "src/third_party/perfetto": {
        "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "9c7ce42050379be8c24a270f395e00c7347965cb",
-        "hash": "sha256-wbHdFhzbOP98IOQnXyUWDQtjt/nOD4VABSyvErhLBI4="
+        "rev": "da65f7e907e0caf473ddec16e15427465f503d05",
+        "hash": "sha256-DWbdXAaIPKxvpr5D+shklo192TG/YxOQMCZ7KE8wJHI="
      },
      "src/third_party/protobuf-javascript/src": {
        "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1514,8 +1514,8 @@
      },
      "src/third_party/search_engines_data/resources": {
        "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "cf814b5cc732a437b4ee636f1c7907f8f1ced51a",
-        "hash": "sha256-koTwcthcJn3a4XH+rY+E3z4uvWbv+1yuX9qkcqu5t5A="
+        "rev": "b9f48dc46a8172cbdd9c3923bd5a85c04458e49f",
+        "hash": "sha256-hLY4ge+lfx6ftlr+lbH+PLF5q0bx2z99hpe9IfGr/S0="
      },
      "src/third_party/sframe/src": {
        "url": "https://chromium.googlesource.com/external/github.com/cisco/sframe",
@@ -1524,8 +1524,8 @@
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "0873ec164a06966b90ae0d43ef783cfb180084ae",
-        "hash": "sha256-LbSs+UNakFipC2t9TSbZVreylVXHf1PsbK6z2qJh6QI="
+        "rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
+        "hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1539,8 +1539,8 @@
      },
      "src/third_party/sqlite/src": {
        "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
-        "rev": "0a5fe1b18a5b651b6c4c90d397e3d0b8061f73fb",
-        "hash": "sha256-y+lJK8Qi22KUcYyY62x9xCXej85on9e0FxySaMNSYPY="
+        "rev": "ba8c54c83337618a9f15dd368a267e46b672fc84",
+        "hash": "sha256-0I1kNRIMsBLH7u+l005YAfdOlPsiK+2/PFlHi6Kaj5w="
      },
      "src/third_party/swiftshader": {
        "url": "https://swiftshader.googlesource.com/SwiftShader.git",
@@ -1554,23 +1554,23 @@
      },
      "src/third_party/tflite/src": {
        "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "7bedf2e94aff6ca62150d74fd40aa63cb73c6583",
-        "hash": "sha256-Uv1SbtjalHt7XLAcvOfiycgepDrEK8/JdpD3GPK1MNo="
+        "rev": "a387c0a471a69c0c9068334e73d184e1e0ce579f",
+        "hash": "sha256-REahts/Z20Yy000uyrtpvCs6cshboy8PY3mW4xz9xm0="
      },
      "src/third_party/litert/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git",
-        "rev": "1ae23176dd5d3a43e35961d8236d5adda7f8c0a1",
-        "hash": "sha256-xcCqZA8BKZG/TV/fAUAWPOoZwSQkRDATlhE6A05PyX0="
+        "rev": "2add6f4eda319e204c7c021ec871503a0fa766fc",
+        "hash": "sha256-zV+1VfylQfn3yUs99JYsPXFW1OSnQohR8O9Oy4dURJg="
      },
      "src/third_party/vulkan-deps": {
        "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "9bf18397113dbdc7adf4f76408df7f79d4ad141a",
-        "hash": "sha256-ol8SSAFHrEfsKWUmg64klpFFXIlZU4gyibENmzZD454="
+        "rev": "89c8e85edb61327644aca41e27641b43711bc783",
+        "hash": "sha256-r6ttlYFgrJcsHXb9Rdro4/KIQyPfv8ViueSaPRux7YM="
      },
      "src/third_party/glslang/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "8292684e941bf22583b257bd9dfe47daccacb665",
-        "hash": "sha256-1D971MPCHr8vnj31IFUwe1s+X3UAabxYUQ1Cd/VyqDA="
+        "rev": "5d69854866df654a898a32d93cff20a181ac82ed",
+        "hash": "sha256-DWvwxPD2T9Ojwg3sRKWuTlt36kqBk0wn5ii7PoXvd5E="
      },
      "src/third_party/spirv-cross/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1579,38 +1579,38 @@
      },
      "src/third_party/spirv-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "29981f65241605e08b0ede4cfeb999fe3b723c6a",
-        "hash": "sha256-tGY4H3+5p9M5LBK/xxRdMT9CX+qq3e7fPkaftnpjU9I="
+        "rev": "0d25db97cb9b8f725e4c95e4553001710e7fc39d",
+        "hash": "sha256-HvdKHnraSSWBriVgiNfhnC60moYRseDb3aRxxoANX1I="
      },
      "src/third_party/spirv-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "a665e21f3061f34064b39937cf00fe8d8769f4ef",
-        "hash": "sha256-4m/xdMk/r4C5zdU/CZzdoXtRN0MWs8pN5QUPI5Ej3+w="
+        "rev": "e39e5c5838bc4b4162c349f2a2e5f163efe5432f",
+        "hash": "sha256-lNBakr+4dRpdjbw204vjarZyz9PLCsFSW/4iFboknCI="
      },
      "src/third_party/vulkan-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "d314eae73fdc90847bb8304a86ee7c6a8ee023b6",
-        "hash": "sha256-YU51vfV/8vQqVTngS2SRHKXpgxU/5IJ+jAT5pcYUcpw="
+        "rev": "0b7f383797fa7be53ae28213e001ae60668ee511",
+        "hash": "sha256-hRAu7Gj7t38huQSKceL6eq5LSjto8pByxmZgkiQIX3o="
      },
      "src/third_party/vulkan-loader/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "59a70594de4559fd3aed73fe8ac2d6c48ca002d4",
-        "hash": "sha256-M/gm3fkCcFZJyslWCO/v2DzuavTOfvvKvx+0bNihEqs="
+        "rev": "83ddfc5ec5ca64ddd1055cefa1559c568101075a",
+        "hash": "sha256-LqklBLCWg04Qet0CtffTQwqBvkeu2Py8DM8eNuideNo="
      },
      "src/third_party/vulkan-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "286299bb6b732e4b22771cfb9d7d421542d40501",
-        "hash": "sha256-kbySCu2c5nh6icnPQV6qplfg1gHFnGPEYOG6G6TG8EU="
+        "rev": "99140cef98b4ea135141e0040d84c17a1543e5e3",
+        "hash": "sha256-lETdemR3/hkPULaDpnrH8mEnL+CBKiXb9YQE1cdG260="
      },
      "src/third_party/vulkan-utility-libraries/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "e9585c3e3d41ab608ee3b098ce4721d357308fc8",
-        "hash": "sha256-WcSiUe3vB7zUO0vpqcVJkKqhnZXz76ApWaoMO49efXg="
+        "rev": "245b48c522b5375c0acd5377d52bef5e4917f31e",
+        "hash": "sha256-1h5iWfG+6dOhS6JX4mCyAHbbBe6Nnge775614Atwi1c="
      },
      "src/third_party/vulkan-validation-layers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "11079f041fa85ec27c40c4ef2d63531138a2ab98",
-        "hash": "sha256-1lG6shUQRKXtojLHwfZD6gDz5yVnNoVp6BHMyUz70Co="
+        "rev": "6d4c4f8b14241307a822f21bb9453b2380b66117",
+        "hash": "sha256-fk0IXwY5LJk0WNQHERtq3Yt7KpwBLppkHFgoH47RHpo="
      },
      "src/third_party/vulkan_memory_allocator": {
        "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1619,8 +1619,8 @@
      },
      "src/third_party/wayland/src": {
        "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
-        "rev": "736d12ac67c20c60dc406dc49bb06be878501f86",
-        "hash": "sha256-5iG0HaPXJCEo027TuyXlJQNGluTaAPlvwQDFbiYOEJQ="
+        "rev": "87cc8a8728a923fc57938faa81ba0e74f34ecdc7",
+        "hash": "sha256-dnaXYcVfc4DfNRsAEL316eSTen9tpf+nuQbActege4E="
      },
      "src/third_party/wayland-protocols/src": {
        "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git",
@@ -1649,8 +1649,8 @@
      },
      "src/third_party/webgpu-cts/src": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "499044af47ec2717e06e644d0943e6fcdb3f3538",
-        "hash": "sha256-M8TWqKdqoiZ01vbDpcRyPWIOaBPCPdSSflxcIpbYjFA="
+        "rev": "2959e1c3959aa55cd3f02726995ae68159d0e064",
+        "hash": "sha256-Z8hszmUjsRupyLk6LTit1R2rZyYfOakTJ75niMwl/Xs="
      },
      "src/third_party/webpagereplay": {
        "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -1659,13 +1659,13 @@
      },
      "src/third_party/webpagereplay/third_party/clang-format/script": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
-        "rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11",
-        "hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0="
+        "rev": "70510081984cfcdb14a15b3e08dfe9776dc7ed37",
+        "hash": "sha256-IC5Dy3elgEezXmRyDbafx5i+V9wiDLMmnpi7O7BucdE="
      },
      "src/third_party/webrtc": {
        "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "6f37672d358475cd17544121a12494da454d85fb",
-        "hash": "sha256-c0h6bD8zNZbacnOgRei+yVB+5+AvfglW+eQDNZU945M="
+        "rev": "9ea5afcad008b940468c2a15aec339592cf5a935",
+        "hash": "sha256-y0W8g4STp/9vJJQ6ZBt4Pssl9kFLEF1WChxDD+sm68E="
      },
      "src/third_party/wuffs/src": {
        "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1679,8 +1679,8 @@
      },
      "src/third_party/xnnpack/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "09c4a9137f3a19b053dc45724a62f4f73ec7746a",
-        "hash": "sha256-eoS9qQ1hOJJBw6RQ2mTyRQb/AaAj8XnFbtqPpAb99y4="
+        "rev": "eccfcfe85b347d8f48015ecdf9fa7db1a9ef61cb",
+        "hash": "sha256-BqbqC2PUcvTdz3IxxkySHxzpfNp1uI7dFLMx50JbXMc="
      },
      "src/third_party/libei/src": {
        "url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git",
@@ -1689,18 +1689,18 @@
      },
      "src/third_party/zstd/src": {
        "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "5233c58e6ca0b1c4c6b353ad79649191ed195bdc",
-        "hash": "sha256-vEl0s7Mjh+5rciOMxm99PNWiamtCk+sTN4lRYKCIZ+8="
+        "rev": "5c7b7bad26808e6b40ac3b3d0075466e27738a9d",
+        "hash": "sha256-dncfOdwIDcMGT5VvzpzMBAbLkE4e6vAPeZBlEmoWcCc="
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "4323497a6a73839e6d5260f6acd7ec0212cb3321",
-        "hash": "sha256-HUg4GGtYL4xGk/xw0QXxNZAnsFVcznklWGQaqhZj9QM="
+        "rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
+        "hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
      },
      "src/agents/shared": {
        "url": "https://chromium.googlesource.com/chromium/agents.git",
-        "rev": "559f135fc214d637f85174c6be7010804e31f1e5",
-        "hash": "sha256-/PhF9Pc8wPx+TLABd3yD218TfEatBySazVci1Wc+9e4="
+        "rev": "e64987d3ea47f5f5d00c66de617aec591d1c0bcf",
+        "hash": "sha256-LEVJVFhLptUEXDqGt6n9GybLOTfl3uAc2+ifvoD5kiU="
      }
    }
  }
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
@@ -8,11 +8,11 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "140.15.0esr";
+  version = "140.16.0esr";
  applicationName = "Firefox ESR";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "c3a9c92776fc0fe4ec84e83d608822a84ab424bef3e9200de8e17f161369d13bb4a5caf5de326dded23edaf1c6b424d831218029786d4cfd1d857ee2634efeff";
+    sha512 = "fabf5b481594a9a860b6ae379d2ee89ba291b807c94334ee15bad1fe862edb47c22e890d892e33d6a6ec57fce4ab12aa9c9c6fa4a501b881ecc6211ac04bd9a0";
  };

  meta = {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix
@@ -8,11 +8,11 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "153.2.0esr";
+  version = "153.3.0esr";
  applicationName = "Firefox ESR";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "a8cd4784bb52ca89c0fe37404e894c044f6145c62e9fcdeffe621fde81ae4602078be575e26c90d83e5e47f26675d3ee897cd6a20027d09d4ba7d0e785ce39bc";
+    sha512 = "56a5e092f0aba91febf01d227e8068520513f632d09c5ffbad4cbb2de307d9066425f353a1b7fcf5648733e02a9b17cfc9aaed5e39d7562a6b143b1c9827a668";
  };

  meta = {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "155.0.1";
+  version = "156.0";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "6d137a7a315cb1d0aac1a3fe314af80fe290c49b7c2e47f8687b25d4720927b2a0dc71a3da9d75f6cab479067db114caa6732d17e888b0abfce99238a8af0f39";
+    sha512 = "0463304a0898670d248114f66f7c235166ae2397c3989a7c878c96f0c589fbbba1f1c87432daa22633b9fadd94394adf1dc37f0e67d22b066c75efe5eead75ce";
  };

  meta = {
--- a/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json
@@ -1,138 +0,0 @@
-{
-  "images-calico-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
-    "sha256": "b96aefa4fbf96dc0b5cb082149b284a73b2e5ffc65d301470c8be50d6e24171a"
-  },
-  "images-calico-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
-    "sha256": "1ff5a5b1cdb4146dadf2e6496f2234999b441c178e4b49018c49fa1215f48619"
-  },
-  "images-calico-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
-    "sha256": "35841cab143b72339f60a3b7ffd5135bea57ba44c88daf066648a9189f904a4f"
-  },
-  "images-calico-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
-    "sha256": "ceb7630706258aade56b68f90f6d64fcf5f7a6472d54b4b97af1bd8265458df3"
-  },
-  "images-canal-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
-    "sha256": "1e0a7b2a0861f6b27c3fab39431892ceddd42db5aa5a1f5cfd6ca5cab1e411f7"
-  },
-  "images-canal-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
-    "sha256": "9e89572eb2a5958b456dc1ca418bdbdbd694a176dd2cf41e6df55fe0488156ba"
-  },
-  "images-canal-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
-    "sha256": "56d2d64e2ffd0e646b6080c604e892852e7c55b840f7775dd212d64c9e125a0f"
-  },
-  "images-canal-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
-    "sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
-  },
-  "images-cilium-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
-    "sha256": "e10abc0506747cb9dcb354af4c29d37f31679d3319e3814888364feb686836b9"
-  },
-  "images-cilium-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
-    "sha256": "6fceeec753283b5b3c929a57b59e72b73377b4ed6a95d73555de5e624923e101"
-  },
-  "images-cilium-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
-    "sha256": "5abf640b766d1e6fd836cca8eb85aafca0106f5a4789c379559b428b9aeb9578"
-  },
-  "images-cilium-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
-    "sha256": "d67e47e302b9284dcd2948e209caf9821b5e2c1b8490af7326bbf888f97139c1"
-  },
-  "images-core-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
-    "sha256": "8b02c772cb20cec6bc61968a0a4071dced6102bfd10238f2c3d5a682dfd25770"
-  },
-  "images-core-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
-    "sha256": "c3648746e25fb04d6bfedd15acfff93c99eaf77cfd5d17072781b56796ea1d70"
-  },
-  "images-core-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
-    "sha256": "b539ab5039895868b6fd5ffea1185be5c1f7a52c1234d9db032d4834f7e9c267"
-  },
-  "images-core-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
-    "sha256": "8d2782b68a84cf828bc0cfa33fc9279f7d8c2019ce46b1dfc75f0378b0adb8f6"
-  },
-  "images-flannel-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
-    "sha256": "51a04645359b508e1df9e9bb4968888d1612cc722f8729c98cf4f140d8ab929c"
-  },
-  "images-flannel-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
-    "sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
-  },
-  "images-flannel-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
-    "sha256": "6346d2a01245ba8ef1c597fe5a9a790bedf62023e9b08d22cccac1b360d293da"
-  },
-  "images-flannel-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
-    "sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
-  },
-  "images-harvester-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
-    "sha256": "ccbf694b1c7ce66be5dace3d59b03a24c5f81f16bee75305c316b30bc05e5000"
-  },
-  "images-harvester-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
-    "sha256": "ff88c0ece81ac069be668f4e4599a3dd15c811e669a57c48423db3c160d566a7"
-  },
-  "images-harvester-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
-    "sha256": "0879e9c11ba3820a854736a0318a279d68099e7050abd311fb8e8bd6417d3b11"
-  },
-  "images-harvester-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
-    "sha256": "9c560f992ea61b0ffa2b2f781ebd860dff73852f3f3c5614621e0eb7040c0c17"
-  },
-  "images-multus-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
-    "sha256": "ff784686ed52ec8a5674d89372904610f7a90a9f000e2145d6cbaf26c46df35a"
-  },
-  "images-multus-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
-    "sha256": "704506a2db41de3035ff4b551bc8b603f33450bfe91438904446787d259eede3"
-  },
-  "images-multus-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
-    "sha256": "b39481711942f2b7858b2cc0125d5d60ff31db22bd7e0c816e267d92a738f8f1"
-  },
-  "images-multus-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
-    "sha256": "abcdce72833b56893aa1234a6f935b457f056cd67107b45b1ff8795c2a6f8aab"
-  },
-  "images-traefik-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
-    "sha256": "a5d1f4ed24df06c1b55978e3b7230193bbfde54f240ad98ee06e8037ee2bacb6"
-  },
-  "images-traefik-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
-    "sha256": "6dabff733c90a3c2c7304bfe0c530cb6a2304c5a585b0de4fc5f46e700c5fcee"
-  },
-  "images-traefik-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
-    "sha256": "4c5666b4537ab4e54258c64a35cc965c13513722d6861e73d01c295a6b879ade"
-  },
-  "images-traefik-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
-    "sha256": "d71e455ce8358e31ed590a7a264d9a3ae212c955df8f36cea314243533fe4d83"
-  },
-  "images-vsphere-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
-    "sha256": "69c150b8f3e90752d685cd4c76e211afbe0b616b71bd3124c7bce4f0e0b563f2"
-  },
-  "images-vsphere-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
-    "sha256": "e97c3d30c70e498da1cea062cf3d780fb25a416fb4c0b9956a44892ca9ccf0d0"
-  }
-}
--- a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix
@@ -1,13 +0,0 @@
-{
-  rke2Version = "1.33.13+rke2r2";
-  rke2Commit = "f0fee0e6a6822f36d0cca144c97e33cb979ec184";
-  rke2TarballHash = "sha256-WoBZxFMVB9l/KcCfO0RbeBNidZ1uZ8fwilZZQRDNHT8=";
-  rke2VendorHash = "sha256-9qYtpCfpmrAEV1gFBke2oeI+lcM6Qzk3MTyuVHmpJLg=";
-  k8sImageTag = "v1.33.13-rke2r2-build20260723";
-  etcdVersion = "v3.6.14-k3s1-build20260723";
-  pauseVersion = "3.10.2";
-  ccmVersion = "v1.33.13-0.20260610231102-b1a9339db253-build20260710";
-  dockerizedVersion = "v1.33.13-rke2r2";
-  helmJobVersion = "v0.13.3-build20260727";
-  imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
-}
--- a/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json
+++ b/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json
@@ -1,138 +1,138 @@
 {
  "images-calico-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
-    "sha256": "eca4b54a87b17ca7878a90322a76221cc14b0f191db24a88792a31a128444cb7"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
+    "sha256": "bf01280d541d3b836a582313eac3d7657ea3d5102cbba829e153d9d73f68d9e1"
  },
  "images-calico-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
-    "sha256": "914212fd8288f73361ef29d945b3a2102165df70153fc8c20c180f72704c4da2"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
+    "sha256": "ad9f490fabd8686710221994f697a538f75c374d41198d8be4dddd2b8ab20964"
  },
  "images-calico-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
-    "sha256": "34c6c98dd024ce7e5ffcc17112988be2ab703c3a8977f01312815bda38df11e5"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
+    "sha256": "04a3b7c7d04597a892c693b46082220de96fe23c2ba08862ae99798aa3eaa68d"
  },
  "images-calico-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
-    "sha256": "d1aac5a3f88163b5c0a6dd152be8e6e62b05b3fe85ebf9d6288b5de585d9e056"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
+    "sha256": "0b5f3c70a24377ebc395676ed13bb7dc258c545f2ab7bdba0d74ed150ad7a5f8"
  },
  "images-canal-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
-    "sha256": "9351ecae73961309c566991322839acb0df573f0e826cdeb278babe141357d8b"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
+    "sha256": "2a934cd0eb1e736628c30722a514ece6c9c66dbc4463ee3e00392acd9316db26"
  },
  "images-canal-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
-    "sha256": "1f2aeec78ca8380b55f8398905e9dbe4af5cbb8b3ae9cb4bdcc46b08dcb75c56"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
+    "sha256": "4359b651bfdec8f3bcc01b351b33a55ff21f06b18a767366db6f3800d5750871"
  },
  "images-canal-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
-    "sha256": "b52d98c63d46a8b908bbe3fa2a075fb5b7ea4dbb4325f3a9de63dcc4272f04ff"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
+    "sha256": "21f22228f27848816c7f5fb21b078dfa842ac2e716a8310fb7a306218a8d79e4"
  },
  "images-canal-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
-    "sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
+    "sha256": "fdb78292756a38d2136fa2be014d77f29b06d5ffbdfe8e379d9688614abf89e2"
  },
  "images-cilium-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
-    "sha256": "a0acd19bcf7f99321635aaff76abf5b5ab256f31e71957dda22caf5ee97f383d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
+    "sha256": "db9220609c897176878efe3aff65abc8b32a76ecaac5a80c1c7d61f8ec4f800d"
  },
  "images-cilium-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
-    "sha256": "ed1e42b4c1db97d65f5ab42faf443fd1786af092bd69b931811557beb17875fe"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
+    "sha256": "3f3835bd55f7b02b4365c12b69902fb6943cde22014ed9c91ebfce4386d4d458"
  },
  "images-cilium-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
-    "sha256": "55569b7c58a2cdb2194c14c9b1252fe4545c02c1c0df2e152cf2fa70c29e6e46"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
+    "sha256": "9ecf145d7ced82287354cab8313ee588bce98f81715eaf5e42c6fee1b1d40c0b"
  },
  "images-cilium-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
-    "sha256": "916bc0aac94e499bdd6015ca727b97c39da5c635ed87edfc5bff432e3b93bb6a"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
+    "sha256": "b97c53104b876a7494abd7108573000701766fc1ccfee779a47d021f879d349a"
  },
  "images-core-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
-    "sha256": "dbc4e96df1cf68bb1554dffcde377cafde6b58afc6a57ff627bffaaab9387c64"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
+    "sha256": "81945ab99e039dc5f78083b30ec79ad46503bf1897007cb297dc7dc72e0523d5"
  },
  "images-core-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
-    "sha256": "c98faf27f1867a21fd928185c5b3ce11e58576239724547b14dd714d2cf485f1"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
+    "sha256": "7a07540b2fa9cefd87ab9d2598e78ef7a7b8a2aa8e12dfb3bf34fa7aa7eedcbf"
  },
  "images-core-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
-    "sha256": "670909f4bbdf4cae8cd2cd289e127b62753a98a0dde17c94f8287c4f04edb631"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
+    "sha256": "d52a0baaa2fad9ea031b6a55231167a1cee0135df0d9e7ec456fcdd571db45b4"
  },
  "images-core-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
-    "sha256": "581e77dfad0c37c8ec8ce21aa62eb04e484476e25ee955e51f2e541bd41eb83e"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
+    "sha256": "276d52eb5d612558fb796d07a78d6a5acd994335be4c5273adc1b1e010feb5bd"
  },
  "images-flannel-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
-    "sha256": "990ea84921cb04bcc8c4b78e5ef2896a5c1cbc864ca7948af56179f46ea82aed"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
+    "sha256": "55b6af3347987a16d592b814790724c869663ec015088bc8aaaecc3732ee592e"
  },
  "images-flannel-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
-    "sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
+    "sha256": "8205dd4dc70b3f2fdb34f4e92c9c46b76ba33ab0953f3852518ee805fdbca905"
  },
  "images-flannel-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
-    "sha256": "b0736b431a1665687a5744307e62e34d98a739c9f28d1b51bbaa3b6d9db81aa7"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
+    "sha256": "15ae6906a8177b8b7829edf35f228fa5791e2993941d3335a59bb4ce985ea6fb"
  },
  "images-flannel-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
-    "sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
+    "sha256": "d833c1d1e13063b25c3d0013a653b1f137b4a020fd97ccfa5519d251f158c69c"
  },
  "images-harvester-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
-    "sha256": "c8129804d926d6916dc17840239dc4ed00dd71dfb9431ef3a52b61e5f763fc9d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
+    "sha256": "b72890e493a00eec15f2f041ac9285bd29a46f6fabb194e482f374202f3ebd1e"
  },
  "images-harvester-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
-    "sha256": "b0571922737f3b4794880a6a1ed36aecf863fa99756ac97dc3e47e2ba65d84b7"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
+    "sha256": "74a4b8fda0882d61859eb6fb0a4783f798f60d211e32dd2e4f75efc4fe8d805c"
  },
  "images-harvester-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
-    "sha256": "e78cfd46abc07c7330f1a99a2eb1b3b49aab0f4772c027e16e58fbeeabe26936"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
+    "sha256": "e1f0f5a57dc055fd8f7d49e196dbcd5cb1054dc8015fd2cfd5bc6f9946340320"
  },
  "images-harvester-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
-    "sha256": "004a123bc2ae8030a6a79f03a6f20d079f43d040b2730b6bfb573a1d105d89fe"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
+    "sha256": "3d034060ca80754c86ce34519682c5f6f69e28d5bdaedd81d33efbe714824142"
  },
  "images-multus-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
-    "sha256": "f5bc06ea799a91fe0d74929f6882591d8b541d785f91959789b3a17fbcf6cfdd"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
+    "sha256": "884ad55eb6d4d068ee1de58889f17b2a151bf1c18791c67fad22d0a84f16015b"
  },
  "images-multus-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
-    "sha256": "6e5795d1367a04ca096cefaececa0f77b180bd343cd806727ce1712b1d28cc98"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
+    "sha256": "1e107e9b71db928d4328332aeaf9ed760e43960839fbdb2a90499fcf6dbec27e"
  },
  "images-multus-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
-    "sha256": "03d4f0ded6a8da7007c241cace1cc007c2074b92846e52c2a73f97e2d1c3ed82"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
+    "sha256": "548d328ff86381c416dced6fad23f8ceb065d0eacc8815590bb84addf21cf377"
  },
  "images-multus-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
-    "sha256": "4c4b241191ec370c9fc2c77ed2b319d8b094a7f4ca35d3a2a1563643865ae283"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
+    "sha256": "ddd3887b811ded657376843714675a306b2036955d6106e996fd475a92a447ea"
  },
  "images-traefik-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
-    "sha256": "1febfa1c29687a343e0c6a829100a2e612ba4dbab4050a39d15fdd9706f0cff2"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
+    "sha256": "18506df7d42dee9215adb3e116c59202578e6ef75809a4abc7b42753bc2c7a90"
  },
  "images-traefik-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
-    "sha256": "6dabff733c90a3c2c7304bfe0c530cb6a2304c5a585b0de4fc5f46e700c5fcee"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
+    "sha256": "2734dba5228db1b23c73efef73a7e6a762a3135547a173b769a2060cafb277a2"
  },
  "images-traefik-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
-    "sha256": "705031339da6ff24d83e3cfcaeca01051055f06f125038cc397d753883f0af91"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
+    "sha256": "a4034ce89c2fa2dc0761db6453e063b4deb5b63ddade5a99c46a67a4c8e2402b"
  },
  "images-traefik-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
-    "sha256": "d71e455ce8358e31ed590a7a264d9a3ae212c955df8f36cea314243533fe4d83"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
+    "sha256": "de2bcbe1cbe5c2e55f2c23961d3f55017db04a99fc03da294f0a4c18860d14c2"
  },
  "images-vsphere-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
-    "sha256": "c1ee6654b45f0106e00aa4cd2b423c8b35c79964470419e4c012d963c72ed0f3"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
+    "sha256": "7074a9bae6fb6b0fa39099a8e31fe8d97daddc1b677a9bbec62132ecc8a5cf7a"
  },
  "images-vsphere-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
-    "sha256": "19afe144421cc7f430adb20a91e64ae91f0fac2ea6b7aeab6b480adee21f4fad"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.34.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
+    "sha256": "f5a6fd0224a60693fa23cb917fed3d2c9e8ef80dfb3d18b23b70077c007e9ead"
  }
 }
--- a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix
@@ -1,13 +1,13 @@
 {
-  rke2Version = "1.34.10+rke2r1";
-  rke2Commit = "d419f09226d50a4777d348e5c53ea1bce3849b77";
-  rke2TarballHash = "sha256-upkkAdlrAkj6RLsIbkNB5KdQylxvb1P47x1AfDcpxfY=";
-  rke2VendorHash = "sha256-ep2qR8V3V1F7PHj9rU9hOZb0o4GQVUdtGHyAEWgpM2A=";
-  k8sImageTag = "v1.34.10-rke2r1-build20260723";
-  etcdVersion = "v3.6.14-k3s1-build20260723";
+  rke2Version = "1.34.11+rke2r1";
+  rke2Commit = "2506fee512985398ca0b50d875c3df73069763ce";
+  rke2TarballHash = "sha256-jrXi8KZmq+yGSKaVUUsZ+mNKzV1cSTOLPkPFye+OdpI=";
+  rke2VendorHash = "sha256-AYsoVlykxpyIeVpuXpEY4uKJ3NyzRlOdOiJJl22m8VA=";
+  k8sImageTag = "v1.34.11-rke2r1-build20260821";
+  etcdVersion = "v3.6.14-k3s1-build20260819";
  pauseVersion = "3.10.2";
-  ccmVersion = "v1.34.9-0.20260610230036-3060dff9c388-build20260710";
-  dockerizedVersion = "v1.34.10-rke2r1";
-  helmJobVersion = "v0.13.3-build20260727";
+  ccmVersion = "v1.34.11-0.20260817193950-75826e8afefa-build20260820";
+  dockerizedVersion = "v1.34.11-rke2r1";
+  helmJobVersion = "v0.13.3-build20260820";
  imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
 }
--- a/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json
+++ b/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json
@@ -1,138 +1,138 @@
 {
  "images-calico-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
-    "sha256": "91e39707c7be99f988db35d2c9a203c2f7ccdfd8419c1a7e7cf9c869a44e82e0"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
+    "sha256": "5f4fc4e757864e6e373815b68fcd579f845bff584ee0bc9f0dc97f9e260717d9"
  },
  "images-calico-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
-    "sha256": "263eef9bc34b84d25f69d871c5c6b0d968f57b128501c56cd75be76fcd34a5ff"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
+    "sha256": "87344e7c6eea1a2fe1ca029f307d04caece4fe40e7c50fb1ab16fa1d26b23f6b"
  },
  "images-calico-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
-    "sha256": "fb88b8044e1143eb65d6d167917c3c5effb0ffbdc6dbc3d5bb87f7b9d73d91d5"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
+    "sha256": "5ac774802ca0ac3471b2ae2a75e00c1f7a76d32df4e5a3bc18ba717ab2fcd69e"
  },
  "images-calico-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
-    "sha256": "257222e58aa7429c53edc52f647a2c6ce3932b491b2943c3e726afe91219614f"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
+    "sha256": "e21343847eeca388e8dcdf4d088578f232aba7a51e5c104f155d6a143a18111a"
  },
  "images-canal-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
-    "sha256": "af9fe952ce6dcfb1192d40ca01d0d9a7f29477fef21bdae96490c2192f2ded74"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
+    "sha256": "6f918827f8ab8d99573de7671649ccb405fe1826ebb9f4d3257e94468225b46d"
  },
  "images-canal-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
-    "sha256": "9e89572eb2a5958b456dc1ca418bdbdbd694a176dd2cf41e6df55fe0488156ba"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
+    "sha256": "4359b651bfdec8f3bcc01b351b33a55ff21f06b18a767366db6f3800d5750871"
  },
  "images-canal-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
-    "sha256": "b52d98c63d46a8b908bbe3fa2a075fb5b7ea4dbb4325f3a9de63dcc4272f04ff"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
+    "sha256": "aad7a91c4fdeb798d9d5f045536901269a07fb97fea2e87edf2d0c7959d00e5d"
  },
  "images-canal-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
-    "sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
+    "sha256": "fdb78292756a38d2136fa2be014d77f29b06d5ffbdfe8e379d9688614abf89e2"
  },
  "images-cilium-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
-    "sha256": "f943fd65168368d4b76ede3d809daad8733126df8d1bb809cf841b50b0402e94"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
+    "sha256": "2660b7803f26855083b72461ecea9489ab93d3f148ef38f0cadbf46555cc3799"
  },
  "images-cilium-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
-    "sha256": "dc9cb3d8af8db6a0a0312e3be3e31b1fa44a20731b8d3f7a1e30e8481940c12c"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
+    "sha256": "e474738e8dacad29c2b703e1745ad92ff746d1c2b10eecae726aedaffb904c72"
  },
  "images-cilium-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
-    "sha256": "bcfee32f8a9bc0c62ad2b747f4fb36bffbdb8cee5e6d4f93827325514ebd9f7d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
+    "sha256": "0fec5acb8c9f5bd847a95b39175a901315228b98db1b4bbcfc766863cf10e282"
  },
  "images-cilium-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
-    "sha256": "61d4038542e15892ecb122d99cc22226fad4cf4877e6bba9d49406d514624a8d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
+    "sha256": "1a1e4fc3017a203d1b1098aaee30a2dcf2afd1059b88ad1d4772531c8e4f97ad"
  },
  "images-core-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
-    "sha256": "606d9e6960cf1496668eab999a9bec2eee052027e90a750e2c99b4f185382c4a"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
+    "sha256": "b42c081fd85474f8f994089de514ccc9930d491671ed4dd2e25b65be3a3b1e02"
  },
  "images-core-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
-    "sha256": "f7d4aad521229dfa820a3dea2365582681aa1aa4a076bd02122b0ac0eb79e265"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
+    "sha256": "1fe8f2b57142713b545c94586833088eed92fdd2782046bd9e71fff0e7aafa93"
  },
  "images-core-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
-    "sha256": "5d3ee44b2d6e3d50258b5f99fdc8356dd7b1eb00198fee429bebe4881375861c"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
+    "sha256": "4cc17307f939be90df7a978045d51247f39e7bb4e8ad491b0735eebd9c92a64d"
  },
  "images-core-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
-    "sha256": "87fe42d4052ad62cf25d0cd6bd23a9e8e2adf36961583c25a48d10dac8f39d4e"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
+    "sha256": "85116f76f82643bd13ddf09a69a00aaa16e73d7b94be41c20cf69ef403e314da"
  },
  "images-flannel-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
-    "sha256": "eda0f523a6b5021bf9a59f7e9e9c0d564f472c22615e83f101ea68027478007c"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
+    "sha256": "4bd430fdf2faa193a584fb0b083b937d297506515117c149623a07eab373f370"
  },
  "images-flannel-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
-    "sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
+    "sha256": "775d3fc9f321380e01810e13c66d9c974307f70ca18af9bec2d75a86eb5c4d33"
  },
  "images-flannel-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
-    "sha256": "49a0914944127d296890d86686642392f6ceb7d220d05412954aea136d019227"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
+    "sha256": "24a5c8e92a3743ea9d0a776e5011ed41eb3885e3f1c85381ca794abb656e966a"
  },
  "images-flannel-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
-    "sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
+    "sha256": "d833c1d1e13063b25c3d0013a653b1f137b4a020fd97ccfa5519d251f158c69c"
  },
  "images-harvester-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
-    "sha256": "dc8586e214ac70a896fa4aab6392ea20e44b0ba078f059fea7470c055558682d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
+    "sha256": "006d72a46bfe1e703c16bab8740a961ad965f673eff98d4625006294f7294a3a"
  },
  "images-harvester-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
-    "sha256": "fcb029dd456d0a9137714aae73d0b3edcbd400955425a5b9df1c8e7cedc06154"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
+    "sha256": "20c0651a945543f61115f862288baf4ea8c7dd79973dfab6146a4883ea83f15e"
  },
  "images-harvester-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
-    "sha256": "3b543d0099c5e4b42c5a8db5610a620e25f554027fea964ad31f3011125d81ed"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
+    "sha256": "b0436e330f1c898ef63d12160eeadb49db725c809ad3046d37f67121a3311a45"
  },
  "images-harvester-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
-    "sha256": "b55b3c2f9c36a3a9907bf7338eaf83803cb8a851ab18475fa3f9b31262f8c3d2"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
+    "sha256": "8c2809abe3fad464db1d0c24549f6278ddfdf362c6180d33f612003196f3da8f"
  },
  "images-multus-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
-    "sha256": "712a02ff2e07b34ac0f720126d235b4cb86eacac9ede923922f43db696890280"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
+    "sha256": "77c59e9f0c7cb58eef1f7f2dd505bb71f432433ee11b52d28c7db3dc24c2af5e"
  },
  "images-multus-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
-    "sha256": "d29151e7c0fc86483bea1e146ea3e0186a6356f46757849fa67bd4e372d11268"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
+    "sha256": "392fb8a1c17ffe909f8a17d05c4e624bae74a73fde220bc19c8d105f51f30b27"
  },
  "images-multus-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
-    "sha256": "e13eddf16db1f7d1ccdf98b12df763bdebe89c10201ab1e824038406464e0706"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
+    "sha256": "ae44bccc910e9978d53583c139ec9d6c5ca5c3a4210f91228e3e9bc341a16f14"
  },
  "images-multus-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
    "sha256": "4c17856eccd8855f8dc5f9b2d34b8d24e2f650c6894f19d6bb3f0c5a7c46f052"
  },
  "images-traefik-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
-    "sha256": "acf5461ddaf78e88fd10d1a8897836298d68f3b1a765e1c4ef02e0b5701d7e55"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
+    "sha256": "e711fb5cf94a24b67febd46d9ea3ea477d95212adbefa43056e25685aacd12ec"
  },
  "images-traefik-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
-    "sha256": "6dabff733c90a3c2c7304bfe0c530cb6a2304c5a585b0de4fc5f46e700c5fcee"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
+    "sha256": "2734dba5228db1b23c73efef73a7e6a762a3135547a173b769a2060cafb277a2"
  },
  "images-traefik-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
-    "sha256": "f52d58a9d3926ee719ddd26f20c683b5584c6b5debdca085224d492ff7cf959b"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
+    "sha256": "a4034ce89c2fa2dc0761db6453e063b4deb5b63ddade5a99c46a67a4c8e2402b"
  },
  "images-traefik-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
-    "sha256": "d71e455ce8358e31ed590a7a264d9a3ae212c955df8f36cea314243533fe4d83"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
+    "sha256": "de2bcbe1cbe5c2e55f2c23961d3f55017db04a99fc03da294f0a4c18860d14c2"
  },
  "images-vsphere-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
-    "sha256": "9ccc00fd7c728f9db168a70c8ee25875c7122e101adcd089876345f8963f7331"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
+    "sha256": "bcec731e66b1300ca93a1b6786af5fc49f2f749d6f8de92fd20271c4235b0e75"
  },
  "images-vsphere-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
-    "sha256": "75becdf7144effe5894eef6423f2e6ea8c8549bfdf315bdff1a2cb64c41c2b2d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.35.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
+    "sha256": "13d4620f5dbb820ad09a910fdb6186db9c9ba0a51e335e6fe0f27b2fbd7d9416"
  }
 }
--- a/pkgs/applications/networking/cluster/rke2/1_35/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_35/versions.nix
@@ -1,13 +1,13 @@
 {
-  rke2Version = "1.35.7+rke2r1";
-  rke2Commit = "382a8b31a8fd78e376ab6f02c4bb0ec5592aada2";
-  rke2TarballHash = "sha256-+GGX3vfd3JwT+i1ilNx1K4CJV9qlTy9kuOfvA9k21a4=";
-  rke2VendorHash = "sha256-OR3BT9/n/LDn9Ngt0/eF2rNfvJmShvTVcWVBVYy2a+Q=";
-  k8sImageTag = "v1.35.7-rke2r1-build20260723";
-  etcdVersion = "v3.6.14-k3s1-build20260723";
+  rke2Version = "1.35.8+rke2r1";
+  rke2Commit = "0fec82ea2fa6c7b25b7a3fe3cd990fbecc07e1bb";
+  rke2TarballHash = "sha256-WtdKeJ/AbUJaY+ovYZAEpDpWNXYFvJwkPf2V533cIn8=";
+  rke2VendorHash = "sha256-+OaVavHIG6Xx3bOBi90PXKI28dSQWtKHV8A+7EbbF7E=";
+  k8sImageTag = "v1.35.8-rke2r1-build20260821";
+  etcdVersion = "v3.6.14-k3s1-build20260819";
  pauseVersion = "3.10.2";
-  ccmVersion = "v1.35.6-0.20260610221957-158346759a70-build20260710";
-  dockerizedVersion = "v1.35.7-rke2r1";
-  helmJobVersion = "v0.13.3-build20260727";
+  ccmVersion = "v1.35.8-0.20260817193936-20fc9c33a412-build20260820";
+  dockerizedVersion = "v1.35.8-rke2r1";
+  helmJobVersion = "v0.13.3-build20260820";
  imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
 }
--- a/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json
+++ b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json
@@ -1,138 +1,138 @@
 {
  "images-calico-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
-    "sha256": "4ed202b0063c9c6da4610d61a96088143a92934cf3f49a51c6992c97172ffe00"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
+    "sha256": "b06ffc2ed6d8d31c624900ddfde822f2c99dd763b95939689118fc7612c4464c"
  },
  "images-calico-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
-    "sha256": "385b9bb3a4de9482a4e8937173efcd68c9dfc956cac626d835d0bd5fcde82bb9"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
+    "sha256": "62e8d4fd3f9710cdaa069fbf5ab9f7766265f8e016e2e64b549cff65226a236f"
  },
  "images-calico-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
-    "sha256": "64ce20381ca4930c566345d0511074924d0bef27b2ebc7ab85ec952c13fa6b41"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
+    "sha256": "ed2fa4a995e3d0a0e27d088542fbf448ce985664e9eff7144fc65c33c5e81ccd"
  },
  "images-calico-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
-    "sha256": "597ba9638da491d89e291707fa5cbd1245ba6f543dcb19d5005346834cc45f30"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
+    "sha256": "9acc7a3d9c8f1350ffcb640aa96146b9e5005a7d7d22e7d3b95071d5e3898556"
  },
  "images-canal-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
-    "sha256": "57eb0f3a69ed0ba6664c0fb24f14fc479d3c176a1f5f834c0d7af49d4467977e"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
+    "sha256": "cc15190ff288f5763c4f4e53f3acaa9296f93488d8d19cae7c7c7ad6c5869573"
  },
  "images-canal-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
-    "sha256": "9e89572eb2a5958b456dc1ca418bdbdbd694a176dd2cf41e6df55fe0488156ba"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
+    "sha256": "4359b651bfdec8f3bcc01b351b33a55ff21f06b18a767366db6f3800d5750871"
  },
  "images-canal-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
-    "sha256": "8788a2972a5c839ae98f1920f0f4bd5a9e14c4dcbe7d01f3f2d366aaf0904940"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
+    "sha256": "73bcbdf50c5cb1abbc978a6abcd5769d5fcf0448aaf36bb808d3937213e85b08"
  },
  "images-canal-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
-    "sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
+    "sha256": "fdb78292756a38d2136fa2be014d77f29b06d5ffbdfe8e379d9688614abf89e2"
  },
  "images-cilium-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
-    "sha256": "b7a4c106daf2050a643006b42ed0f851fb6f60afaa55304d168899a04a4bbc6e"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
+    "sha256": "fb9343b772f063c79240892a7b894bfb59eef1bb988a4249481e44b1ffaa0c94"
  },
  "images-cilium-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
-    "sha256": "5cca08587f244bb884868265b81f4fac429574a7bdf557f80d42e9e7611ee316"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
+    "sha256": "6c76903f258b12bc0f322bcb029247ee49544b925170d320409401beeecd41bd"
  },
  "images-cilium-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
-    "sha256": "1bd2ad26212aac5d198b619d51aa5d5dd5e38617d4b9817878bdbc0f7f7cf7de"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
+    "sha256": "d838b664df5087b7a42e32b0791e2ecf6d5842d8482197ebb07137ee8b84ff46"
  },
  "images-cilium-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
-    "sha256": "1462679bf0044b27a1b2f1ff0feff9f0e8d90cec40ec7049fb6fbfcd63f7740d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
+    "sha256": "4174ecb382950b90e9103d5b264876f5efae0f704ff2e927f36ed4412134c110"
  },
  "images-core-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
-    "sha256": "6e9ce2614995d0cf4263c1179e641094db79bde677c4bd383f3dd0689dee9c33"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
+    "sha256": "0b4e1047104090016494e2d908d5eac4726be5791ae2bf2ace34c0a7c1a865a4"
  },
  "images-core-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
-    "sha256": "9d7bfbbf0ab0965f3057e7fbb0e369ceca2c8f4eb57f096f1c832f0a5d08015f"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
+    "sha256": "8988a2eff587dd88b8eab86fe719703e9541a1f08d22771a94cbec446a13db86"
  },
  "images-core-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
-    "sha256": "47b61336f2a0241783853e0046fbf51fbd8734fd650ffe04734bc4971f9eafc4"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
+    "sha256": "1ca03103bba3e95a05d5a140688b82ce9881e45442266247c8c38cae65362558"
  },
  "images-core-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
-    "sha256": "2e905c87eef9cae836a39c0ad51da2bed89381bb5b9f3b899881d72daa206a1d"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
+    "sha256": "20f73e4bf666f5c5b6c935a818a1304583a5782027e2ec0b7c304fc909320597"
  },
  "images-flannel-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
-    "sha256": "f20614609ba944a77e3e6a563c60fd6ae532772b9f1f6566f9b437e57011f5a6"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
+    "sha256": "b4402c73e9bf743c1f3bb7542f0c3829c1da03278f2723ee857a835a9f52ff4d"
  },
  "images-flannel-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
-    "sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
+    "sha256": "8205dd4dc70b3f2fdb34f4e92c9c46b76ba33ab0953f3852518ee805fdbca905"
  },
  "images-flannel-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
-    "sha256": "26af48dc2d2a3801192592958ff5b0650ed7b8b5663a713cf303b03f082639ea"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
+    "sha256": "16016e1c985dbd199be5648969db133e6e50200263e6c22ab0da6eec0b00a260"
  },
  "images-flannel-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
-    "sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
+    "sha256": "d833c1d1e13063b25c3d0013a653b1f137b4a020fd97ccfa5519d251f158c69c"
  },
  "images-harvester-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
-    "sha256": "76b394f6c07307b2a67273737aff50391155fbc9fec3089fbc2c89e23b96e142"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
+    "sha256": "d5c277b8a9bc6c68efe8a299c18bf45230575ac18d7a83d5e54188bfd4372f75"
  },
  "images-harvester-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
-    "sha256": "3fd4d6add8a68bc8708117e8a4ab250111afc28d97240827f28ffef3b046baf4"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
+    "sha256": "dc3e25c7eefd553bf1aef1b19f3d94334e7a18a9a16c055bce7dfd2f9c71169c"
  },
  "images-harvester-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
-    "sha256": "f44c3cc282661291539114f1cc9303961b16846b7a33b5205bdc16abb6e37440"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
+    "sha256": "504ddee3e91660e9879c49eb9610389eb53387907ca375d4d71baf4507dbbd99"
  },
  "images-harvester-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
-    "sha256": "752c3257002cf8c0bb5ac2a30517662fe60365269eff568788d1d8d0d256fa55"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
+    "sha256": "2a44901076e30e7a85adbc705e83fd27309dc58182ad6b44a782db5b971845ed"
  },
  "images-ingress-nginx-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.gz",
-    "sha256": "236775e2760b87dd5fd308bd09fd66ba8b1c1291e131bea76f68711e35ac017f"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.gz",
+    "sha256": "11841a3a1791dde1b3e194dd320881e0c7f180fdc4dc047ef1a2f769a90d232b"
  },
  "images-ingress-nginx-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.zst",
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.zst",
    "sha256": "d5b7d3f12de0799cebf84fc6260fc4f093f2837c5fef6fc84849d8f1da5cbc22"
  },
  "images-ingress-nginx-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.gz",
-    "sha256": "c16c548f205eb8c39d62554331bf8626f258cdc2e876515dd90005103edb24a6"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.gz",
+    "sha256": "5a745681f7f502d1d3e7e468b6572010ebdf92e1004e072dbf479a03df25608c"
  },
  "images-ingress-nginx-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.zst",
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.zst",
    "sha256": "ae55e099bc706ff46166843107097f61518d3c0a7832c3f71ba1171e4506d497"
  },
  "images-multus-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
-    "sha256": "7882f9f291571090d5aa849ac9ef40d409627c5019d414be5b8d58a95473a8fd"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
+    "sha256": "bdcd9607d50b2875d3b00cbfa2aee92cbf6b2ef80025a05431e5f9a226add0b3"
  },
  "images-multus-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
    "sha256": "6e5795d1367a04ca096cefaececa0f77b180bd343cd806727ce1712b1d28cc98"
  },
  "images-multus-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
-    "sha256": "d3a4c183bd226d22f5173b4e11feec5c1ca8315977c8bfa6850a3462c72ba8c5"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
+    "sha256": "3a98ba0bc66a28abca192129ab80310e460676b0a3140807510a149cb3307b38"
  },
  "images-multus-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
-    "sha256": "c994c1e337054121d1b8b204e6ebbd6a895a12a6d09c4969cad037d448447461"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
+    "sha256": "ddd3887b811ded657376843714675a306b2036955d6106e996fd475a92a447ea"
  },
  "images-vsphere-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
-    "sha256": "ea071b7f68f3dae1cda0658a61df0c3e932aac6eaa92f6ed00074ae21f760713"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
+    "sha256": "53c4a84f7a1dcff1dd3560d0f87cb6010d3a1ae3a8bc025b5a1767a45a45c421"
  },
  "images-vsphere-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
-    "sha256": "01b86578072b262389ca7d68a6b40a4d40bb644fcdae162426755e855817a4d0"
+    "url": "https://github.com/rancher/rke2/releases/download/v1.36.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
+    "sha256": "7d3862ba7ce25ac00e02b81bf6663899f33b74f6829fe156c276dfdf68e168f4"
  }
 }
--- a/pkgs/applications/networking/cluster/rke2/1_36/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix
@@ -1,13 +1,13 @@
 {
-  rke2Version = "1.36.3+rke2r1";
-  rke2Commit = "c4f306e6c5fa18dfb447bf6b8a0423f2da68c939";
-  rke2TarballHash = "sha256-KNYRnek5EcHE2Xu6sYdKKqmzJ/h4LuaR/KIILyHAmoM=";
-  rke2VendorHash = "sha256-0SuhW4tRv7YZCNNCRikGYRw1DVaWvaZ1/q83Uko6YAg=";
-  k8sImageTag = "v1.36.3-rke2r1-build20260723";
-  etcdVersion = "v3.6.14-k3s1-build20260723";
+  rke2Version = "1.36.4+rke2r1";
+  rke2Commit = "7479a59cdd2c8ce0b8871699a24daa4b7c28cc64";
+  rke2TarballHash = "sha256-VO7epe6yWZ1RMN/mhJ3ZkERigHW1gEcRw+K/kmtEpA4=";
+  rke2VendorHash = "sha256-QmMQieCBIZ0X0d/OkdznQPN/I8NH+mX7vjWaMWOfKjQ=";
+  k8sImageTag = "v1.36.4-rke2r1-build20260821";
+  etcdVersion = "v3.6.14-k3s1-build20260819";
  pauseVersion = "3.10.2";
-  ccmVersion = "v1.36.2-0.20260610225606-10b320a3ba51-build20260709";
-  dockerizedVersion = "v1.36.3-rke2r1";
-  helmJobVersion = "v0.13.3-build20260727";
+  ccmVersion = "v1.36.4-0.20260817193921-a2fc9574e060-build20260820";
+  dockerizedVersion = "v1.36.4-rke2r1";
+  helmJobVersion = "v0.13.3-build20260820";
  imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
 }
--- a/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/pkgs/applications/networking/cluster/rke2/default.nix
@@ -5,8 +5,6 @@ let
  extraArgs = removeAttrs args [ "callPackage" ];
 in
 rec {
-  rke2_1_33 = common (import ./1_33/versions.nix) extraArgs;
-
  rke2_1_34 = common (import ./1_34/versions.nix) extraArgs;

  rke2_1_35 = common (import ./1_35/versions.nix) extraArgs;
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -977,13 +977,13 @@
    "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
  },
  "newrelic_newrelic": {
-    "hash": "sha256-HEnS5hgVePhG5dEB+ALKEXd0yUt+4QbAu/m+hWzkvz0=",
+    "hash": "sha256-feT15NquPB7KV3nw+hsyP5aqG67nFgLi3k5LKOSyp+Y=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.97.1",
+    "rev": "v3.97.5",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/KKT8PWCyfC0w39Mo8X33ycudupl0BDGw0DyLIyymRo="
+    "vendorHash": "sha256-dMNDu9uxrZXsqmmEsDWB0ruiRamCgm5jEK5372lLt8E="
  },
  "ns1-terraform_ns1": {
    "hash": "sha256-6w0r6QXm16h4I4PFj80dJhTDbF4FPMjJalO0TfXGBEA=",
@@ -1067,11 +1067,11 @@
    "vendorHash": null
  },
  "oracle_oci": {
-    "hash": "sha256-3/apEon1W1iaB7UIkYgI4POV+f1uVDVXX4V6dyeqsLk=",
+    "hash": "sha256-N/0SwbH9eYbXmfRP/X534AsaQVgyUGztVkBlUOHgRGY=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v8.28.0",
+    "rev": "v9.1.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -1463,13 +1463,13 @@
    "vendorHash": "sha256-G3OCHFeCUCN5YUusxGNx+xnbpYoA2F+uGdpEn70ExN8="
  },
  "vmware_avi": {
-    "hash": "sha256-jhP8b6BpsBBMjYP2IPvoq9cvGQ+LMDcZyYAFTYbnhC8=",
+    "hash": "sha256-xENQPgjXt6hegLYh5muZUhhEd5x5IvdQyXs8HQBRCGs=",
    "homepage": "https://registry.terraform.io/providers/vmware/avi",
    "owner": "vmware",
    "repo": "terraform-provider-avi",
-    "rev": "v32.1.2",
+    "rev": "v32.1.3",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3vlOA/0w2JKtSkz+p8VQcsLD42beIXa81Ahw7/jkkqs="
+    "vendorHash": "sha256-heaypQctuh0aqONOb8IAjBbYUGF2j4QMBiYvMiQM+rI="
  },
  "vmware_vcd": {
    "hash": "sha256-/o1bINYaSJXqFkda3N2iRwno2QVCE+KaLLGjvlllMEw=",
--- a/pkgs/by-name/_9/_9router/package-lock.json
+++ b/pkgs/by-name/_9/_9router/package-lock.json
@@ -0,0 +1,112 @@
+{
+  "name": "9router",
+  "version": "0.5.75",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "9router",
+      "version": "0.5.75",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "enquirer": "^2.4.1",
+        "node-forge": "^1.3.3",
+        "node-machine-id": "^1.1.12",
+        "react": "19.2.1",
+        "react-dom": "19.2.1"
+      },
+      "bin": {
+        "9router": "cli.js"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
+      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
+      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-machine-id": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
+      "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
+      "license": "MIT"
+    },
+    "node_modules/react": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz",
+      "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz",
+      "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==",
+      "license": "MIT",
+      "dependencies": {
+        "scheduler": "^0.27.0"
+      },
+      "peerDependencies": {
+        "react": "^19.2.1"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "license": "MIT"
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    }
+  }
+}
--- a/pkgs/by-name/_9/_9router/package.nix
+++ b/pkgs/by-name/_9/_9router/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchzip,
+  nix-update-script,
+  nodejs,
+}:
+buildNpmPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "9router";
+  version = "0.5.75";
+
+  src = fetchzip {
+    url = "https://registry.npmjs.org/9router/-/9router-${finalAttrs.version}.tgz";
+    hash = "sha256-4G6DXod9H6FOJ6MSWm//p4lpjT4032/7YfpsqrvdT9A=";
+  };
+
+  npmDepsHash = "sha256-L1FsPonQR0CkezH6A3fQdIUwb5Tzd269CFO6NhhXbGQ=";
+
+  postPatch = ''
+    # devDependencies only drive the upstream bundling step, which the tarball
+    # has already run, and would pull in esbuild binaries for every platform.
+    ${lib.getExe' nodejs "node"} --eval '
+      const pkg = require("./package.json");
+      delete pkg.devDependencies;
+      require("fs").writeFileSync("package.json", JSON.stringify(pkg, null, 2));
+    '
+
+    # npm tarball doesn't ship a lock file; vendor a generated one.
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  # The tarball ships a prebuilt Next.js standalone bundle under app/.
+  dontNpmBuild = true;
+
+  # Skip the bundled postinstall hook, which downloads better-sqlite3, sql.js
+  # and systray2 into $HOME and so requires network access.
+  npmFlags = [ "--ignore-scripts" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Local AI gateway routing requests across multiple AI providers";
+    homepage = "https://github.com/decolua/9router";
+    downloadPage = "https://www.npmjs.com/package/9router";
+    changelog = "https://github.com/decolua/9router/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ imcvampire ];
+    mainProgram = "9router";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+  };
+})
--- a/pkgs/by-name/ab/abpoa/package.nix
+++ b/pkgs/by-name/ab/abpoa/package.nix
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "${lib.optionalString enablePython "py"}abpoa";
-  version = "1.5.6";
+  version = "1.5.7";

  src = fetchFromGitHub {
    owner = "yangao07";
    repo = "abPOA";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-MZ1btOcrWDXRXaSl8mALZCrZaS17/SL5PnYrrFLDcrc=";
+    hash = "sha256-eKF1BVni8E8TAaWJme33IeOqUhmvyUNPdTPCRWd0L80=";
  };

  patches = [ ./simd-arch.patch ];
--- a/pkgs/by-name/ad/adhammer/package.nix
+++ b/pkgs/by-name/ad/adhammer/package.nix
@@ -10,7 +10,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "adhammer";
-  version = "1.4.10";
+  version = "1.5.1";

  __structuredAttrs = true;

@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "icedracon";
    repo = "adhammer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-a5grgBntlLcfPgdm+wxdftSPeMoXoY8pG6uAEIc04b8=";
+    hash = "sha256-9wUpvYzbXpgB2nzseLx1qHKBzyDLehrVY0PCy3dHBQM=";
  };

-  cargoHash = "sha256-7XDB8wFbTMZLXBe+H1FFPvJGAlu8VmooZExxAQDb4RI=";
+  cargoHash = "sha256-l9Gw3HXbQ5TYN4XdwG68HU1+lr2PU+zalvjMQ6NKPXs=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/ad/adrs/package.nix
+++ b/pkgs/by-name/ad/adrs/package.nix
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "adrs";
-  version = "0.11.1";
+  version = "0.12.1";

  src = fetchFromGitHub {
    owner = "joshrotenberg";
    repo = "adrs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9FWBfOwePl4ML7OIyhbiZAiXVoyEwtyJCxcPsO/tW3E=";
+    hash = "sha256-enUoRwEEn97W9j4mLxzGI9C1WRWNmOJ+AQXS3kWuD3w=";
  };

-  cargoHash = "sha256-hN7saY0W2dov1cR0VRab7K/wqCnYMCkOpR5ayAY34+Q=";
+  cargoHash = "sha256-kPTA4pH/mXY02hs0XLi8zGR1hNaFiF6VoSprDlqrmpA=";

  meta = {
    description = "Command-line tool for managing Architectural Decision Records";
--- a/pkgs/by-name/ai/airbuddy/package.nix
+++ b/pkgs/by-name/ai/airbuddy/package.nix
@@ -7,12 +7,12 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "airbuddy";
-  version = "2.7.3";
+  version = "2.8.1-660";

  src = fetchurl {
    name = "AirBuddy.dmg";
-    url = "https://download.airbuddy.app/WebDownload/AirBuddy_v${finalAttrs.version}.dmg";
-    hash = "sha256-cwvSFvaREbF+JvV5Y5dFaj6fZbzdzcjBgzdQ9WDcCFY=";
+    url = "https://su.airbuddy.app/kCRSAmcjBc/AirBuddy_v${finalAttrs.version}.dmg";
+    hash = "sha256-YeO1zmPRNF46EmuRp142J9SRvWzHraWr1+VuqthJzsQ=";
  };

  dontPatch = true;
--- a/pkgs/by-name/al/alibuild/package.nix
+++ b/pkgs/by-name/al/alibuild/package.nix
@@ -6,12 +6,12 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "alibuild";
-  version = "1.17.42";
+  version = "1.17.44";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-QFNyb6lmTGOaAj4qyDo/mTW7J6LHfALnjo+b0WTllDQ=";
+    hash = "sha256-hLFbxJVOWp1j8pV2v3h7UBZ691EONGb5HNIDrizyq6E=";
  };

  build-system = with python3Packages; [
@@ -19,8 +19,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
    setuptools-scm
  ];

-  nativeBuildInputs = with python3Packages; [ pip ];
-
  dependencies = with python3Packages; [
    requests
    pyyaml
@@ -29,9 +27,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
    distro
  ];

-  pythonRelaxDeps = [ "boto3" ];
-
-  doCheck = false;
+  postPatch = ''
+    # strip setuptools_scm upper bound limit
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools_scm[toml]>=6.2,<10" "setuptools_scm[toml]>=6.2"
+    substituteInPlace setup.py \
+      --replace-fail "setuptools_scm>=6.2,<10" "setuptools_scm>=6.2"
+  '';

  meta = {
    homepage = "https://alisw.github.io/alibuild/";
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "alienarena";
-  version = "7.72.1";
+  version = "7.72.3";

  src = fetchFromGitHub {
    owner = "alienarena";
    repo = "alienarena";
    rev = version;
-    hash = "sha256-GRvscAOYPY9wah9jweDSlWKT1oY4ZY0Bh79v4W/qKk8=";
+    hash = "sha256-BBPQNPpRF8NbgNH0Iha0gGPfu+qrS+yPXUBV895AsG0=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/am/amber-lsp/package.nix
+++ b/pkgs/by-name/am/amber-lsp/package.nix
@@ -0,0 +1,44 @@
+{
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "amber-lsp";
+  version = "0.3.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "amber-lang";
+    repo = "amber-lsp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-d5FJGeQol6NPVCbZ8F97s6jiV/JrbVJMcXwro2hBJfI=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ makeWrapper ];
+
+  cargoHash = "sha256-YSoNYjru/CWEYNqSkjCKFDps3XmmCRo4VaZ6n/7pI5A=";
+
+  # Each of the 380+ async tests spins up a tokio runtime which can exhaust
+  # memory if run in parallel on many cores.
+  checkFlags = [ "--test-threads=4" ];
+
+  postFixup = ''
+    # By default it wants to write to $out/amber-lsp-resources
+    wrapProgram $out/bin/amber-lsp \
+      --run '
+        export AMBER_LSP_RESOURCES_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/amber-lsp-resources"
+      '
+  '';
+
+  meta = {
+    description = "Amber's Language Server";
+    homepage = "https://github.com/amber-lang/amber-lsp";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "amber-lsp";
+    maintainers = with lib.maintainers; [ beeb ];
+  };
+})
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -27,13 +27,13 @@ in

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "ani-cli";
-  version = "5.0";
+  version = "5.1";

  src = fetchFromGitHub {
    owner = "pystardust";
    repo = "ani-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-rRQESi0Skoyf1jy/dRRK6ooKRPQhkak107kk5ulwZYI=";
+    hash = "sha256-lPQA3iO3F/9NS2IziQccsJ3aai6WMQy6YObdB3mDCZA=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -189,7 +189,6 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      johnrichardrinehart
      veprbl
-      wegank
    ];
    platforms = lib.platforms.unix;
  };
--- a/pkgs/by-name/au/audacity_3/package.nix
+++ b/pkgs/by-name/au/audacity_3/package.nix
@@ -214,7 +214,6 @@ stdenv.mkDerivation (finalAttrs: {
    ];
    maintainers = with lib.maintainers; [
      veprbl
-      wegank
    ];
    platforms = lib.platforms.unix;
  };
--- a/pkgs/by-name/aw/awakened-poe-trade/package.nix
+++ b/pkgs/by-name/aw/awakened-poe-trade/package.nix
@@ -13,11 +13,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "awakened-poe-trade";
-  version = "3.29.104";
+  version = "3.29.108";

  src = fetchurl {
    url = "https://github.com/SnosMe/awakened-poe-trade/releases/download/v${finalAttrs.version}/Awakened-PoE-Trade-${finalAttrs.version}.AppImage";
-    hash = "sha256-ApZwjy1tJwUtevLA7QY8/zrnHI5Tt4aXMpTo+5VWGUg=";
+    hash = "sha256-DIksV61mC0E2ZPztWK+WnMqR9KXwLMWQpc7hajaymyE=";
  };

  passthru = {
--- a/pkgs/by-name/aw/awsume/package.nix
+++ b/pkgs/by-name/aw/awsume/package.nix
@@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "awsume";
-  version = "4.5.5";
+  version = "4.5.7";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "trek10inc";
    repo = "awsume";
    tag = finalAttrs.version;
-    hash = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
+    hash = "sha256-UTwqu2czo2ASql18dj0qwPGmKCF0QxVqyX7PZMWRUeg=";
  };

  env.AWSUME_SKIP_ALIAS_SETUP = 1;
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -32,18 +32,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bcachefs-tools";
-  version = "1.39.5";
+  version = "1.39.6";

  src = fetchFromGitHub {
    owner = "koverstreet";
    repo = "bcachefs-tools";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-k9JW6GMXFwphkYGcYMwA59uafNj0EV96wTnbzeuVM1w=";
+    hash = "sha256-cBYn/g6eLT5rTumo4Y24rWSHS2Sc7gFthPuCg1AQ22k=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
-    hash = "sha256-hbh4+vpZtVpda2yVZK+fkdPXWd5+GYLbWYPfJsYtPfM=";
+    hash = "sha256-djiIwZie9HjQ/+bCEGniMFkJA66oI0n+9y9Iax4GHOM=";
  };

  postPatch = ''
--- a/pkgs/by-name/bo/bookorbit/package.nix
+++ b/pkgs/by-name/bo/bookorbit/package.nix
@@ -16,7 +16,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "bookorbit";
-  version = "2.9.0";
+  version = "2.10.0";
  __structuredAttrs = true;
  strictDeps = true;

@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "bookorbit";
    repo = "bookorbit";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Dj/H7HWzxscl+uSMGDRgAwLeHDzcZEOM0RsiWrPJjUs=";
+    hash = "sha256-Hczdvkv0p17qbsg0ZKczpFFZwMLasX5QC/yZQ5BOzA4=";
  };

  pnpmWorkspaces = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
      ;
    inherit pnpm;
    fetcherVersion = 4;
-    hash = "sha256-NVI9R6n9HIE2VufTcqe4cjZbTK30R/i6dZy39TGH8qs=";
+    hash = "sha256-v/SVAGwDyBGdHdrbk0H3cpnF+w2/TLOcVfLFXe8kr8Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/bp/bpf-linker/package.nix
+++ b/pkgs/by-name/bp/bpf-linker/package.nix
@@ -13,16 +13,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "bpf-linker";
-  version = "0.11.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "aya-rs";
    repo = "bpf-linker";
    tag = "v${version}";
-    hash = "sha256-uMpLQR2FAI96MYfWo8lR9pUeWhswY6wMUOxQwq3hCdw=";
+    hash = "sha256-qo5cJBZQHsbKSL+6YA0vcmPCo76pg2soekWziysXTDM=";
  };

-  cargoHash = "sha256-asCS4oLMXJ4y4vCDRsq2kuTOOPHebT0Dd+AE20GkZvI=";
+  cargoHash = "sha256-uiJQZ4U3lW2Vs1Dbb1v+eIgSNaLnd5MKpZi0O8KwGRE=";

  buildNoDefaultFeatures = true;
  buildFeatures = [ "llvm-${lib.versions.major llvmPackagesForLinker.llvm.version}" ];
--- a/pkgs/by-name/ce/celf/package.nix
+++ b/pkgs/by-name/ce/celf/package.nix
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  smlnj,
+  smlnj-legacy,
 }:

 stdenv.mkDerivation {
@@ -16,18 +16,18 @@ stdenv.mkDerivation {
    sha256 = "0slrwcxglp0sdbp6wr65cdkl5wcap2i0fqxbwqfi1q3cpb6ph6hq";
  };

-  buildInputs = [ smlnj ];
+  buildInputs = [ smlnj-legacy ];

  # (can also build with MLton)
  buildPhase = ''
-    export SMLNJ_HOME=${smlnj}
+    export SMLNJ_HOME=${smlnj-legacy}
    sml < main-export.sml
  '';

  installPhase = ''
    mkdir -p $out/bin
    cp .heap* $out/bin/
-    ./.mkexec ${smlnj}/bin/sml $out/bin celf
+    ./.mkexec ${smlnj-legacy}/bin/sml $out/bin celf
  '';

  meta = {
--- a/pkgs/by-name/ch/chiri/package.nix
+++ b/pkgs/by-name/ch/chiri/package.nix
@@ -22,122 +22,107 @@
  webkitgtk_4_1,
 }:

-rustPlatform.buildRustPackage (
-  finalAttrs:
-  let
-    # on macOS, Node.js worker threads default to `trackUnmanagedFds: true`
-    # when used with pnpm's graceful-fs EAGAIN retry loop, this causes file descriptor
-    # churn that leads to a crash during cleanup (presenting as `Killed: 9` / SIGKILL)
-    # within the Nix sandbox. so we just disable `trackUnmanagedFds` to prevent this
-    # see: https://github.com/NixOS/nixpkgs/issues/525627
-    pnpm-patched = pnpm_11.overrideAttrs (old: {
-      postPatch = (old.postPatch or "") + ''
-        substituteInPlace dist/pnpm.mjs \
-          --replace-fail \
-            'resourceLimits: this._workerResourceLimits' \
-            'resourceLimits: this._workerResourceLimits, trackUnmanagedFds: false'
-      '';
-    });
-  in
-  {
-    pname = "chiri";
-    version = "1.0.0";
+let
+  pnpm = pnpm_11;
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "chiri";
+  version = "1.0.0";

-    src = fetchFromGitHub {
-      owner = "chiriapp";
-      repo = "chiri";
-      tag = "app-v${finalAttrs.version}";
-      hash = "sha256-ASmDHMlp+jNA/8uJ78SLv/2plG41KYkKdel2WpMGwq8=";
-    };
+  src = fetchFromGitHub {
+    owner = "chiriapp";
+    repo = "chiri";
+    tag = "app-v${finalAttrs.version}";
+    hash = "sha256-ASmDHMlp+jNA/8uJ78SLv/2plG41KYkKdel2WpMGwq8=";
+  };

-    cargoHash = "sha256-BeEpTFKWr81vNBUhHOnfrJ/yNgpZGDExnaxvIbwkBMs=";
+  cargoHash = "sha256-BeEpTFKWr81vNBUhHOnfrJ/yNgpZGDExnaxvIbwkBMs=";

-    pnpmDeps = fetchPnpmDeps {
-      inherit (finalAttrs) pname version src;
-      pnpm = pnpm-patched;
-      hash = "sha256-IQgYbkGsPC0TbqcDxhOgVWFmpxprCCwrQI7QJx4IpAc=";
-      fetcherVersion = 4;
-    };
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    hash = "sha256-IQgYbkGsPC0TbqcDxhOgVWFmpxprCCwrQI7QJx4IpAc=";
+    fetcherVersion = 4;
+  };

-    nativeBuildInputs = [
-      cargo-tauri.hook
-      nodejs_26
-      pnpmConfigHook
-      pnpm-patched
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wrapGAppsHook4
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      makeBinaryWrapper
-    ];
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs_26
+    pkg-config
+    pnpm
+    pnpmConfigHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];

-    buildInputs = [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib-networking
-      libayatana-appindicator
-      webkitgtk_4_1
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    libayatana-appindicator
+    webkitgtk_4_1
+  ];

-    cargoRoot = "src-tauri";
-    buildAndTestSubdir = "src-tauri";
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = "src-tauri";

-    postPatch =
-      lib.optionalString stdenv.hostPlatform.isLinux ''
-        for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
-          if [[ -f "$libappindicatorRs" ]]; then
-            substituteInPlace "$libappindicatorRs" \
-              --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-          fi
-        done
-      ''
-      + ''
-        substituteInPlace src-tauri/tauri.conf.json \
-          --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
-      '';
-
-    # This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
-    preBuild = ''
-      unset TAURI_SIGNING_PRIVATE_KEY
-      unset TAURI_SIGNING_PUBLIC_KEY
-      pnpm build
+  postPatch =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      for libappindicatorRs in $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs; do
+        if [[ -f "$libappindicatorRs" ]]; then
+          substituteInPlace "$libappindicatorRs" \
+            --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+        fi
+      done
+    ''
+    + ''
+      substituteInPlace src-tauri/tauri.conf.json \
+        --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
    '';

-    postInstall =
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          mkdir -p $out/bin
-          makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
-        ''
-      else
-        ''
-          mv $out/bin/Chiri $out/bin/chiri
-          for desktopFile in \
-            $out/share/applications/Chiri.desktop \
-            $out/share/applications/garden.chiri.Chiri.desktop
-          do
-            if [ -f "$desktopFile" ]; then
-              substituteInPlace "$desktopFile" \
-                --replace-fail "Exec=Chiri" "Exec=chiri"
-            fi
-          done
-        '';
+  # This is needed since the signing keys are private, and are only used in CI during releases anyways. Regular users won't need this.
+  preBuild = ''
+    unset TAURI_SIGNING_PRIVATE_KEY
+    unset TAURI_SIGNING_PUBLIC_KEY
+    pnpm build
+  '';

-    doCheck = false;
+  postInstall =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/bin
+        makeWrapper "$out/Applications/Chiri.app/Contents/MacOS/chiri" "$out/bin/chiri"
+      ''
+    else
+      ''
+        mv $out/bin/Chiri $out/bin/chiri
+        for desktopFile in \
+          $out/share/applications/Chiri.desktop \
+          $out/share/applications/garden.chiri.Chiri.desktop
+        do
+          if [ -f "$desktopFile" ]; then
+            substituteInPlace "$desktopFile" \
+              --replace-fail "Exec=Chiri" "Exec=chiri"
+          fi
+        done
+      '';

-    passthru.updateScript = nix-update-script;
+  doCheck = false;

-    meta = {
-      description = "Cross-platform CalDAV task management app";
-      homepage = "https://github.com/chiriapp/chiri";
-      changelog = "https://github.com/chiriapp/chiri/releases/tag/app-v${finalAttrs.version}";
-      license = lib.licenses.zlib;
-      maintainers = with lib.maintainers; [ SapphoSys ];
-      mainProgram = "chiri";
-      platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    };
-  }
-)
+  passthru.updateScript = nix-update-script;
+
+  meta = {
+    description = "Cross-platform CalDAV task management app";
+    homepage = "https://github.com/chiriapp/chiri";
+    changelog = "https://github.com/chiriapp/chiri/releases/tag/app-v${finalAttrs.version}";
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ SapphoSys ];
+    mainProgram = "chiri";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})
--- a/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix
+++ b/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix
@@ -6,11 +6,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "chromium-hsts-preload-list";
-  version = "153.0.7990.1";
+  version = "155.0.8053.3";

  src = fetchurl {
    url = "https://raw.github.com/chromium/chromium/${finalAttrs.version}/net/http/transport_security_state_static.json";
-    hash = "sha256-ObT9lWtjw/V0UGY552pEWJ6KbfF0izB/zJ7v+00IFB8=";
+    hash = "sha256-GIC2O/GOHi7MpYKiLYlmiLHwh1nzvdCHcUSb3fC18I4=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/ci/cine/package.nix
+++ b/pkgs/by-name/ci/cine/package.nix
@@ -19,14 +19,14 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "cine";
-  version = "1.8.2";
+  version = "1.8.4";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "diegopvlk";
    repo = "Cine";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kgWK27GThlQFZ0M8UjGR37vKdaPvbg0MfZPB5gq+xGY=";
+    hash = "sha256-zUsfAe8PdfBv9XzJ0mY+ELIcl+x35v11THj9gtG/fxg=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/cl/clp/package.nix
+++ b/pkgs/by-name/cl/clp/package.nix
@@ -9,13 +9,13 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "1.17.10";
+  version = "1.17.11";
  pname = "clp";
  src = fetchFromGitHub {
    owner = "coin-or";
    repo = "Clp";
    rev = "releases/${finalAttrs.version}";
-    hash = "sha256-9IlBT6o1aHAaYw2/39XrUis72P9fesmG3B6i/e+v3mM=";
+    hash = "sha256-Gt42F6xc1XgcB6VvtaSAam8/QLJjPRHNKkx3sBFwcFg=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/co/coc-rust-analyzer/package.nix
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -7,16 +7,16 @@

 buildNpmPackage {
  pname = "coc-rust-analyzer";
-  version = "0-unstable-2026-08-11";
+  version = "0-unstable-2026-09-01";

  src = fetchFromGitHub {
    owner = "fannheyward";
    repo = "coc-rust-analyzer";
-    rev = "f61f4f712c9902ea6362c73e25e70ec552deb0e5";
-    hash = "sha256-Hm3TGc/6DPEqGwZ1KIHFlCP0BipJCoaKBg05cnjVv04=";
+    rev = "674637e97ff14073b09350b41f8737bb95400cf1";
+    hash = "sha256-FrrsBvkfyrZZCfTMNxht4+ub9r3gy+zdWXNLGuCWlJA=";
  };

-  npmDepsHash = "sha256-Td6TdFxrWTZE+2NKxTABChAB/YaN8MjL/uemda+AYfc=";
+  npmDepsHash = "sha256-h4vCJEZxI7M7xD9e5VdI2JDgRLcGdEO0SNXLrv3E5A8=";

  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

--- a/pkgs/by-name/co/commafeed/package.nix
+++ b/pkgs/by-name/co/commafeed/package.nix
@@ -13,13 +13,13 @@
  nix-update-script,
 }:
 let
-  version = "7.3.0";
+  version = "7.3.2";

  src = fetchFromGitHub {
    owner = "Athou";
    repo = "commafeed";
    tag = version;
-    hash = "sha256-VCN8NBVGQl7/D3fESxiw3ipUoK3qBM0SSnEYBB0E+64=";
+    hash = "sha256-AmmXM6lLGa5t9tHe4Ae8LCkIR/nkY89/4D2KIQnVcNU=";
  };

  frontend = buildNpmPackage {
@@ -29,7 +29,7 @@ let

    sourceRoot = "${src.name}/commafeed-client";

-    npmDepsHash = "sha256-usdJEjW/Oz993Ik8JZnEQ08ArqmLx/3hSdhlUJgCrig=";
+    npmDepsHash = "sha256-oh97YH9yaIqjjOqtd8iMvlZ5gc4cwJpkLrZyAZGS9Ho=";

    nativeBuildInputs = [ biome ];

@@ -55,7 +55,7 @@ maven.buildMavenPackage {

  pname = "commafeed";

-  mvnHash = "sha256-Gi+KMrdSXlnI34wvAYnJffVCa3WUYkPEFIv382+mwj4=";
+  mvnHash = "sha256-d6sq5v+BToT1rj7AXPpuLZP9uKpXyt8F3EYWxV7uyoY=";
  mvnJdk = jdk25;

  mvnParameters = lib.escapeShellArgs [
--- a/pkgs/by-name/co/conduit/package.nix
+++ b/pkgs/by-name/co/conduit/package.nix
@@ -15,14 +15,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "conduit";
-  version = "0.9.7";
+  version = "0.9.8";
+
+  __structuredAttrs = true;
+  strictDeps = true;

  src = fetchFromGitHub {
    owner = "LLNL";
    repo = "conduit";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-DmnHGj6Q/i+wVNIbaTGrFX9f0Kry2X5bC7zahXv29I4=";
+    hash = "sha256-uGHOz15jv8RHM2JTuJpzppMBKCqMqoWX7w0QZqJ+h8c=";
  };

  nativeBuildInputs = [
@@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    description = "Simplified Data Exchange for HPC Simulations";
    homepage = "https://github.com/LLNL/conduit";
-    changelog = "https://github.com/LLNL/conduit/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/LLNL/conduit/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.bsd3Lbnl;
    maintainers = with lib.maintainers; [ GaetanLepage ];
    platforms = lib.platforms.all;
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@

 buildGoModule rec {
  pname = "containerd";
-  version = "2.3.4";
+  version = "2.3.5";

  outputs = [
    "out"
@@ -28,7 +28,7 @@ buildGoModule rec {
    owner = "containerd";
    repo = "containerd";
    tag = "v${version}";
-    hash = "sha256-IGgToUpkbqtjGJD+GtCPSeHW9ZRnSS8NMfECok9HgjU=";
+    hash = "sha256-RIZxlXwgOizLVKr4XRIKAlUP19URolGp4J849hoQMSM=";
  };

  postPatch = ''
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "converseen";
-  version = "0.15.2.7";
+  version = "0.15.2.8";

  src = fetchFromGitHub {
    owner = "Faster3ck";
    repo = "Converseen";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-TS6aCq1tH/0+im2pEYe2a+0KChKHhXJoTu0MjHoZJdQ=";
+    hash = "sha256-YodeOYe4fMOjQ+jrUo0PVdcEvOktZ+MCK+g8ZpIFczI=";
  };

  strictDeps = true;
--- a/pkgs/by-name/co/copybara/package.nix
+++ b/pkgs/by-name/co/copybara/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "copybara";
-  version = "20260831";
+  version = "20260907";

  src = fetchurl {
    url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
-    hash = "sha256-g4HOrjXluLoX/C1apban6PdnOaL+eYXkx22UriMuqKc=";
+    hash = "sha256-RJnpzQwHz8m4LDr2RLe5XBeH7qmA+ZwVFVFXdMEwfWQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/co/corrode-scanner/package.nix
+++ b/pkgs/by-name/co/corrode-scanner/package.nix
@@ -8,7 +8,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "corrode-scanner";
-  version = "0.5.1";
+  version = "0.5.2";

  __structuredAttrs = true;

@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "ul0gic";
    repo = "corrode";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cxmX0UOEI78P9K4glTh7B2b+/Uc5pHY961RamarvZm0=";
+    hash = "sha256-Vxad4HOrrndeDwVZUnDKP/wwrHLiw0dPK3/SJw7AyLQ=";
  };

-  cargoHash = "sha256-f+gwucHpQu5IJqll/DmGYkNwu/5a2esl9URpwj7c3Pc=";
+  cargoHash = "sha256-wpel50zTaLtKVwzai9aIFzjWNLOE5mDoGF7Q+eqUO2M=";

  nativeInstallCheckInputs = [ versionCheckHook ];

--- a/pkgs/by-name/co/cosmic-app-library/package.nix
+++ b/pkgs/by-name/co/cosmic-app-library/package.nix
@@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-app-library";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-app-library";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-9Swwvo1yny2PWK9n6NqH8tC/lOYplhNJXiENrhl+++U=";
+    hash = "sha256-oAGo8ByFHiSR9J57Ytn9kjMRwu103Retr9VcZjjaTtY=";
  };

-  cargoHash = "sha256-Lq1Gs1/dcIxfWM4jNIH2qGu94HCC+JKxFdUTb/MDHzg=";
+  cargoHash = "sha256-UNSoRkHFQ1VpIeF/xMyONpwZ8hG5yUkTWqq/9LQ1wqs=";

  separateDebugInfo = true;
  __structuredAttrs = true;
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-applets";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-applets";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-sy+fX6hqwkuU0HlcyObxDds+jhmP68RfmrDC5PW6VpA=";
+    hash = "sha256-OMz/lh5bJ7YjS6GLP+yQsJ9HvYNDedj2MMMA5pgwPEE=";
  };

-  cargoHash = "sha256-xgpsIynrVcN62IQ++ABZqqbP0ak86eQYTc1SCSxy2l4=";
+  cargoHash = "sha256-iGnqu6Di2kxEAujzJ+Yy+A4cUZrdDjQ7aF3yrVz+QYU=";

  separateDebugInfo = true;
  __structuredAttrs = true;
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -14,7 +14,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-bg";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,17 +20,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-comp";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-comp";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-6iV0ZxSSw+2t5qUvEzM/W4+/erwx03TsOwKb64P8CrE=";
+    hash = "sha256-axWy7F05WOt03WX4nYdObclFf3E12C4zxQ2eNLOjPp0=";
  };

-  cargoHash = "sha256-b8X5X6aQZMa8X189812syMBPvjJDUbJUpx+jiar8fzQ=";
+  cargoHash = "sha256-J9/7DVMyx4SV/BKhg4l9B4haRdGfspmoZjr8LPTzmgo=";

  # Only default feature is systemd
  buildNoDefaultFeatures = !useSystemd;
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,21 +16,21 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-edit";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-edit";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-YUHUHCxXVKwnVQxGswB+YLxlzazAO9/K+k047rwL5L4=";
+    hash = "sha256-mZnL9W67hnHVS4wJBAprdPzU8VEq6mguzuhXjtPPIhc=";
  };

  postPatch = ''
    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
  '';

-  cargoHash = "sha256-e45NuPO/m+C6HaowHAOZ+++60RZMQMcQaXg/xKyZ8wM=";
+  cargoHash = "sha256-NERnN9TqqpzI9kD2ujfs11W0RnVxU+Ra6GjGk3FGO3A=";

  separateDebugInfo = true;
  __structuredAttrs = true;
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-files";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-files";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Zp8Lx/MV06Di/QZAhGymwpCubjWjdzpFwP/vlBgu1tQ=";
+    hash = "sha256-AHb+DIoQ4LKE//QSFKxTbmmse1D9C6VYQ0vhiqnbFaY=";
  };

-  cargoHash = "sha256-FDMgpFFT3JUPBcKVLHavg9hT6psW922oEx+wuUM13l4=";
+  cargoHash = "sha256-wO4tci+Ocd9sIwp2lQN7RNKc+XeqvlSJGdViQ+lVt4Q=";

  separateDebugInfo = true;
  __structuredAttrs = true;
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -20,14 +20,14 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-greeter";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-greeter";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-hDVdl2+7NVLA+YxO2HToni57IEr0i4OGTsYDc3YGTuw=";
+    hash = "sha256-mC8m6hbQ6VgJoFl7VFRkbKl4zev8pffKHRtzvXtwoRo=";
  };

  postPatch = ''
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,14 +9,14 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "cosmic-icons";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-icons";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-QUTAYIQ6qAhjZK/9BZjJzTViECLUwO/MyaOqiRb1Ans=";
+    hash = "sha256-IlWVDJZBDn0RZaWpMx+mVJrcn5eqz2i6qDIjvQjkTZ4=";
  };

  __structuredAttrs = true;
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-idle";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,14 +14,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-initial-setup";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-initial-setup";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-ta73ldHhrv6EPu7ECILyWe/dRKc0drBV3oKJvbNX9kQ=";
+    hash = "sha256-Qv95Q528TN/UafVS3C6yZqvbu/EDT+/Gj0Od50ZvIVs=";
  };

  postPatch = ''
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-launcher";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-launcher";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-BQemb4435oF2Pc7RD48O/09bM91OOl3MzndEE5G/m6E=";
+    hash = "sha256-qfBP5EzI7+oVYt5MdY+WypG5SvsFvk46F78q/cwIpWo=";
  };

-  cargoHash = "sha256-TCgQ1WMvyqa+YdpUWDPaWzbkQDNX1YEIxqx2M+ENKH0=";
+  cargoHash = "sha256-NwIcWFnN6ulNq0RVMYLlYfHGbMTgd71mbqzAAP5ZCKc=";

  separateDebugInfo = true;
  __structuredAttrs = true;
--- a/pkgs/by-name/co/cosmic-monitor/package.nix
+++ b/pkgs/by-name/co/cosmic-monitor/package.nix
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-monitor";
-  version = "1.6.0";
+  version = "1.8.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-monitor";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-JkD0UdIEMwVPas57N15ufJvCjJkVHCrQ4a87vdAQpjU=";
+    hash = "sha256-nItwje+QZkR0L+wOsmOVPJwo4THwiRLLvIFvH6XP31o=";
  };

-  cargoHash = "sha256-+kno98Pq7xWtM1Q51n85LOm7+lVl08Y1pArrwmVXT1I=";
+  cargoHash = "sha256-HHKIXKyS1zDkNGbsEWiKghPqIsPKRUJtjxKuNfI6mak=";

  separateDebugInfo = true;
  __structuredAttrs = true;
--- a/Show More
+++ b/Show More