rPackages.talib: fix build (#543630)

Clean up

.github/workflows/bot.yml

@@ -41,6 +41,10 @@ jobs:
   run:
     runs-on: ubuntu-slim
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
+    env:
+      # TODO: Remove after 2026-03-04, when Node 24 becomes the default.
+      # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
@@ -49,8 +53,7 @@ jobs:
             ci/github-script
 
       - name: Install dependencies
-        run: npm ci --package-lock-only=false @actions/artifact bottleneck
-        working-directory: ci/github-script
+        run: npm install @actions/artifact@6.2.1 bottleneck@2.19.5
 
       # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
       - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0

.github/workflows/check.yml

@@ -51,8 +51,7 @@ jobs:
             ci/github-script
 
       - name: Install dependencies
-        run: npm ci --package-lock-only=false bottleneck
-        working-directory: trusted/ci/github-script
+        run: npm install bottleneck@2.19.5
 
       - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         if: github.event_name != 'pull_request' && vars.NIXPKGS_COMMIT_CHECK_CLIENT_ID

.github/workflows/teams.yml

@@ -38,8 +38,7 @@ jobs:
             maintainers/github-teams.json
 
       - name: Install dependencies
-        run: npm ci --package-lock-only=false bottleneck
-        working-directory: ci/github-script
+        run: npm install bottleneck@2.19.5
 
       - name: Synchronise teams
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0

ci/OWNERS

@@ -211,7 +211,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 /pkgs/development/perl-modules      @stigtsp @marcusramberg
 
 # R
-/pkgs/applications/science/math/R   @jbedo
+/pkgs/by-name/r/R   @jbedo
 /pkgs/development/r-modules         @jbedo
 
 # Rust

ci/github-script/lint-commits.js

@@ -74,10 +74,8 @@ async function checkCommitMessages({ commits, core }) {
     'fix',
     'perf',
     'refactor',
-    'services',
     'style',
     'test',
-    'update',
   ]
 
   /**

ci/github-script/package-lock.json

@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "github-script",
       "dependencies": {
         "@actions/artifact": "6.2.1",
         "@actions/core": "1.10.1",

ci/github-script/package.json

@@ -2,7 +2,9 @@
   "private": true,
   "//": [
     "Keep `@actions/core` and `@actions/github` in sync with",
-    "https://github.com/actions/github-script/blob/main/package.json."
+    "https://github.com/actions/github-script/blob/main/package.json.",
+    "Keep `@actions/artifact` and `bottleneck` in sync with",
+    "`.github/workflows/bot.yml`."
   ],
   "dependencies": {
     "@actions/artifact": "6.2.1",

ci/pinned.json

@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
-      "url": "https://github.com/NixOS/nixpkgs/archive/421eebfd0ec7bccd4abe826ce62d7e6e83129493.tar.gz",
-      "hash": "sha256:1lxfhfgiv1sz2v7fg43gny57sa6wf59n98q7ldsyb2p06f4sal7w"
+      "revision": "6edbf1a6a03e75886a6609c088801a0856449e88",
+      "url": "https://github.com/NixOS/nixpkgs/archive/6edbf1a6a03e75886a6609c088801a0856449e88.tar.gz",
+      "hash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30="
     }
   },
   "version": 8

doc/build-helpers/testers.chapter.md

@@ -758,7 +758,6 @@ An attribute set of derivations which perform the tests during their build.
   - Output attribute `config` is the resulting evaluated services attrset (e.g., the value of the `system.services` option in NixOS).
     This attribute must be available even if `checkDrv` would fail.
   - Output attribute `checkDrv` is a representative derivation whose existence and buildability prove the eval is sound (e.g., `system.build.toplevel` in NixOS, but could perhaps be more specific in the case of another process manager integration).
-  - The generic tester only reads `config` and `checkDrv`. An integration may return additional attributes for its own integration-specific eval checks. Such extra attributes are optional.
 
 `mkTest` (function)
 
@@ -773,14 +772,6 @@ An attribute set of derivations which perform the tests during their build.
 : Path to a directory writable by service processes and readable by `testExe`.
   The integration must ensure this directory is available when the services and `testExe` run.
 
-`callReload` (function)
-
-: `path -> string`.
-  Given a service's name `path` (the list of service names from the top-level service down to the target sub-service, e.g. `[ "reload" "inner" ]`), returns a shell command that reloads that service.
-  The command is embedded in `testExe` and executed with sufficient privilege to reload the service (e.g. as root in the test VM).
-  There is no manager-agnostic reload command, so every integration must provide this; the integration joins the `path` per its own unit-naming convention (the suite does not assume one).
-  On NixOS the `path` dash-joins into the systemd unit name with a `.service` suffix, so the command is `systemctl reload ${lib.concatStringsSep "-" path}.service` (a top-level service is a single-element path `[ "svc" ]` -> `svc.service`; a nested sub-service `[ "parent" "child" ]` -> `parent-child.service`).
-
 :::{.example #ex-modularServiceCompliance-nixos}
 
 # NixOS invocation of the compliance suite
@@ -811,7 +802,6 @@ recurseIntoAttrs (
         config = machine.config.system.services;
         checkDrv = machine.config.system.build.toplevel;
       };
-    callReload = path: "systemctl reload ${lib.concatStringsSep "-" path}.service";
     mkTest =
       {
         name,

doc/channels.chapter.md

@@ -1,26 +0,0 @@
-# How channels work {#how-channels-work}
-
-nixpkgs uses the [channels feature](https://nixos.org/nix/manual/#sec-channels) of nix.
-
-nixpkgs is distributed for users of Nix on non-NixOS distributions through the channel
-`nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels,
-e.g. `nixos-22.11`, which includes all packages and modules for the stable NixOS
-22.11. Stable NixOS releases are generally only given
-security updates. More up to date packages and modules are available via the
-`nixos-unstable` channel.
-
-Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the
-nixpkgs repository, although both do lag the `master` branch by generally
-[a couple of days](https://status.nixos.org/). Updates to a channel are
-distributed as soon as all tests for that channel pass, e.g.
-[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
-shows the status of tests for the `nixpkgs-unstable` channel.
-
-The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/),
-which also builds binary packages from the Nix expressions in Nixpkgs for
-`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`.
-The binaries are made available via a [binary cache](https://cache.nixos.org).
-
-The current Nix expressions of the channels are available in the
-[nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
-that correspond to the channel names (e.g. `nixos-22.11-small`).

doc/hooks/pnpm.section.md

@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    fetcherVersion = 4;
+    fetcherversion = 4;
     hash = lib.fakeHash;
   };
 
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    fetcherVersion = 4;
+    fetcherversion = 4;
     hash = lib.fakeHash;
   };
 

doc/languages-frameworks/lua.section.md

@@ -167,12 +167,9 @@ To add a new package without updating all packages, run
 ```sh
 
 nix-shell -p luarocks-packages-updater
-luarocks-packages-updater add [--maintainers "<maintainer>"] <package-name>
+luarocks-packages-updater add <package-name>
 ```
 
-The optional `--maintainers` argument accepts a space-separated list of nixpkgs maintainer names.
-When omitted, the package is added without maintainers.
-
 [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
 The automation only goes so far though and some packages need to be customized.
 These customizations go in [pkgs/development/lua-modules/overrides.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/overrides.nix).

doc/languages-frameworks/rocq.section.md

@@ -68,7 +68,7 @@ The recommended way of defining a derivation for a Rocq library, is to use the `
 * `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
 * `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Rocq libraries and Rocq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Rocq packages to work correctly,
 * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `rocq-core.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Rocq was built against.
-* `useDuneifVersion` (optional, default to `(x: false)`) uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"`  will use dune if the version of the package is greater or equal to `"1.1"`,
+* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"`  will use dune if the version of the package is greater or equal to `"1.1"`,
 * `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
 * `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
 * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.

doc/languages-frameworks/vim.section.md

@@ -149,11 +149,6 @@ Note: this is not possible anymore for Neovim.
 
 ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
 
-:::{.note}
-Before adding a Neovim Lua plugin, check if a release is available on [luarocks](https://luarocks.org/).
-If it is, add it as a [LuaRocks based plugin](#neovim-luarocks-based-plugins).
-:::
-
 Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names).
 
 When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/update.py) to update the tree sitter grammars for `nvim-treesitter`.

doc/preface.chapter.md

@@ -1,14 +1,50 @@
-# Overview {#preface}
+# Preface {#preface}
 
-Nixpkgs is a set of packages for the [Nix package manager](https://nixos.org/nix/), released under the [MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
+The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
+[Nix package manager](https://nixos.org/nix/), released under a
+[permissive MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
+Packages are available for several platforms, and can be used with the Nix
+package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos).
 
-Further documentation:
+This document is the user [_reference_](https://nix.dev/contributing/documentation/diataxis#reference) manual for Nixpkgs.
+It describes the entire public interface of Nixpkgs in a concise and orderly manner, and all relevant behaviors, with examples and cross-references.
 
+To discover other kinds of documentation:
 - [nix.dev](https://nix.dev/): Tutorials and guides for getting things done with Nix
-- [NixOS Search](https://search.nixos.org)
-- [Contributing](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): to Nixpkgs
+- [NixOS **Option Search**](https://search.nixos.org/options) and reference documentation
+- [Nixpkgs **Package Search**](https://search.nixos.org/packages)
+- [**NixOS** manual](https://nixos.org/manual/nixos/stable/): Reference documentation for the NixOS Linux distribution
+- [`CONTRIBUTING.md`](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): Contributing to Nixpkgs, including this manual
+
+## Overview of Nixpkgs {#overview-of-nixpkgs}
 
 Nix expressions describe how to build packages from source and are collected in
-the [nixpkgs repository](https://github.com/NixOS/nixpkgs).
+the [Nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
+collection are Nix expressions for
+[NixOS modules](https://nixos.org/nixos/manual/index.html#sec-writing-modules).
+With these expressions the Nix package manager can build binary packages.
 
-Packages are distributed through [channels](#how-channels-work).
+Packages, including the Nix packages collection, are distributed through
+[channels](https://nixos.org/nix/manual/#sec-channels). The collection is
+distributed for users of Nix on non-NixOS distributions through the channel
+`nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels,
+e.g., `nixos-22.11`, which includes all packages and modules for the stable NixOS
+22.11. Stable NixOS releases are generally only given
+security updates. More up-to-date packages and modules are available via the
+`nixos-unstable` channel.
+
+Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the
+Nixpkgs repository, although both do lag the `master` branch by generally
+[a couple of days](https://status.nixos.org/). Updates to a channel are
+distributed as soon as all tests for that channel pass, e.g.,
+[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
+shows the status of tests for the `nixpkgs-unstable` channel.
+
+The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/),
+which also builds binary packages from the Nix expressions in Nixpkgs for
+`x86_64-linux`, `aarch64-linux`, and `aarch64-darwin`.
+The binaries are made available via a [binary cache](https://cache.nixos.org).
+
+The current Nix expressions of the channels are available in the
+[Nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
+that correspond to the channel names (e.g., `nixos-22.11-small`).

doc/redirects.json

@@ -152,9 +152,6 @@
   "ghc-deprecation-policy": [
     "index.html#ghc-deprecation-policy"
   ],
-  "how-channels-work": [
-    "index.html#how-channels-work"
-  ],
   "inkscape-plugins": [
     "index.html#inkscape-plugins"
   ],
@@ -398,7 +395,9 @@
     "index.html#pnpm-build-hook-honored-variables"
   ],
   "preface": [
-    "index.html#preface",
+    "index.html#preface"
+  ],
+  "overview-of-nixpkgs": [
     "index.html#overview-of-nixpkgs"
   ],
   "part-using": [

doc/using-nixpkgs.md

@@ -1,7 +1,6 @@
 # Using Nixpkgs {#part-using}
 
 ```{=include=} chapters
-channels.chapter.md
 using/platform-support.chapter.md
 using/configuration.chapter.md
 using/overlays.chapter.md

lib/services/service.nix

@@ -7,11 +7,10 @@
 {
   lib,
   config,
-  options,
   ...
 }:
 let
-  inherit (lib) mkEnableOption mkOption types;
+  inherit (lib) mkOption types;
   pathOrStr = types.coercedTo types.path (x: "${x}") types.str;
 in
 {
@@ -41,7 +40,7 @@ in
       visible = "shallow";
     };
     process = {
-      argv = mkOption {
+      argv = lib.mkOption {
         type = types.listOf pathOrStr;
         example = lib.literalExpression ''[ (lib.getExe config.package) "--nobackground" ]'';
         description = ''
@@ -73,12 +72,15 @@ in
     };
 
     notificationProtocol = mkOption {
-      type = types.submodule {
-        options = {
-          systemd = mkEnableOption "Whether the service supports systemd-notify.";
-          s6 = mkEnableOption "Whether the service supports s6-notify.";
-        };
-      };
+      type = types.listOf (
+        types.enum [
+          "systemd"
+          "s6"
+        ]
+      );
+
+      default = [ ];
+      apply = v: lib.unique v;
       description = ''
         Notification protocol that this service supports with the underlying service manager.
       '';
@@ -88,20 +90,13 @@ in
   config = {
     assertions = [
       {
-        # `reloadSignal` derives `reloadCommand` at `mkDefault` priority below, so a
-        # conflict only exists when the user *also* set `reloadCommand` explicitly.
-        # An explicit (non-`mkDefault`) definition has `defaultOverridePriority`.
-        assertion =
-          !(
-            config.process.reloadSignal != null
-            && options.process.reloadCommand.highestPrio <= lib.modules.defaultOverridePriority
-          );
+        assertion = config.process.reloadSignal != null && config.process.reloadCommand != null;
         message = "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand.";
       }
     ];
 
-    process.reloadCommand = lib.mkIf (config.process.reloadSignal != null) (
-      lib.mkDefault "${pkgs.coreutils}/bin/kill -${config.process.reloadSignal} $MAINPID"
+    process.reloadCommand = (lib.mkIf config.process.reloadSignal != null) (
+      lib.mkForce "${pkgs.coreutils}/bin/kill -${config.process.reloadSignal} $MAINPID"
     );
   };
 }

maintainers/maintainer-list.nix

@@ -93,11 +93,6 @@
     github = "0x120581f";
     githubId = 130835755;
   };
-  _0x2B = {
-    name = "0x2B";
-    github = "0x2B-bin";
-    githubId = 49249957;
-  };
   _0x3f = {
     name = "0x3f";
     github = "0x3fiona";
@@ -1603,12 +1598,6 @@
     githubId = 153175;
     name = "Andrew Marshall";
   };
-  ambiso = {
-    email = "ambisotopy@gmail.com";
-    github = "ambiso";
-    githubId = 3750466;
-    name = "Robin Leander Schröder";
-  };
   ambossmann = {
     email = "timogottszky+git@gmail.com";
     github = "Ambossmann";
@@ -2734,11 +2723,6 @@
     githubId = 574938;
     name = "Jonathan Glines";
   };
-  auscaster = {
-    github = "auscaster";
-    githubId = 100876;
-    name = "Kam Low";
-  };
   auscyber = {
     email = "ivyp@outlook.com.au";
     github = "auscyber";
@@ -4191,12 +4175,6 @@
     github = "brittonr";
     githubId = 4730485;
   };
-  BrockoliniMorgan = {
-    name = "Brock Morgan";
-    email = "brockjamesmorgan@gmail.com";
-    github = "BrockoliniMorgan";
-    githubId = 166275321;
-  };
   brodes = {
     email = "me@brod.es";
     github = "brhoades";
@@ -4691,12 +4669,6 @@
     githubId = 53847249;
     name = "Casey Avila";
   };
-  caspersonn = {
-    email = "lucakasper8@gmail.com";
-    github = "Caspersonn";
-    githubId = 96787412;
-    name = "Luca Kasper";
-  };
   cassandracomar = {
     name = "Cassandra Comar";
     github = "cassandracomar";
@@ -5266,12 +5238,6 @@
     githubId = 1448923;
     name = "Christian Kauhaus";
   };
-  ckgxrg = {
-    email = "ckgxrg@ckgxrg.io";
-    github = "ckgxrg-salt";
-    githubId = 165614491;
-    name = "ckgxrg";
-  };
   cko = {
     email = "christine.koppelt@gmail.com";
     github = "cko";
@@ -12323,12 +12289,6 @@
     githubId = 67414100;
     name = "Jachym Putta";
   };
-  jack-avery = {
-    email = "jack.avery.business@gmail.com";
-    github = "jack-avery";
-    githubId = 47289484;
-    name = "Jack Avery";
-  };
   jackcres = {
     email = "crespomerchano@gmail.com";
     github = "omarcresp";
@@ -13300,6 +13260,12 @@
     githubId = 879272;
     name = "Julio Merino";
   };
+  jn-sena = {
+    email = "jn-sena@proton.me";
+    github = "jn-sena";
+    githubId = 45771313;
+    name = "Sena";
+  };
   jnsgruk = {
     email = "jon@sgrs.uk";
     github = "jnsgruk";
@@ -15635,12 +15601,6 @@
     githubId = 632767;
     name = "Guillaume Maudoux";
   };
-  layzyoldman = {
-    email = "ricardopaivacampos@gmail.com";
-    github = "layzyoldman";
-    githubId = 193278607;
-    name = "Ricardo Campos";
-  };
   LazilyStableProton = {
     email = "LazilyStable@proton.me";
     github = "LazyStability";
@@ -19322,12 +19282,6 @@
     githubId = 220262;
     name = "Ion Mudreac";
   };
-  mugaizzo = {
-    email = "mugahedman@hotmail.com";
-    github = "mugaizzo";
-    githubId = 15838537;
-    name = "Mugahed Izzeldin";
-  };
   mulatta = {
     email = "seungwon@mulatta.io";
     github = "mulatta";
@@ -19825,12 +19779,6 @@
     githubId = 364510;
     name = "Tobias Geerinckx-Rice";
   };
-  ndavd = {
-    email = "email@ndavd.com";
-    github = "ndavd";
-    githubId = 74260683;
-    name = "Nuno David";
-  };
   ndl = {
     email = "ndl@endl.ch";
     github = "ndl";
@@ -25006,12 +24954,6 @@
     githubId = 47582;
     name = "Samir Talwar";
   };
-  samiser = {
-    email = "nixos@me.samiser.xyz";
-    github = "samiser";
-    githubId = 32001364;
-    name = "Sam";
-  };
   samlich = {
     email = "nixos@samli.ch";
     github = "samlich";
@@ -29908,11 +29850,6 @@
     githubId = 7038383;
     name = "Vojta Káně";
   };
-  vokinn = {
-    github = "vokinn";
-    githubId = 113241287;
-    name = "vokin";
-  };
   volfyd = {
     email = "lb.nix@lisbethmail.com";
     github = "volfyd";
@@ -30921,11 +30858,6 @@
     githubId = 106241330;
     name = "Success Kingsley";
   };
-  xqtc161 = {
-    github = "xqtc161";
-    githubId = 65857432;
-    name = "tila";
-  };
   xrelkd = {
     github = "xrelkd";
     githubId = 46590321;

maintainers/scripts/luarocks-packages.csv

@@ -6,13 +6,13 @@ basexx,,,,,,
 bcrypt,,,,,,ulysseszhan
 binaryheap,,,,,,vcunat
 bit32,,,,,5.1,lblasc
-busted,,,,,,alerque
+busted,,,,,,
 busted-htest,,,,,,mrcjkb
 canola.nvim,,,,,,saadndm
 cassowary,,,,,,alerque
 cldr,,,,,,alerque
 commons.nvim,,,,,5.1,mrcjkb
-compat53,,,,,,vcunat alerque
+compat53,,,,,,vcunat
 coop.nvim,,,,,,
 cosmo,,,,,,
 coxpcall,,,,1.17.0-1,,
@@ -38,7 +38,7 @@ inspect,,,,,,
 jsregexp,,,,0.0.7-2,,
 kulala.nvim,,,,,,
 ldbus,,,https://luarocks.org/dev,,,
-ldoc,,,,,,alerque
+ldoc,,,,,,
 lgi,,,,,,
 linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,,
 ljsyscall,,,,,5.1,lblasc
@@ -62,7 +62,7 @@ lua-cjson,,,,,,
 lua-cmsgpack,,,,,,
 lua-curl,,,,,,
 lua-ffi-zlib,,,,,,
-lua-iconv,,,,7.0.0,,alerque
+lua-iconv,,,,7.0.0,,
 lua-lsp,,,,,,
 lua-messagepack,,,,,,
 lua-protobuf,,,,,,lockejan
@@ -78,10 +78,10 @@ lua-toml,,,,,,
 lua-utils.nvim,,,,,,mrcjkb
 lua-yajl,,,,,,pstn
 lua-zlib,,,,,,koral
-lua_cliargs,,,,,,alerque
+lua_cliargs,,,,,,
 luabitop,https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec,,,,,
-luacheck,,,,,,alerque
-luacov,,,,,,alerque
+luacheck,,,,,,
+luacov,,,,,,
 luacov-reporter-lcov,,,,,,ulysseszhan
 luadbi,,,,,,
 luadbi-mysql,,,,,,
@@ -91,7 +91,7 @@ luaepnf,,,,,,
 luaevent,,,,,,
 luaexpat,,,,,,arobyn flosse
 luaffi,,,https://luarocks.org/dev,,,
-luafilesystem,,,,,,flosse alerque
+luafilesystem,,,,,,flosse
 lualdap,,,,,,aanderse
 lualine.nvim,,,https://luarocks.org/dev,,,
 lualogging,,,,,,
@@ -104,12 +104,12 @@ luarocks-build-rust-mlua,,,,,,mrcjkb
 luarocks-build-tree-sitter-cli,,,,,,
 luarocks-build-treesitter-parser,,,,,,mrcjkb
 luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
-luasec,,,,,,flosse alerque
+luasec,,,,,,flosse
 luasnip,,,,,,
-luasocket,,,,,,alerque
+luasocket,,,,,,
 luasql-sqlite3,,,,,,
-luassert,,,,,,alerque
-luasystem,,,,,,alerque
+luassert,,,,,,
+luasystem,,,,,,
 luatext,,,,,,
 luaunbound,,,,,,
 luaunit,,,,,,lockejan
@@ -159,7 +159,7 @@ rocks-git.nvim,,,,,5.1,mrcjkb
 rocks.nvim,,,,,5.1,mrcjkb
 rtp.nvim,,,,,5.1,mrcjkb
 rustaceanvim,,,,,5.1,mrcjkb
-say,,,,,,alerque
+say,,,,,,
 serpent,,,,,,lockejan
 sofa,,,,,,f4z3r
 sqlite,,,,,,

nixos/doc/manual/redirects.json

@@ -2306,9 +2306,6 @@
   "test-opt-meta.hydraPlatforms": [
     "index.html#test-opt-meta.hydraPlatforms"
   ],
-  "test-opt-meta.teams": [
-    "index.html#test-opt-meta.teams"
-  ],
   "test-opt-meta.timeout": [
     "index.html#test-opt-meta.timeout"
   ],

nixos/doc/manual/release-notes/rl-2611.section.md

@@ -77,24 +77,12 @@
 
 - A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options.
 
-- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module.
-  Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals.
-
-  If you were relying on `NIX_XDG_DESKTOP_PORTAL_DIR` to point at custom portal
-  definitions, add the package providing them to `xdg.portal.extraPortals`.
-
 - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
 
 - `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in.
 
 - Apache Kafka has dropped support for ZooKeeper mode. The `apacheKafka_3_9` and `apacheKafka_4_0` packages have been removed, as every remaining packaged version is KRaft-only. The `services.apache-kafka.zookeeper` option (previously an alias for `services.apache-kafka.settings."zookeeper.connect"`) has been removed; migrate your cluster to [KRaft](#module-services-apache-kafka-kraft) mode instead.
 
-- `virtualisation.registries.block` / `insecure` / `search` were deprecated,
-  because they mapped to the deprecated V1 `registries.conf` format.
-  See the new option {option}`virtualisation.registries.settings`
-  and [containers-registries.conf(5)](https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md)
-  to migrate to the new configuration format.
-
 - When Avahi's mDNS resolver is enabled (`services.avahi.nssmdns4` or `services.avahi.nssmdns6`), only the minimal mDNS resolver is enabled by default to avoid adding a 5 second delay to every failed reverse hostname lookup (e.g., delaying ping by 5 seconds). The "full" mDNS resolver now remains disabled unless `services.avahi.nssmdnsFull` is also enabled. Users who have customized [`/etc/mdns.allow`](https://github.com/avahi/nss-mdns/tree/master#etcmdnsallow) to allow mDNS domains not ending `.local` must enable `services.avahi.nssmdnsFull` to continue to resolve such domains.
 
 - String values passed to `services.phpfpm.settings`, `services.phpfpm.pools.<name>.phpEnv`, and `services.phpfpm.pools.<name>.settings` are now properly quoted and escaped, except for the `${}` syntax that is left as-is. If you are manually escaping these values, please adjust accordingly.
@@ -166,5 +154,3 @@
   - If [`system.stateVersion`](#opt-system.stateVersion) is >=26.05, `pkgs.nextcloud33` will be installed by default.
   - If [`system.stateVersion`](#opt-system.stateVersion) is >=25.11, `pkgs.nextcloud32` will be installed by default.
   - Please note that Nextcloud prohibits skipping major versions while upgrading. You can upgrade to specific versions by declaring `services.nextcloud.package = pkgs.nextcloud33;`.
-
-- `trilium-desktop` and `trilium-server` have been updated to 0.104.0. This release includes security hardening fixes that may break functionality. [See upstream release note for details](https://github.com/TriliumNext/Trilium/releases/tag/v0.104.0).

nixos/lib/testing/meta.nix

@@ -1,20 +1,6 @@
-{ lib, options, ... }:
+{ lib, ... }:
 let
   inherit (lib) types mkOption literalMD;
-
-  # Approximate position of meta.teams / meta.maintainers in nixos tests.
-  # Right now this assumes only one such position and ignores other definitions.
-  # FIXME allow having multiple `maintainersPosition` et al..
-  getPosition =
-    definitionsWithLocations:
-    if definitionsWithLocations == [ ] then
-      null
-    else
-      {
-        file = (lib.head definitionsWithLocations).file;
-        column = 0;
-        line = 1;
-      };
 in
 {
   options = {
@@ -26,7 +12,7 @@ in
       '';
       apply = lib.filterAttrs (k: v: v != null);
       type = types.submodule (
-        { options, config, ... }:
+        { config, ... }:
         {
           options = {
             maintainers = mkOption {
@@ -36,25 +22,6 @@ in
                 The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
               '';
             };
-            maintainersPosition = mkOption {
-              internal = true;
-              readOnly = true;
-              type = types.nullOr types.attrs;
-              default = getPosition options.maintainers.definitionsWithLocations;
-            };
-            teams = mkOption {
-              type = types.listOf types.raw;
-              default = [ ];
-              description = ''
-                The [list of maintainer-teams](https://nixos.org/manual/nixpkgs/stable/#var-meta-teams) for this test.
-              '';
-            };
-            teamsPosition = mkOption {
-              internal = true;
-              readOnly = true;
-              type = types.nullOr types.attrs;
-              default = getPosition options.teams.definitionsWithLocations;
-            };
             timeout = mkOption {
               type = types.nullOr types.int;
               default = 3600; # 1 hour

nixos/modules/config/xdg/portal.nix

@@ -150,6 +150,7 @@ in
 
         sessionVariables = {
           NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1";
+          NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals";
         };
 
         etc = lib.concatMapAttrs (

nixos/modules/i18n/input-method/default.nix

@@ -23,16 +23,11 @@ let
         allowSubstitutes = false;
         buildInputs = [
           cfg.package
-          pkgs.gtk2
-        ];
-
-        disallowedReferences = [
-          (lib.getDev pkgs.gtk2)
         ];
       }
       ''
         mkdir -p $out/etc/gtk-2.0/
-        GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
+        GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache
       '';
 
   gtk3_cache =
@@ -42,16 +37,11 @@ let
         allowSubstitutes = false;
         buildInputs = [
           cfg.package
-          pkgs.gtk3
-        ];
-
-        disallowedReferences = [
-          (lib.getDev pkgs.gtk3)
         ];
       }
       ''
         mkdir -p $out/etc/gtk-3.0/
-        GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
+        GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache
       '';
 
 in

nixos/modules/programs/bat.nix

@@ -8,7 +8,6 @@ let
   inherit (builtins) isList;
   inherit (lib)
     concatMapStrings
-    escapeShellArg
     literalExpression
     maintainers
     mapAttrs'
@@ -35,7 +34,7 @@ let
     else if isBool value then
       boolToString value
     else
-      escapeShellArg (toString value);
+      toString value;
 in
 {
   options.programs.bat = {

nixos/modules/programs/corefreq.nix

@@ -12,7 +12,7 @@ in
 {
   options = {
     programs.corefreq = {
-      enable = lib.mkEnableOption "the corefreq daemon and kernel module";
+      enable = lib.mkEnableOption "Whether to enable the corefreq daemon and kernel module";
 
       package = lib.mkOption {
         type = lib.types.package;

nixos/modules/security/account-utils.nix

@@ -6,7 +6,6 @@
 }:
 let
   cfg = config.security.account-utils;
-  format = pkgs.formats.ini { };
 in
 {
   options.security.account-utils = {
@@ -26,16 +25,6 @@ in
         :::
       '';
     };
-    pwaccessd.settings = lib.mkOption {
-      description = ''
-        Options for pwaccessd.
-        See {manpage}`pwaccessd.conf(5)` for available options.
-      '';
-      type = lib.types.submodule {
-        freeformType = format.type;
-      };
-      default = { };
-    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -55,8 +44,6 @@ in
     };
 
     environment.systemPackages = [ cfg.package ];
-    environment.etc."account-utils/pwaccessd.conf".source =
-      format.generate "pwaccessd.conf" cfg.pwaccessd.settings;
 
     security.pam.services = {
       pwupd-passwd = { };

nixos/modules/security/auditd.nix

@@ -18,7 +18,7 @@ let
 
   pluginOptions = lib.types.submodule {
     options = {
-      active = lib.mkEnableOption "this plugin";
+      active = lib.mkEnableOption "Whether to enable this plugin";
       direction = lib.mkOption {
         type = lib.types.enum [
           "in"

nixos/modules/services/display-managers/gdm.nix

@@ -421,7 +421,7 @@ in
             {
               name = "unix";
               control = "sufficient";
-              modulePath = config.security.pam.pam_unixModulePath;
+              modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
             }
           ];
 
@@ -567,7 +567,7 @@ in
             {
               name = "unix";
               control = "sufficient";
-              modulePath = config.security.pam.pam_unixModulePath;
+              modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
             }
           ];
 
@@ -575,7 +575,7 @@ in
             {
               name = "unix";
               control = "requisite";
-              modulePath = config.security.pam.pam_unixModulePath;
+              modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
               settings.nullok = true;
               settings.yescrypt = true;
             }

nixos/modules/services/display-managers/plasma-login-manager.nix

@@ -201,7 +201,7 @@ in
               # Setup session
               name = "unix";
               control = "required";
-              modulePath = config.security.pam.pam_unixModulePath;
+              modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
             }
             {
               name = "systemd";

nixos/modules/services/display-managers/sddm.nix

@@ -442,7 +442,7 @@ in
             {
               name = "unix";
               control = "sufficient";
-              modulePath = config.security.pam.pam_unixModulePath;
+              modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
             }
           ];
 

nixos/modules/services/misc/bees.nix

@@ -17,7 +17,6 @@ let
     notice = 5;
     info = 6;
     debug = 7;
-    trace = 8;
   };
 
   fsOptions = with lib.types; {

nixos/modules/services/misc/jellyfin.nix

@@ -33,11 +33,7 @@ let
     ;
   cfg = config.services.jellyfin;
   filteredDecodingCodecs = builtins.filter (
-    c:
-    c != "hevc10bit"
-    && c != "hevcRExt10bit"
-    && c != "hevcRExt12bit"
-    && cfg.transcoding.hardwareDecodingCodecs.${c}
+    c: c != "hevcRExt10bit" && c != "hevcRExt12bit" && cfg.transcoding.hardwareDecodingCodecs.${c}
   ) (builtins.attrNames cfg.transcoding.hardwareDecodingCodecs);
   encodingXmlText = ''
     <?xml version="1.0" encoding="utf-8"?>
@@ -62,7 +58,6 @@ let
       <AllowAv1Encoding>${boolToString cfg.transcoding.hardwareEncodingCodecs.av1}</AllowAv1Encoding>
       <EnableIntelLowPowerH264HwEncoder>${boolToString cfg.transcoding.enableIntelLowPowerEncoding}</EnableIntelLowPowerH264HwEncoder>
       <EnableIntelLowPowerHevcHwEncoder>${boolToString cfg.transcoding.enableIntelLowPowerEncoding}</EnableIntelLowPowerHevcHwEncoder>
-      <EnableDecodingColorDepth10Hevc>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevc10bit}</EnableDecodingColorDepth10Hevc>
       <EnableDecodingColorDepth10HevcRext>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt10bit}</EnableDecodingColorDepth10HevcRext>
       <EnableDecodingColorDepth12HevcRext>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt12bit}</EnableDecodingColorDepth12HevcRext>
       <HardwareDecodingCodecs>

nixos/modules/services/misc/paperless.nix

@@ -24,8 +24,6 @@ let
     GRANIAN_HOST = cfg.address;
     GRANIAN_PORT = toString cfg.port;
     GRANIAN_WORKERS_KILL_TIMEOUT = "60";
-    # django-allauth uses python requests, which doesn't use the systems CA bundle by default: https://requests.readthedocs.io/en/latest/user/advanced/#ca-certificates
-    REQUESTS_CA_BUNDLE = config.security.pki.caBundle;
   }
   // lib.optionalAttrs (config.time.timeZone != null) {
     PAPERLESS_TIME_ZONE = config.time.timeZone;

nixos/modules/services/networking/llama-swap.nix

@@ -42,15 +42,6 @@ in
       '';
     };
 
-    useLlamaCppCacheDir = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = ''
-        Whether to use {file}`/var/cache/llama-cpp` as {env}`LLAMA_CACHE` instead
-        of {file}`/var/cache/llama-swap` to share models and other cache with {option}`services.llama-cpp`.
-      '';
-    };
-
     tls = {
       enable = lib.mkEnableOption "TLS encryption";
 
@@ -122,10 +113,6 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      environment = {
-        LLAMA_CACHE = lib.mkDefault "/var/cache/${config.systemd.services.llama-swap.serviceConfig.CacheDirectory}";
-      };
-
       serviceConfig = {
         Type = "exec";
         ExecStart = "${lib.getExe cfg.package} ${
@@ -143,12 +130,6 @@ in
         Restart = "on-failure";
         RestartSec = 3;
 
-        CacheDirectory =
-          if cfg.useLlamaCppCacheDir then
-            config.systemd.services.llama-cpp.serviceConfig.CacheDirectory
-          else
-            "llama-swap";
-
         # for GPU acceleration
         PrivateDevices = false;
 

nixos/modules/services/networking/tetrd.nix

@@ -5,19 +5,13 @@
   ...
 }:
 
-let
-  cfg = config.services.tetrd;
-in
 {
-  options.services.tetrd = {
-    enable = lib.mkEnableOption "tetrd";
-    package = lib.mkPackageOption pkgs "tetrd" { };
-  };
+  options.services.tetrd.enable = lib.mkEnableOption "tetrd";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.services.tetrd.enable {
     environment = {
-      systemPackages = [ cfg.package ];
-      # etc."resolv.conf".source = "/etc/tetrd/resolv.conf"; # Disabled overwriting of resolve.conf since otherwise tetrd disables your dns when its not connected to a device.
+      systemPackages = [ pkgs.tetrd ];
+      etc."resolv.conf".source = "/etc/tetrd/resolv.conf";
     };
 
     # Our resolv.conf will override resolvconf's version.
@@ -27,11 +21,11 @@ in
       tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ];
 
       services.tetrd = {
-        description = cfg.package.meta.description;
+        description = pkgs.tetrd.meta.description;
         wantedBy = [ "multi-user.target" ];
 
         serviceConfig = {
-          ExecStart = "${cfg.package}/opt/Tetrd/bin/tetrd";
+          ExecStart = "${pkgs.tetrd}/opt/Tetrd/bin/tetrd";
           Restart = "always";
           RuntimeDirectory = "tetrd";
           RootDirectory = "/run/tetrd";

nixos/modules/services/ttys/kmscon.nix

@@ -214,7 +214,7 @@ in
           {
             name = "unix";
             control = "required";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
           }
         ];
         session = utils.pam.autoOrderRules [
@@ -230,7 +230,7 @@ in
           {
             name = "unix";
             control = "required";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
           }
           {
             name = "systemd";

nixos/modules/services/wayland/cage.nix

@@ -113,7 +113,7 @@ in
           {
             name = "unix";
             control = "required";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
             settings.nullok = true;
           }
         ];
@@ -121,14 +121,14 @@ in
           {
             name = "unix";
             control = "required";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
           }
         ];
         session = utils.pam.autoOrderRules [
           {
             name = "unix";
             control = "required";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
           }
           {
             name = "env";

nixos/modules/services/web-apps/bentopdf.nix

@@ -60,7 +60,7 @@ in
     services.nginx = lib.mkIf cfg.nginx.enable {
       enable = lib.mkDefault true;
       virtualHosts."${cfg.domain}" = lib.mkMerge [
-        (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.nginx.virtualHost)
+        cfg.nginx.virtualHost
         {
           root = lib.mkForce "${cfg.package}";
 
@@ -82,7 +82,7 @@ in
     services.caddy = lib.mkIf cfg.caddy.enable {
       enable = lib.mkDefault true;
       virtualHosts."${cfg.domain}" = lib.mkMerge [
-        (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.caddy.virtualHost)
+        cfg.caddy.virtualHost
         {
           hostName = lib.mkForce cfg.domain;
           extraConfig = ''

nixos/modules/services/web-apps/flarum.nix

@@ -10,23 +10,16 @@ with lib;
 let
   cfg = config.services.flarum;
 
-  # Only placeholders reach the world-readable Nix store; the install
-  # script substitutes the real secrets at runtime.
   flarumInstallConfig = pkgs.writeText "config.json" (
     builtins.toJSON {
       debug = false;
       offline = false;
 
       baseUrl = cfg.baseUrl;
-      databaseConfiguration =
-        cfg.database
-        // optionalAttrs (cfg.databasePasswordFile != null) {
-          password = "@databasePassword@";
-        };
+      databaseConfiguration = cfg.database;
       adminUser = {
         username = cfg.adminUser;
-        password =
-          if cfg.initialAdminPasswordFile != null then "@adminPassword@" else cfg.initialAdminPassword;
+        password = cfg.initialAdminPassword;
         email = cfg.adminEmail;
       };
       settings = {
@@ -76,26 +69,7 @@ in
     initialAdminPassword = mkOption {
       type = types.str;
       default = "flarum";
-      description = ''
-        Initial password for the adminUser.
-
-        WARNING: This is stored world-readable in the Nix store.
-        Use {option}`initialAdminPasswordFile` instead.
-      '';
-    };
-
-    initialAdminPasswordFile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      example = "/run/secrets/flarum-admin-password";
-      description = ''
-        File containing the initial password for adminUser.
-        Must be readable by the flarum user.
-        Takes precedence over {option}`initialAdminPassword`.
-
-        The password must not contain `"` or `\` characters, as it is
-        substituted into a JSON installation config verbatim.
-      '';
+      description = "Initial password for the adminUser";
     };
 
     user = mkOption {
@@ -124,12 +98,7 @@ in
           bool
           int
         ]);
-      description = ''
-        MySQL database parameters.
-
-        WARNING: A `password` set here is stored world-readable in the
-        Nix store. Use {option}`databasePasswordFile` instead.
-      '';
+      description = "MySQL database parameters";
       default = {
         # the database driver; i.e. MySQL; MariaDB...
         driver = "mysql";
@@ -149,20 +118,6 @@ in
       };
     };
 
-    databasePasswordFile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      example = "/run/secrets/flarum-db-password";
-      description = ''
-        File containing the database password.
-        Must be readable by the flarum user.
-        Takes precedence over `database.password`.
-
-        The password must not contain `"` or `\` characters, as it is
-        substituted into a JSON installation config verbatim.
-      '';
-    };
-
     createDatabaseLocally = mkOption {
       type = types.bool;
       default = false;
@@ -255,8 +210,6 @@ in
         Type = "oneshot";
         User = cfg.user;
         Group = cfg.group;
-        # The secret-filled install config is staged in /tmp
-        PrivateTmp = true;
       };
       path = [ config.services.phpfpm.phpPackage ];
       script = ''
@@ -269,18 +222,7 @@ in
       ''
       + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
         if [ ! -f config.php ]; then
-          install -m 0600 ${flarumInstallConfig} /tmp/flarum-install.json
-          ${optionalString (cfg.initialAdminPasswordFile != null) ''
-            ${pkgs.replace-secret}/bin/replace-secret '@adminPassword@' \
-              ${escapeShellArg cfg.initialAdminPasswordFile} /tmp/flarum-install.json
-          ''}
-          ${optionalString (cfg.databasePasswordFile != null) ''
-            ${pkgs.replace-secret}/bin/replace-secret '@databasePassword@' \
-              ${escapeShellArg cfg.databasePasswordFile} /tmp/flarum-install.json
-          ''}
-          php flarum install --file=/tmp/flarum-install.json
-          # config.php contains the database password; stateDir is world-readable
-          chmod 600 config.php
+          php flarum install --file=${flarumInstallConfig}
         fi
       ''
       + ''

nixos/modules/services/web-servers/caddy/default.nix

@@ -448,8 +448,8 @@ in
     '';
 
     # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
-    boot.kernel.sysctl."net.core.rmem_max" = mkDefault 7500000;
-    boot.kernel.sysctl."net.core.wmem_max" = mkDefault 7500000;
+    boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000;
+    boot.kernel.sysctl."net.core.wmem_max" = mkDefault 2500000;
 
     systemd.packages = [ cfg.package ];
     systemd.services.caddy = {

nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix

@@ -0,0 +1,122 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  dmcfg = config.services.xserver.displayManager;
+  ldmcfg = dmcfg.lightdm;
+  cfg = ldmcfg.greeters.enso;
+
+  theme = cfg.theme.package;
+  icons = cfg.iconTheme.package;
+  cursors = cfg.cursorTheme.package;
+
+  ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" ''
+    [greeter]
+    default-wallpaper=${ldmcfg.background}
+    gtk-theme=${cfg.theme.name}
+    icon-theme=${cfg.iconTheme.name}
+    cursor-theme=${cfg.cursorTheme.name}
+    blur=${toString cfg.blur}
+    brightness=${toString cfg.brightness}
+    ${cfg.extraConfig}
+  '';
+in
+{
+  options = {
+    services.xserver.displayManager.lightdm.greeters.enso = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable enso-os-greeter as the lightdm greeter
+        '';
+      };
+
+      theme = {
+        package = mkPackageOption pkgs "gnome-themes-extra" { };
+        name = mkOption {
+          type = types.str;
+          default = "Adwaita";
+          description = ''
+            Name of the theme to use for the lightdm-enso-os-greeter
+          '';
+        };
+      };
+
+      iconTheme = {
+        package = mkPackageOption pkgs "papirus-icon-theme" { };
+        name = mkOption {
+          type = types.str;
+          default = "ePapirus";
+          description = ''
+            Name of the icon theme to use for the lightdm-enso-os-greeter
+          '';
+        };
+      };
+
+      cursorTheme = {
+        package = mkPackageOption pkgs "capitaine-cursors" { };
+        name = mkOption {
+          type = types.str;
+          default = "capitane-cursors";
+          description = ''
+            Name of the cursor theme to use for the lightdm-enso-os-greeter
+          '';
+        };
+      };
+
+      blur = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether or not to enable blur
+        '';
+      };
+
+      brightness = mkOption {
+        type = types.int;
+        default = 7;
+        description = ''
+          Brightness
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration that should be put in the greeter.conf
+          configuration file
+        '';
+      };
+    };
+  };
+
+  config = mkIf (ldmcfg.enable && cfg.enable) {
+    environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
+
+    environment.systemPackages = [
+      cursors
+      icons
+      theme
+    ];
+
+    services.xserver.displayManager.lightdm = {
+      greeter = mkDefault {
+        package = pkgs.lightdm-enso-os-greeter.xgreeters;
+        name = "pantheon-greeter";
+      };
+
+      greeters = {
+        gtk = {
+          enable = mkDefault false;
+        };
+      };
+    };
+  };
+}

nixos/modules/services/x11/display-managers/lightdm.nix

@@ -83,6 +83,7 @@ in
   imports = [
     ./lightdm-greeters/gtk.nix
     ./lightdm-greeters/mini.nix
+    ./lightdm-greeters/enso-os.nix
     ./lightdm-greeters/pantheon.nix
     ./lightdm-greeters/lomiri.nix
     ./lightdm-greeters/tiny.nix
@@ -106,9 +107,6 @@ in
         "user"
       ]
     )
-    (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "lightdm" "greeters" "enso" ]
-      "services.xserver.displayManager.lightdm.greeters.enso has been removed following removal of the corresponding package."
-    )
   ];
 
   options = {
@@ -364,7 +362,7 @@ in
           {
             name = "unix";
             control = "sufficient";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
           }
         ];
 
@@ -448,7 +446,7 @@ in
           {
             name = "unix";
             control = "sufficient";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
           }
         ];
 
@@ -456,7 +454,7 @@ in
           {
             name = "unix";
             control = "requisite";
-            modulePath = config.security.pam.pam_unixModulePath;
+            modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
             settings.nullok = true;
             settings.yescrypt = true;
           }

nixos/modules/system/boot/resolved.nix

@@ -30,8 +30,9 @@ let
 
   dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries;
 
-  transformSettings = settings: {
-    Resolve = lib.mapAttrs (
+  transformSettings =
+    settings:
+    lib.mapAttrs (
       key: value:
       # concat lists for options that should result in space-separated values
       if
@@ -45,8 +46,7 @@ let
         concatStringsSep " " value
       else
         value
-    ) settings.Resolve;
-  };
+    ) settings;
 
   resolvedConf = settingsToSections (transformSettings cfg.settings);
 in

nixos/modules/system/service/systemd/service.nix

@@ -126,29 +126,33 @@ in
         `%i` (instance), `%t` (runtime directory), and environment variables using
         `''${VAR}` syntax in your command line.
 
-        By default, it is set to {option}`process.reloadCommand` when specified, or an
-        empty string otherwise. Because {option}`process.reloadCommand` is already a
-        command line (not an argument list), it is used verbatim so that references
-        like `$MAINPID` are preserved.
+        By default, it is either set to null or this is set to the escaped version of {option}`process.reloadCommand`
+        when specified to prevent systemd substitution. Set this option explicitly to enable
+        systemd's substitution features.
 
         To extend {option}`process.reloadCommand` with systemd specifiers, you can append
-        to the command line:
+        to the escaped arguments:
 
         ```nix
         systemd.mainExecReload =
-          config.process.reloadCommand + " --systemd-unit %n";
+          config.systemd.lib.escapeSystemdExecArgs config.process.reload + " --systemd-unit %n";
         ```
 
         This pattern allows you to pass the unit name (or other systemd specifiers)
-        as additional arguments.
+        as additional arguments while keeping the base command from {option}`process.argv`
+        properly escaped.
 
         See {manpage}`systemd.service(5)` (section "COMMAND LINES") for details on
         variable substitution and {manpage}`systemd.unit(5)` (section "SPECIFIERS")
         for available specifiers like `%n`, `%i`, `%t`.
       '';
       type = types.nullOr types.str;
-      default = if config.process.reloadCommand != null then config.process.reloadCommand else "";
-      defaultText = lib.literalExpression "config.process.reloadCommand";
+      default =
+        if config.process.reloadCommand then
+          config.systemd.lib.escapeSystemdExecArgs config.process.reloadCommand
+        else
+          "";
+      defaultText = lib.literalExpression "config.systemd.lib.escapeSystemdExecArgs config.process.reloadCommand";
     };
 
     systemd.services = mkOption {
@@ -209,7 +213,9 @@ in
       wantedBy = lib.mkDefault [ "multi-user.target" ];
       serviceConfig = {
         ExecReload = config.systemd.mainExecReload;
-        Type = lib.mkDefault (if config.notificationProtocol.systemd then "notify" else "simple");
+        Type = lib.mkDefault (
+          if (config.serviceManager.notificationProtocol == "systemd") then "notify" else "simple"
+        );
         Restart = lib.mkDefault "always";
         RestartSec = lib.mkDefault "5";
         ExecStart = [

nixos/modules/virtualisation/containers.nix

@@ -9,15 +9,6 @@ let
 
   inherit (lib) literalExpression mkOption types;
 
-  oldRegistriesOptionsUsed = lib.any (x: x != [ ]) (
-    with cfg.registries;
-    [
-      search
-      insecure
-      block
-    ]
-  );
-
   toml = pkgs.formats.toml { };
 in
 {
@@ -70,54 +61,30 @@ in
     };
 
     registries = {
-      # TODO: remove those options in 26.11
       search = mkOption {
-        visible = false;
         type = types.listOf types.str;
-        default = [ ];
+        default = [
+          "docker.io"
+          "quay.io"
+        ];
         description = ''
           List of repositories to search.
-
-          Deprecated, examine {option}`virtualisation.registries.settings` instead.
         '';
       };
 
       insecure = mkOption {
         default = [ ];
-        visible = false;
         type = types.listOf types.str;
         description = ''
           List of insecure repositories.
-
-          Deprecated, examine {option}`virtualisation.registries.settings` instead.
         '';
       };
 
       block = mkOption {
         default = [ ];
-        visible = false;
         type = types.listOf types.str;
         description = ''
           List of blocked repositories.
-
-          Deprecated, examine {option}`virtualisation.registries.settings` instead.
-        '';
-      };
-
-      settings = mkOption {
-        type = toml.type;
-        default = {
-          registry = [
-            { location = "docker.io"; }
-            { location = "quay.io"; }
-          ];
-        };
-        description = ''
-          repositories.conf configuration.
-
-          Examine [containers-registries.conf(5)] for more information about the format.
-
-            [containers-registries.conf(5)]: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md
         '';
       };
     };
@@ -145,15 +112,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    warnings = lib.optional oldRegistriesOptionsUsed "the options virtualisation.registries.search / insecure / block are deprecated. See virtualisation.registries.settings instead.";
-
-    virtualisation.containers.registries.settings = lib.mkIf oldRegistriesOptionsUsed {
-      registries = {
-        block.registries = cfg.registries.block;
-        insecure.registries = cfg.registries.insecure;
-        search.registries = cfg.registries.search;
-      };
-    };
 
     virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ];
 
@@ -178,7 +136,9 @@ in
 
       "containers/storage.conf".source = toml.generate "storage.conf" cfg.storage.settings;
 
-      "containers/registries.conf".source = toml.generate "registries.conf" cfg.registries.settings;
+      "containers/registries.conf".source = toml.generate "registries.conf" {
+        registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries;
+      };
 
       "containers/policy.json".source =
         if cfg.policy != { } then

nixos/tests/all-tests.nix

@@ -730,13 +730,7 @@ in
   greetd-no-shadow = runTest ./greetd-no-shadow.nix;
   grocy = runTest ./grocy.nix;
   grow-partition = runTest ./grow-partition.nix;
-  grub = {
-    basic = runTest ./grub/basic.nix;
-    efi = runTest ./grub/efi.nix;
-    graphical = runTest ./grub/graphical.nix;
-    hashed-password = runTest ./grub/hashed-password.nix;
-    mirrored-boots = runTest ./grub/mirrored-boots.nix;
-  };
+  grub = runTest ./grub.nix;
   gs1200-exporter = runTest ./gs1200-exporter.nix;
   guacamole-server = runTest ./guacamole-server.nix;
   guix = handleTest ./guix { };

nixos/tests/coredns.nix

@@ -28,7 +28,7 @@
               position = "start-of-file";
             }
           ];
-          vendorHash = "sha256-cvgq/Djlxjiu0C5QjaxrlEeG7O2mB6mGAwV7/reYlpY=";
+          vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY=";
         };
       };
     };

nixos/tests/flarum.nix

@@ -10,7 +10,7 @@
   };
 
   nodes.machine =
-    { pkgs, ... }:
+    { ... }:
     {
       # Flarum installs and migrates the database on first boot and runs a
       # MariaDB server alongside PHP-FPM and nginx, so give the VM some headroom.
@@ -28,11 +28,8 @@
 
         adminUser = "admin";
         adminEmail = "admin@example.com";
-        # The trailing newline matches how secret managers typically write files.
-        initialAdminPasswordFile = "${pkgs.writeText "admin-pass" "flarum-admin-password\n"}";
-        # MariaDB authenticates via unix socket and never checks this password;
-        # setting it still exercises the substitution path.
-        databasePasswordFile = "${pkgs.writeText "db-pass" "flarum-db-password\n"}";
+        # Flarum rejects admin passwords shorter than 8 characters.
+        initialAdminPassword = "flarum-admin-password";
       };
     };
 
@@ -51,23 +48,5 @@
 
     # The admin API endpoint should respond, confirming the app booted cleanly.
     machine.succeed("curl -sf http://localhost/api -o /dev/null")
-
-    # Only the placeholders may appear in the install config in the Nix store.
-    machine.succeed("grep -q '@adminPassword@' /nix/store/*-config.json")
-    machine.succeed("grep -q '@databasePassword@' /nix/store/*-config.json")
-    machine.fail("grep -qe 'flarum-admin-password' -e 'flarum-db-password' /nix/store/*-config.json")
-
-    # A successful login proves the admin password was substituted intact.
-    machine.succeed(
-        "curl -sf http://localhost/api/token "
-        + "-H 'Content-Type: application/json' "
-        + "-d '{\"identification\": \"admin\", \"password\": \"flarum-admin-password\"}' "
-        + "| grep -F token"
-    )
-
-    # The database password must arrive intact in config.php, which must
-    # not be world-readable.
-    machine.succeed("grep -q 'flarum-db-password' /var/lib/flarum/config.php")
-    machine.succeed("[ $(stat -c %a /var/lib/flarum/config.php) = 600 ]")
   '';
 }

nixos/tests/gnome-extensions.nix

@@ -146,7 +146,7 @@
 
               machine.succeed(f"${run "gnome-extensions enable {extension}"}")
               wait_time = 5
-              while "ACTIVATING" in getState(extension) and (wait_time := wait_time - 1) > 0:
+              while getState(extension) == "ACTIVATING" and (wait_time := wait_time - 1) > 0:
                   machine.log(f"Extension {extension} is still activating, waiting {wait_time} more seconds")
                   machine.sleep(1)
               checkState("ACTIVE", extension)

nixos/tests/grub/efi.nix

@@ -1,45 +0,0 @@
-{ lib, ... }:
-{
-  name = "grub-efi";
-
-  meta = with lib.maintainers; {
-    maintainers = [
-      tomfitzhenry
-      rnhmjoj
-    ];
-  };
-
-  nodes.machine =
-    { ... }:
-    {
-      virtualisation.useBootLoader = true;
-      virtualisation.useEFIBoot = true;
-
-      boot.loader.grub = {
-        enable = true;
-        efiSupport = true;
-        device = "nodev";
-
-        # Read GRUB from the serial console so its output can be matched
-        # deterministically with wait_for_console_text, rather than via OCR.
-        extraConfig = "serial; terminal_output serial";
-      };
-      boot.loader.efi.canTouchEfiVariables = true;
-    };
-
-  testScript = ''
-    machine.start()
-
-    with subtest("Enters GRUB"):
-        machine.wait_for_console_text("GNU GRUB")
-
-    with subtest("Loads kernel"):
-        machine.wait_for_console_text("Linux version")
-
-    with subtest("Reaches multi-user target"):
-        machine.wait_for_unit("multi-user.target")
-
-    with subtest("Boots via UEFI"):
-        machine.succeed("test -d /sys/firmware/efi")
-  '';
-}

nixos/tests/grub/graphical.nix

@@ -1,57 +0,0 @@
-{ lib, ... }:
-{
-  name = "grub-graphical";
-
-  meta = with lib.maintainers; {
-    maintainers = [
-      tomfitzhenry
-      rnhmjoj
-    ];
-  };
-
-  nodes.machine =
-    { pkgs, ... }:
-    let
-      # GRUB only draws a background image when it is in graphical gfxterm
-      # mode. Bake a marker string into the splash so the OCR check below can
-      # only succeed when gfxterm actually rendered it; a silent fallback to
-      # text mode would show the plain menu without this image (and its text).
-      #
-      # The image must be an 8-bit sRGB PNG, otherwise GRUB's png module fails
-      # to load it and silently falls back to its default (non-graphical) menu.
-      splash = pkgs.runCommand "grub-gfxterm-splash.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } ''
-        magick -size 1024x768 xc:'#2d2d2d' \
-          -font ${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf \
-          -gravity south -pointsize 48 -fill white \
-          -annotate +0+150 'GFXTERMOK' \
-          -depth 8 -type TrueColor PNG24:$out
-      '';
-    in
-    {
-      virtualisation.useBootLoader = true;
-
-      # Leave the menu up long enough for OCR to catch it; we boot early with a
-      # keypress once it has, so this does not slow the test down.
-      boot.loader.timeout = 30;
-      boot.loader.grub = {
-        enable = true;
-        splashImage = splash;
-      };
-    };
-
-  enableOCR = true;
-
-  testScript = ''
-    machine.start()
-
-    with subtest("GRUB renders its menu graphically (gfxterm), showing the splash"):
-        # The marker text lives inside the background image, so reading it back
-        # proves GRUB displayed the image rather than falling back to text mode.
-        machine.wait_for_text("GFXTERMOK")
-        machine.screenshot("grub_gfxterm")
-
-    with subtest("Machine boots into NixOS from GRUB"):
-        machine.send_key("ret")
-        machine.wait_for_unit("multi-user.target")
-  '';
-}

nixos/tests/grub/hashed-password.nix

@@ -1,77 +0,0 @@
-{ lib, ... }:
-{
-  name = "grub-hashed-password";
-
-  meta = with lib.maintainers; {
-    maintainers = [
-      tomfitzhenry
-      rnhmjoj
-    ];
-  };
-
-  nodes.machine =
-    { pkgs, ... }:
-    let
-      mkGrubPbkdf2HashFile =
-        password:
-        toString (
-          pkgs.runCommandLocal "grub-pbkdf2-hash" { nativeBuildInputs = [ pkgs.grub2 ]; } ''
-            printf "%s\n%s\n" "${password}" "${password}" | grub-mkpasswd-pbkdf2 | grep -o 'grub\.pbkdf2\.[^[:space:]]*' > $out
-          ''
-        );
-    in
-    {
-      virtualisation.useBootLoader = true;
-
-      boot.loader.timeout = null;
-      boot.loader.grub = {
-        enable = true;
-        users.bob.hashedPasswordFile = mkGrubPbkdf2HashFile "bobsecret";
-
-        # Read GRUB from the serial console so its output can be matched
-        # deterministically; OCR would work but is flakier, which matters for
-        # the multi-step interactive login exercised below.
-        extraConfig = "serial; terminal_output serial";
-      };
-    };
-
-  testScript = ''
-    def grub_login_as(user, password):
-        """
-        Enters user and password to log into GRUB
-        """
-        machine.wait_for_console_text("Enter username:")
-        machine.send_chars(user + "\n")
-        machine.wait_for_console_text("Enter password:")
-        machine.send_chars(password + "\n")
-
-
-    def grub_select_all_configurations():
-        """
-        Selects "All configurations" from the GRUB menu
-        to trigger a login request.
-        """
-        machine.send_monitor_command("sendkey down")
-        machine.send_monitor_command("sendkey ret")
-
-
-    machine.start()
-
-    # wait for grub screen
-    machine.wait_for_console_text("GNU GRUB")
-
-    grub_select_all_configurations()
-    with subtest("Invalid hashedPassword credentials are rejected"):
-        grub_login_as("bob", "wrongsecret")
-        machine.wait_for_console_text("access denied")
-
-    grub_select_all_configurations()
-    with subtest("Valid hashedPassword credentials are accepted"):
-        grub_login_as("bob", "bobsecret")
-        machine.send_chars("\n")  # press enter to boot
-        machine.wait_for_console_text("Linux version")
-
-    with subtest("Machine boots correctly"):
-        machine.wait_for_unit("multi-user.target")
-  '';
-}

nixos/tests/grub/mirrored-boots.nix

@@ -1,61 +0,0 @@
-{ lib, ... }:
-{
-  name = "grub-mirrored-boots";
-
-  meta = with lib.maintainers; {
-    maintainers = [
-      tomfitzhenry
-      rnhmjoj
-    ];
-  };
-
-  nodes.machine =
-    { lib, ... }:
-    {
-      virtualisation.useBootLoader = true;
-
-      boot.loader.timeout = null;
-      boot.loader.grub = {
-        enable = true;
-        device = lib.mkOverride 0 "";
-        mirroredBoots = [
-          {
-            path = "/boot1";
-            devices = [ "/dev/vda" ];
-          }
-          {
-            path = "/boot2";
-            devices = [ "nodev" ];
-          }
-        ];
-
-        # Read GRUB from the serial console so its output can be matched
-        # deterministically with wait_for_console_text, rather than via OCR.
-        extraConfig = "serial; terminal_output serial";
-      };
-    };
-
-  testScript = ''
-    machine.start()
-
-    # wait for grub screen
-    machine.wait_for_console_text("GNU GRUB")
-
-    machine.send_chars("\n")  # press enter to boot default option
-
-    with subtest("Machine boots correctly"):
-        machine.wait_for_unit("multi-user.target")
-
-    with subtest("Verify boot path 1 GRUB installation and configuration"):
-        machine.succeed("test -d /boot1/grub")
-        machine.succeed("test -f /boot1/grub/grub.cfg")
-        machine.succeed("test -f /boot1/grub/state")
-        machine.succeed("grep -q 'menuentry' /boot1/grub/grub.cfg")
-
-    with subtest("Verify boot path 2 GRUB installation and configuration"):
-        machine.succeed("test -d /boot2/grub")
-        machine.succeed("test -f /boot2/grub/grub.cfg")
-        machine.succeed("test -f /boot2/grub/state")
-        machine.succeed("grep -q 'menuentry' /boot2/grub/grub.cfg")
-  '';
-}

nixos/tests/installer.nix

@@ -1467,6 +1467,7 @@ in
   # Full disk encryption (root, kernel and initrd encrypted) using GRUB, GPT/UEFI,
   # LVM-on-LUKS and a keyfile in initrd.secrets to enter the passphrase once
   fullDiskEncryption = makeInstallerTest "fullDiskEncryption" {
+    broken = true;
     createPartitions = ''
       installer.succeed(
           "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
@@ -1507,53 +1508,6 @@ in
     '';
     enableOCR = true;
     postBootCommands = ''
-      target.wait_for_text("Enter passphrase for")
-      # GRUB's EFI keyboard input appears to drop characters when typed at the
-      # default speed (producing an "Invalid passphrase" error), so type slowly.
-      target.send_chars("supersecret\n", 0.2)
-    '';
-  };
-
-  # Root, kernel and initrd encrypted using GRUB cryptodisk, MBR/legacy BIOS,
-  # plain LUKS and a keyfile in initrd.secrets to enter the passphrase once
-  grubCryptodiskLegacyBios = makeInstallerTest "grubCryptodiskLegacyBios" {
-    meta.maintainers = [ maintainers.tomfitzhenry ];
-    createPartitions = ''
-      installer.succeed(
-          "flock /dev/vda parted --script /dev/vda -- mklabel msdos mkpart primary ext4 1MiB -1GiB mkpart primary linux-swap -1GiB 100%",
-          "udevadm settle",
-          "echo -n supersecret | cryptsetup luksFormat -q --pbkdf-force-iterations 1000 --type luks1 /dev/vda1 -",
-          "echo -n supersecret | cryptsetup luksOpen /dev/vda1 cryptroot",
-          "mkfs.ext4 -L nixos /dev/mapper/cryptroot",
-          "mkswap -L swap /dev/vda2",
-          "swapon -L swap",
-          "mount LABEL=nixos /mnt",
-          "mkdir -p /mnt/etc/nixos",
-          # Add a keyfile so stage 1 can unlock the root device without a second,
-          # interactive prompt. This keeps the test independent of the stage 1
-          # implementation, which matters because the scripted and systemd
-          # initrds word their passphrase prompts differently. Only GRUB (which
-          # is stage 1 independent) then prompts interactively.
-          "dd if=/dev/urandom of=/mnt/etc/nixos/luks.key bs=256 count=1",
-          "echo -n supersecret | cryptsetup luksAddKey -q --pbkdf-force-iterations 1000 --key-file - /dev/vda1 /mnt/etc/nixos/luks.key",
-      )
-    '';
-    bootLoader = "grub";
-    # GRUB draws its cryptodisk passphrase prompt on the console terminal
-    # without a trailing newline, so the line-based wait_for_console_text can
-    # never observe it. Use OCR (wait_for_text) to read it off the screen.
-    enableOCR = true;
-    extraConfig = ''
-      boot.loader.grub.enableCryptodisk = true;
-      boot.initrd.secrets."/luks.key" = "/etc/nixos/luks.key";
-      boot.initrd.luks.devices.cryptroot = {
-        device = lib.mkForce "/dev/vda1";
-        keyFile = "/luks.key";
-      };
-    '';
-    postBootCommands = ''
-      # GRUB has to unlock the disk to read /boot before it can boot the kernel;
-      # stage 1 then unlocks the root device with the embedded keyfile.
       target.wait_for_text("Enter passphrase for")
       target.send_chars("supersecret\n")
     '';

nixos/tests/jellyfin.nix

@@ -33,7 +33,6 @@
           hardwareDecodingCodecs = {
             h264 = true;
             hevc = true;
-            hevc10bit = true;
             vp9 = true;
             hevcRExt10bit = true;
             hevcRExt12bit = true;
@@ -175,8 +174,7 @@
           assert config.get("EnableIntelLowPowerH264HwEncoder") == True, f"Intel low power H264: expected True, got '{config.get('EnableIntelLowPowerH264HwEncoder')}'"
           assert config.get("EnableIntelLowPowerHevcHwEncoder") == True, f"Intel low power HEVC: expected True, got '{config.get('EnableIntelLowPowerHevcHwEncoder')}'"
 
-          # HEVC color depth verification
-          assert config.get("EnableDecodingColorDepth10Hevc") == True, f"HEVC 10bit: expected True, got '{config.get('EnableDecodingColorDepth10Hevc')}'"
+          # HEVC RExt color depth verification
           assert config.get("EnableDecodingColorDepth10HevcRext") == True, f"HEVC RExt 10bit: expected True, got '{config.get('EnableDecodingColorDepth10HevcRext')}'"
           assert config.get("EnableDecodingColorDepth12HevcRext") == True, f"HEVC RExt 12bit: expected True, got '{config.get('EnableDecodingColorDepth12HevcRext')}'"
 

nixos/tests/login-nosuid.nix

@@ -11,12 +11,7 @@
     {
       security.enableWrappers = false;
       systemd.settings.Manager.NoNewPrivileges = true;
-      security.account-utils = {
-        enable = true;
-        pwaccessd.settings = {
-          ExpiredCheck.SpMin = true;
-        };
-      };
+      security.account-utils.enable = true;
       users.mutableUsers = true;
       security.account-utils.extraArgs = [
         "-v"
@@ -51,9 +46,6 @@
         print(f"passwd path is: {passwd_path}")
         assert "account-utils" in passwd_path
 
-    with subtest("config file exists"):
-        machine.succeed("ls /etc/account-utils/pwaccessd.conf")
-
     with subtest("create user"):
         machine.succeed("useradd -m alice")
         machine.succeed("(echo foobar; echo foobar) | passwd alice")

nixos/tests/system-services-compliance.nix

@@ -7,23 +7,6 @@
 
 let
   sharedDir = "/tmp/modular-service-compliance";
-
-  inherit (pkgs) lib coreutils;
-
-  evalSystemServices =
-    services:
-    evalSystem (
-      { ... }:
-      {
-        system.services = services;
-        system.stateVersion = "25.05";
-        fileSystems."/" = {
-          device = "/test/dummy";
-          fsType = "auto";
-        };
-        boot.loader.grub.enable = false;
-      }
-    );
 in
 let
   suite = pkgs.testers.modularServiceCompliance {
@@ -32,13 +15,23 @@ let
     evalConfig =
       { services }:
       let
-        machine = evalSystemServices services;
+        machine = evalSystem (
+          { ... }:
+          {
+            system.services = services;
+            system.stateVersion = "25.05";
+            fileSystems."/" = {
+              device = "/test/dummy";
+              fsType = "auto";
+            };
+            boot.loader.grub.enable = false;
+          }
+        );
       in
       {
         config = machine.config.system.services;
         checkDrv = machine.config.system.build.toplevel;
       };
-    callReload = path: "systemctl reload ${lib.concatStringsSep "-" path}.service";
     mkTest =
       {
         name,
@@ -56,80 +49,6 @@ let
         meta.maintainers = with pkgs.lib.maintainers; [ roberth ];
       };
   };
-
-  # systemd-specific eval assertions. serviceConfig.Type/ExecReload only exist on
-  # the resolved host units, so a fresh eval is used per case.
-  systemdEvalTests =
-    let
-      defaultUnits =
-        (evalSystemServices {
-          service.process.argv = [ "${coreutils}/bin/true" ];
-        }).config.systemd.services;
-
-      notifyUnits =
-        (evalSystemServices {
-          service = {
-            process.argv = [ "${coreutils}/bin/true" ];
-            notificationProtocol.systemd = true;
-          };
-        }).config.systemd.services;
-
-      reloadUnits =
-        (evalSystemServices {
-          service = {
-            process.argv = [ "${coreutils}/bin/true" ];
-            process.reloadSignal = "HUP";
-          };
-        }).config.systemd.services;
-    in
-    {
-      testDefaultType = {
-        expr = defaultUnits.service.serviceConfig.Type;
-        expected = "simple";
-      };
-
-      testNotifyType = {
-        expr = notifyUnits.service.serviceConfig.Type;
-        expected = "notify";
-      };
-
-      testReloadExecReload = {
-        expr = reloadUnits.service.serviceConfig.ExecReload;
-        expected = "${coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-
-  systemdEval = pkgs.stdenvNoCC.mkDerivation (finalAttrs: {
-    __structuredAttrs = true;
-    name = "system-services-compliance-systemd-eval-report";
-    passthru = {
-      tests = systemdEvalTests;
-      failures = lib.runTests finalAttrs.finalPackage.tests;
-    };
-    testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.finalPackage.tests;
-    buildCommand = ''
-      touch $out
-      for testName in "''${!testResults[@]}"; do
-        if [[ -n "''${testResults[$testName]}" ]]; then
-          echo "PASS  $testName"
-        else
-          echo "FAIL  $testName"
-        fi
-      done
-    ''
-    + lib.optionalString (lib.any (v: !v) (lib.attrValues finalAttrs.testResults)) ''
-      {
-        echo ""
-        echo "systemd-specific eval-level compliance failures:"
-        for testName in "''${!testResults[@]}"; do
-          if [[ -z "''${testResults[$testName]}" ]]; then
-            echo "- $testName"
-          fi
-        done
-      } >&2
-      exit 1
-    '';
-  });
 in
 
 # Please the callTest pattern.
@@ -145,4 +64,4 @@ pkgs.lib.mapAttrs (
       test = v;
       driver = v;
     }
-) (suite // { systemd-eval = systemdEval; })
+) suite

pkgs/applications/audio/pianoteq/default.nix

@@ -13,7 +13,6 @@
   makeDesktopItem,
   makeWrapper,
   p7zip,
-  gnutar,
   writeShellScript,
 }:
 let
@@ -47,17 +46,9 @@ let
 
       pname = "pianoteq-${name}";
 
-      unpackPhase =
-        if lib.hasSuffix ".7z" src then
-          ''
-            ${p7zip}/bin/7z x $src
-          ''
-        else if lib.hasSuffix ".tar.xz" src then
-          ''
-            ${gnutar}/bin/tar -xf $src
-          ''
-        else
-          throw "unexpected file format";
+      unpackPhase = ''
+        ${p7zip}/bin/7z x $src
+      '';
 
       nativeBuildInputs = [
         autoPatchelfHook
@@ -252,7 +243,6 @@ let
   version6 = "6.7.3";
   version7 = "7.5.4";
   version8 = "8.4.0";
-  version9 = "9.1.2";
 
   mkStandard =
     version: hash:
@@ -302,35 +292,8 @@ let
         inherit hash;
       };
     };
-  mkTrial9 =
-    hash:
-    mkPianoteq {
-      name = "trial";
-      version = version9;
-      mainProgram = "Pianoteq 9";
-      startupWMClass = "Pianoteq Trial";
-      src = fetchPianoteqTrial {
-        name = "pianoteq_trial_v${versionForFile version9}.tar.xz";
-        inherit hash;
-      };
-    };
-  mkStage9 =
-    hash:
-    mkPianoteq {
-      name = "stage";
-      version = version9;
-      mainProgram = "Pianoteq 9 STAGE";
-      startupWMClass = "Pianoteq STAGE";
-      src = fetchPianoteqWithLogin {
-        name = "pianoteq_setup_v${versionForFile version9}.tar.xz";
-        inherit hash;
-      };
-    };
 in
 {
-  trial_9 = mkTrial9 "sha256-1ofPL6F12Gv+k2rZBadOa5Iyukuji6vdww87ufdKjM8=";
-  stage_9 = mkStage9 "sha256-Jvm/AhBwgj5INW8U48rJjgDB7j/Z1VnYKczvtrpl/AY=";
-
   standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc=";
   stage_8 = mkStage version8 "";
   standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw=";

pkgs/applications/editors/android-studio/default.nix

@@ -16,9 +16,9 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2026.1.2.10"; # "Android Studio Quail 2 | 2026.1.2"
-    sha256Hash = "sha256-ZERaVAkucFbG638aia0RbQ/uwu9flluOWU1iq9tYWQ8=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.10/android-studio-quail2-linux.tar.gz";
+    version = "2026.1.1.10"; # "Android Studio Quail 1 | 2026.1.1 Patch 2"
+    sha256Hash = "sha256-+9PxFtEsrtck6o2g0s2ufnkRcPefKqESc+oPLSKiJNw=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.10/android-studio-quail1-patch2-linux.tar.gz";
   };
   betaVersion = {
     version = "2026.1.3.5"; # "Android Studio Quail 3 | 2026.1.3 RC 1"

pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix

@@ -9,10 +9,10 @@
     elpaBuild {
       pname = "a68-mode";
       ename = "a68-mode";
-      version = "1.3.0.20260710.2";
+      version = "1.3.0.20260614.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/a68-mode-1.3.0.20260710.2.tar";
-        sha256 = "10qxsr316kv8317zfjwixj7pmsrqykycwf6pmw0wiv8w0vq0v9jr";
+        url = "https://elpa.gnu.org/devel/a68-mode-1.3.0.20260614.1.tar";
+        sha256 = "1b51c2v7sx8g4mm2irm43rgb741syphji6cglpv1r3j9wvcpj58k";
       };
       packageRequires = [ ];
       meta = {
@@ -74,10 +74,10 @@
     elpaBuild {
       pname = "activities";
       ename = "activities";
-      version = "0.8pre0.20251118.85";
+      version = "0.80.20251118.222434";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/activities-0.8pre0.20251118.85.tar";
-        sha256 = "0v0s5vlfd2dv4shbmxqn37mcvfmfszdk0nwi1y184hwsp0bkvzqx";
+        url = "https://elpa.gnu.org/devel/activities-0.80.20251118.222434.tar";
+        sha256 = "19h5c1cpmxl1j0k6yicy3gw10wcnc3likb1q0frwchw8vnp7bx96";
       };
       packageRequires = [ persist ];
       meta = {
@@ -461,10 +461,10 @@
     elpaBuild {
       pname = "auctex";
       ename = "auctex";
-      version = "14.1.2.0.20260710.47";
+      version = "14.1.2.0.20260623.43";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auctex-14.1.2.0.20260710.47.tar";
-        sha256 = "0vlx2mi7fvch1h6s2cyjrwk88zib8l5cmzwh9z0i0z6pgnx5d7nq";
+        url = "https://elpa.gnu.org/devel/auctex-14.1.2.0.20260623.43.tar";
+        sha256 = "0csk0k8njms3dn2ijbsvm9g78k6yvdxgcdcibj79acllzslhnwis";
       };
       packageRequires = [ ];
       meta = {
@@ -505,10 +505,10 @@
     elpaBuild {
       pname = "auctex-label-numbers";
       ename = "auctex-label-numbers";
-      version = "0.3.0.20260714.1";
+      version = "0.2.0.20241019.12742";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.3.0.20260714.1.tar";
-        sha256 = "1bqw342873z0cpjg6lg3inscbjilwrgm0dgd9bhc7bb8mas7hkaj";
+        url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20241019.12742.tar";
+        sha256 = "0y4y8267r3bmwshcb5qkfrpnaxs1zwy1rwdhngjci005n68bslk9";
       };
       packageRequires = [ auctex ];
       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.20260619.82";
       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.20260619.82.tar";
+        sha256 = "0rf10gab6vfrmiwcvm6b6cb0a3vlaydc4cgfpq34na9czqn760r0";
       };
       packageRequires = [ ];
       meta = {
@@ -902,10 +902,10 @@
     elpaBuild {
       pname = "breadcrumb";
       ename = "breadcrumb";
-      version = "1.0.1.0.20260630.15";
+      version = "1.0.1.0.20260507.73535";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20260630.15.tar";
-        sha256 = "12l1bi4gynmgfffbj7w6za21a3n6776iqixm33rh7zkbzfhafvxl";
+        url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20260507.73535.tar";
+        sha256 = "1ccx08zczmkgdm9xb1bnz0v4a4yrf3zy5nnfyax57anw3m8yliz2";
       };
       packageRequires = [ project ];
       meta = {
@@ -1106,10 +1106,10 @@
     elpaBuild {
       pname = "cape";
       ename = "cape";
-      version = "2.7.0.20260628.1";
+      version = "2.7.0.20260519.102137";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-2.7.0.20260628.1.tar";
-        sha256 = "1hbwh1752p1rjh4csn6vs4k9bv2qxa0ms6s914aclx72slqa2qvj";
+        url = "https://elpa.gnu.org/devel/cape-2.7.0.20260519.102137.tar";
+        sha256 = "1ilx7ka6vx2xv0xfmc4sbjf8nqsgxd4vzj5r417ckmpfb4vnpa18";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1414,10 +1414,10 @@
     elpaBuild {
       pname = "company";
       ename = "company";
-      version = "1.0.2.0.20260718.178";
+      version = "1.0.2.0.20260618.138";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/company-1.0.2.0.20260718.178.tar";
-        sha256 = "15ymhxywy9kh33rpjrbnn6h545hkwgqcc7mbjpjp7p2kghh1xndj";
+        url = "https://elpa.gnu.org/devel/company-1.0.2.0.20260618.138.tar";
+        sha256 = "072y63bvpq6falkg3yqv8smhkba2nqlw6crm5809pqrihfm8ybii";
       };
       packageRequires = [ posframe ];
       meta = {
@@ -1509,10 +1509,10 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "31.0.0.2.0.20260716.2";
+      version = "31.0.0.1.0.20260606.2";
       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.1.0.20260606.2.tar";
+        sha256 = "1bziwppgl138pf65q9jbw3c8xsarik9617fnqw3wnp3hlkg39b4m";
       };
       packageRequires = [ ];
       meta = {
@@ -1573,10 +1573,10 @@
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "3.6.0.20260716.5";
+      version = "3.6.0.20260607.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-3.6.0.20260716.5.tar";
-        sha256 = "1hn04wqdbdbrim1idbcqj9b0lkicghhyaba0jpw7zdw682hfjcaf";
+        url = "https://elpa.gnu.org/devel/consult-3.6.0.20260607.1.tar";
+        sha256 = "02z3cdzf2lyis0a5kc8vcyas8ycz8gfli7hiahx6zc7dyd94mi9s";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1596,10 +1596,10 @@
     elpaBuild {
       pname = "consult-denote";
       ename = "consult-denote";
-      version = "0.5.1.0.20260704.0";
+      version = "0.5.0.0.20260520.122738";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-denote-0.5.1.0.20260704.0.tar";
-        sha256 = "0bfy6gzznxg356s1nqrv5ma26rlb9njf12dbkma6glpr8l7gpavv";
+        url = "https://elpa.gnu.org/devel/consult-denote-0.5.0.0.20260520.122738.tar";
+        sha256 = "19y5vd4j1ndnxr5z7fz8ghxs5ra0y9d0qca2npglcmzy5l6zsaga";
       };
       packageRequires = [
         consult
@@ -1686,10 +1686,10 @@
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "2.10.0.20260719.16";
+      version = "2.10.0.20260519.105314";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-2.10.0.20260719.16.tar";
-        sha256 = "0h3mjsfk8zsviqcqccql4pcj87ja0am78ag3q2w8jw77bqvk5s4a";
+        url = "https://elpa.gnu.org/devel/corfu-2.10.0.20260519.105314.tar";
+        sha256 = "15ajzvqjw61rqp6gb275x81d4bl8dsj04lzl84cjj8khf3m1jrcp";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1903,10 +1903,10 @@
     elpaBuild {
       pname = "cursory";
       ename = "cursory";
-      version = "1.2.0.0.20260701.4";
+      version = "1.2.0.0.20260424.102447";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260701.4.tar";
-        sha256 = "0087hsy0qzzlhj7zsasmc6x41w6gnh21sb0in7zyahy2x0qrqwi4";
+        url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260424.102447.tar";
+        sha256 = "14yaa5bay9asyvhkq8bj3fhbzrhry6pc87vhw4gm64ixm9k499g5";
       };
       packageRequires = [ ];
       meta = {
@@ -1967,10 +1967,10 @@
     elpaBuild {
       pname = "dape";
       ename = "dape";
-      version = "0.27.1.0.20260719.8";
+      version = "0.27.1.0.20260602.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dape-0.27.1.0.20260719.8.tar";
-        sha256 = "08y9z6l5qirz812v0wz1y3fklsqj9b0476scl2ziq8mvjdkv37bq";
+        url = "https://elpa.gnu.org/devel/dape-0.27.1.0.20260602.5.tar";
+        sha256 = "0vy4b8p9wys1rj7rra87p9yld9d8szlg0y77ls1hnq2lqnsxvyqd";
       };
       packageRequires = [ jsonrpc ];
       meta = {
@@ -2101,10 +2101,10 @@
     elpaBuild {
       pname = "denote";
       ename = "denote";
-      version = "4.2.3.0.20260707.7";
+      version = "4.2.3.0.20260611.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-4.2.3.0.20260707.7.tar";
-        sha256 = "0yrqdz1znd5nkrwqiwrzgsgb7d1yysqmy1lr05r2yj3rlfzhcnvi";
+        url = "https://elpa.gnu.org/devel/denote-4.2.3.0.20260611.3.tar";
+        sha256 = "0cg6zk2sz6dbss0z6is17xri4mzqkx7m1pbxr4f2fzhh59wk93ww";
       };
       packageRequires = [ ];
       meta = {
@@ -2277,10 +2277,10 @@
     elpaBuild {
       pname = "denote-silo";
       ename = "denote-silo";
-      version = "0.3.2.0.20260705.4";
+      version = "0.3.0.0.20260520.122913";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-silo-0.3.2.0.20260705.4.tar";
-        sha256 = "08zgg8jll6kdmzqrzx2j0q0g35sk6sfbp6qxd687sc8p9n9bx4yg";
+        url = "https://elpa.gnu.org/devel/denote-silo-0.3.0.0.20260520.122913.tar";
+        sha256 = "0dx6nhjga8mq5g0db24jjzlvdy218bh2yszasjls101nf9ksc3hy";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2363,10 +2363,10 @@
     elpaBuild {
       pname = "dicom";
       ename = "dicom";
-      version = "1.5.0.20260704.4";
+      version = "1.5.0.20260605.1";
       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.5.0.20260605.1.tar";
+        sha256 = "1lasbqwkgd74jck88525nx76da7535s2m15c47awjpr2hhbwra89";
       };
       packageRequires = [ compat ];
       meta = {
@@ -2413,10 +2413,10 @@
     elpaBuild {
       pname = "diff-hl";
       ename = "diff-hl";
-      version = "1.10.0.0.20260627.186";
+      version = "1.10.0.0.20260624.182";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20260627.186.tar";
-        sha256 = "0anq2hcihzsm3ff0g0smk8w72x5fi3frqymbm1dci679ssx4316v";
+        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20260624.182.tar";
+        sha256 = "1gppg1sqc4gwc9szl83zbaw1hk140zqw9sy275cl85v7bd4wdvja";
       };
       packageRequires = [ cl-lib ];
       meta = {
@@ -2710,10 +2710,10 @@
     elpaBuild {
       pname = "doc-view-follow";
       ename = "doc-view-follow";
-      version = "0.3.2.0.20260708.1";
+      version = "0.3.2.0.20250427.143824";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/doc-view-follow-0.3.2.0.20260708.1.tar";
-        sha256 = "0xyd9w7fqaj22dp43788gm5i7rzbhch2sh2mmarhyw4xp9a7j83w";
+        url = "https://elpa.gnu.org/devel/doc-view-follow-0.3.2.0.20250427.143824.tar";
+        sha256 = "04jk93rkv682w6zcfr283gpwgi5fiq5w3xdpv49zkwddx783crfa";
       };
       packageRequires = [ ];
       meta = {
@@ -2752,10 +2752,10 @@
     elpaBuild {
       pname = "doric-themes";
       ename = "doric-themes";
-      version = "1.2.1.0.20260716.2";
+      version = "1.1.0.0.20260618.8";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/doric-themes-1.2.1.0.20260716.2.tar";
-        sha256 = "00jysh555i53hx32drdfwc25bf09jq4hm0q6w2q9h2pzrk8wmk85";
+        url = "https://elpa.gnu.org/devel/doric-themes-1.1.0.0.20260618.8.tar";
+        sha256 = "11ck5y66zh9lwiiqmxfh1w4s5k8irvncmd6zsanhh8wb2fd9wms8";
       };
       packageRequires = [ ];
       meta = {
@@ -2774,10 +2774,10 @@
     elpaBuild {
       pname = "drepl";
       ename = "drepl";
-      version = "0.4.0.20260715.8";
+      version = "0.4.0.20260520.140843";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/drepl-0.4.0.20260715.8.tar";
-        sha256 = "01gbl3gqrlz2gimmjsk0nb6zyps8a89z96bwrxqfjph6w13d33gw";
+        url = "https://elpa.gnu.org/devel/drepl-0.4.0.20260520.140843.tar";
+        sha256 = "0apa8fi1j1wkjnjxfsyyf8k21na4q7fvlg6baz2y2aaqisfykqlh";
       };
       packageRequires = [ comint-mime ];
       meta = {
@@ -3004,10 +3004,10 @@
     elpaBuild {
       pname = "eglot";
       ename = "eglot";
-      version = "1.24.0.20260623.0";
+      version = "1.23.0.20260622.30";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.24.0.20260623.0.tar";
-        sha256 = "16zcxb2xfxfxppkr0l00h72q5wgww6bi66zqf76h1j84k295mjwv";
+        url = "https://elpa.gnu.org/devel/eglot-1.23.0.20260622.30.tar";
+        sha256 = "0ignlpfdlxjk0z66z8gq2paffm2r874wajf94b1r61xa1mmf63nn";
       };
       packageRequires = [
         eldoc
@@ -3080,10 +3080,10 @@
     elpaBuild {
       pname = "eldoc";
       ename = "eldoc";
-      version = "1.16.0.0.20260709.6";
+      version = "1.16.0.0.20260514.100530";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eldoc-1.16.0.0.20260709.6.tar";
-        sha256 = "0i3bls6iq0lm03w09vrillqygx8xx9xpf2ixr8k2q3my4g8kszqx";
+        url = "https://elpa.gnu.org/devel/eldoc-1.16.0.0.20260514.100530.tar";
+        sha256 = "00pmjqjljxwr5n69h8pqc4yxsdl9pq1d2djlzbvs0cl99xgn7sjb";
       };
       packageRequires = [ ];
       meta = {
@@ -3178,10 +3178,10 @@
     elpaBuild {
       pname = "ellama";
       ename = "ellama";
-      version = "1.30.0.0.20260712.1";
+      version = "1.27.2.0.20260605.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ellama-1.30.0.0.20260712.1.tar";
-        sha256 = "0gn0jgi3li4ycqwjk2bbfwp47awxkr5pscyxpnxyy1qbjlv77s4d";
+        url = "https://elpa.gnu.org/devel/ellama-1.27.2.0.20260605.1.tar";
+        sha256 = "1vklfqrrygamgyr2f9ndnrwyxxvgai2431bvywxiwwgh8lk937hg";
       };
       packageRequires = [
         compat
@@ -3247,10 +3247,10 @@
     elpaBuild {
       pname = "emacs-lisp-intro-nl";
       ename = "emacs-lisp-intro-nl";
-      version = "0.0.20260702.44";
+      version = "0.0.20260529.43";
       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.20260529.43.tar";
+        sha256 = "1aisy3awq830i3bwzyd508w96vcr8igy0gcv9j2mvfa8fzzh0m56";
       };
       packageRequires = [ ];
       meta = {
@@ -3325,10 +3325,10 @@
     elpaBuild {
       pname = "ement";
       ename = "ement";
-      version = "0.18pre0.20251117.1";
+      version = "0.180.20251117.191748";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ement-0.18pre0.20251117.1.tar";
-        sha256 = "0d5cgm00qq6rclpq63jkn8677kkhbql79xg6isij39d7nhrkfyp1";
+        url = "https://elpa.gnu.org/devel/ement-0.180.20251117.191748.tar";
+        sha256 = "12464sywsxwnhc0mpkcqy0wsvjig5q6g2pqa985vnk3vygx7w9gz";
       };
       packageRequires = [
         map
@@ -3446,10 +3446,10 @@
     elpaBuild {
       pname = "erc";
       ename = "erc";
-      version = "5.7snapshot0.20260630.20";
+      version = "5.70.20260605.12";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/erc-5.7snapshot0.20260630.20.tar";
-        sha256 = "0b8nibq9xrs6y0ia99fvf2vxx8wkvkj4vygzswb7130fdf7s3r5l";
+        url = "https://elpa.gnu.org/devel/erc-5.70.20260605.12.tar";
+        sha256 = "0nxvjbmy9lf4px6p4ndkwxn32540s841byn5zb8vnc238al8h2k5";
       };
       packageRequires = [ compat ];
       meta = {
@@ -3609,10 +3609,10 @@
     elpaBuild {
       pname = "exwm";
       ename = "exwm";
-      version = "0.35.0.20260718.3";
+      version = "0.34.0.20260623.71";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/exwm-0.35.0.20260718.3.tar";
-        sha256 = "1kk9ggm9q32rz5dld2w2znpifwpjcncn7ih19rkw3bfd2q8bgirg";
+        url = "https://elpa.gnu.org/devel/exwm-0.34.0.20260623.71.tar";
+        sha256 = "1mwi57r477xv3wg8ninlsf7k1jdl4f38i85p55r8xqa54hsgmr8s";
       };
       packageRequires = [
         compat
@@ -3655,10 +3655,10 @@
     elpaBuild {
       pname = "ffs";
       ename = "ffs";
-      version = "0.2.3snapshot0.20260522.1";
+      version = "0.2.30.20260522.94521";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ffs-0.2.3snapshot0.20260522.1.tar";
-        sha256 = "1csx6sxdi4aa68ajjbgfymb1y2l3n6w1ig566n1lhxkpn2mh5xji";
+        url = "https://elpa.gnu.org/devel/ffs-0.2.30.20260522.94521.tar";
+        sha256 = "0y8rsj2b6sjs9pai9swk18g72ms71lvv28zaw55v69dl1wjchvfc";
       };
       packageRequires = [ ];
       meta = {
@@ -3764,10 +3764,10 @@
     elpaBuild {
       pname = "flymake";
       ename = "flymake";
-      version = "1.4.5.0.20260702.3";
+      version = "1.4.5.0.20260512.154242";
       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.5.0.20260512.154242.tar";
+        sha256 = "1wsfb33ybn6kiqn7mbnpr3vwgf68vszi9566jpl9vn8vhjq8xvkd";
       };
       packageRequires = [
         eldoc
@@ -3831,10 +3831,10 @@
     elpaBuild {
       pname = "flymake-proselint";
       ename = "flymake-proselint";
-      version = "0.3.0.0.20260704.11";
+      version = "0.3.0.0.20230325.160756";
       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.20230325.160756.tar";
+        sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz";
       };
       packageRequires = [ ];
       meta = {
@@ -3852,10 +3852,10 @@
     elpaBuild {
       pname = "fontaine";
       ename = "fontaine";
-      version = "3.1.0.0.20260629.0";
+      version = "3.0.1.0.20260424.102702";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/fontaine-3.1.0.0.20260629.0.tar";
-        sha256 = "1d4jf8y02xp09c9gwa0rnp5c941rzpkpf9npk9zs07c6k1612j34";
+        url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20260424.102702.tar";
+        sha256 = "01nnyx1hy869yd2x3vhzp13qzy90c6rhsj8r8jkyyd5ycfzrkdnn";
       };
       packageRequires = [ ];
       meta = {
@@ -3874,10 +3874,10 @@
     elpaBuild {
       pname = "forgejo";
       ename = "forgejo";
-      version = "0.2.3.0.20260715.17";
+      version = "0.2.3.0.20260619.16";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/forgejo-0.2.3.0.20260715.17.tar";
-        sha256 = "12vg44zkpr8s8i4wal2z3b6ii9gigdw674p10dx3zpj7zibjglry";
+        url = "https://elpa.gnu.org/devel/forgejo-0.2.3.0.20260619.16.tar";
+        sha256 = "1ywj3k0syc09qx267dyj313qhdm583jij2raacz6q9vrh53wwrsz";
       };
       packageRequires = [ keymap-popup ];
       meta = {
@@ -4180,10 +4180,10 @@
     elpaBuild {
       pname = "gnosis";
       ename = "gnosis";
-      version = "0.10.6.0.20260707.26";
+      version = "0.10.6.0.20260508.2618";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gnosis-0.10.6.0.20260707.26.tar";
-        sha256 = "1s3mf539ri3d7rq0b9w6f6kla2ybkxrzwkqzq2mi92vzvypjmbv0";
+        url = "https://elpa.gnu.org/devel/gnosis-0.10.6.0.20260508.2618.tar";
+        sha256 = "04rsg495ldyj739spfk4xwrylfzh27ffkjam9rn86c43rip2arvm";
       };
       packageRequires = [
         compat
@@ -4391,10 +4391,10 @@
     elpaBuild {
       pname = "greader";
       ename = "greader";
-      version = "0.19.5.0.20260627.0";
+      version = "0.19.4.0.20260608.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/greader-0.19.5.0.20260627.0.tar";
-        sha256 = "1c37viwmwvhha7hra6zraim58yy3mf68ds738xky448ddbimrvl0";
+        url = "https://elpa.gnu.org/devel/greader-0.19.4.0.20260608.0.tar";
+        sha256 = "1pzblg6k9acx8nmpg9mzb42wi7invlip6zfchy03rq8f3gbk9vwy";
       };
       packageRequires = [
         compat
@@ -4459,10 +4459,10 @@
     elpaBuild {
       pname = "guess-language";
       ename = "guess-language";
-      version = "0.0.1.0.20260625.150";
+      version = "0.0.1.0.20260529.147";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20260625.150.tar";
-        sha256 = "0g3cvp1p1bpbf2h5vwrjcghj4bkhcpx00jqsivvrmyighpmgpxzs";
+        url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20260529.147.tar";
+        sha256 = "05dcakya74m9q459kywfdy1qyvlpdxwhg7fhphqqahj9pwa85yd9";
       };
       packageRequires = [
         cl-lib
@@ -4653,10 +4653,10 @@
     elpaBuild {
       pname = "hyperbole";
       ename = "hyperbole";
-      version = "9.0.2pre0.20260712.1235";
+      version = "9.0.20.20260622.1172";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260712.1235.tar";
-        sha256 = "0ca3kpkv2rzydn7rxqvn4dw8dgk72q51mdpvdbwdk9a18pjp0fam";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.20.20260622.1172.tar";
+        sha256 = "0590d8ww3yq2p9x85m6435acrsmnnwg7njz96jg7wrkbnadjkyx1";
       };
       packageRequires = [ ];
       meta = {
@@ -4674,10 +4674,10 @@
     elpaBuild {
       pname = "ibuffer-sidebar";
       ename = "ibuffer-sidebar";
-      version = "1.0.0.0.20260718.2";
+      version = "0.0.1.0.20260612.36";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ibuffer-sidebar-1.0.0.0.20260718.2.tar";
-        sha256 = "1l9wk75nqbl0n8k0zbqjvkd7fb2j6b2zsag62khk9zpya50gsap7";
+        url = "https://elpa.gnu.org/devel/ibuffer-sidebar-0.0.1.0.20260612.36.tar";
+        sha256 = "0r6wpdcn6fqrlgvmxihiwxp6lzhijjvwzikgv8nbh25x0gmz2nqm";
       };
       packageRequires = [ ];
       meta = {
@@ -5028,10 +5028,10 @@
     elpaBuild {
       pname = "javaimp";
       ename = "javaimp";
-      version = "0.9.2.0.20260715.9";
+      version = "0.9.2.0.20260619.6";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/javaimp-0.9.2.0.20260715.9.tar";
-        sha256 = "1fv10bx8f7y5f85zkyavav6ylkwxlznhfwbf4w4mybfj1p61mwha";
+        url = "https://elpa.gnu.org/devel/javaimp-0.9.2.0.20260619.6.tar";
+        sha256 = "0axf8n0ymm80gswwf8hj20rzzdln04is1qy9ri8bd1iw689lvdgd";
       };
       packageRequires = [ ];
       meta = {
@@ -5072,10 +5072,10 @@
     elpaBuild {
       pname = "jinx";
       ename = "jinx";
-      version = "2.8.0.20260628.1";
+      version = "2.8.0.20260519.104155";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jinx-2.8.0.20260628.1.tar";
-        sha256 = "0rgmkdiw7x0xknp9ndwzz1jvnkl9pyymzm7wrlzsigf5mzvx9n79";
+        url = "https://elpa.gnu.org/devel/jinx-2.8.0.20260519.104155.tar";
+        sha256 = "0npksm6qrjnlsjrsl0szdvgim2xjbqj1az4ar7gli4s4z0pl0bkk";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5116,10 +5116,10 @@
     elpaBuild {
       pname = "js2-mode";
       ename = "js2-mode";
-      version = "20231224.0.20260627.14";
+      version = "20231224.0.20241205.14012";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20260627.14.tar";
-        sha256 = "1cjccwswizryk0wn6ps40clmbjgf1h2amfw1hp6akmzsq4hs9abi";
+        url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20241205.14012.tar";
+        sha256 = "0kcxgkib56fjgv9c2ancr046ag3nwr6zw5x2dzw9gbnlma5w3x66";
       };
       packageRequires = [ cl-lib ];
       meta = {
@@ -5158,10 +5158,10 @@
     elpaBuild {
       pname = "jsonrpc";
       ename = "jsonrpc";
-      version = "1.0.29.0.20260623.0";
+      version = "1.0.28.0.20260504.104721";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.29.0.20260623.0.tar";
-        sha256 = "08l1xicms32yagpv20yi0b626nkyc5xwaljq4fda7ygndkhlm5a2";
+        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.28.0.20260504.104721.tar";
+        sha256 = "1p33407vls4hfa109zl9z2jqp7iya7flzy0j2rc6cxi8k5m6ls3m";
       };
       packageRequires = [ ];
       meta = {
@@ -5200,10 +5200,10 @@
     elpaBuild {
       pname = "keymap-popup";
       ename = "keymap-popup";
-      version = "0.4.0.0.20260715.2";
+      version = "0.3.1.0.20260530.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/keymap-popup-0.4.0.0.20260715.2.tar";
-        sha256 = "02077lc09shc76y1gzh7gk9ij2ap0hkgqx40m6bsg79n25i55zgz";
+        url = "https://elpa.gnu.org/devel/keymap-popup-0.3.1.0.20260530.4.tar";
+        sha256 = "1k6aqp65x3azbipj2pwdg15pip045cawx4im04s84kbk91fx0fxs";
       };
       packageRequires = [ ];
       meta = {
@@ -5481,32 +5481,6 @@
       };
     }
   ) { };
-  lisp-ts-mode = callPackage (
-    {
-      compat,
-      cond-star,
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "lisp-ts-mode";
-      ename = "lisp-ts-mode";
-      version = "0.3.0.0.20260720.0";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/lisp-ts-mode-0.3.0.0.20260720.0.tar";
-        sha256 = "09xnsw5rsvkwx8dvxw9m60fc3pwk21r0iydm0r55bj7sksb6z7id";
-      };
-      packageRequires = [
-        compat
-        cond-star
-      ];
-      meta = {
-        homepage = "https://elpa.gnu.org/devel/lisp-ts-mode.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   listen = callPackage (
     {
       elpaBuild,
@@ -5571,10 +5545,10 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.31.2.0.20260718.2";
+      version = "0.31.1.0.20260624.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.31.2.0.20260718.2.tar";
-        sha256 = "0zhf1a7n0x58hf56ln1lpf61pjfn2bj8mmy940w5k3kp8y3zyxz7";
+        url = "https://elpa.gnu.org/devel/llm-0.31.1.0.20260624.0.tar";
+        sha256 = "0cakiavkq25axdvpnpsj57qfwppb3g14aww0vxzdpb8w80wzf1h1";
       };
       packageRequires = [
         compat
@@ -5811,10 +5785,10 @@
     elpaBuild {
       pname = "marginalia";
       ename = "marginalia";
-      version = "2.11.0.20260628.1";
+      version = "2.11.0.20260519.104425";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/marginalia-2.11.0.20260628.1.tar";
-        sha256 = "1kya2x33xbp0ghjv46484jjy7qhqsh7xkcr0pnvi6m4dgcxrg6al";
+        url = "https://elpa.gnu.org/devel/marginalia-2.11.0.20260519.104425.tar";
+        sha256 = "11n680dghiyzm5sk3b4s8adxdj457lm50nac1khkr8vfbqfdd7j6";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5938,10 +5912,10 @@
     elpaBuild {
       pname = "mct";
       ename = "mct";
-      version = "1.1.1.0.20260629.0";
+      version = "1.1.0.0.20260424.102720";
       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.0.0.20260424.102720.tar";
+        sha256 = "1413vjnlm12s65yalna2lqb26a77als5h3pyxlpjaf8rb9lpgchw";
       };
       packageRequires = [ ];
       meta = {
@@ -6203,10 +6177,10 @@
     elpaBuild {
       pname = "modus-themes";
       ename = "modus-themes";
-      version = "5.3.0.0.20260717.26";
+      version = "5.3.0.0.20260623.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-5.3.0.0.20260717.26.tar";
-        sha256 = "0a3gd5cww0bifh9j3hxnsjb4csik7qlifa3i306l0lmj00sls1hl";
+        url = "https://elpa.gnu.org/devel/modus-themes-5.3.0.0.20260623.1.tar";
+        sha256 = "03cj2sgr1p1xkygxqfx00z13lnpzndn44niymipccds8rb8ipsri";
       };
       packageRequires = [ ];
       meta = {
@@ -6224,10 +6198,10 @@
     elpaBuild {
       pname = "mpdired";
       ename = "mpdired";
-      version = "4pre0.20250502.1";
+      version = "40.20250502.114712";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/mpdired-4pre0.20250502.1.tar";
-        sha256 = "1hrp0q5dql57hd40q838vbdrlbbyd1g7kfvf5w3zvhziq0dj61gx";
+        url = "https://elpa.gnu.org/devel/mpdired-40.20250502.114712.tar";
+        sha256 = "1dzvv4q13xad0940yg5qc3mbznkkslh3kjcy8br6jfq9qfp85gh0";
       };
       packageRequires = [ ];
       meta = {
@@ -6608,10 +6582,10 @@
     elpaBuild {
       pname = "oauth2";
       ename = "oauth2";
-      version = "0.19.1snapshot0.20260526.1";
+      version = "0.19.10.20260526.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/oauth2-0.19.1snapshot0.20260526.1.tar";
-        sha256 = "0fxrg7ypj642mxdpn06g31ynlb96w64na99fakpdcf9wa0a5ir2s";
+        url = "https://elpa.gnu.org/devel/oauth2-0.19.10.20260526.1.tar";
+        sha256 = "1i1sndnrjgyrfzhll2wjhc2n0n0wyfpswwnfc5p8097jda1q27hk";
       };
       packageRequires = [ ];
       meta = {
@@ -6737,10 +6711,10 @@
     elpaBuild {
       pname = "orderless";
       ename = "orderless";
-      version = "1.7.0.20260628.2";
+      version = "1.7.0.20260519.103644";
       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.20260519.103644.tar";
+        sha256 = "0l5ylzvnlgbswlnr7nqaqrrzm88j7hya69rwawp8m9nyar10mj7q";
       };
       packageRequires = [ compat ];
       meta = {
@@ -6758,10 +6732,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "10.0pre0.20260715.383";
+      version = "10.0.20260622.360";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260715.383.tar";
-        sha256 = "0dys9gg55z0bn7p9g7f2rw01v1my3ba3qmm3555g7xhpmy7gcfd6";
+        url = "https://elpa.gnu.org/devel/org-10.0.20260622.360.tar";
+        sha256 = "1fizzj0vsv78sg7hivsicxvkvksyl7lw0iah0djnp1sfvl54gxf8";
       };
       packageRequires = [ ];
       meta = {
@@ -6829,10 +6803,10 @@
     elpaBuild {
       pname = "org-gnosis";
       ename = "org-gnosis";
-      version = "0.2.2.0.20260711.6";
+      version = "0.2.2.0.20260224.203152";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-gnosis-0.2.2.0.20260711.6.tar";
-        sha256 = "0zh6wl8qcxx1av1x8pp6756wcdqnwa2h2yv6i8742l8rqi5xfybg";
+        url = "https://elpa.gnu.org/devel/org-gnosis-0.2.2.0.20260224.203152.tar";
+        sha256 = "1ls3wnd4brn3aadafyfn4m4lkav5v5sm77irlijnm90rg2jdk7xc";
       };
       packageRequires = [
         compat
@@ -6905,10 +6879,10 @@
     elpaBuild {
       pname = "org-modern";
       ename = "org-modern";
-      version = "1.14.0.20260707.5";
+      version = "1.14.0.20260519.104634";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-modern-1.14.0.20260707.5.tar";
-        sha256 = "1hd30siq6jnqnxmkrgibp86cn3kjma1ifa216mw9fkl3bg8js506";
+        url = "https://elpa.gnu.org/devel/org-modern-1.14.0.20260519.104634.tar";
+        sha256 = "0q4iqgv18a24fhwsxrhz6f7awik0v5jxvq19brnp7k83zssw5gdj";
       };
       packageRequires = [
         compat
@@ -7085,10 +7059,10 @@
     elpaBuild {
       pname = "osm";
       ename = "osm";
-      version = "2.4.0.20260705.0";
+      version = "2.3.0.20260623.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/osm-2.4.0.20260705.0.tar";
-        sha256 = "0s9m0j1r3hxllwmzarbg3k3yqfqrfnz93nqphpnf1p7lbwzk5v1c";
+        url = "https://elpa.gnu.org/devel/osm-2.3.0.20260623.1.tar";
+        sha256 = "07a7vwcpqjrq5vrvsb0bmmx0vjsdxq3449pfcsnnyamws3qhrwa1";
       };
       packageRequires = [ compat ];
       meta = {
@@ -7404,10 +7378,10 @@
     elpaBuild {
       pname = "plz";
       ename = "plz";
-      version = "0.10pre0.20250318.18";
+      version = "0.100.20250318.183534";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-0.10pre0.20250318.18.tar";
-        sha256 = "0lsaxls0dgj1hqm6fc03ns67k0wdp6jp688n9galiczk7zzllvpg";
+        url = "https://elpa.gnu.org/devel/plz-0.100.20250318.183534.tar";
+        sha256 = "0ai10h4fhavrb2nxcp5a59g32cf95q99cia7ck9chw6dznb73vpj";
       };
       packageRequires = [ ];
       meta = {
@@ -7426,10 +7400,10 @@
     elpaBuild {
       pname = "plz-event-source";
       ename = "plz-event-source";
-      version = "0.1.4pre0.20250413.0";
+      version = "0.1.40.20250413.93107";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-event-source-0.1.4pre0.20250413.0.tar";
-        sha256 = "12f9ava513hiwb9cighnnliq7nn3d1kfy2hjg6npl89nhii82g5f";
+        url = "https://elpa.gnu.org/devel/plz-event-source-0.1.40.20250413.93107.tar";
+        sha256 = "0fm2rdsrfcw0hdwycpgcwgkikl6w5ldicr3zwhqwq4vxzfzaflb6";
       };
       packageRequires = [ plz-media-type ];
       meta = {
@@ -7448,10 +7422,10 @@
     elpaBuild {
       pname = "plz-media-type";
       ename = "plz-media-type";
-      version = "0.2.5pre0.20250412.0";
+      version = "0.2.50.20250412.100044";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-media-type-0.2.5pre0.20250412.0.tar";
-        sha256 = "1agd1m6pxmqd7vkqvrv382fg76wx0kz9dxkbz0pwpf5p9dlpl6mm";
+        url = "https://elpa.gnu.org/devel/plz-media-type-0.2.50.20250412.100044.tar";
+        sha256 = "1dglmb2vaznrz3c4l6nrdwfs8zqz2pj3js5d1zkbw3ld2q01m9rv";
       };
       packageRequires = [ plz ];
       meta = {
@@ -7638,10 +7612,10 @@
     elpaBuild {
       pname = "pq";
       ename = "pq";
-      version = "0.2.0.20240911.1";
+      version = "0.2.0.20240317.135839";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/pq-0.2.0.20240911.1.tar";
-        sha256 = "07033s0lrns0ibmpvm7n02xfp1dwzkrb08vlsv5fj3lx7v0dk5g6";
+        url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar";
+        sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z";
       };
       packageRequires = [ ];
       meta = {
@@ -7681,10 +7655,10 @@
     elpaBuild {
       pname = "preview-auto";
       ename = "preview-auto";
-      version = "0.5.0.0.20260708.0";
+      version = "0.4.2.0.20260617.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/preview-auto-0.5.0.0.20260708.0.tar";
-        sha256 = "1f4y9mrv7g46cvzjiygn703nfc293zha0ivsbkbj6qd6r78hklpf";
+        url = "https://elpa.gnu.org/devel/preview-auto-0.4.2.0.20260617.3.tar";
+        sha256 = "1p518f3b78lxsjbq3q4vkj25hy04yrm9xk1srk9clr3jx3i8gbvr";
       };
       packageRequires = [ auctex ];
       meta = {
@@ -7725,10 +7699,10 @@
     elpaBuild {
       pname = "project";
       ename = "project";
-      version = "0.12.0.0.20260716.0";
+      version = "0.11.2.0.20260612.29";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/project-0.12.0.0.20260716.0.tar";
-        sha256 = "0iaqw9ci3sbq3y3ry7r3pyv4ydlbx8b01p7chqq3b3h55vdi3i1d";
+        url = "https://elpa.gnu.org/devel/project-0.11.2.0.20260612.29.tar";
+        sha256 = "19bb3v47ikpf445zz4pgxlnynkwyjacydws15lgsc853npca1df1";
       };
       packageRequires = [ xref ];
       meta = {
@@ -8563,27 +8537,6 @@
       };
     }
   ) { };
-  sendai-theme = callPackage (
-    {
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "sendai-theme";
-      ename = "sendai-theme";
-      version = "0.1.1snapshot0.20260701.2";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/devel/sendai-theme-0.1.1snapshot0.20260701.2.tar";
-        sha256 = "08xpcxs280mbipllcjl06hmrxmpdzrwkfzcrvq6n9k2dv62x1cki";
-      };
-      packageRequires = [ ];
-      meta = {
-        homepage = "https://elpa.gnu.org/devel/sendai-theme.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   seq = callPackage (
     {
       elpaBuild,
@@ -9518,10 +9471,10 @@
     elpaBuild {
       pname = "taxy";
       ename = "taxy";
-      version = "0.11pre0.20251129.2";
+      version = "0.110.20251129.62050";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/taxy-0.11pre0.20251129.2.tar";
-        sha256 = "1y4k68h5z1xc7x0rc3lx1cyvbpniirqglr2gik08m1m1570r6w4x";
+        url = "https://elpa.gnu.org/devel/taxy-0.110.20251129.62050.tar";
+        sha256 = "0nvrwsz87rmwnyafd1291kmxg8f4k62l9jm207my7dnyq5ks0b19";
       };
       packageRequires = [ ];
       meta = {
@@ -9587,10 +9540,10 @@
     elpaBuild {
       pname = "tempel";
       ename = "tempel";
-      version = "1.14.0.20260705.0";
+      version = "1.13.0.20260609.1";
       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.13.0.20260609.1.tar";
+        sha256 = "1n423dfaij4ixss5w8nm519kdainipswdr38gx3qhcb59l0pywhd";
       };
       packageRequires = [ compat ];
       meta = {
@@ -9867,10 +9820,10 @@
     elpaBuild {
       pname = "tramp";
       ename = "tramp";
-      version = "2.8.2.0.20260720.2";
+      version = "2.8.1.5.0.20260530.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tramp-2.8.2.0.20260720.2.tar";
-        sha256 = "01a6riczx8wvy72x9v56p314r37xnr7i8z6394li307xw3gkznzd";
+        url = "https://elpa.gnu.org/devel/tramp-2.8.1.5.0.20260530.0.tar";
+        sha256 = "1d4ksg9cw8a9kqbwpa8jafjwb29g5f8640nd5v6chd6a5lv1z9sf";
       };
       packageRequires = [ ];
       meta = {
@@ -9977,10 +9930,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.13.5.0.20260701.0";
+      version = "0.13.4.0.20260617.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.13.5.0.20260701.0.tar";
-        sha256 = "0hhb042jacadfz01fgc9dpjqcz441vpwn3gw0g7qyqaqjhh1i5ci";
+        url = "https://elpa.gnu.org/devel/transient-0.13.4.0.20260617.1.tar";
+        sha256 = "1y96c432kviy2xnijzp5y49fyazjfab49i8jyysgf87pbxjpylsl";
       };
       packageRequires = [
         compat
@@ -10003,10 +9956,10 @@
     elpaBuild {
       pname = "transient-cycles";
       ename = "transient-cycles";
-      version = "2.1.0.20260625.0";
+      version = "2.0.0.20250625.85410";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-cycles-2.1.0.20260625.0.tar";
-        sha256 = "1jadhnszdnc9hj6992bpdmdrqcrig0r172dis8cwxksfrcb0qpgs";
+        url = "https://elpa.gnu.org/devel/transient-cycles-2.0.0.20250625.85410.tar";
+        sha256 = "1782gr8hwidfxilggb83s2v9wzkvyhcxbv3nj8f4aylhcdahfzf8";
       };
       packageRequires = [ ];
       meta = {
@@ -10223,10 +10176,10 @@
     elpaBuild {
       pname = "urgrep";
       ename = "urgrep";
-      version = "0.6.1snapshot0.20260619.3";
+      version = "0.6.10.20260619.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/urgrep-0.6.1snapshot0.20260619.3.tar";
-        sha256 = "0aks8nan0rjavz72s34c1d6wq4031z2wf2rbi73kr4sfq944yiss";
+        url = "https://elpa.gnu.org/devel/urgrep-0.6.10.20260619.3.tar";
+        sha256 = "1cakwsfi1caz1z30d3dshsjq348ghzh6s9z474zwcdycay94037i";
       };
       packageRequires = [ compat ];
       meta = {
@@ -10575,10 +10528,10 @@
     elpaBuild {
       pname = "vertico";
       ename = "vertico";
-      version = "2.10.0.20260709.7";
+      version = "2.10.0.20260605.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-2.10.0.20260709.7.tar";
-        sha256 = "0jq13xdfbgrdf6b48sd70znax4mvcbf2p0h17mbc8vg006fs3xih";
+        url = "https://elpa.gnu.org/devel/vertico-2.10.0.20260605.0.tar";
+        sha256 = "0c7fj7issnnz4m0hm9c4ggpl4siic3y67pvgjfkil9zd1z7jnh0s";
       };
       packageRequires = [ compat ];
       meta = {
@@ -10988,10 +10941,10 @@
     elpaBuild {
       pname = "with-command-redo";
       ename = "with-command-redo";
-      version = "0.2.0.20260710.0";
+      version = "0.1.0.20260504.211611";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/with-command-redo-0.2.0.20260710.0.tar";
-        sha256 = "0zk18x8bplbishpxwy8r3m51i3kcai4crc6d4pipg927qdymry7z";
+        url = "https://elpa.gnu.org/devel/with-command-redo-0.1.0.20260504.211611.tar";
+        sha256 = "1k37zdj23p606mxinaics0djp8n2rdylc7k4p03sacxmjiw34fid";
       };
       packageRequires = [ ];
       meta = {
@@ -11094,10 +11047,10 @@
     elpaBuild {
       pname = "xelb";
       ename = "xelb";
-      version = "0.23.0.20260627.0";
+      version = "0.22.0.20260623.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/xelb-0.23.0.20260627.0.tar";
-        sha256 = "0q5z5mvdfgc411nqxqf9qi8gw43pdf3yqsg48riv67w58nnx11bv";
+        url = "https://elpa.gnu.org/devel/xelb-0.22.0.20260623.5.tar";
+        sha256 = "0v5rwk9m76zy1irg7ii84slfwb360fy5h3kacnzdrgxlwk7aw6rj";
       };
       packageRequires = [ compat ];
       meta = {

pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix

@@ -484,10 +484,10 @@
     elpaBuild {
       pname = "auctex-label-numbers";
       ename = "auctex-label-numbers";
-      version = "0.3";
+      version = "0.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.3.tar";
-        sha256 = "10dgq2jnzxd2w10a9raz9gj6nzlmyk048fzlv839sf5m73pjq89s";
+        url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar";
+        sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x";
       };
       packageRequires = [ auctex ];
       meta = {
@@ -1484,10 +1484,10 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "31.0.0.2";
+      version = "31.0.0.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/compat-31.0.0.2.tar";
-        sha256 = "0f0gig6imlf5gx8qykvwajvhr66v52v7hsifqwh8nzq820x6kn27";
+        url = "https://elpa.gnu.org/packages/compat-31.0.0.1.tar";
+        sha256 = "1lraq5i8jk0wsrnkv66q6lxv314fm8c09hrfvm0gj2lpn8126f20";
       };
       packageRequires = [ ];
       meta = {
@@ -1571,10 +1571,10 @@
     elpaBuild {
       pname = "consult-denote";
       ename = "consult-denote";
-      version = "0.5.1";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/consult-denote-0.5.1.tar";
-        sha256 = "0if1qfma6ssb4ciwviz5avm68k1yivj23sg2m2fmb9asry9zrvjd";
+        url = "https://elpa.gnu.org/packages/consult-denote-0.5.0.tar";
+        sha256 = "1qmfwmm4hi0z2lqn6ryfwckrivrlvy16y42w729q6pk0nd21j48k";
       };
       packageRequires = [
         consult
@@ -2231,10 +2231,10 @@
     elpaBuild {
       pname = "denote-silo";
       ename = "denote-silo";
-      version = "0.3.2";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/denote-silo-0.3.2.tar";
-        sha256 = "14qbzf336n62s5wp2v67fp8das28aa8a0ahv3nxg5w3fbdxdf03b";
+        url = "https://elpa.gnu.org/packages/denote-silo-0.3.0.tar";
+        sha256 = "1pwhn1k8cdb4n6v1l6d6ld5zm4gfzb5vl9fp1myqlfkjx756lglj";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2684,10 +2684,10 @@
     elpaBuild {
       pname = "doric-themes";
       ename = "doric-themes";
-      version = "1.2.1";
+      version = "1.1.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.1.0.tar";
+        sha256 = "12rm5swbhn52yh4nvngqqbaiy8j97bi86a0k7swdb08vxmgp5kzh";
       };
       packageRequires = [ ];
       meta = {
@@ -2936,10 +2936,10 @@
     elpaBuild {
       pname = "eglot";
       ename = "eglot";
-      version = "1.24";
+      version = "1.23";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/eglot-1.24.tar";
-        sha256 = "0fi10gxw33lh15xvwv5bfqzv81wp7k3yibqc2mzbn59kwrja94gc";
+        url = "https://elpa.gnu.org/packages/eglot-1.23.tar";
+        sha256 = "1l83c90rdamlk576bd859jkg6406hgxi7w4c6ixlw509c66qr3s6";
       };
       packageRequires = [
         eldoc
@@ -3110,10 +3110,10 @@
     elpaBuild {
       pname = "ellama";
       ename = "ellama";
-      version = "1.30.0";
+      version = "1.27.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ellama-1.30.0.tar";
-        sha256 = "0xfyli6mzv5rdw6ddzy7q4w7332z4vniz1dmxlyr4r0dczyjq0pk";
+        url = "https://elpa.gnu.org/packages/ellama-1.27.2.tar";
+        sha256 = "09l22c29vv8bd70vq681ashvlyqcq3ajk37nmdkcj7j4ik53l4bh";
       };
       packageRequires = [
         compat
@@ -3520,10 +3520,10 @@
     elpaBuild {
       pname = "exwm";
       ename = "exwm";
-      version = "0.35";
+      version = "0.34";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/exwm-0.35.tar";
-        sha256 = "05sfgprmsy3yc82qqm2ysg091yw91d0vb74cd612bqxyi3ifqa19";
+        url = "https://elpa.gnu.org/packages/exwm-0.34.tar";
+        sha256 = "1hp2ni9c6bn627275x37n6zhcismvni6vqp7cpdn3cx292n7sx6z";
       };
       packageRequires = [
         compat
@@ -3761,10 +3761,10 @@
     elpaBuild {
       pname = "fontaine";
       ename = "fontaine";
-      version = "3.1.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/fontaine-3.1.0.tar";
-        sha256 = "066q3pys9f4d7jkvm52yrj0df12jz8z22gv2f4jpb47g1iapkp9f";
+        url = "https://elpa.gnu.org/packages/fontaine-3.0.1.tar";
+        sha256 = "0bgfg6pkw724id1d3igiw4g0204wnjwsbnabfy2rq6nrf99z1qwr";
       };
       packageRequires = [ ];
       meta = {
@@ -4300,10 +4300,10 @@
     elpaBuild {
       pname = "greader";
       ename = "greader";
-      version = "0.19.5";
+      version = "0.19.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/greader-0.19.5.tar";
-        sha256 = "1kzm63xp0fzryha5msyl0f4gdhhacz4ys0b0z1wf5phy832bc1w1";
+        url = "https://elpa.gnu.org/packages/greader-0.19.4.tar";
+        sha256 = "1wg25481rdzfjshsjhaf2747hsy964gn1zc5gbmqak8y1vmsjb6h";
       };
       packageRequires = [
         compat
@@ -4578,27 +4578,6 @@
       };
     }
   ) { };
-  ibuffer-sidebar = callPackage (
-    {
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "ibuffer-sidebar";
-      ename = "ibuffer-sidebar";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ibuffer-sidebar-1.0.0.tar";
-        sha256 = "00wgka7g7gndk8vczrm3pvx09l46mv93yc0i4w3xlma30z0clivw";
-      };
-      packageRequires = [ ];
-      meta = {
-        homepage = "https://elpa.gnu.org/packages/ibuffer-sidebar.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   idlwave = callPackage (
     {
       elpaBuild,
@@ -5071,10 +5050,10 @@
     elpaBuild {
       pname = "jsonrpc";
       ename = "jsonrpc";
-      version = "1.0.29";
+      version = "1.0.28";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/jsonrpc-1.0.29.tar";
-        sha256 = "1cjxdzckxffiw2cjp68rf382iaf7qpg9iqkxm0yrz0rmw3vk3gcq";
+        url = "https://elpa.gnu.org/packages/jsonrpc-1.0.28.tar";
+        sha256 = "13zdm9ss1sfpw55lwr8nrv1ha30qcj7v10m1ql8r9cbdxxkzxp8f";
       };
       packageRequires = [ ];
       meta = {
@@ -5113,10 +5092,10 @@
     elpaBuild {
       pname = "keymap-popup";
       ename = "keymap-popup";
-      version = "0.4.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/keymap-popup-0.4.0.tar";
-        sha256 = "0hdzppwrq78hzamr05jjj3nmdsv0fxbv93gs94gmwbc07jiq0937";
+        url = "https://elpa.gnu.org/packages/keymap-popup-0.3.1.tar";
+        sha256 = "0m44s8618n7g5pajxiv4k1dfx6l58gr01a3ga26fxc51j1d05q8b";
       };
       packageRequires = [ ];
       meta = {
@@ -5394,32 +5373,6 @@
       };
     }
   ) { };
-  lisp-ts-mode = callPackage (
-    {
-      compat,
-      cond-star,
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "lisp-ts-mode";
-      ename = "lisp-ts-mode";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/lisp-ts-mode-0.3.0.tar";
-        sha256 = "0dh15bdmjgn4jmdc8xdf0wddj1zkbpi9xqw32m724h1y5511whh2";
-      };
-      packageRequires = [
-        compat
-        cond-star
-      ];
-      meta = {
-        homepage = "https://elpa.gnu.org/packages/lisp-ts-mode.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   listen = callPackage (
     {
       elpaBuild,
@@ -5484,10 +5437,10 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.31.2";
+      version = "0.31.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/llm-0.31.2.tar";
-        sha256 = "08lc058w1xhiv3cxfkbcjaszplvwhmdyxpcwqkzw3x2sb11pn7rj";
+        url = "https://elpa.gnu.org/packages/llm-0.31.1.tar";
+        sha256 = "1395rh5jk3c0hfszzvn9xp3qyyi48nvz1x1v3vljgx4qzzcakgh3";
       };
       packageRequires = [
         compat
@@ -5849,10 +5802,10 @@
     elpaBuild {
       pname = "mct";
       ename = "mct";
-      version = "1.1.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/mct-1.1.1.tar";
-        sha256 = "18kwrm93vmkhm8l6gim1r3daizrj6k65lsq8xmja55a1jr60j1xi";
+        url = "https://elpa.gnu.org/packages/mct-1.1.0.tar";
+        sha256 = "0kv0j37bdsmc2jv7adpx5m48cp4h0kvjq2jfwv7d8nzpk5kk2d2p";
       };
       packageRequires = [ ];
       meta = {
@@ -6645,10 +6598,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.8.7";
+      version = "9.8.6";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-9.8.7.tar";
-        sha256 = "1y7sf3p9jqkfw8k6wddy2p9hfskiq4a5hkx8sq39dgb4sri6v03d";
+        url = "https://elpa.gnu.org/packages/org-9.8.6.tar";
+        sha256 = "0qc9c49k8fcaa8c947wb7knn5lbm2bigvzxkbx8cdbyrj15pra4j";
       };
       packageRequires = [ ];
       meta = {
@@ -6972,10 +6925,10 @@
     elpaBuild {
       pname = "osm";
       ename = "osm";
-      version = "2.4";
+      version = "2.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/osm-2.4.tar";
-        sha256 = "1w270bjnxxlwi3vbgfb0aih6lkr8bgs872yrwfpl423x9wkrk48j";
+        url = "https://elpa.gnu.org/packages/osm-2.3.tar";
+        sha256 = "0x08qbdk7y05cm8kc35f2i6k5xnd9iyyhr0f0fyi489kbvd3n1nh";
       };
       packageRequires = [ compat ];
       meta = {
@@ -7526,10 +7479,10 @@
     elpaBuild {
       pname = "preview-auto";
       ename = "preview-auto";
-      version = "0.5.0";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/preview-auto-0.5.0.tar";
-        sha256 = "1d8rm22aqvgyg46r4vdf2w3ywxmqiny46y0p030i9q26xc2xq7my";
+        url = "https://elpa.gnu.org/packages/preview-auto-0.4.2.tar";
+        sha256 = "1fg4nxzqjk13q9yvhrjmm9qqrszf9xd2n9jfji2v31f0rphlkc3p";
       };
       packageRequires = [ auctex ];
       meta = {
@@ -7570,10 +7523,10 @@
     elpaBuild {
       pname = "project";
       ename = "project";
-      version = "0.12.0";
+      version = "0.11.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/project-0.12.0.tar";
-        sha256 = "0g7in5lzv21j4mrmqp60bl02gwrh2mrs6fw1ysj6pwaqlza9hw4w";
+        url = "https://elpa.gnu.org/packages/project-0.11.2.tar";
+        sha256 = "0gyjdqxsblsmh2higkr2a6vfl051hpqzm0pxrzwsg2766xmldgqk";
       };
       packageRequires = [ xref ];
       meta = {
@@ -8389,27 +8342,6 @@
       };
     }
   ) { };
-  sendai-theme = callPackage (
-    {
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "sendai-theme";
-      ename = "sendai-theme";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/sendai-theme-0.1.0.tar";
-        sha256 = "0c8k19pj5l148g34isi6w309msrq6q3z65427ilky47xzs067faz";
-      };
-      packageRequires = [ ];
-      meta = {
-        homepage = "https://elpa.gnu.org/packages/sendai-theme.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   seq = callPackage (
     {
       elpaBuild,
@@ -9346,10 +9278,10 @@
     elpaBuild {
       pname = "tempel";
       ename = "tempel";
-      version = "1.14";
+      version = "1.13";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tempel-1.14.tar";
-        sha256 = "1m2zy53drrpcjqky7a2pfhrnrynhj7hdksl68kfz8r6lp5id6xf3";
+        url = "https://elpa.gnu.org/packages/tempel-1.13.tar";
+        sha256 = "1sxyxz799nw56wqrm7hsr0dq2yaxckr9a1rynw2jsrfhbzcxpbfp";
       };
       packageRequires = [ compat ];
       meta = {
@@ -9626,10 +9558,10 @@
     elpaBuild {
       pname = "tramp";
       ename = "tramp";
-      version = "2.8.2";
+      version = "2.8.1.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tramp-2.8.2.tar";
-        sha256 = "1d9mki1ik8ck891jq7kzkf93aqalfm0i9vqdbm5km8g317wqpaqn";
+        url = "https://elpa.gnu.org/packages/tramp-2.8.1.5.tar";
+        sha256 = "04rhm5ijx3qs386ffxvp2117a4xn7zw6z5cqci77f6q07i5921zw";
       };
       packageRequires = [ ];
       meta = {
@@ -9730,21 +9662,19 @@
       elpaBuild,
       fetchurl,
       lib,
-      llama,
       seq,
     }:
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.13.5";
+      version = "0.13.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-0.13.5.tar";
-        sha256 = "15mdg6q6ns6sqyrikvxvn4l76dxz5gai9a9hqvf61vgk35vkgz47";
+        url = "https://elpa.gnu.org/packages/transient-0.13.4.tar";
+        sha256 = "02142xcxv50bycshbl6qj47q6s9gi6sbagrnyjqi5ma74509zq6h";
       };
       packageRequires = [
         compat
         cond-let
-        llama
         seq
       ];
       meta = {
@@ -9762,10 +9692,10 @@
     elpaBuild {
       pname = "transient-cycles";
       ename = "transient-cycles";
-      version = "2.1";
+      version = "2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-cycles-2.1.tar";
-        sha256 = "12g22ajwf3lsqi3c9bajqq30n1aaq96r15mfd1z2bbzpn1gfahkf";
+        url = "https://elpa.gnu.org/packages/transient-cycles-2.0.tar";
+        sha256 = "0cq2k77rgbw3fx84a2d33nbb75wqxynrc1mx4gb32a9ysm0sa4s3";
       };
       packageRequires = [ ];
       meta = {
@@ -10741,27 +10671,6 @@
       };
     }
   ) { };
-  with-command-redo = callPackage (
-    {
-      elpaBuild,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "with-command-redo";
-      ename = "with-command-redo";
-      version = "0.2";
-      src = fetchurl {
-        url = "https://elpa.gnu.org/packages/with-command-redo-0.2.tar";
-        sha256 = "1da6xklk9yf9xazspr9d987rsfxl8m2y556g99cnf3cj6bx8npa3";
-      };
-      packageRequires = [ ];
-      meta = {
-        homepage = "https://elpa.gnu.org/packages/with-command-redo.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   wpuzzle = callPackage (
     {
       elpaBuild,
@@ -10856,10 +10765,10 @@
     elpaBuild {
       pname = "xelb";
       ename = "xelb";
-      version = "0.23";
+      version = "0.22";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/xelb-0.23.tar";
-        sha256 = "1fsqs06g2hx248sngp7lqkx1m63m96jvmdks28xcamw1j1p8h0v0";
+        url = "https://elpa.gnu.org/packages/xelb-0.22.tar";
+        sha256 = "0vd0dsigr2lvwvvm32kf20dyg5bvafinb2xhz491f8wj2w99fjx4";
       };
       packageRequires = [ compat ];
       meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix

@@ -14,13 +14,13 @@ let
 
   pname = "ghostel";
 
-  version = "0.44.0";
+  version = "0.41.0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "dakra";
     repo = "ghostel";
-    tag = "v${version}";
-    hash = "sha256-vRGZoQtjsL42ga07fOfEjccKRidAhqgwHBoKs++62Ls=";
+    rev = "eb806d158df4ff302aee68e91caf257f11d66320";
+    hash = "sha256-Xz3Sy0iR/g5SoEzqJTZo2ymfMPYQ0NvnAOEoXiXhQFE=";
   };
 
   module = stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ let
     deps = zig.fetchDeps {
       inherit (finalAttrs) src pname version;
       fetchAll = true;
-      hash = "sha256-yrVgiofdmVjTGJ+PGPGRCc8gb/JcEca1uAzIoPgHHqU=";
+      hash = "sha256-lFU0ywNyP1q2NL9MkIfWciH03VAA/Act5dGYAV4V7EY=";
     };
 
     nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
@@ -69,7 +69,7 @@ melpaBuild {
   '';
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
 
     inherit module;
   };

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

@@ -1703,9 +1703,6 @@ let
 
           shampoo = ignoreCompilationError super.shampoo; # elisp error
 
-          # missing optional dependencies
-          shexc-ts-mode = addPackageRequires super.shexc-ts-mode [ self.yaml ];
-
           # missing optional dependencies and one of them (mew) is not on any ELPA
           shimbun = ignoreCompilationError (
             addPackageRequires super.shimbun [

pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix

@@ -75,10 +75,10 @@
     elpaBuild {
       pname = "aidermacs";
       ename = "aidermacs";
-      version = "1.9.0.20260719.1";
+      version = "1.7.0.20260521.153004";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.9.0.20260719.1.tar";
-        sha256 = "1rian9r2vvdnrk0hqmrgpsp2lbi7ci5gr8jzg9ghgpkz7bjsa8w1";
+        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.7.0.20260521.153004.tar";
+        sha256 = "11pw6absa9nj0ps8n17jzsqdnajk1cdz7rv6lnp2ibfyfg6vr03c";
       };
       packageRequires = [
         compat
@@ -269,10 +269,10 @@
     elpaBuild {
       pname = "auto-dim-other-buffers";
       ename = "auto-dim-other-buffers";
-      version = "2.2.2.0.20260624.0";
+      version = "2.2.1.0.20250116.140242";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.2.0.20260624.0.tar";
-        sha256 = "1kpglnqss61dx9px0v2agbnfnjymjynslr31mpc73p6qjv0fqgcv";
+        url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.1.0.20250116.140242.tar";
+        sha256 = "07v5n7d3whk79by6xwd1gak1m73k4zpcscwfminfidj3f6rmkj92";
       };
       packageRequires = [ ];
       meta = {
@@ -333,10 +333,10 @@
     elpaBuild {
       pname = "bash-completion";
       ename = "bash-completion";
-      version = "3.2.1snapshot0.20260325.20";
+      version = "3.2.10.20260325.162703";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.1snapshot0.20260325.20.tar";
-        sha256 = "1ircxf1kgdjbrkx1i16z3lv62vbdsspyhl6hh589827031lsz0sj";
+        url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.10.20260325.162703.tar";
+        sha256 = "0jfad1l564dz5w9n980d0yvf7ivbp570vapwx451h74f3g9xdcx1";
       };
       packageRequires = [ ];
       meta = {
@@ -543,10 +543,10 @@
     elpaBuild {
       pname = "caml";
       ename = "caml";
-      version = "4.10snapshot0.20250227.11";
+      version = "4.100.20250227.123439";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/caml-4.10snapshot0.20250227.11.tar";
-        sha256 = "06r646gvwkqmsiiln434c6x6w17f8in0rqaymxpgyfhrxmx6skbb";
+        url = "https://elpa.nongnu.org/nongnu-devel/caml-4.100.20250227.123439.tar";
+        sha256 = "0niymrn7d4gh5bd7wgrpbfh8r7d8i455ihr0i4lgs2v7xrgzc5ci";
       };
       packageRequires = [ ];
       meta = {
@@ -566,10 +566,10 @@
     elpaBuild {
       pname = "casual";
       ename = "casual";
-      version = "2.17.1.0.20260718.0";
+      version = "2.16.2.0.20260609.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-2.16.2.0.20260609.0.tar";
+        sha256 = "1n3br77c56psicqs394kdgzlmsxbzzbm5w7bm0g3pkz5kq1jh5bh";
       };
       packageRequires = [
         csv-mode
@@ -619,10 +619,10 @@
     elpaBuild {
       pname = "cider";
       ename = "cider";
-      version = "2.0.1snapshot0.20260718.7";
+      version = "1.23.0.20260624.34";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-2.0.1snapshot0.20260718.7.tar";
-        sha256 = "1y5bp14z67xky44nv419hwjry2n0md2ff54pi8mnfffcd0ikvp97";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.23.0.20260624.34.tar";
+        sha256 = "0p56g5ni3w6rlajqp368zi6gw4jp0c0s5786fh04iv0kyqipw60p";
       };
       packageRequires = [
         clojure-mode
@@ -649,10 +649,10 @@
     elpaBuild {
       pname = "clojure-mode";
       ename = "clojure-mode";
-      version = "5.23.0.0.20260709.7";
+      version = "5.23.0.0.20260615.3";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.23.0.0.20260709.7.tar";
-        sha256 = "0rw17p4kgifzyxz393say6dbv5m5csvfwbyj9l96cyi9x71llz19";
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.23.0.0.20260615.3.tar";
+        sha256 = "03sfdnyp7m9mvz55mdvp62wkjklp5nr4xrmrac5z5gvjwviqhcva";
       };
       packageRequires = [ ];
       meta = {
@@ -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.20260616.45";
       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.20260616.45.tar";
+        sha256 = "01vnjim6l8c6b6h6sgbznwssyqzr183j983i2p9s5gwpphcwi3qz";
       };
       packageRequires = [ ];
       meta = {
@@ -712,10 +712,10 @@
     elpaBuild {
       pname = "cond-let";
       ename = "cond-let";
-      version = "1.1.3.0.20260701.0";
+      version = "1.1.2.0.20260601.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.2.0.20260601.0.tar";
+        sha256 = "0yqnwc5xv7aqazrr3g921lclrc6pnbaf1h3qv1qm8qxbvz7z76vd";
       };
       packageRequires = [ ];
       meta = {
@@ -735,10 +735,10 @@
     elpaBuild {
       pname = "consult-flycheck";
       ename = "consult-flycheck";
-      version = "1.2.0.20260628.1";
+      version = "1.2.0.20260605.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.2.0.20260628.1.tar";
-        sha256 = "0vffihzsnpnjcfkj2gc9qyx4hh274zhfq3nsgddygsl7dcbjv8xp";
+        url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.2.0.20260605.0.tar";
+        sha256 = "0kyhr3wzcdzjacda9hf07h0lrgayzacv8ly3hpnrvxq0gyjk9sk8";
       };
       packageRequires = [
         consult
@@ -785,10 +785,10 @@
     elpaBuild {
       pname = "crux";
       ename = "crux";
-      version = "0.6.0snapshot0.20260315.12";
+      version = "0.6.0.20260315.62204";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20260315.12.tar";
-        sha256 = "09anj5a7p0waqyg0cng6x8231078xk4p6ig0ayancspbgyi9yp4d";
+        url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0.20260315.62204.tar";
+        sha256 = "0sbv5m22fgn5444ck8j0l9zvi8m8x7jv46z2zl06r6139s8m4l81";
       };
       packageRequires = [ ];
       meta = {
@@ -914,10 +914,10 @@
     elpaBuild {
       pname = "datetime";
       ename = "datetime";
-      version = "0.10.3snapshot0.20250203.0";
+      version = "0.10.30.20250203.204701";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/datetime-0.10.3snapshot0.20250203.0.tar";
-        sha256 = "0d3vi2fg17rv4id78jdq9xv44skc1ndkajq9plf6x9bsgbbf3mcz";
+        url = "https://elpa.nongnu.org/nongnu-devel/datetime-0.10.30.20250203.204701.tar";
+        sha256 = "07c2wr4wdfp94hdiaxfzpcic80yckw32db9ay83gb21jy2rvys91";
       };
       packageRequires = [ extmap ];
       meta = {
@@ -978,10 +978,10 @@
     elpaBuild {
       pname = "devil";
       ename = "devil";
-      version = "0.7.0beta3.0.20240129.11";
+      version = "0.7.3.0.20240129.2809";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.0beta3.0.20240129.11.tar";
-        sha256 = "174wkr002wif8h62dlj34c5h7a1a52zs097n8flncm014l6m3y3i";
+        url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.3.0.20240129.2809.tar";
+        sha256 = "0gqmp1x6li3g7fvy3aydm1smlx587g59d9fwv5ci3z5ik8cb98h8";
       };
       packageRequires = [ ];
       meta = {
@@ -999,10 +999,10 @@
     elpaBuild {
       pname = "diff-ansi";
       ename = "diff-ansi";
-      version = "0.2.0.20260713.62";
+      version = "0.2.0.20260524.93804";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20260713.62.tar";
-        sha256 = "0gxf2cjk96c5kx80qsn4w9ckg738zis2hhvbp26dgzkppmwxdwyk";
+        url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20260524.93804.tar";
+        sha256 = "1wjvyhs8lfq5fszxlmrjwpw3spa3qq9dn7wmh0m0ilavmnql492v";
       };
       packageRequires = [ ];
       meta = {
@@ -1021,10 +1021,10 @@
     elpaBuild {
       pname = "dirvish";
       ename = "dirvish";
-      version = "2.3.0.0.20260716.9";
+      version = "2.3.0.0.20250504.80741";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.3.0.0.20260716.9.tar";
-        sha256 = "0yr5x846v1zynyacfpgn8zhhrzsw5qw3fqnr1w9cscljzfwlajs8";
+        url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.3.0.0.20250504.80741.tar";
+        sha256 = "0h8ap8bnqy2czvgkc71l49ms3kwk8lciz0ydzi2yy5xgh5pvs71k";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1084,10 +1084,10 @@
     elpaBuild {
       pname = "dracula-theme";
       ename = "dracula-theme";
-      version = "1.8.3.0.20260701.10";
+      version = "1.8.3.0.20260519.113056";
       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.20260519.113056.tar";
+        sha256 = "0jw288i092zgfkkazxsmx60va9fbklb2y7awcq2fwpbph7k14w4r";
       };
       packageRequires = [ ];
       meta = {
@@ -1307,10 +1307,10 @@
     elpaBuild {
       pname = "elfeed";
       ename = "elfeed";
-      version = "4.1.0.0.20260714.9";
+      version = "4.0.1.0.20260623.15";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/elfeed-4.1.0.0.20260714.9.tar";
-        sha256 = "05y0j3hmz1ch2fsv4gryf6d4ygk1xc5vh6zi5fn7ydyxkp49pnqr";
+        url = "https://elpa.nongnu.org/nongnu-devel/elfeed-4.0.1.0.20260623.15.tar";
+        sha256 = "1l9zizafja49r9kmn85qv3sfwh4kpp44yvz33b6gfrj06gn1mppf";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1331,10 +1331,10 @@
     elpaBuild {
       pname = "elfeed-web";
       ename = "elfeed-web";
-      version = "4.0.0.0.20260628.4";
+      version = "4.0.0.0.20260623.3";
       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.0.0.0.20260623.3.tar";
+        sha256 = "18sqr02xn2vzfajysbz8i0f2m6vqq39c2vhazs8bi638vjk4irc0";
       };
       packageRequires = [
         compat
@@ -1550,28 +1550,6 @@
       };
     }
   ) { };
-  evil-collection = callPackage (
-    {
-      elpaBuild,
-      evil,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "evil-collection";
-      ename = "evil-collection";
-      version = "3.0.0.0.20260719.2";
-      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-collection-3.0.0.0.20260719.2.tar";
-        sha256 = "0xccbmkxzqdw5nqzaink8yab4ga3j0cg7djgiqrzdcd2cc44vqgx";
-      };
-      packageRequires = [ evil ];
-      meta = {
-        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-collection.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   evil-emacs-cursor-model-mode = callPackage (
     {
       elpaBuild,
@@ -1916,10 +1894,10 @@
     elpaBuild {
       pname = "extmap";
       ename = "extmap";
-      version = "1.3.1snapshot0.20250203.2";
+      version = "1.3.10.20250203.193959";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/extmap-1.3.1snapshot0.20250203.2.tar";
-        sha256 = "07davhhx3nq15b3i7mfckxy9cnsq12y5cds8m0m4bw61sz8svxvi";
+        url = "https://elpa.nongnu.org/nongnu-devel/extmap-1.3.10.20250203.193959.tar";
+        sha256 = "1xp7y64zi0pik02r78ks90zydddx583h3f4689n4ldif5zz3wd2k";
       };
       packageRequires = [ ];
       meta = {
@@ -2059,10 +2037,10 @@
     elpaBuild {
       pname = "flycheck";
       ename = "flycheck";
-      version = "37.0.0.20260720.8";
+      version = "36.0.0.20260604.57";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-37.0.0.20260720.8.tar";
-        sha256 = "1d7pb6kqz5s862d43l0ywzvhcd15xj2y8ixgc9zy42yz3rwnqlbj";
+        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-36.0.0.20260604.57.tar";
+        sha256 = "1rkpzjy998x346sc7ka2nvhavlam0d9klpgccsandacywdps1imq";
       };
       packageRequires = [ seq ];
       meta = {
@@ -2260,10 +2238,10 @@
     elpaBuild {
       pname = "geiser";
       ename = "geiser";
-      version = "0.33.1.0.20260718.4";
+      version = "0.33.1.0.20260523.150214";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.33.1.0.20260718.4.tar";
-        sha256 = "14sipclbj37v0f0yc1pk0fl1p704f1gzpd3r21zyh3wkgfj2vjf5";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.33.1.0.20260523.150214.tar";
+        sha256 = "1k0x34c6w0bnrbbkc01frn5h2kbn9pr02i80clr9vfixjv7zar9b";
       };
       packageRequires = [ project ];
       meta = {
@@ -2304,10 +2282,10 @@
     elpaBuild {
       pname = "geiser-chibi";
       ename = "geiser-chibi";
-      version = "0.17.0.20260706.3";
+      version = "0.17.0.20240521.155242";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi-0.17.0.20260706.3.tar";
-        sha256 = "08rhpfr9zsgdmz8j4f8va07ww7lk9kbxcpnm3wxjl940n56nhji9";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi-0.17.0.20240521.155242.tar";
+        sha256 = "0xiaikj274ypfj546snxpi6h30jlc9hifhnw8ljj1zxsafr1wzqq";
       };
       packageRequires = [ geiser ];
       meta = {
@@ -2630,10 +2608,10 @@
     elpaBuild {
       pname = "gnuplot";
       ename = "gnuplot";
-      version = "0.12.0.20260628.3";
+      version = "0.12.0.20260623.2";
       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.20260623.2.tar";
+        sha256 = "0w38z2cmrrnc0bh6pdsqyrhsipz59lknfrkcyahybpbi80x0cgl8";
       };
       packageRequires = [ compat ];
       meta = {
@@ -2737,10 +2715,10 @@
     elpaBuild {
       pname = "gptel";
       ename = "gptel";
-      version = "0.9.9.5.0.20260715.65";
+      version = "0.9.9.5.0.20260620.44";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.5.0.20260715.65.tar";
-        sha256 = "0ax0i8v68ibx4mh6pyz8lqjrkjw7zz9chwkricmjkcn7kha3l6l2";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.5.0.20260620.44.tar";
+        sha256 = "1j9ij8z4hyd4rbz96gk99myrw39x8fd907imnvarqq9xl42m9hrj";
       };
       packageRequires = [
         compat
@@ -2934,10 +2912,10 @@
     elpaBuild {
       pname = "helm";
       ename = "helm";
-      version = "4.0.7.0.20260716.25";
+      version = "4.0.7.0.20260624.21";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.7.0.20260716.25.tar";
-        sha256 = "0g3qmffjwfyrw3iqwrp2ai8pm7q6wan2x0w62vlbacvkziqy7vgf";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.7.0.20260624.21.tar";
+        sha256 = "13kprv1v1snk018m4ccjiyj8ndmc9jf7f5saw896kq16rdiwq72p";
       };
       packageRequires = [
         helm-core
@@ -2959,10 +2937,10 @@
     elpaBuild {
       pname = "helm-core";
       ename = "helm-core";
-      version = "4.0.7.0.20260716.25";
+      version = "4.0.7.0.20260624.21";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.7.0.20260716.25.tar";
-        sha256 = "0qrcc87av7s3xmrl9290rsjljlh68hdh4wyrfjk0g988kpdpbyqx";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.7.0.20260624.21.tar";
+        sha256 = "1w3xdawc6br7i0300544rc6c35yrbck2rkd0d667fv4c79nhvix3";
       };
       packageRequires = [ async ];
       meta = {
@@ -3092,10 +3070,10 @@
     elpaBuild {
       pname = "hyperdrive";
       ename = "hyperdrive";
-      version = "0.6pre0.20251120.26";
+      version = "0.60.20251120.145618";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20251120.26.tar";
-        sha256 = "0j8zglxc2bjvbfdzw9lzy5lksda6hq6xjwcmiyg489yfrx1n5gk5";
+        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.60.20251120.145618.tar";
+        sha256 = "0m4ns20mfcbxqy68qdlbyy9ywvwvhrlrz34dr7g35cz836740a2v";
       };
       packageRequires = [
         compat
@@ -3349,10 +3327,10 @@
     elpaBuild {
       pname = "jabber";
       ename = "jabber";
-      version = "0.12.2.0.20260715.2";
+      version = "0.11.0.0.20260619.11";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.12.2.0.20260715.2.tar";
-        sha256 = "1d07y9qax62hgyxmcyfdk8w30y0p7qn4x0al2qzh1k0slvw12yjy";
+        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.11.0.0.20260619.11.tar";
+        sha256 = "0gjjbl93l0x9sqlmxabrpirkkw5c514pbja74znmdh3j89b7x5zs";
       };
       packageRequires = [
         fsm
@@ -3555,10 +3533,10 @@
     elpaBuild {
       pname = "logview";
       ename = "logview";
-      version = "0.19.4snapshot0.20260218.1";
+      version = "0.19.40.20260218.201306";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.4snapshot0.20260218.1.tar";
-        sha256 = "1z9qplw6gbkvq5dmh2pwiwjva36bzy2dcfc4xrc79l1m0c0nffks";
+        url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.40.20260218.201306.tar";
+        sha256 = "0nzhy8g714gy2w7dd9wyiwx9my2asbl9d1ps7k6m9g44xbvb2y0s";
       };
       packageRequires = [
         compat
@@ -3584,10 +3562,10 @@
     elpaBuild {
       pname = "loopy";
       ename = "loopy";
-      version = "0.16.1.0.20260718.10";
+      version = "0.16.0.0.20260622.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.16.1.0.20260718.10.tar";
-        sha256 = "1gcw2if57rf30n0clxjfg372zb41nkrbx2q1ygh792l1cxlhbr51";
+        url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.16.0.0.20260622.0.tar";
+        sha256 = "1s534lm9ysk8q0z4ndlb4zxns1mzpffy1p11zf4qy54qsh0brj9x";
       };
       packageRequires = [
         compat
@@ -3612,10 +3590,10 @@
     elpaBuild {
       pname = "loopy-dash";
       ename = "loopy-dash";
-      version = "0.13.0.0.20260718.11";
+      version = "0.13.0.0.20260312.12155";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/loopy-dash-0.13.0.0.20260718.11.tar";
-        sha256 = "0ph9w0505yljnaiykmas8hjfj0d4rnbxv7xdw3j5aglffshl626z";
+        url = "https://elpa.nongnu.org/nongnu-devel/loopy-dash-0.13.0.0.20260312.12155.tar";
+        sha256 = "1rg98wgrh5s6slafz8g8piazz04pa6fwiymgpic6hcrmf842fgpy";
       };
       packageRequires = [
         dash
@@ -3711,10 +3689,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "4.6.0.0.20260718.46";
+      version = "4.5.0.0.20260622.306";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.6.0.0.20260718.46.tar";
-        sha256 = "1ln6p4y19z2j2x9hj63v4p5d9kl83vzw993bwirbljf59gwn60qz";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.5.0.0.20260622.306.tar";
+        sha256 = "07r0zjz7n6vy7fywmqf577vh7mx801104ph7302m4icawqbrk1gd";
       };
       packageRequires = [
         compat
@@ -3744,10 +3722,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "4.6.0.0.20260718.46";
+      version = "4.5.0.0.20260622.306";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.6.0.0.20260718.46.tar";
-        sha256 = "02glfja6slz17qv3qzrwjz32a5j3yqj135z430nm2bz015c4k2gv";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.5.0.0.20260622.306.tar";
+        sha256 = "017345kx3wpfipy6pas53cyrhg4qx9pjl8ja7kram2g1hra3hm3z";
       };
       packageRequires = [
         compat
@@ -3770,10 +3748,10 @@
     elpaBuild {
       pname = "markdown-mode";
       ename = "markdown-mode";
-      version = "2.9alpha0.20260425.11";
+      version = "2.90.20260425.95459";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260425.11.tar";
-        sha256 = "0gfaxz089cm7rzwdz9dva4kz8i1cndlq67svcb0fnyca03p6lgkr";
+        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.90.20260425.95459.tar";
+        sha256 = "1xdszi0kjn3dg9nrn004hcb7ib7adh3vf6a8aznkaz4zhhqs420m";
       };
       packageRequires = [ ];
       meta = {
@@ -3868,10 +3846,10 @@
     elpaBuild {
       pname = "meow";
       ename = "meow";
-      version = "1.5.0.0.20260714.67";
+      version = "1.5.0.0.20260619.66";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20260714.67.tar";
-        sha256 = "1w91jlbpp37p4c11z15njvn8icd78hhwkldx70d6y28ngk14q9g3";
+        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20260619.66.tar";
+        sha256 = "1m4ymrg1q8d87zxg72na8a272852qhw443na1g2lf0i01sqijsr8";
       };
       packageRequires = [ ];
       meta = {
@@ -4106,10 +4084,10 @@
     elpaBuild {
       pname = "opam-switch-mode";
       ename = "opam-switch-mode";
-      version = "1.8snapshot0.20230802.1";
+      version = "1.80.20230802.91729";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode-1.8snapshot0.20230802.1.tar";
-        sha256 = "11nvx2rp6zc4m78nkf5c9gbpfyrg68rkrwfvg6iqsga4aw4mr5z8";
+        url = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode-1.80.20230802.91729.tar";
+        sha256 = "1wp7h0p0mfa5gpwbn9sh43a7zy2yaslb9db9k54ylapqn8d8zapx";
       };
       packageRequires = [ ];
       meta = {
@@ -4288,10 +4266,10 @@
     elpaBuild {
       pname = "org-transclusion-http";
       ename = "org-transclusion-http";
-      version = "0.5pre0.20240630.1";
+      version = "0.50.20240630.140904";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http-0.5pre0.20240630.1.tar";
-        sha256 = "06cnyym38nrli2hb74g8qpwaajy3brg64sfkfr5rmbrqyqwlqspp";
+        url = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http-0.50.20240630.140904.tar";
+        sha256 = "0kgq58mr7r9jlsc68nm6z6fm3wb0y1kjayj0qp7pbipqj9dx6b9z";
       };
       packageRequires = [
         org-transclusion
@@ -4338,10 +4316,10 @@
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "2.2.0.0.20260701.0";
+      version = "2.1.3.0.20260623.18";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.2.0.0.20260701.0.tar";
-        sha256 = "143w8vvgn9qfyfrdd8ccs4grpgnksbvjby9sb077ciqjnzimnx5d";
+        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.1.3.0.20260623.18.tar";
+        sha256 = "0cpi9xzs79jbysj127z72611x82wpbzhfgz603ww454x9qiyb9fa";
       };
       packageRequires = [
         compat
@@ -4451,10 +4429,10 @@
     elpaBuild {
       pname = "paredit";
       ename = "paredit";
-      version = "27beta0.20241103.20";
+      version = "270.20241103.213959";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20241103.20.tar";
-        sha256 = "0dmqfcir64pb9nw577wqnh0g0d6kvvzc4v8hca4bcl17ipa0wjkz";
+        url = "https://elpa.nongnu.org/nongnu-devel/paredit-270.20241103.213959.tar";
+        sha256 = "11fbgw18934ddrba1z5fz6c42m2b7jdmrg2lnzlracxfgk9gfp8p";
       };
       packageRequires = [ ];
       meta = {
@@ -4588,10 +4566,10 @@
     elpaBuild {
       pname = "pg";
       ename = "pg";
-      version = "0.68.0.20260719.0";
+      version = "0.67.0.20260610.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.68.0.20260719.0.tar";
-        sha256 = "1awd1rsb95vka0raf8pdgpyj1mmx8s3nqqhgqcxs4h44v8fppyc6";
+        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.67.0.20260610.2.tar";
+        sha256 = "16014aqcz3pj31pbwgyaw9qsqz5rfmmscdah6qvppg2dg17lwfhg";
       };
       packageRequires = [ peg ];
       meta = {
@@ -4609,10 +4587,10 @@
     elpaBuild {
       pname = "php-mode";
       ename = "php-mode";
-      version = "1.26.1.0.20260719.80";
+      version = "1.26.1.0.20251112.64638";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20260719.80.tar";
-        sha256 = "0wsid2y7lybyzk6kf61k9jc80vk3qz3bqsr2rgqy6hln5rv8g5q8";
+        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20251112.64638.tar";
+        sha256 = "1vh7ynpbpps46jw5g9qwzzhyb4kll0dpppj5493kpjj3d87xclir";
       };
       packageRequires = [ ];
       meta = {
@@ -4694,10 +4672,10 @@
     elpaBuild {
       pname = "projectile";
       ename = "projectile";
-      version = "3.3.0snapshot0.20260720.5";
+      version = "2.10.0.20260620.133";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/projectile-3.3.0snapshot0.20260720.5.tar";
-        sha256 = "1n26lg4i2k8nh5sw3yxjrjdmqdylmf0wdbijc0gkqzlafa3nh6qg";
+        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.10.0.20260620.133.tar";
+        sha256 = "1l2m7v59jx8myiaswyrwrm2z60hkk8vqnfl7bnzzvjcs10jafl82";
       };
       packageRequires = [ compat ];
       meta = {
@@ -4715,10 +4693,10 @@
     elpaBuild {
       pname = "proof-general";
       ename = "proof-general";
-      version = "4.6snapshot0.20260622.265";
+      version = "4.60.20260622.265";
       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.60.20260622.265.tar";
+        sha256 = "1b9qv3dv173aqx5k0drkysk017g1ycrzy25kzdhkxg8280kz3v5k";
       };
       packageRequires = [ ];
       meta = {
@@ -4759,10 +4737,10 @@
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20260626.0";
+      version = "1.0.20260303.123213";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20260626.0.tar";
-        sha256 = "19lbiv2wd1fs1jzr4j9q89j41hbhvlgfg9h48bjxki8dqs96d668";
+        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20260303.123213.tar";
+        sha256 = "1iqbrsy5sivv9mm6sk48vj1mv4magh7bg7346i1a02plr0hg8qml";
       };
       packageRequires = [ compat ];
       meta = {
@@ -4950,10 +4928,10 @@
     elpaBuild {
       pname = "rubocop";
       ename = "rubocop";
-      version = "0.7.0snapshot0.20210309.1";
+      version = "0.7.0.20210309.124149";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/rubocop-0.7.0snapshot0.20210309.1.tar";
-        sha256 = "0bggy6nc2wsng83df3vrqw8ygs5ys87i09511kl5d9xfhds7fx4j";
+        url = "https://elpa.nongnu.org/nongnu-devel/rubocop-0.7.0.20210309.124149.tar";
+        sha256 = "0akmidx76zrrfcax7397cs1plwnr3dm83npakbpkssihf08b13aq";
       };
       packageRequires = [ ];
       meta = {
@@ -5019,10 +4997,10 @@
     elpaBuild {
       pname = "scad-mode";
       ename = "scad-mode";
-      version = "99.0.0.20260628.1";
+      version = "99.0.0.20260519.103934";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-99.0.0.20260628.1.tar";
-        sha256 = "0pwx9vknh5w1m3cqp1081dq07061qwn7y292y0x85cvisak8hkcs";
+        url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-99.0.0.20260519.103934.tar";
+        sha256 = "1rh44ifrfihh1jiy1g8fj5gln6ycdimpszilfhzy9fawxwlqhrqk";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5124,10 +5102,10 @@
     elpaBuild {
       pname = "sesman";
       ename = "sesman";
-      version = "0.3.3snapshot0.20260616.21";
+      version = "0.3.30.20260616.21";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/sesman-0.3.3snapshot0.20260616.21.tar";
-        sha256 = "1nc2h58dcjwvi9kjqgmw79cvdc9i1ja8xkxs69hjhyq7y0wp85kf";
+        url = "https://elpa.nongnu.org/nongnu-devel/sesman-0.3.30.20260616.21.tar";
+        sha256 = "0px5lb4xqv8j1n4qran31ra5cq7l1adgfsghm63hwd2sqb999337";
       };
       packageRequires = [ ];
       meta = {
@@ -5167,10 +5145,10 @@
     elpaBuild {
       pname = "simple-httpd";
       ename = "simple-httpd";
-      version = "1.6.0.20260709.3";
+      version = "1.6.0.20260623.1";
       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.6.0.20260623.1.tar";
+        sha256 = "1npss5lv7r2nzvbhzh5jr7w53n2hx6w9pws554srh25hw68v3zd4";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5189,10 +5167,10 @@
     elpaBuild {
       pname = "slime";
       ename = "slime";
-      version = "2.32snapshot0.20260719.53";
+      version = "2.320.20260612.49";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260719.53.tar";
-        sha256 = "06isvwjq37vzf636ci5jb8fkzc926fnjzwx0fszlfax4hy00mlqf";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.320.20260612.49.tar";
+        sha256 = "196g2sc1v84013nk3c8my3w2r3aqvg9sjix2ca64vvrarfamb0ck";
       };
       packageRequires = [ macrostep ];
       meta = {
@@ -5253,10 +5231,10 @@
     elpaBuild {
       pname = "solarized-theme";
       ename = "solarized-theme";
-      version = "2.1.0.0.20260703.8";
+      version = "2.1.0.0.20260610.7";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.1.0.0.20260703.8.tar";
-        sha256 = "0iqgpdjxn6an3vn0pmy7iya5xs1ihjc9rj0kiyk6xlfswzc5pyfk";
+        url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.1.0.0.20260610.7.tar";
+        sha256 = "1phh2qqjf68ap6giid63zpnggx41y1zvn9q2c60igx01fv7xnykd";
       };
       packageRequires = [ ];
       meta = {
@@ -5465,10 +5443,10 @@
     elpaBuild {
       pname = "symbol-overlay";
       ename = "symbol-overlay";
-      version = "4.3.0.20260703.4";
+      version = "4.3.0.20260423.145452";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20260703.4.tar";
-        sha256 = "1mg02vrf7lhqiqkqlnl9czd11aw9i3gsa00f53fbn80vy123hixb";
+        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20260423.145452.tar";
+        sha256 = "16gm3gj84wd7v6qhf3p0sz2jgbbyi60kqwkb41rfiz7n79qlijpg";
       };
       packageRequires = [ seq ];
       meta = {
@@ -5761,6 +5739,7 @@
   ) { };
   tuareg = callPackage (
     {
+      caml,
       elpaBuild,
       fetchurl,
       lib,
@@ -5768,12 +5747,12 @@
     elpaBuild {
       pname = "tuareg";
       ename = "tuareg";
-      version = "3.1.1snapshot0.20260626.1";
+      version = "3.0.20.20260617.40";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.1.1snapshot0.20260626.1.tar";
-        sha256 = "0y1ygn4d8dcw0zgq0y2f65kmx64id5dcv2d23kvk2sddr53qya8f";
+        url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.0.20.20260617.40.tar";
+        sha256 = "0xmfvmxnk50pymajgmymwzmhjs8x5ac9dg1r7mx4iwsv15x13m4f";
       };
-      packageRequires = [ ];
+      packageRequires = [ caml ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu-devel/tuareg.html";
         license = lib.licenses.free;
@@ -5810,10 +5789,10 @@
     elpaBuild {
       pname = "typst-ts-mode";
       ename = "typst-ts-mode";
-      version = "0.12.2.0.20260624.24";
+      version = "0.12.2.0.20260415.103532";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260624.24.tar";
-        sha256 = "13amyfg5zkbxwp1gipnyn01wpwpyv0p0w4sv97xpfiyazhs5w4bn";
+        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260415.103532.tar";
+        sha256 = "190jabvm3p74cd96rrbj45y68myg32zvlxjrq01zvi3jv29xbpf6";
       };
       packageRequires = [ ];
       meta = {
@@ -5958,10 +5937,10 @@
     elpaBuild {
       pname = "vm";
       ename = "vm";
-      version = "8.3.3snapshot0.20260716.51";
+      version = "8.3.30.20260610.33";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260716.51.tar";
-        sha256 = "04pq2a39czffcj4rwv0c7bg53vc95mjyk4jqqp25blk4v4l9ygs2";
+        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.30.20260610.33.tar";
+        sha256 = "0194px4dg5q2rgddvqwylcywymjx39s3ih16kh6d8whvlk1xcm6p";
       };
       packageRequires = [ vcard ];
       meta = {
@@ -6026,10 +6005,10 @@
     elpaBuild {
       pname = "wfnames";
       ename = "wfnames";
-      version = "1.2.0.20260706.4";
+      version = "1.2.0.20260105.45812";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20260706.4.tar";
-        sha256 = "1gzypbg4nkf7yyscyq8p9n5ckclg0rcks5s8rilsljb0csnx35nz";
+        url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20260105.45812.tar";
+        sha256 = "116d5j1sqb0fbqlfaxxiaraw8c6mg69nw5mn412zwrvbq4vgpp4c";
       };
       packageRequires = [ ];
       meta = {
@@ -6092,10 +6071,10 @@
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.5.2.0.20260701.0";
+      version = "3.5.1.0.20260623.3";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.5.2.0.20260701.0.tar";
-        sha256 = "067x2q0ykrp9llva4gn1cjyxwnhb0yh1cxr6ghdd4yccbfdi4y85";
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.5.1.0.20260623.3.tar";
+        sha256 = "16mfh41zkdylbk92cizm4ia69lwirq58mb8rms9v448s41w2wvka";
       };
       packageRequires = [
         compat
@@ -6206,10 +6185,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "28.11.20260712150256.0.20260712.0";
+      version = "28.11.20260416140940.0.20260416.141130";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260712150256.0.20260712.0.tar";
-        sha256 = "0g4lfqm81kpszwlkapvr25c8c0b4rmg00zrr62ziz16bplvgy3ky";
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260416140940.0.20260416.141130.tar";
+        sha256 = "0mrfn3z60jgk2f9lccb3qcaa52rvh366ys97ypz5lgjlxal1sr5r";
       };
       packageRequires = [ ];
       meta = {
@@ -6313,10 +6292,10 @@
     elpaBuild {
       pname = "zenburn-theme";
       ename = "zenburn-theme";
-      version = "2.10.0.0.20260704.2";
+      version = "2.10.0.0.20260601.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.10.0.0.20260704.2.tar";
-        sha256 = "17wp8z3nycqr3rva4npq3gi8ddv93fwzqh45bfgcr6a0zv4pfxp4";
+        url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.10.0.0.20260601.0.tar";
+        sha256 = "0li865y8wp8gsim2xiscxhmpfnwd394ag9x9kpff082yg2q4j2ww";
       };
       packageRequires = [ ];
       meta = {
@@ -6335,10 +6314,10 @@
     elpaBuild {
       pname = "zig-mode";
       ename = "zig-mode";
-      version = "0.0.8.0.20260717.49";
+      version = "0.0.8.0.20251128.25646";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20260717.49.tar";
-        sha256 = "182rhhax10ldn763fraa5fc2vqlglzm9iq2yq2rvndgklqlf5bsc";
+        url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20251128.25646.tar";
+        sha256 = "03nqzy5xyqsr7ax1m0sprk75ygkyspj824vixgkrflqnrhyj5b2s";
       };
       packageRequires = [ reformatter ];
       meta = {

pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix

@@ -75,10 +75,10 @@
     elpaBuild {
       pname = "aidermacs";
       ename = "aidermacs";
-      version = "1.9";
+      version = "1.7";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.9.tar";
-        sha256 = "05ff2kfy97870qgvv89ysrk8cwnr3zxh1f01lvp7rk7siln0w10d";
+        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.7.tar";
+        sha256 = "17l7dlg218j63zwzi51wdczamvxlv54l0ivkip3h3kll386lkcm6";
       };
       packageRequires = [
         compat
@@ -269,10 +269,10 @@
     elpaBuild {
       pname = "auto-dim-other-buffers";
       ename = "auto-dim-other-buffers";
-      version = "2.2.2";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.2.2.tar";
-        sha256 = "1464kwsdkzh4v0w2y8sv2v5w1s552a2pq1q81jpbfwh2md47ais2";
+        url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.2.1.tar";
+        sha256 = "00x0niv1zd47b2xl19k3fi0xxskdndiabns107cxzwb7pnkp4f0m";
       };
       packageRequires = [ ];
       meta = {
@@ -566,10 +566,10 @@
     elpaBuild {
       pname = "casual";
       ename = "casual";
-      version = "2.17.1";
+      version = "2.16.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/casual-2.17.1.tar";
-        sha256 = "0wnr7lqb3c6wzcbjh19cj00jdh3rhplzyxq2khk009pfld861pa3";
+        url = "https://elpa.nongnu.org/nongnu/casual-2.16.2.tar";
+        sha256 = "0aqkxxds4paicn1r4hy13f71cl4qllf9dfijpl4mp5zizyx8a8a2";
       };
       packageRequires = [
         csv-mode
@@ -619,10 +619,10 @@
     elpaBuild {
       pname = "cider";
       ename = "cider";
-      version = "2.0.0";
+      version = "1.22.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/cider-2.0.0.tar";
-        sha256 = "1i8drgg7fbj4l4y7mgh47fw94bajwd5sdacfkvii0d6pc8sda2if";
+        url = "https://elpa.nongnu.org/nongnu/cider-1.22.2.tar";
+        sha256 = "0a7mcg1lazn1xyl3sxy0qpwd4qipf0ix56891ydjcv7i9yhggnpc";
       };
       packageRequires = [
         clojure-mode
@@ -735,10 +735,10 @@
     elpaBuild {
       pname = "cond-let";
       ename = "cond-let";
-      version = "1.1.3";
+      version = "1.1.2";
       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.2.tar";
+        sha256 = "04p2jf8nm1q00439r26vvg9549hld4spcabghwsgmf89gqjiv8mm";
       };
       packageRequires = [ ];
       meta = {
@@ -1331,10 +1331,10 @@
     elpaBuild {
       pname = "elfeed";
       ename = "elfeed";
-      version = "4.1.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/elfeed-4.1.0.tar";
-        sha256 = "0bwmhba975rsj9pk3s6wq7lsa38v4s0737hvhhdbzx1i66z45hmx";
+        url = "https://elpa.nongnu.org/nongnu/elfeed-4.0.1.tar";
+        sha256 = "1az6lj58j1kkxzpa7ik8irl3z2b9f7yxsm92pfqlcwplsnm2q8q2";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1568,28 +1568,6 @@
       };
     }
   ) { };
-  evil-collection = callPackage (
-    {
-      elpaBuild,
-      evil,
-      fetchurl,
-      lib,
-    }:
-    elpaBuild {
-      pname = "evil-collection";
-      ename = "evil-collection";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/evil-collection-3.0.0.tar";
-        sha256 = "1a347yznrgw8b5y8jwj4rbryidr24c7g8c2is9pd4470v5h7jnfd";
-      };
-      packageRequires = [ evil ];
-      meta = {
-        homepage = "https://elpa.nongnu.org/nongnu/evil-collection.html";
-        license = lib.licenses.free;
-      };
-    }
-  ) { };
   evil-emacs-cursor-model-mode = callPackage (
     {
       elpaBuild,
@@ -2077,10 +2055,10 @@
     elpaBuild {
       pname = "flycheck";
       ename = "flycheck";
-      version = "37.0";
+      version = "36.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/flycheck-37.0.tar";
-        sha256 = "0x565wcnxkmdsf87dzv555r6m86lmlwz4c16isgac8dn1qp7l5jb";
+        url = "https://elpa.nongnu.org/nongnu/flycheck-36.0.tar";
+        sha256 = "0172y6qzkys77cbvdla1iiiznpxpscjzmsdr66m66s8g4bf7f1p2";
       };
       packageRequires = [ seq ];
       meta = {
@@ -3366,10 +3344,10 @@
     elpaBuild {
       pname = "jabber";
       ename = "jabber";
-      version = "0.12.2";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/jabber-0.12.2.tar";
-        sha256 = "0klii5m93g5dva7wrf7v0habb9pghrpa6kw63c5x1ym2w7sh8v6q";
+        url = "https://elpa.nongnu.org/nongnu/jabber-0.11.0.tar";
+        sha256 = "1wikfd8iqj9r1qrh6cd593vgbkjndfpm9f12ilsdwxwh0nx3cpd7";
       };
       packageRequires = [
         fsm
@@ -3601,10 +3579,10 @@
     elpaBuild {
       pname = "loopy";
       ename = "loopy";
-      version = "0.16.1";
+      version = "0.16.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/loopy-0.16.1.tar";
-        sha256 = "17p5km90v2pwwqr66x39h2ca6dx47xig1rkpvk1m4nlw32nqv1dh";
+        url = "https://elpa.nongnu.org/nongnu/loopy-0.16.0.tar";
+        sha256 = "0bav318gimpv42y0ww9c0gm90pkma3ri0xp9mfimz9yriw2bjzyv";
       };
       packageRequires = [
         compat
@@ -3728,10 +3706,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "4.6.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-4.6.0.tar";
-        sha256 = "0m7n3jvdf8d40wzglz67addk1nwwbvb7wkm0nq1mjpayqvwqyjml";
+        url = "https://elpa.nongnu.org/nongnu/magit-4.5.0.tar";
+        sha256 = "080hc0y9pah86g7nw1x1gh2issap54r8dg9vzpm2l923cxy9jnbp";
       };
       packageRequires = [
         compat
@@ -3761,10 +3739,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "4.6.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-section-4.6.0.tar";
-        sha256 = "085fr4fnk2wcd9z5l4ks20q69r501sx96abhyw80lshbd9rzj59z";
+        url = "https://elpa.nongnu.org/nongnu/magit-section-4.5.0.tar";
+        sha256 = "1k63g8ayvg152r16ml5ph8q07qs5a424vs4i5q32icvl78v6cn2z";
       };
       packageRequires = [
         compat
@@ -4355,22 +4333,20 @@
       elpaBuild,
       fetchurl,
       lib,
-      llama,
       magit,
       org,
     }:
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "2.2.0";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/orgit-2.2.0.tar";
-        sha256 = "0lw6mp6war3aqsad8vbdpz33nx7kki8df39xm7gnq1ja2dkgf9ah";
+        url = "https://elpa.nongnu.org/nongnu/orgit-2.1.3.tar";
+        sha256 = "1brwy6jx7jxb8jlkr8jq8hsdzmizqs41hkb3p14rmqqd0m5ddapl";
       };
       packageRequires = [
         compat
         cond-let
-        llama
         magit
         org
       ];
@@ -4612,10 +4588,10 @@
     elpaBuild {
       pname = "pg";
       ename = "pg";
-      version = "0.68";
+      version = "0.67";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/pg-0.68.tar";
-        sha256 = "0nnr5gz4bm0hfdwj8f0vkfwb2apbk5sv3l85q7b420nwcs7d546r";
+        url = "https://elpa.nongnu.org/nongnu/pg-0.67.tar";
+        sha256 = "01q06yk011pn9pg9srilwy0k9nn8x5pl32k1mn9i54mbikf7ac5b";
       };
       packageRequires = [ peg ];
       meta = {
@@ -4710,7 +4686,6 @@
   ) { };
   projectile = callPackage (
     {
-      compat,
       elpaBuild,
       fetchurl,
       lib,
@@ -4718,12 +4693,12 @@
     elpaBuild {
       pname = "projectile";
       ename = "projectile";
-      version = "3.2.1";
+      version = "2.9.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/projectile-3.2.1.tar";
-        sha256 = "07hfhfbig1zw1fs0k7m22n3wqdyk4fj5fbpcrg0x4q2dw05r5bbj";
+        url = "https://elpa.nongnu.org/nongnu/projectile-2.9.1.tar";
+        sha256 = "07icp9baa7jkyqnz4b1sxl1dg88y5vzzhiwyfb12q349flbkkkb1";
       };
-      packageRequires = [ compat ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu/projectile.html";
         license = lib.licenses.free;
@@ -4783,10 +4758,10 @@
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20260626.0";
+      version = "1.0.20260303.123213";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20260626.0.tar";
-        sha256 = "0y45m019fl0rdgjdz9ap1cr5agqg0gssfi04p33xqdcjkwrf51d0";
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20260303.123213.tar";
+        sha256 = "1wxhdrwm2fr3rnv7ghziibnpbx99z9qdaa54zd11jzjpkjgf2jxs";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5801,6 +5776,7 @@
   ) { };
   tuareg = callPackage (
     {
+      caml,
       elpaBuild,
       fetchurl,
       lib,
@@ -5808,12 +5784,12 @@
     elpaBuild {
       pname = "tuareg";
       ename = "tuareg";
-      version = "3.1.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/tuareg-3.1.0.tar";
-        sha256 = "1fhw143rmdzrfrh6y3jdsyq6yqwv1dy6m6sg4s3mbqhnhxawc9sm";
+        url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar";
+        sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj";
       };
-      packageRequires = [ ];
+      packageRequires = [ caml ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu/tuareg.html";
         license = lib.licenses.free;
@@ -6127,20 +6103,18 @@
       elpaBuild,
       fetchurl,
       lib,
-      llama,
     }:
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.5.2";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/with-editor-3.5.2.tar";
-        sha256 = "1qibgsb67zh8k8mpk3ghy2ilmrmf3dxz75clfvn2qji5ds2qlkzq";
+        url = "https://elpa.nongnu.org/nongnu/with-editor-3.5.1.tar";
+        sha256 = "0p19n8kx9gkj87pr8rlac8b9vlrb57w7k5b62fx9dwx2m54dixh9";
       };
       packageRequires = [
         compat
         cond-let
-        llama
       ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu/with-editor.html";
@@ -6246,10 +6220,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "28.11.20260712150256";
+      version = "28.11.20260416140940";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260712150256.tar";
-        sha256 = "1c4xsvmc92ydil78j2kk6avgswgz4ll5fx4mrlsmrq1z57v99ca1";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260416140940.tar";
+        sha256 = "0zzdwrd4h12bqlxzpj7xs4m5cdgx9nbljrnyld6qs5b19352izyl";
       };
       packageRequires = [ ];
       meta = {

pkgs/applications/editors/vim/plugins/generated.nix

@@ -446,12 +446,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-07-20";
+    version = "0-unstable-2026-07-07";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "e520902f405da5f5ad392d32babad5b5dd5ffa44";
-      hash = "sha256-zNXm/0W+Hv562zt6NxHnFuO2nBxjX5dlxS7pRB+KXQY=";
+      rev = "e954496f8ef22904e8a84f5078f4a110fdc7a0d3";
+      hash = "sha256-b8HOclkr3FoCNUDJ6f0ULsfyiQB38+9PNxl0CibVL60=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -1050,12 +1050,12 @@ final: prev: {
 
   artio-nvim = buildVimPlugin {
     pname = "artio.nvim";
-    version = "0-unstable-2026-07-17";
+    version = "0-unstable-2026-06-23";
     src = fetchFromGitHub {
       owner = "comfysage";
       repo = "artio.nvim";
-      rev = "19d71f8d9c721872e97aa0e5f094041c96f3feca";
-      hash = "sha256-X1QXSoowhgs+uhO1T9OtaSXhAryzLCzGfHNgCFiO3is=";
+      rev = "52a074e6a15780df350c03b5c7ab47f706fe6da8";
+      hash = "sha256-8hbFtJXpkH1L2ZI6Rv9HTQcseog77yf78Wc/9WsvzPA=";
     };
     meta.homepage = "https://github.com/comfysage/artio.nvim/";
     meta.license = getLicenseFromSpdxId "EUPL-1.2";
@@ -1414,12 +1414,12 @@ final: prev: {
 
   autoclose-nvim = buildVimPlugin {
     pname = "autoclose.nvim";
-    version = "0-unstable-2026-07-20";
+    version = "0-unstable-2026-03-22";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "autoclose.nvim";
-      rev = "27063904b2238ce7867e430885b6abcfb08357ea";
-      hash = "sha256-BjNP8Facn3Cy/EHYioUB9mXb19sBzBeSCY1xTpPOWG8=";
+      rev = "bafd0368716216fa6a7bb2a43ecd889b44efdb46";
+      hash = "sha256-DOKKyaDmfUPRTcXJvqD+0zAr63+93H0auax6Dse0Igo=";
     };
     meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1638,12 +1638,12 @@ final: prev: {
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "0-unstable-2026-07-19";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "8d059b82367160cd530253afbbcd20dc4b34129f";
-      hash = "sha256-wW6UidkM6avqQVhPEgRtDXgxHsMdD+IM01A5ABebYT4=";
+      rev = "cbb71c6cb56f53b30ab1a95a6d277f7e0524025b";
+      hash = "sha256-QG9FcdlCKYXzncvDt47RQQGyJ2ARt1N+ec75qtc7gSk=";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
     meta.license = unfree;
@@ -1946,12 +1946,12 @@ final: prev: {
 
   blink-cmp-tmux = buildVimPlugin {
     pname = "blink-cmp-tmux";
-    version = "0-unstable-2026-07-16";
+    version = "0-unstable-2026-02-11";
     src = fetchFromGitHub {
       owner = "mgalliou";
       repo = "blink-cmp-tmux";
-      rev = "112ddbf2e09d9cb4736de70dd01eb9654cf01d70";
-      hash = "sha256-7Wj7bIg7vAOz0OygISORRphsEV6RcsR6m/S2tRyzEpU=";
+      rev = "1ef35d8e388475ab8eaeecfc12e196c78bd5de04";
+      hash = "sha256-enoPsYF8llGShf+sx6rLYYnLLzrd+jdCdZ4gy9A2lKU=";
     };
     meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2042,20 +2042,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  blink-lib = buildVimPlugin {
-    pname = "blink.lib";
-    version = "0-unstable-2026-06-19";
-    src = fetchFromGitHub {
-      owner = "saghen";
-      repo = "blink.lib";
-      rev = "5876dd95deeb70aadbe9f1c0b7117a135061cdac";
-      hash = "sha256-FsDcgBiD3fl0EO1advAoQBbA2HY1p8Ja7lwhmpB++Zc=";
-    };
-    meta.homepage = "https://github.com/saghen/blink.lib/";
-    meta.license = getLicenseFromSpdxId "MIT";
-    meta.hydraPlatforms = [ ];
-  };
-
   blink-nerdfont-nvim = buildVimPlugin {
     pname = "blink-nerdfont.nvim";
     version = "0-unstable-2025-12-14";
@@ -2268,12 +2254,12 @@ final: prev: {
 
   bullets-vim = buildVimPlugin {
     pname = "bullets.vim";
-    version = "2.0.0-unstable-2026-07-16";
+    version = "2.0.0-unstable-2026-06-03";
     src = fetchFromGitHub {
       owner = "bullets-vim";
       repo = "bullets.vim";
-      rev = "81570b98ca44b4100b3ddcf8d9ca74b9a9b0c884";
-      hash = "sha256-yTxXXnVyk/vbr+tWD9RquJvk2ksa8Okuhg3NnyeBp3o=";
+      rev = "3f667eeca58bd4ba411b41edefef51e7fed1a2b1";
+      hash = "sha256-fq3ATtCeXeq3CR97KbEu8mOEF8CtpEt7z8z3OO5IQQY=";
     };
     meta.homepage = "https://github.com/bullets-vim/bullets.vim/";
     meta.license = unfree;
@@ -3582,12 +3568,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.20.0";
+    version = "19.19.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.20.0";
-      hash = "sha256-vDKbjW9izNruCLiPRQEs+yoOrA+YkuyvmdovFTY4nfw=";
+      tag = "v19.19.0";
+      hash = "sha256-1ypjttA0T6wnVrqBaiqGtcJnqiyhxeg2EXh7O9nPBpE=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -4199,12 +4185,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-07-16";
+    version = "0-unstable-2026-07-12";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "83580b587f6fc50568ec61ae79e18762fcf35c17";
-      hash = "sha256-OKlZh1FKIk4DhyAtc0rSnEOZoa75NQKRtdFYDjkTZPE=";
+      rev = "0b2b0db07b0426441ece46988d9ab28088f07cd5";
+      hash = "sha256-SjAiNoeAxuu2UFHupUnDtjrPtGqAiFdHoq21Qn35OVA=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -4619,12 +4605,12 @@ final: prev: {
 
   ddc-source-lsp = buildVimPlugin {
     pname = "ddc-source-lsp";
-    version = "1.2.0-unstable-2026-07-20";
+    version = "1.2.0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-source-lsp";
-      rev = "2f476ae123bea5b3583f9d4ca141f63981e70b06";
-      hash = "sha256-2rMdU1FUP4HJP2o2MtL93po/FmloMzZ/sqeQWHPP55g=";
+      rev = "7718b6d9539ebddc18e961f90ff1aca7975ffe5c";
+      hash = "sha256-2JVCuFXc6mtXUDEB1lVgWC2q38kvwr9tyjKO/Z4iY9k=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
     meta.license = unfree;
@@ -7185,12 +7171,12 @@ final: prev: {
 
   hardtime-nvim = buildVimPlugin {
     pname = "hardtime.nvim";
-    version = "1.2.0-unstable-2026-07-20";
+    version = "1.2.0-unstable-2025-09-13";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "hardtime.nvim";
-      rev = "244753782b945def87472d8f4e9e6a9d4ec18689";
-      hash = "sha256-Zers7vdGRGy8n520G9uMuHwMAP3STHqU5d5a2Ln9rDQ=";
+      rev = "b4e431934af1fe224a3a801f632c008278cb7628";
+      hash = "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0=";
     };
     meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8389,12 +8375,12 @@ final: prev: {
 
   kitty-scrollback-nvim = buildVimPlugin {
     pname = "kitty-scrollback.nvim";
-    version = "9.2.1";
+    version = "9.2.0";
     src = fetchFromGitHub {
       owner = "mikesmithgh";
       repo = "kitty-scrollback.nvim";
-      tag = "v9.2.1";
-      hash = "sha256-8IkvoJ8nTlP5WCqMpJqUhBsz7OYB/Mlp1lH5TJRpvOE=";
+      tag = "v9.2.0";
+      hash = "sha256-M/sd8lUv7leapzI3uD0VNkMAwaFhPmXsktFnHMPJz0U=";
     };
     meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11048,12 +11034,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-07-19";
+    version = "1.4.0-unstable-2026-07-16";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "1246df7a5d1811d84212f11edb43550cd8380ebd";
-      hash = "sha256-hlQf+xJ+/9OTqp5VtPsNE7QW6uVjWeUkqQ8r1u6MWkI=";
+      rev = "50bdc4130d9e30d28d0b209544d49ee472f6bf12";
+      hash = "sha256-hsYouOS+ImmA6HnwqFRq3RMBTsn87oHrnijMqvargU4=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11132,12 +11118,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-07-16";
+    version = "3.0.0-unstable-2026-07-15";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "f8674ec894315c02449b61c9de9a116c5aafeb90";
-      hash = "sha256-ETu9zy2In3M8/3fqYUfTRt0mKiocm3paJFjgQ82Yj3I=";
+      rev = "95295edaa26e8e8db5a9bc4119256e602311c6bc";
+      hash = "sha256-hAswp9Ba5xfFfBS+NKjLOoSky+SRrLfd8fdFC46Dq2s=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12156,12 +12142,12 @@ final: prev: {
 
   none-ls-extras-nvim = buildVimPlugin {
     pname = "none-ls-extras.nvim";
-    version = "0-unstable-2026-07-17";
+    version = "0-unstable-2026-06-06";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls-extras.nvim";
-      rev = "9a8b8a9aeb43382e5aaf49b00b7cfb5d42d32118";
-      hash = "sha256-YmDhDUqSJPOllXzkyrVUgnshrI5+Kt5Te8tEmnjOAVQ=";
+      rev = "27681d797a26f1b4d6119296df42f5204c88a2dc";
+      hash = "sha256-GZLT8X1eLeSkiV5EN1nOkCQg5nwNATURi/KMj90i40I=";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/";
     meta.license = getLicenseFromSpdxId "Unlicense";
@@ -12282,12 +12268,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "0-unstable-2026-07-19";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "222c8cc1ad66076c05b7c9d0695781ebe3799d88";
-      hash = "sha256-SKSRwXi0KdJtWkmak1LLwXIUukwIhMxKHy9HIMnu0DQ=";
+      rev = "28019401865beffcedc744bb1506d0201b88f2f9";
+      hash = "sha256-QKBDxZzEQKGzHOVJmS9D9i9h2/0HubbgUlAvaA7Erh0=";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -13760,12 +13746,12 @@ final: prev: {
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "0.10.0-unstable-2026-07-19";
+    version = "0.10.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "7248feaca45e4d944591497964bc19afa89ad1c6";
-      hash = "sha256-FQj0+qeaW9rLy3dUbGbUG4UYtnry7UBA1n9SM2qXLdk=";
+      rev = "4916d6592ede8c07973490d9322f187e07dfefac";
+      hash = "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -13872,12 +13858,12 @@ final: prev: {
 
   nvim-treesitter-textobjects = buildVimPlugin {
     pname = "nvim-treesitter-textobjects";
-    version = "0-unstable-2026-07-19";
+    version = "0-unstable-2026-04-07";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "898ee307df58f854d11cd7edd06472574d48014e";
-      hash = "sha256-naZ+p5RrC+uUyFRaksmozDfNgJRifff+9TDWx79DCPk=";
+      rev = "851e865342e5a4cb1ae23d31caf6e991e1c99f1e";
+      hash = "sha256-fOpRElIwvsFWm4AwETx7fpC3RtdH2BpCfX4YHVitqw0=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -14184,8 +14170,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "tarides";
       repo = "ocaml.nvim";
-      rev = "d74934117fb7a513e64601ad1d1b53a34b00b01f";
-      hash = "sha256-zJJZP8jxa7e9Fn0N8JFzfP3d2TElkASFt8ptaWCOYpM=";
+      rev = "e12ded73f461d392cc2cad579a39733ebe34de61";
+      hash = "sha256-3NiRM02g7BU+MzCybSfsyZdODcPA+RbuNU9QOmmoCxo=";
     };
     meta.homepage = "https://github.com/tarides/ocaml.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15162,12 +15148,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "5.2.0-1";
+    version = "5.1.1-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v5.2.0-1";
-      hash = "sha256-p/p7VxmuNusgUXtPpiCGa+BSgDDS/yKvtAV93cKmIEg=";
+      tag = "v5.1.1-1";
+      hash = "sha256-NmkKA9AH1uOgHSQT9S8RIFQrkrhkDvpKIfDqHGfzoFI=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -16269,12 +16255,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-07-18";
+    version = "2.1.0-unstable-2026-07-10";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "de39b4d75695e2377401c7d05f896657637d244b";
-      hash = "sha256-Xqnre4RfIID/m8hXUpcMrsLssjfp/cbSpG24cory2BI=";
+      rev = "9493405fb8ee683aa6efd50c529f6296ad8f40ad";
+      hash = "sha256-cMPRVxFMBVRpIcy7kCQyoXzgsIFJJ1cDgAcvOm9FNnI=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16283,12 +16269,12 @@ final: prev: {
 
   smartcolumn-nvim = buildVimPlugin {
     pname = "smartcolumn.nvim";
-    version = "1.1.1-unstable-2026-07-20";
+    version = "1.1.1-unstable-2025-07-21";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "smartcolumn.nvim";
-      rev = "5351ae24e992a397d2abac48b7774dc8ef0acf40";
-      hash = "sha256-+ICVS16n0CFWbTqBzGkvxQohyYiAvr6gIxZqura3PUw=";
+      rev = "b9cdbdf42f7ac5a659204cd5926017c7ff724a19";
+      hash = "sha256-QAb0O/ZwTVogRyTK8+Y4ORaN6nVaeYepKgfSCF/fIPU=";
     };
     meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -21150,12 +21136,12 @@ final: prev: {
 
   vim-go = buildVimPlugin {
     pname = "vim-go";
-    version = "1.29-unstable-2026-07-18";
+    version = "1.29-unstable-2026-07-08";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "d69962d20a2a60e4bdc92a2281e5f0aaaa109635";
-      hash = "sha256-tXA45Hhnr9Vv4p6MyNAxj2SOC+P8eGkIEVE8PDnyFx4=";
+      rev = "551d423ba27915d96721c8709702edd23bc2bb48";
+      hash = "sha256-ps2QQ6xyQpvfCZ+tTUTzBt3kxu7+VtDcvLnH2HS8pRY=";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
     meta.license = unfree;
@@ -21936,12 +21922,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "0-unstable-2026-07-19";
+    version = "0-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "d9aa6784fe3a870e78ba82b5d176c0c5745e23f7";
-      hash = "sha256-/QrVhax5PTidfSi6WAxJNX4mbBhUGFZLlG3WsqoT2Ro=";
+      rev = "b3301b091c730061a6da1f9fab670eece6af187c";
+      hash = "sha256-ZcrnrD8ZHb76U1SrjEGlDLSr54WbtAyqjeooj8y0tug=";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -22244,12 +22230,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "0.0.1-unstable-2026-07-16";
+    version = "0.0.1-unstable-2026-07-11";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "22d06c9e4b620d5c2f055aec590dec6d383e5316";
-      hash = "sha256-LiWvL9QpZFPUH+Uek19ce6/e8B6uATmje/emUvyLWJk=";
+      rev = "1b1803c4ae35ef8fecaaea1e6580ee700278804f";
+      hash = "sha256-kGQZWrg6tf5j/iHfTIKiQC/JZJRoKbKxMYzfhERvN+8=";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25281,12 +25267,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2.17-unstable-2026-07-18";
+    version = "2.17-unstable-2026-07-05";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "6368e31fdaf766ff908a2c06e9ee14fc66dec409";
-      hash = "sha256-/0DoAJ3Iv8eJlRqNodumYqllY+4c3zv+oY1EpbvC8ak=";
+      rev = "a5949d2800c1866c878956d49c51fc8d003c6b99";
+      hash = "sha256-P7zDZBNy2WivNbwCURpS3zTNd5nXenYu2PZEbyWnbCY=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -26039,12 +26025,12 @@ final: prev: {
 
   zen-nvim = buildVimPlugin {
     pname = "zen.nvim";
-    version = "0-unstable-2026-07-18";
+    version = "0-unstable-2026-04-17";
     src = fetchFromGitHub {
       owner = "sand4rt";
       repo = "zen.nvim";
-      rev = "cc7306e9ea479b19e8ef4c5fba35b4efd4b66692";
-      hash = "sha256-ZFuhNDVmUU7A02w/rzDn8uze7ivHVu2GI3+6PyIxAgE=";
+      rev = "8d77a06063d74393ace9a984f32c4c158dcef6ba";
+      hash = "sha256-1zLxgs1EqAoGrjIr26awTFZ+NS06Ph/SDQHczBNCsaA=";
     };
     meta.homepage = "https://github.com/sand4rt/zen.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";

pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix

@@ -3,26 +3,25 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
-  vimPlugins,
   vimUtils,
   stdenv,
   nix-update-script,
 }:
 let
-  version = "0.6.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.pairs";
     tag = "v${version}";
-    hash = "sha256-XWrsZAH0tIPyRjr3PnAS2QAGE3+1z00jdnsxkKG0qPE=";
+    hash = "sha256-PTbj6jlXNRUOmwFSplvRDDiyyGqkBzUKtuBrvZm9kzM=";
   };
 
   blink-pairs-lib = rustPlatform.buildRustPackage {
     pname = "blink-pairs";
     inherit version src;
 
-    cargoHash = "sha256-XLlluprxhVueHhkIufJa7fJXvFxpJJzh89+yL9PZ4GI=";
+    cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU=";
 
     env = {
       RUSTC_BOOTSTRAP = 1;
@@ -43,15 +42,13 @@ vimUtils.buildVimPlugin {
   pname = "blink.pairs";
   inherit version src;
 
-  dependencies = [ vimPlugins.blink-lib ];
-
   preInstall =
     let
       ext = stdenv.hostPlatform.extensions.sharedLibrary;
     in
     ''
-      mkdir -p lib
-      ln -s ${blink-pairs-lib}/lib/libblink_pairs_parser${ext} lib/
+      mkdir -p target/release
+      ln -s ${blink-pairs-lib}/lib/libblink_pairs${ext} target/release/
     '';
 
   nvimSkipModules = [
@@ -74,9 +71,6 @@ vimUtils.buildVimPlugin {
     homepage = "https://github.com/Saghen/blink.pairs";
     changelog = "https://github.com/Saghen/blink.pairs/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      isabelroses
-      saadndm
-    ];
+    maintainers = with lib.maintainers; [ isabelroses ];
   };
 }

pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix

@@ -13,18 +13,18 @@
   writableTmpDirAsHomeHook,
 }:
 let
-  version = "0.10.1";
+  version = "0.10.0";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff";
     tag = "v${version}";
-    hash = "sha256-GGoy8ghA87vwHEc0fi97uiBrpRTAGk/QgqzKu8BBRXo=";
+    hash = "sha256-nrstsxOxHTeSKkqpvyxdzyypfHU6wZBQpvNnCfjh9s4=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-sOE3Zrs/ZtOIusH0+OvR1Ew5sfQfse6eWSLPwDPVSU4=";
+    cargoHash = "sha256-Nlf2Bxwe5KvZF0unpeK/mMFmv4NM+IKPpFOopXoNRxU=";
 
     cargoBuildFlags = [
       "-p"

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -3602,6 +3602,7 @@ assertNoAdditions {
       snacks-nvim
       telescope-nvim
     ];
+    dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
       # Issue reproduction file
       "minimal"

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -146,7 +146,6 @@ https://github.com/MahanRahmati/blink-nerdfont.nvim/,,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,,
 https://github.com/Saghen/blink.compat/,,
 https://github.com/Saghen/blink.indent/,,
-https://github.com/saghen/blink.lib/,,
 https://github.com/dundalek/bloat.nvim/,,
 https://github.com/HampusHauffman/block.nvim/,,
 https://github.com/uloco/bluloco.nvim/,,

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-Y6MXjJBmhMzuQMwhkPLHK/vtciTdjsGvkEblH3ofju0=";
+          hash = "sha256-JYg1P0t3YadTxmqeRSky8X9emLnP2cO3BYO9R7PgQfM=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-8VvDtb+8SoLTRC7pXwH40amRurxTQgCmhdi0u7e5AfU=";
+          hash = "sha256-miK4K8THmT+ebjcAl/3Cp9vtVWfMlpIWWIqyAm5+YeQ=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-bqjEgsjY+zyG1g/KtkRNxAlazIpc+HwGWvsMQNnPI2M=";
+          hash = "sha256-ao9yGH9xIBmNrp/sHpwpxKZnR8LjXl1Cegfgw7Nq+2M=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.218";
+      version = "2.1.215";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

pkgs/applications/editors/vscode/extensions/default.nix

@@ -4852,8 +4852,8 @@ let
         mktplcRef = {
           name = "emacs-mcx";
           publisher = "tuttieee";
-          version = "0.111.0";
-          hash = "sha256-3z4B1NBQD3hbGcwWpS48bXuUAN1jVlSRLF0PDKGJH3A=";
+          version = "0.110.11";
+          hash = "sha256-LiiZI0Ze5F5w7OtiqY7wMpzdtyof/ynUH57wRfQnxFs=";
         };
         meta = {
           changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
@@ -5577,8 +5577,8 @@ let
         mktplcRef = {
           name = "vscode-zig";
           publisher = "ziglang";
-          version = "0.6.19";
-          hash = "sha256-kdoks0da6+uofzvN5lulkDAVihSS7xoF/Q6Fo5yzQbg=";
+          version = "0.6.18";
+          hash = "sha256-jn/2Nmz6N84BCWnRdnM8w5AdiF2hh55h39SDTmRry5I=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";

pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix

@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "material-icon-theme";
     publisher = "PKief";
-    version = "5.37.0";
-    hash = "sha256-remt7+OQnOqSrtUoUN3QCXXR3Bti/lWIMfb7i4j3w84=";
+    version = "5.36.1";
+    hash = "sha256-1yxTjIsyj8o97VlvDlWqPCNIxd6XgbjpqF5qNbVtEwg=";
   };
   meta = {
     description = "Material Design Icons for Visual Studio Code";

pkgs/applications/editors/vscode/generic.nix

@@ -181,6 +181,7 @@ stdenv.mkDerivation (
       buildFHSEnv customizedArgs;
   in
   {
+
     inherit
       pname
       version
@@ -198,16 +199,8 @@ stdenv.mkDerivation (
         updateScript
         vscodeVersion
         ;
-      fhs = (fhs { }).overrideAttrs (old: {
-        strictDeps = true;
-        __structuredAttrs = true;
-      });
-      fhsWithPackages =
-        f:
-        (fhs { additionalPkgs = f; }).overrideAttrs (old: {
-          strictDeps = true;
-          __structuredAttrs = true;
-        });
+      fhs = fhs { };
+      fhsWithPackages = f: fhs { additionalPkgs = f; };
     }
     // lib.optionalAttrs (vscodeServer != null) {
       inherit rev vscodeServer;
@@ -426,11 +419,7 @@ stdenv.mkDerivation (
         let
           nodeModulesPath =
             if stdenv.hostPlatform.isDarwin then
-              # 1.129 moved node_modules back into app.asar, shipping native
-              # binaries in the asar.unpacked directory like before 1.94
-              if lib.versionAtLeast vscodeVersion "1.129.0" then
-                "Contents/Resources/app/node_modules.asar.unpacked"
-              else if lib.versionAtLeast vscodeVersion "1.94.0" then
+              if lib.versionAtLeast vscodeVersion "1.94.0" then
                 "Contents/Resources/app/node_modules"
               else
                 "Contents/Resources/app/node_modules.asar.unpacked"

pkgs/applications/emulators/libretro/cores/dosbox-pure.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2026-07-15";
+  version = "0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "a4a0bab7f8931433588f2fcad9045c85b277373d";
-    hash = "sha256-sniDrr5kSU/OnoE08WXNmTTstfI6cHyq4I7xjtrM+7c=";
+    rev = "d137f0cacff196fb44a2783ecbc6e8ddb3e57cfc";
+    hash = "sha256-4KPYwvtVLrzZcn3LYqSWmP+qWFjtNsCjrVY/L93/ZOE=";
   };
 
   hardeningDisable = [ "format" ];

pkgs/applications/emulators/libretro/cores/gambatte.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-07-17";
+  version = "0-unstable-2026-07-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "9b3b5e3cc18ec92f460d37dd551eaf90c55bfcea";
-    hash = "sha256-IBQmVcWx839rRV8uLUou4fdwxgZqVbMWyqRVa3Dq0rc=";
+    rev = "dfc165599f3f1068c40a0b7ad6fe5f161283d483";
+    hash = "sha256-a7GXw0B/ekIcNl08s1DpuRQZyxm4tYGWzNVVBTjXeOk=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/pcsx2.nix

@@ -11,13 +11,13 @@
 }:
 mkLibretroCore {
   core = "pcsx2";
-  version = "0-unstable-2026-07-20";
+  version = "0-unstable-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "ps2";
-    rev = "43129ad5ccbde21b022dd3b3fad1862f72a109bf";
-    hash = "sha256-frS44hQeMAgNMEJ5xzmt4fUpx5om5csUsE4qe4kZBao=";
+    rev = "b03969a333f38de21f866c2a10da4300d170364d";
+    hash = "sha256-djGM6hMQCvJQG2+PWDRLeM+13/Q8upD25uhH4vU/yko=";
     fetchSubmodules = true;
   };
 

pkgs/applications/emulators/libretro/cores/swanstation.nix

@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2026-07-20";
+  version = "0-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "5430a4a53b89fa5827c97b84ada29d23317245bc";
-    hash = "sha256-sE9jJjdt25nz0+B0oSonRubYWurE20o/FDdUTj//qOI=";
+    rev = "32e5654cb4ff17db3e950250a677767906fa3cf8";
+    hash = "sha256-l4Vb1kSuoqMJC4gn+S61zuePZaYvJ/nmVyoFOlsCTBM=";
   };
 
   extraNativeBuildInputs = [ cmake ];

pkgs/applications/emulators/libretro/cores/vba-next.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vba-next";
-  version = "0-unstable-2026-07-21";
+  version = "0-unstable-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vba-next";
-    rev = "2b96fd3a77025f3083daf61126b1852d5e0eace7";
-    hash = "sha256-09KSCGlmHNrftX86CVUUAAIHiOpM+MpWwa+XOw3MrJA=";
+    rev = "91de6188c2544ecb13c7bc05e4d9c361d21a49ad";
+    hash = "sha256-gC5SAw7wHlMxvFFXOSFB5abInAme23140eAm5uyOlNg=";
   };
 
   meta = {

pkgs/applications/emulators/wibo/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
         meta.license = lib.licenses.unfree;
       };
     in
-    lib.optionalString finalAttrs.finalPackage.doCheck ''
+    lib.optionalString finalAttrs.doCheck ''
       MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c
       file test.o | grep "ELF 32-bit"
     '';

pkgs/applications/graphics/inkscape/extensions/textext/default.nix

@@ -109,20 +109,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
     # Include gobject-introspection typelibs in the wrapper.
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-
-    # TexText probes for a GUI toolkit by spawning a subprocess
-    # (`sys.executable -c "import gi; gi.require_version('Gtk', '3.0'); ..."`)
-    # instead of importing in-process. The Python wrapper makes runtime
-    # dependencies importable via a site.addsitedir preamble and deliberately
-    # does not export PYTHONPATH, so the spawned probe interpreter cannot import
-    # gi and TexText aborts with "Neither GTK nor TkInter has been found".
-    # Export PYTHONPATH so the probe subprocess inherits the dependencies too.
-    # See https://github.com/NixOS/nixpkgs/issues/384042
-    makeWrapperArgs+=(--prefix PYTHONPATH : "${
-      lib.makeSearchPath python3.sitePackages (
-        finalAttrs.propagatedBuildInputs ++ [ python3.pkgs.pycairo ]
-      )
-    }")
   '';
 
   postFixup = ''

pkgs/applications/networking/browsers/chromium/info.json

@@ -1,9 +1,9 @@
 {
   "chromium": {
-    "version": "150.0.7871.181",
+    "version": "150.0.7871.128",
     "chromedriver": {
-      "version": "150.0.7871.182",
-      "hash_darwin_aarch64": "sha256-JddVyl8sX2ab0M5qWoHslf1r+u8tkzkCZePR4M+eNMA="
+      "version": "150.0.7871.129",
+      "hash_darwin_aarch64": "sha256-CtfrqG/AeXCg7Sl6LoidM+OhYvBWkRJoAxv3g68wqUw="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9",
-        "hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=",
+        "rev": "81891e5ca708047763816c778216799ef14c66cb",
+        "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -91,8 +91,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c",
-        "hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4="
+        "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
+        "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -136,8 +136,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "d089fc91e7e4881362463faf8efe9ae435e34660",
-        "hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q="
+        "rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
+        "hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
       },
       "src/third_party/dawn/third_party/glfw3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -656,8 +656,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "587c5b0f5a7b0260826a0c19094c2d952195066e",
-        "hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo="
+        "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
+        "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -826,8 +826,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638",
-        "hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs="
+        "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
+        "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",
@@ -837,7 +837,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "150.0.7871.181",
+    "version": "150.0.7871.128",
     "deps": {
       "depot_tools": {
         "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
@@ -849,16 +849,16 @@
         "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
       },
       "ungoogled-patches": {
-        "rev": "150.0.7871.181-1",
-        "hash": "sha256-ifqEnOcvi49cFOYan8ShiwteXYnFrLPclrIBZiE1rGY="
+        "rev": "150.0.7871.128-1",
+        "hash": "sha256-GxSsGTC68IEMPt85RLBCVDT0dTl7ZVVPc8o4vxc50H8="
       },
       "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9",
-        "hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=",
+        "rev": "81891e5ca708047763816c778216799ef14c66cb",
+        "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -928,8 +928,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c",
-        "hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4="
+        "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
+        "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -973,8 +973,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "d089fc91e7e4881362463faf8efe9ae435e34660",
-        "hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q="
+        "rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
+        "hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
       },
       "src/third_party/dawn/third_party/glfw3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1493,8 +1493,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "587c5b0f5a7b0260826a0c19094c2d952195066e",
-        "hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo="
+        "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
+        "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1663,8 +1663,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638",
-        "hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs="
+        "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
+        "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",

pkgs/applications/networking/cluster/nomad/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
+  buildGoModule,
   buildGo125Module,
-  buildGo126Module,
   fetchFromGitHub,
   nixosTests,
   installShellFiles,
@@ -82,19 +82,6 @@ rec {
 
   nomad = nomad_1_11;
 
-  nomad_2_0 = generic {
-    buildGoModule = buildGo126Module;
-    version = "2.0.0";
-    hash = "sha256-5rCAcOXWQ6g2iK1d5wy/a/DZQC2xwwdpI1SscDX98C8=";
-    vendorHash = "sha256-3/H7QgVOHtaUs6BOF7ATVgrA0cfNBbm940Axrvq2bKU=";
-    license = lib.licenses.bsl11;
-    passthru.tests.nomad = nixosTests.nomad;
-    preCheck = ''
-      export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
-    '';
-    __structuredAttrs = true;
-  };
-
   nomad_1_11 = generic {
     buildGoModule = buildGo125Module;
     version = "1.11.3";

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -54,13 +54,13 @@
     "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs="
   },
   "aminueza_minio": {
-    "hash": "sha256-lSjpFr0qBhCvwE1+DgaGPQe9gsgVNPh+go801BhedfY=",
+    "hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v3.38.5",
+    "rev": "v3.38.3",
     "spdx": "AGPL-3.0",
-    "vendorHash": "sha256-gSGsjK6JOBN5NdV7tpTXU7UMze9t7UHMDe/W7suFNU0="
+    "vendorHash": "sha256-se32x/vxIRiAewIIUZb/wR9eB6sDpDzN3n7OS5m8t5g="
   },
   "argoproj-labs_argocd": {
     "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=",
@@ -119,13 +119,13 @@
     "vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE="
   },
   "brightbox_brightbox": {
-    "hash": "sha256-bvwdtiwzXElhsXLmftXZQ567ExcC0E0L/5OeqIdp1SQ=",
+    "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
     "homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
     "owner": "brightbox",
     "repo": "terraform-provider-brightbox",
-    "rev": "v3.4.4",
+    "rev": "v3.4.3",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TLNHhSyMw0rKFtd9EChg7zSGoxe57rh36nAPqu1j8w8="
+    "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
   },
   "buildkite_buildkite": {
     "hash": "sha256-egeZCTQFyhKG0giyjNK9C/W+OGMOGv2l+65Vg3iTi2A=",
@@ -364,22 +364,22 @@
     "vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U="
   },
   "drfaust92_bitbucket": {
-    "hash": "sha256-m5Ya99ulMesUwl54sbHuvOYumbPcAhWMESVGbXIOJpE=",
+    "hash": "sha256-TPRHLR1wqX2uxV51iSk7IveqNQ1lLEy51G0fnfAM0No=",
     "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
     "owner": "DrFaust92",
     "repo": "terraform-provider-bitbucket",
-    "rev": "v2.52.0",
+    "rev": "v2.51.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-uokHd4hDvWl6mrBa062F/uZmYPnW3TIZZKZwKBVq+Lo="
+    "vendorHash": "sha256-RtS88NqkO1nG/8znM0sQqsAIfDc+sOMy8N4T4hmvaVA="
   },
   "e-breuninger_netbox": {
-    "hash": "sha256-qyzw5a35twJ5gsEe0ANv6a9MMD0UyV8hYbYt/2bBJ/k=",
+    "hash": "sha256-rCDopABF6BDJo4sdwfy+GrU9EPAIldjddj+j7opf8FA=",
     "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox",
     "owner": "e-breuninger",
     "repo": "terraform-provider-netbox",
-    "rev": "v5.7.0",
+    "rev": "v5.6.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-y9GRTuoh1X6GfGkGZbPpO500y8DoJS1dnwZL3BCTUcY="
+    "vendorHash": "sha256-WaeRXTqXakFTYMHio+VLIKS4kS5wHQdY5zdJYwrlVjE="
   },
   "equinix_equinix": {
     "hash": "sha256-Tn8CnLx2ibkj7qlzpYCX7Cm+yoTcZujVELMJSbG+/ec=",
@@ -508,13 +508,13 @@
     "vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc="
   },
   "hashicorp_aws": {
-    "hash": "sha256-ZeFC9ebkt7SWFOCpt6zD60wOTRB8tiV6SQYr/O38FRw=",
+    "hash": "sha256-876U9ojKfnJCRKaTFhW9NvBQ6fvTpC0NYE+fhwkCwk8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v6.55.0",
+    "rev": "v6.54.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/6esBCIsNXUmx38NXUk/d3Td4uSgwZXvkETQhaERwLQ="
+    "vendorHash": "sha256-lxxSwaBXrl2xrZJ+OHrCBvHKmsq3D9Om7/Y0zPaYIQg="
   },
   "hashicorp_awscc": {
     "hash": "sha256-SziDO4K6qv62zolBKdrhXIyaEOMM5hJ0h6ros1wC2l0=",
@@ -589,13 +589,13 @@
     "vendorHash": "sha256-moP2fqZnj8J6IFAhb0n6pikVYVg2Is22xd/xuuJ+zIQ="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-wf+pFYuDMqlFYvaTKTpgaeSSBoLgQlUAarobUAotLMo=",
+    "hash": "sha256-pEdNv1MViCsCb3wFoDghCeQ5q2FErtGrQL9noL5B11g=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.40.0",
+    "rev": "v7.39.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7f0HZQXVsIq7m8CUApTnHIroOjKwT1GaP+GjCf4C6n0="
+    "vendorHash": "sha256-u4zldvOO/TtNHC8B+c63DWMbk7iEix+S+y/RLExchI8="
   },
   "hashicorp_helm": {
     "hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=",
@@ -715,13 +715,13 @@
     "vendorHash": null
   },
   "hetznercloud_hcloud": {
-    "hash": "sha256-pfcgLftuPwbVsKVPAE0iF9p59eK12dtLjwPY2YMy4KE=",
+    "hash": "sha256-Clbg0LS5SYpaEyevbZ+oDG3xFXEWjV376JvStPi3MnU=",
     "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
     "owner": "hetznercloud",
     "repo": "terraform-provider-hcloud",
-    "rev": "v1.66.1",
+    "rev": "v1.66.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Hh9sMVRVVoUEsu6nqdHhmPO2q4xPfyb0VNbhDvyPdRg="
+    "vendorHash": "sha256-6knIcS3hkzt3R1IC1hA6EKOceJl51/pJXpftEaZjgtY="
   },
   "huaweicloud_huaweicloud": {
     "hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=",
@@ -842,13 +842,13 @@
     "vendorHash": "sha256-EAv8EeNn0PJ3BElmg6sKkd/LXNe0lFjEIjHuZRG3CoQ="
   },
   "launchdarkly_launchdarkly": {
-    "hash": "sha256-xQhWB5gUO10v7KXXHci3gvXlI/hg7JXsn9bYxHVGJwc=",
+    "hash": "sha256-PgAK0BUTSyW4CXssQkENohnhtd2O5GPuFVvSDcHWjQ8=",
     "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
     "owner": "launchdarkly",
     "repo": "terraform-provider-launchdarkly",
-    "rev": "v2.30.1",
+    "rev": "v2.30.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-9RisIZUblqqylMW6Bz6ehpwRUXyvTdicuhEGI+n5G3Y="
+    "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM="
   },
   "linode_linode": {
     "hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=",
@@ -1274,11 +1274,11 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic_sumologic": {
-    "hash": "sha256-h4ipmgcEK8Cv9/gQwdOtQqbhfXO/QXJsrHHV6O1HtL8=",
+    "hash": "sha256-MraUjj18ooGYfOnsEJ0oCPIFQITagNRGMeAqZqEQWU4=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.2.10",
+    "rev": "v3.2.9",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg="
   },
@@ -1319,11 +1319,11 @@
     "vendorHash": "sha256-QvtirfTfnvy7CBNUng07OZnbXLHJAyRlf1I9Mur44N4="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-mIiTAFVWNoD2JkVJNYUbrhOPNwCY/ocbTnoGbFROggo=",
+    "hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.83.13",
+    "rev": "v1.83.10",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1508,12 +1508,12 @@
     "vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-0155GXJMfoCnyqaJiF5SJIA1Qz1q2AYe/BB0AYODG/0=",
+    "hash": "sha256-YiUARVEsGfD4IUuTFSrkAIAD6kOyFUoLebSaZtW9FcE=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.218.0",
+    "rev": "v0.215.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FfZvuC/XXhKS03E+l4/9KCLSwx+uTP1LzywckZqX6pA="
+    "vendorHash": "sha256-YNCd1i2HDa0aToZ0vEr6tRugXnBXE+zymhLM+rmRNPI="
   }
 }

pkgs/applications/networking/instant-messengers/profanity/default.nix

@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # see also: https://profanity-im.github.io/guide/latest/build.html#expl
   mesonFlags = [
-    (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
+    (lib.mesonBool "tests" finalAttrs.doCheck)
     (lib.mesonEnable "notifications" notifySupport)
     (lib.mesonEnable "python-plugins" pythonPluginSupport)
     (lib.mesonEnable "c-plugins" true)

pkgs/applications/networking/irc/weechat/default.nix

@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
 
 stdenv.mkDerivation rec {
   pname = "weechat";
-  version = "4.9.4";
+  version = "4.9.3";
 
   src = fetchurl {
     url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-    hash = "sha256-P8UDWfOjsljJ8DFIsC87nFkZRTXRtGXEgfuFp2wu0AU=";
+    hash = "sha256-XH2VOfqGyZ6nalUaiJqSusIeq3uyeQ29NGRS0AsQw3w=";
   };
 
   # Why is this needed? https://github.com/weechat/weechat/issues/2031

pkgs/applications/office/paperwork/src.nix

@@ -27,12 +27,6 @@ rec {
           hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8=";
         }
       )
-      # remove usage of deprecated pkg_resources
-      # remove on next release
-      (fetchpatch {
-        url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/ab244d9c483b23f53e2548b73236d7fe4b94cb3f.patch";
-        hash = "sha256-Wd6OK0BdyTcjLy1NhkLp9N2oOcQWB6geEPOlYDTBsHw=";
-      })
     ];
   };
 

pkgs/applications/science/logic/coq/default.nix

@@ -19,7 +19,7 @@
   ocamlPackages_4_10,
   ocamlPackages_4_12,
   ocamlPackages_4_14,
-  ocamlPackages_5_5,
+  ocamlPackages_5_4,
   rocqPackages, # for versions >= 9.0 that are transition shims on top of Rocq
   ncurses,
   buildIde ? null, # default is true for Coq < 8.14 and false for Coq >= 8.14
@@ -76,7 +76,6 @@ let
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
     "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
     "9.2.0".sha256 = "sha256-rVhv2GLImdVPgRwwTQ+wiWNtRUflMrES0ElIrdTIN1s=";
-    "9.3+rc1".sha256 = "sha256-vGJkRRzf8ur7i9IUpRA/sxVEQvZGnxfV/ex28Lt1kWw=";
   };
   releaseRev = v: "V${v}";
   fetched =
@@ -141,15 +140,12 @@ let
           case = lib.versions.range "8.7" "8.10";
           out = ocamlPackages_4_09;
         }
-      ] ocamlPackages_5_5;
+      ] ocamlPackages_5_4;
   ocamlNativeBuildInputs = [
     ocamlPackages.ocaml
     ocamlPackages.findlib
   ]
   ++ lib.optional (coqAtLeast "8.14") dune;
-  ocamlBuildInputs = [
-    ocamlPackages.findlib
-  ];
   ocamlPropagatedBuildInputs =
     [ ]
     ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5
@@ -229,7 +225,6 @@ let
     buildInputs = [
       ncurses
     ]
-    ++ ocamlBuildInputs
     ++ lib.optionals buildIde (
       if coqAtLeast "8.10" then
         [
@@ -333,18 +328,11 @@ let
       platforms = lib.platforms.unix;
       mainProgram = if buildIde then "coqide" else "coqtop";
     };
-
-    # Things required by the CI
-    strictDeps = true;
-    __structuredAttrs = true;
   };
 in
 if coqAtLeast "8.21" then
   self.overrideAttrs (o: {
     # coq-core is now a shim for rocq
-    nativeBuildInputs = o.nativeBuildInputs ++ [
-      rocqPackages.rocq-core
-    ];
     propagatedBuildInputs = o.propagatedBuildInputs ++ [
       rocqPackages.rocq-core
     ];

pkgs/applications/science/logic/rocq-core/default.nix

@@ -14,7 +14,7 @@
   dune,
   customOCamlPackages ? null,
   ocamlPackages_4_14,
-  ocamlPackages_5_5,
+  ocamlPackages_5_4,
   ncurses,
   csdp ? null,
   version,
@@ -29,7 +29,6 @@ let
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
     "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
     "9.2.0".sha256 = "sha256-rVhv2GLImdVPgRwwTQ+wiWNtRUflMrES0ElIrdTIN1s=";
-    "9.3+rc1".sha256 = "sha256-vGJkRRzf8ur7i9IUpRA/sxVEQvZGnxfV/ex28Lt1kWw=";
   };
   releaseRev = v: "V${v}";
   fetched =
@@ -67,15 +66,12 @@ let
       in
       lib.switch rocq-version [
         (case (range "9.0" "9.1") ocamlPackages_4_14)
-      ] ocamlPackages_5_5;
+      ] ocamlPackages_5_4;
   ocamlNativeBuildInputs = [
     ocamlPackages.ocaml
     ocamlPackages.findlib
     dune
   ];
-  ocamlBuildInputs = [
-    ocamlPackages.findlib
-  ];
   ocamlPropagatedBuildInputs = [ ocamlPackages.zarith ];
   self = stdenv.mkDerivation {
     pname = "rocq";
@@ -134,7 +130,7 @@ let
     };
 
     nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs;
-    buildInputs = [ ncurses ] ++ ocamlBuildInputs;
+    buildInputs = [ ncurses ];
 
     propagatedBuildInputs = ocamlPropagatedBuildInputs;
 
@@ -200,10 +196,6 @@ let
       platforms = lib.platforms.unix;
       mainProgram = "rocq";
     };
-
-    # Things required by the CI
-    strictDeps = true;
-    __structuredAttrs = true;
   };
 in
 self

pkgs/applications/video/kodi/unwrapped.nix

@@ -106,6 +106,8 @@
   libxdmcp,
   dbusSupport ? true,
   dbus,
+  joystickSupport ? true,
+  cwiid,
   nfsSupport ? true,
   libnfs,
   pulseSupport ? true,
@@ -372,6 +374,7 @@ stdenv.mkDerivation (
       libxfixes
     ]
     ++ lib.optional dbusSupport dbus
+    ++ lib.optional joystickSupport cwiid
     ++ lib.optional nfsSupport libnfs
     ++ lib.optional pulseSupport libpulseaudio
     ++ lib.optional pipewireSupport pipewire

pkgs/applications/virtualization/docker/default.nix

@@ -420,18 +420,18 @@ in
 
   docker_29 =
     let
-      version = "29.6.2";
+      version = "29.6.1";
     in
     callPackage dockerGen {
       inherit version;
       cliRev = "v${version}";
-      cliHash = "sha256-WpPSePMCfWAVxCkX1nZyI+sra/Vug009ZPmnVKDaX0I=";
+      cliHash = "sha256-cpK2UMRP/WXHsehG9Sq5UJAjhMesmXTrhe00y4RMRZc=";
       mobyRev = "docker-v${version}";
-      mobyHash = "sha256-zrvrZCRUuiZ2vixZNOUFeGmDehHzSI+FzDMzV1gMqMc=";
+      mobyHash = "sha256-gv+mea9X5TYDWN3IBRpmw0+R2waGxCiubdatNTeUQZI=";
       runcRev = "v1.3.6";
       runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc=";
-      containerdRev = "v2.2.6";
-      containerdHash = "sha256-Ngo9x847cXFYPnj/0I+g7BeV7e1/5T2YXfA1zkIdiPg=";
+      containerdRev = "v2.2.5";
+      containerdHash = "sha256-3ui+0AjEU6H4VHYwF3G85ggVMUdONCLJ5KfciFasmkk=";
       tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
       tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
     };

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix

@@ -13,13 +13,13 @@ let
             mkHyprlandPlugin,
           }:
           let
-            version = "0.56.0";
+            version = "0.55.0";
 
             hyprland-plugins-src = fetchFromGitHub {
               owner = "hyprwm";
               repo = "hyprland-plugins";
               tag = "v${version}";
-              hash = "sha256-piRpwar7VZI3YviYo0a/UMFz9+rLesfv3nRLGKxjVGg=";
+              hash = "sha256-WMUJ7tyw/9QbKUyRzLndEQSqX05fQLmFlRdMAmPD7tI=";
             };
           in
           mkHyprlandPlugin {

pkgs/build-support/testers/modular-service-compliance.nix

@@ -15,7 +15,6 @@
   evalConfig,
   mkTest,
   sharedDir,
-  callReload,
   namePrefix ? "modular-service-compliance",
 }:
 
@@ -46,11 +45,6 @@ let
           ];
           warnings = [ "compliance child warning" ];
         };
-        # A sub-service exercising reload derivation from a reload signal.
-        services.reloadee = {
-          process.argv = [ "${coreutils}/bin/true" ];
-          process.reloadSignal = "HUP";
-        };
       };
     };
   };
@@ -71,7 +65,7 @@ let
       };
 
       testAssertions = {
-        expr = lib.elem {
+        expr = builtins.elem {
           assertion = true;
           message = "compliance test assertion";
         } c.assertions;
@@ -79,12 +73,12 @@ let
       };
 
       testWarnings = {
-        expr = lib.elem "compliance test warning" c.warnings;
+        expr = builtins.elem "compliance test warning" c.warnings;
         expected = true;
       };
 
       testSubServiceAssertions = {
-        expr = lib.elem {
+        expr = builtins.elem {
           assertion = true;
           message = "compliance child assertion";
         } c.services.child.assertions;
@@ -92,58 +86,14 @@ let
       };
 
       testSubServiceWarnings = {
-        expr = lib.elem "compliance child warning" c.services.child.warnings;
-        expected = true;
-      };
-
-      # The reload-conflict assertion must not fire (its `assertion` must hold) for a
-      # service that sets only reloadSignal (guards the inverted-assertion fix, and the
-      # priority-aware conflict detection: reloadSignal derives reloadCommand internally,
-      # which must not be mistaken for a user-set conflict).
-      testNoReloadConflict = {
-        expr = lib.any (
-          a:
-          a.message
-          == "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand."
-          && !a.assertion
-        ) c.services.reloadee.assertions;
-        expected = false;
-      };
-
-      # Setting process.reloadSignal derives process.reloadCommand
-      # (guards the misplaced-paren mkIf fix).
-      testReloadSignalDerivesCommand = {
-        expr = c.services.reloadee.process.reloadCommand;
-        expected = "${coreutils}/bin/kill -HUP $MAINPID";
-      };
-
-      # notificationProtocol submodule bools default to false.
-      testNotificationProtocolSystemdDefault = {
-        expr = c.notificationProtocol.systemd;
-        expected = false;
-      };
-
-      testNotificationProtocolS6Default = {
-        expr = c.notificationProtocol.s6;
-        expected = false;
-      };
-
-      # Setting both reloadSignal and reloadCommand explicitly is a genuine conflict,
-      # so the assertion must fire. Separate eval: checkDrv would fail on this.
-      testReloadConflictFires = {
-        expr = lib.any (
-          a:
-          a.message
-          == "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand."
-          && !a.assertion
-        ) conflictEval.config.conflict.assertions;
+        expr = builtins.elem "compliance child warning" c.services.child.warnings;
         expected = true;
       };
 
       # Separate eval for a failing assertion — checkDrv would fail here,
       # so we only access config.
       testFailingAssertionValue = {
-        expr = lib.elem {
+        expr = builtins.elem {
           assertion = false;
           message = "compliance failing assertion";
         } failingEval.config.failing.assertions;
@@ -151,16 +101,6 @@ let
       };
     };
 
-  conflictEval = evalConfig {
-    services = {
-      conflict = {
-        process.argv = [ "${coreutils}/bin/true" ];
-        process.reloadSignal = "HUP";
-        process.reloadCommand = "${coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-  };
-
   failingEval = evalConfig {
     services = {
       failing = {
@@ -189,24 +129,6 @@ let
     exec "${coreutils}/bin/sleep" infinity
   '';
 
-  /**
-    A reloadable service script. Like `svc`, it namespaces a comms subdirectory
-    by its first argument and records the remaining arguments. It traps SIGHUP
-    and appends a marker line to `$dir/reloads` on each reload, then stays alive
-    as the trapping shell itself (no `exec`, so the trap and MAINPID are kept).
-  */
-  reloadableSvc = writeShellScript "${namePrefix}-reloadable-svc" ''
-    id="$1"; shift
-    dir="${sharedDir}/$id"
-    mkdir -p "$dir"
-    : > "$dir/reloads"
-    reload() { printf 'reloaded\n' >> "$dir/reloads"; }
-    trap reload HUP
-    echo "$$" > "$dir/pid"
-    printf '%s\n' "$@" > "$dir/args"
-    while true; do "${coreutils}/bin/sleep" 1; done
-  '';
-
   mkArgv =
     id: extraArgs:
     [
@@ -249,27 +171,6 @@ let
       inherit text;
     });
 
-  # The reload runtime test's service tree. The reloadable unit is the *sub*-service,
-  # so its name path `[ "reload" "inner" ]` handed to `callReload` exercises the
-  # integration's nested unit naming (NixOS dash-joins to `reload-inner.service`).
-  reloadServices = {
-    reload = {
-      # Parent must run something; a bare keep-alive is enough.
-      process.argv = [
-        reloadableSvc
-        "reload-parent"
-      ];
-      services.inner.process = {
-        argv = [
-          reloadableSvc
-          "reload-inner"
-        ];
-        # The script traps SIGHUP; reloadSignal derives the manager's reload command.
-        reloadSignal = "HUP";
-      };
-    };
-  };
-
 in
 {
   # Eval-level tests: config structure, evaluated in the integration's
@@ -285,9 +186,9 @@ in
     representative = evalResult.checkDrv;
     passthru = {
       tests = evalTestDefs;
-      failures = lib.runTests finalAttrs.finalPackage.tests;
+      failures = lib.runTests finalAttrs.passthru.tests;
     };
-    testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.finalPackage.tests;
+    testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.passthru.tests;
     buildCommand = ''
       touch $out
       for testName in "''${!testResults[@]}"; do
@@ -346,26 +247,5 @@ in
     '';
   };
 
-  # Runtime reload: start a reloadable service, ask the integration to reload it,
-  # and assert the service observed the reload (recorded a SIGHUP marker).
-  reload = mkTest {
-    name = "${namePrefix}-reload";
-    services = reloadServices;
-    testExe = mkTestScript "reload" ''
-      ${waitAndCheck "reload-inner" [ ]}
-      ${callReload [
-        "reload"
-        "inner"
-      ]}
-      timeout=30; elapsed=0
-      while ! grep -qx "reloaded" "${sharedDir}/reload-inner/reloads" && [ "$elapsed" -lt "$timeout" ]; do
-        sleep 1; elapsed=$((elapsed + 1))
-      done
-      grep -qx "reloaded" "${sharedDir}/reload-inner/reloads" \
-        || { echo "reload: no reload recorded after ''${timeout}s"; cat "${sharedDir}/reload-inner/reloads"; exit 1; }
-      echo "reload: reload observed"
-    '';
-  };
-
   # See also the manual compliance items in doc/build-helpers/testers.chapter.md.
 }

pkgs/by-name/ac/account-utils/package.nix

@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "account-utils";
-  version = "1.4.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = "account-utils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F0jM7qEpUjDjf0FTMfTNbD3WDoBShE0SyhDKzgI2K0k=";
+    hash = "sha256-9l+y7FLb0IZXXp4RstlhNR6yA7b4b831obFuiVtO9+k=";
   };
 
   __structuredAttrs = true;
@@ -54,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "c_args" "-ffat-lto-objects")
   ];
 
-  doCheck = true;
-
   passthru.tests = {
     inherit (nixosTests) login-nosuid;
   };

pkgs/by-name/ad/addchain/package.nix

@@ -1,44 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  nix-update-script,
-}:
-buildGoModule rec {
-  pname = "addchain";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "mmcloughlin";
-    repo = "addchain";
-    tag = "v${version}";
-    fetchSubmodules = false;
-    hash = "sha256-msuZgNYqN1QldrbXJJ4BFXYhUsllAPt8W0KRrr8p6TM=";
-  };
-
-  vendorHash = "sha256-qxlVGkbm95WFmH0+48XRXwrF7HRUWFxYHFzmFOaj4GA=";
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/mmcloughlin/addchain/meta.buildversion=${version}"
-  ];
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  subPackages = [ "cmd/addchain" ];
-
-  __structuredAttrs = true;
-
-  meta = {
-    description = "addchain generates short addition chains for exponents of cryptographic interest with results rivaling the best hand-optimized chains";
-    homepage = "https://github.com/mmcloughlin/addchain";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      ambiso
-    ];
-    mainProgram = "addchain";
-  };
-}