From 5f7f61bc5f6b02ae720fb53e18f5406b6c25da3f Mon Sep 17 00:00:00 2001
From: HigherOrderLogic <73709188+HigherOrderLogic@users.noreply.github.com>
Date: Tue, 10 Feb 2026 07:56:35 +0000
Subject: [PATCH 001/107] fishPlugins.hydro: `0-unstable-2024-11-02` ->
 `0-unstable-2025-12-31`

---
 pkgs/shells/fish/plugins/hydro.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix
index dc33038c5545..d9fbc2fec351 100644
--- a/pkgs/shells/fish/plugins/hydro.nix
+++ b/pkgs/shells/fish/plugins/hydro.nix
@@ -6,13 +6,13 @@
 
 buildFishPlugin {
   pname = "hydro";
-  version = "0-unstable-2024-11-02";
+  version = "0-unstable-2025-12-31";
 
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "hydro";
-    rev = "9c93b89573bd722f766f2190a862ae55e728f6ba";
-    hash = "sha256-QYq4sU41/iKvDUczWLYRGqDQpVASF/+6brJJ8IxypjE=";
+    rev = "24bb2375e3cb29c71ab790c8cfe98b9069de80c3";
+    hash = "sha256-8ixve1ws80q5jNdKoooL25Lk7qopVitCMVTucW490fU=";
   };
 
   meta = {

From a17ca394c3a4a7a884e9d8fed139e5ad14216a2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2026 16:17:44 +0000
Subject: [PATCH 002/107] cocogitto: 6.5.0 -> 7.0.0

---
 pkgs/by-name/co/cocogitto/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index e7ecd754de28..8af2fd5b3bed 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cocogitto";
-  version = "6.5.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
     tag = finalAttrs.version;
-    hash = "sha256-aAVoPPeuJN6QPcuc3oBF93dP6U+74bAoSDw93XR01Vo=";
+    hash = "sha256-Z+SXB6bDxyR+Bt3Pz6uF9+sZLjbiFNYeECVFZbx40h8=";
   };
 
-  cargoHash = "sha256-yDpZHkRKsWXXHuSKnzhGrjsFLUFZEpC23tcU3FeUZK8=";
+  cargoHash = "sha256-TGcgiXLgxeOO44eNfd9F0VonTTJhOn1iEJwrO65wcxk=";
 
   # Test depend on git configuration that would likely exist in a normal user environment
   # and might be failing to create the test repository it works in.

From 29cc00f58e5745ce1167ae5f2bf4ad527f3b2c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Sat, 28 Mar 2026 17:49:37 +1100
Subject: [PATCH 003/107] carps-cups: mark as broken on darwin

---
 pkgs/by-name/ca/carps-cups/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/carps-cups/package.nix b/pkgs/by-name/ca/carps-cups/package.nix
index 15d52616d8ec..efed07a5e156 100644
--- a/pkgs/by-name/ca/carps-cups/package.nix
+++ b/pkgs/by-name/ca/carps-cups/package.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
     description = "CUPS Linux drivers for Canon printers";
     homepage = "https://www.canon.com/";
     license = lib.licenses.gpl3Plus;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with lib.maintainers; [
       ewok
     ];

From 9d66a1bc398d7ea89135aeb49615e8ee1086e4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 16 Apr 2026 10:02:46 -0700
Subject: [PATCH 004/107] zfs: simplify kernelIsCompatible function

---
 pkgs/os-specific/linux/zfs/generic.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index ac55f618dccc..ea017985f78e 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -76,20 +76,8 @@ let
       ];
       kernelIsCompatible =
         kernel:
-        let
-          nextMajorMinor =
-            ver:
-            "${lib.versions.major ver}.${
-              lib.pipe ver [
-                lib.versions.minor
-                lib.toInt
-                (x: x + 1)
-                toString
-              ]
-            }";
-        in
         (lib.versionAtLeast kernel.version kernelMinSupportedMajorMinor)
-        && (lib.versionOlder kernel.version (nextMajorMinor kernelMaxSupportedMajorMinor));
+        && (lib.versionAtLeast kernelMaxSupportedMajorMinor (lib.versions.majorMinor kernel.version));
 
       # XXX: You always want to build kernel modules with the same stdenv as the
       # kernel was built with. However, since zfs can also be built for userspace we

From aaa114d63786bbaebfa8e8f0ab303155cc7b24ac Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 18 Apr 2026 20:55:49 +0200
Subject: [PATCH 005/107] wasm-pack: 0.13.1 -> 0.14.0

The old source redirects to wasm-bindgen/wasm-pack now.

changelog: https://github.com/wasm-bindgen/wasm-pack/releases/tag/v0.14.0,

diff: https://github.com/wasm-bindgen/wasm-pack/compare/v0.13.1...v0.14.0
---
 pkgs/by-name/wa/wasm-pack/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix
index 661527e1b9f1..1f02c433b15f 100644
--- a/pkgs/by-name/wa/wasm-pack/package.nix
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-pack";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
-    owner = "rustwasm";
+    owner = "wasm-bindgen";
     repo = "wasm-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc=";
+    hash = "sha256-ik6AJUKuT3GCDTZbHWcplcB7cS0CIcZwFNa6SvGzsIQ=";
   };
 
-  cargoHash = "sha256-nYWvk2v+4IAk/y7fg+Z/nMH+Ml+J5k5ER8uudCQOMB8=";
+  cargoHash = "sha256-n9xuwlj8+3fDTHMS2XobqWFc6mNHQcmmvebRDc82oSo=";
 
   nativeBuildInputs = [
     cmake
@@ -32,9 +32,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doCheck = false;
 
   meta = {
+    changelog = "https://github.com/wasm-bindgen/wasm-pack/releases/tag/v${finalAttrs.version}";
     description = "Utility that builds rust-generated WebAssembly package";
     mainProgram = "wasm-pack";
-    homepage = "https://github.com/rustwasm/wasm-pack";
+    homepage = "https://github.com/wasm-bindgen/wasm-pack";
     license = with lib.licenses; [
       asl20 # or
       mit

From c320f87d6be3e59a5c9d201c8ed95a79f19d7690 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 19 Apr 2026 12:09:42 +0200
Subject: [PATCH 006/107] {lomiri,lomiri-qt6}.lomiri-content-hub: 2.2.2 ->
 2.2.3

---
 .../lomiri/services/lomiri-content-hub/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index d135f1380474..d07f0673be69 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   testers,
@@ -37,13 +36,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-content-hub";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-content-hub";
     tag = finalAttrs.version;
-    hash = "sha256-ukaEur2RgdIVPYm90OUCs0L+F9OQ3zaypreyx33iD5M=";
+    hash = "sha256-48G17gzvk1ENgZHDjjvuHyyCiUfK8rkyokU2gNJ9KVg=";
   };
 
   outputs = [
@@ -55,15 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  patches = [
-    # Remove when version > 2.2.2
-    (fetchpatch {
-      name = "0001-lomiri-content-hub-Properly-include-lomiri-api-includedirs.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/dab1854e5ec0a91fd28c9d84f06dcdd0af39518b.patch";
-      hash = "sha256-aQB8kLL2ZkKUOvFoDQ9rottFsCSNJ66wUjUZxP+kr5k=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace import/*/Content/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

From 2d72672d154424893643ab8999daa3d2df1aaecb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Apr 2026 11:14:39 +0000
Subject: [PATCH 007/107] python3Packages.pypdf: 6.10.0 -> 6.10.2

---
 pkgs/development/python-modules/pypdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index aa98596c77b0..dc6123994982 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "6.10.0";
+  version = "6.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     tag = version;
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-eAbA6vIRJ/wX5r/X218UG2yEqtGTuDAKFpLB702HvM0=";
+    hash = "sha256-f7U9kZrAnUHv0nBrcHI+Otd49jIJz0d1uWRHymWJnYo=";
   };
 
   outputs = [

From 015bf6d0070b2f8c841342ff66e107fe8c9e2f0f Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 24 Apr 2026 22:03:16 +0300
Subject: [PATCH 008/107] ocis: apply patch to fix broken kopano tarball,
 migrate to fetcherVersion = 3

The upstream tarball at https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz
is no longer available. Adapted from the upstream fix in v8.0.1
(https://github.com/owncloud/ocis/pull/12043).
---
 pkgs/by-name/oc/ocis/package.nix       |  24 ++++--
 pkgs/by-name/oc/ocis/remove-kpop.patch | 107 +++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/oc/ocis/remove-kpop.patch

diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix
index 2746044094ea..3ac64c834ce4 100644
--- a/pkgs/by-name/oc/ocis/package.nix
+++ b/pkgs/by-name/oc/ocis/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  applyPatches,
   buildGoModule,
   callPackage,
   gnumake,
@@ -36,11 +37,20 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  src = fetchFromGitHub {
-    owner = "owncloud";
-    repo = "ocis";
-    tag = "v${version}";
-    hash = "sha256-TsMrQx+P1F2t66e0tGG0VvRi4W7+pCpDHd0aNsacOsI=";
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "owncloud";
+      repo = "ocis";
+      tag = "v${version}";
+      hash = "sha256-TsMrQx+P1F2t66e0tGG0VvRi4W7+pCpDHd0aNsacOsI=";
+    };
+    patches = [
+      # Remove the kpop dependency, whose upstream tarball
+      # (https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz) is no longer
+      # available. Adapted from the upstream fix in v8.0.1
+      # (https://github.com/owncloud/ocis/pull/12043).
+      ./remove-kpop.patch
+    ];
   };
 
   nativeBuildInputs = [
@@ -58,8 +68,8 @@ buildGoModule rec {
       ;
     pnpm = pnpm_9;
     sourceRoot = "${src.name}/services/idp";
-    fetcherVersion = 1;
-    hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
+    fetcherVersion = 3;
+    hash = "sha256-5iRnRxFJAWePyx83464guOqBqmao2pybaC4sFVPCOqk=";
   };
   pnpmRoot = "services/idp";
 
diff --git a/pkgs/by-name/oc/ocis/remove-kpop.patch b/pkgs/by-name/oc/ocis/remove-kpop.patch
new file mode 100644
index 000000000000..1db2be43546a
--- /dev/null
+++ b/pkgs/by-name/oc/ocis/remove-kpop.patch
@@ -0,0 +1,107 @@
+--- a/services/idp/package.json	2026-04-24 21:57:00.890593062 +0300
++++ b/services/idp/package.json	2026-04-24 21:57:25.907633711 +0300
+@@ -7,7 +7,7 @@
+     "analyze": "source-map-explorer 'build/static/js/*.js'",
+     "build": "node --openssl-legacy-provider scripts/build.js && rm -f build/service-worker.js",
+     "licenses": "NODE_PATH=./node_modules node ../scripts/js-license-ranger.js",
+-    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL;ODC-By-1.0;BlueOak-1.0.0'  --excludePackages 'identifier;kpop;unicoderegexp' --clarificationsFile license-checker-clarifications.json",
++    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL;ODC-By-1.0;BlueOak-1.0.0'  --excludePackages 'identifier;unicoderegexp' --clarificationsFile license-checker-clarifications.json",
+     "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../../third-party-licenses/node/idp/third-party-licenses.csv",
+     "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../../third-party-licenses/node/idp/third-party-licenses",
+     "lint": "eslint ./**/*.{tsx,ts,jsx,js}",
+@@ -89,7 +89,6 @@
+     "i18next-browser-languagedetector": "^7.1.0",
+     "i18next-http-backend": "^2.2.2",
+     "i18next-resources-to-backend": "^1.1.4",
+-    "kpop": "https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz",
+     "query-string": "^8.1.0",
+     "react": "^17.0.2",
+     "react-app-polyfill": "^2.0.0",
+@@ -153,10 +152,5 @@
+     "webpack": "4.47.0",
+     "webpack-manifest-plugin": "4.1.1",
+     "workbox-webpack-plugin": "7.0.0"
+-  },
+-  "pnpm": {
+-    "overrides": {
+-      "kpop>cldr": ""
+-    }
+   }
+ }
+--- a/services/idp/pnpm-lock.yaml	2026-04-24 21:57:00.893597991 +0300
++++ b/services/idp/pnpm-lock.yaml	2026-04-24 21:59:04.272001217 +0300
+@@ -4,9 +4,6 @@
+   autoInstallPeers: true
+   excludeLinksFromLockfile: false
+ 
+-overrides:
+-  kpop>cldr: ''
+-
+ dependencies:
+   '@fontsource/roboto':
+     specifier: ^5.0.8
+@@ -62,9 +59,6 @@
+   i18next-resources-to-backend:
+     specifier: ^1.1.4
+     version: 1.1.4
+-  kpop:
+-    specifier: https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz
+-    version: '@download.kopano.io/community/kapp+/kpop-2.2.0.tgz(@gluejs/glue@0.3.0)(@material-ui/core@4.12.4)(@material-ui/icons@4.11.3)(notistack@0.8.9)(oidc-client@1.11.5)(react-dom@17.0.2)(react-intl@2.9.0)(react@17.0.2)(render-if@0.1.1)'
+   query-string:
+     specifier: ^8.1.0
+     version: 8.1.0
+@@ -12515,34 +12509,3 @@
+     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+     engines: {node: '>=10'}
+ 
+-  '@download.kopano.io/community/kapp+/kpop-2.2.0.tgz(@gluejs/glue@0.3.0)(@material-ui/core@4.12.4)(@material-ui/icons@4.11.3)(notistack@0.8.9)(oidc-client@1.11.5)(react-dom@17.0.2)(react-intl@2.9.0)(react@17.0.2)(render-if@0.1.1)':
+-    resolution: {registry: https://registry.npmjs.org/, tarball: https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz}
+-    id: '@download.kopano.io/community/kapp+/kpop-2.2.0.tgz'
+-    name: kpop
+-    version: 2.2.0
+-    engines: {node: '>=6.11.0'}
+-    peerDependencies:
+-      '@gluejs/glue': ^0.3.0
+-      '@material-ui/core': ^4.8.0
+-      '@material-ui/icons': ^4.5.1
+-      notistack: ^0.8.8
+-      oidc-client: ^1.9.1
+-      react: ^16.8.0
+-      react-dom: ^16.8.0
+-      react-intl: ^2.6.0
+-      render-if: ^0.1.1
+-    dependencies:
+-      '@gluejs/glue': 0.3.0
+-      '@material-ui/core': 4.12.4(@types/react@17.0.65)(react-dom@17.0.2)(react@17.0.2)
+-      '@material-ui/icons': 4.11.3(@material-ui/core@4.12.4)(@types/react@17.0.65)(react-dom@17.0.2)(react@17.0.2)
+-      cldr: 7.5.0
+-      crc32: 0.2.2
+-      hsv-rgb: 1.0.0
+-      iso-639-1: 2.1.15
+-      notistack: 0.8.9(@material-ui/core@4.12.4)(react-dom@17.0.2)(react@17.0.2)
+-      oidc-client: 1.11.5
+-      react: 17.0.2
+-      react-dom: 17.0.2(react@17.0.2)
+-      react-intl: 2.9.0(prop-types@15.8.1)(react@17.0.2)
+-      render-if: 0.1.1
+-    dev: false
+--- a/services/idp/src/App.jsx	2026-04-24 21:57:00.894599634 +0300
++++ b/services/idp/src/App.jsx	2026-04-24 22:24:12.978001165 +0300
+@@ -1,14 +1,12 @@
+ import React, { ReactElement, Suspense, lazy } from 'react';
+ import PropTypes from 'prop-types';
+ 
+-import { MuiThemeProvider } from '@material-ui/core/styles';
+-import { defaultTheme as theme } from 'kpop/es/theme';
++import { MuiThemeProvider, createTheme } from '@material-ui/core/styles';
+ 
+-import 'kpop/static/css/base.css';
+-import 'kpop/static/css/scrollbar.css';
+-
+ import Spinner from './components/Spinner';
+ import * as version from './version';
++
++const theme = createTheme();
+ 
+ const LazyMain = lazy(() => import(/* webpackChunkName: "identifier-main" */ './Main'));
+ 

From bdfa80c4b84a6800a991b4d219d2486068cd18b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 07:14:01 +0000
Subject: [PATCH 009/107] mycelium: 0.7.5 -> 0.7.6

---
 pkgs/by-name/my/mycelium/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 93bbe79bedb9..7c0438c778c5 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mycelium";
-  version = "0.7.5";
+  version = "0.7.6";
 
   sourceRoot = "${finalAttrs.src.name}/myceliumd";
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "threefoldtech";
     repo = "mycelium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9PjYvzCHSOPlULbElJPVMnLFGTEy/FX56ZaRHUozqvE=";
+    hash = "sha256-6A93ySGmnkqu+TrPsIZJNl4iw26yrUW89TkkfouArn0=";
   };
 
-  cargoHash = "sha256-LSCa8euuOX4BgEDkNQlOdgiL0QzRRMlCoA9opSnPQbI=";
+  cargoHash = "sha256-Firp6R8JZXTzJhV2Psve0kmxP6bT74xHjNq8/q0/pOc=";
 
   nativeBuildInputs = [ versionCheckHook ];
 

From 405f0b817d68c707aca2ebd849dee4a30c7b9b78 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 25 Apr 2026 01:16:08 +0800
Subject: [PATCH 010/107] elpaPackages: update on 2026-04-25 (from
 emacs-overlay)

emacs-overlay commit: bbb5148fa2579456dc7da3741e9d8543ce7d3ef1
---
 .../emacs/elisp-packages/elpa-generated.nix   | 87 ++++++++++++-------
 1 file changed, 54 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 30bd1e7f56c0..f2b696de7ce2 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -2078,10 +2078,10 @@
     elpaBuild {
       pname = "denote-markdown";
       ename = "denote-markdown";
-      version = "0.2.1";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/denote-markdown-0.2.1.tar";
-        sha256 = "1vrnvrcqdwvczls6dc351izvv2ljva3g4si9k6k177pr0r7cvpgv";
+        url = "https://elpa.gnu.org/packages/denote-markdown-0.2.2.tar";
+        sha256 = "1nb5rcjgkhw3nl2jva6lyblmfsl24cdryx3c16w8ydbx6fswhjpj";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2549,6 +2549,27 @@
       };
     }
   ) { };
+  dmsg = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dmsg";
+      ename = "dmsg";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dmsg-0.2.tar";
+        sha256 = "18wnbkd707n2qh9an72wizs0yp71hys6vg0y02iclqmj7igjg28k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dmsg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   do-at-point = callPackage (
     {
       elpaBuild,
@@ -3226,10 +3247,10 @@
     elpaBuild {
       pname = "emms";
       ename = "emms";
-      version = "25";
+      version = "26";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/emms-25.tar";
-        sha256 = "1p194bgysn0mmnaz0n9j236dmz53dlyg202xgq03bi5sl7lrffgp";
+        url = "https://elpa.gnu.org/packages/emms-26.tar";
+        sha256 = "0qcdhml0y69xjaa9l7jb1dsvqij1ksgw2x44zhxfn4f3fwkfxhd5";
       };
       packageRequires = [
         cl-lib
@@ -4256,10 +4277,10 @@
     elpaBuild {
       pname = "gtags-mode";
       ename = "gtags-mode";
-      version = "1.9.4";
+      version = "1.9.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/gtags-mode-1.9.4.tar";
-        sha256 = "01bpgw839gkvy8258kc5p0zy8xv9rh4hpzb0h1hlxcllkir6idgg";
+        url = "https://elpa.gnu.org/packages/gtags-mode-1.9.5.tar";
+        sha256 = "1qb1wcim2abjprmn2bsc6d7vmad217fkc450dgwgxxx5spjgz40d";
       };
       packageRequires = [ ];
       meta = {
@@ -4810,10 +4831,10 @@
     elpaBuild {
       pname = "jarchive";
       ename = "jarchive";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar";
-        sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8";
+        url = "https://elpa.gnu.org/packages/jarchive-0.12.0.tar";
+        sha256 = "04r47jj42crpvix55gfkbc15q0fnps2n1jsgf3z82734qwp9dxmi";
       };
       packageRequires = [ ];
       meta = {
@@ -5068,10 +5089,10 @@
     elpaBuild {
       pname = "kubed";
       ename = "kubed";
-      version = "0.5.1";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/kubed-0.5.1.tar";
-        sha256 = "1mfb9961xi7b7a4g3687y4hhlq37j98qsvq8cl4gsgy3x8j7vs2p";
+        url = "https://elpa.gnu.org/packages/kubed-0.6.1.tar";
+        sha256 = "1filhadwzdkrw2dsma28b10nx62qnhxkp8g483r0il986ipnnshp";
       };
       packageRequires = [ ];
       meta = {
@@ -5671,10 +5692,10 @@
     elpaBuild {
       pname = "matlab-mode";
       ename = "matlab-mode";
-      version = "8.1.2";
+      version = "8.2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/matlab-mode-8.1.2.tar";
-        sha256 = "17s568gnfx0d6s411wpj033a39iik9bsk1w2xkwvgnxwdvw0haxh";
+        url = "https://elpa.gnu.org/packages/matlab-mode-8.2.0.tar";
+        sha256 = "1dk39r9nkm77gllm4xln0am1b73pirds5ss7m55n7hz2w1sas20s";
       };
       packageRequires = [ ];
       meta = {
@@ -5841,10 +5862,10 @@
     elpaBuild {
       pname = "minimail";
       ename = "minimail";
-      version = "0.3";
+      version = "0.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/minimail-0.3.tar";
-        sha256 = "1p8vk9z34ylzg9hvs88wik07m5mr72bqkh19kngw7gqlg0m2ydfp";
+        url = "https://elpa.gnu.org/packages/minimail-0.4.tar";
+        sha256 = "0ic8axms52v63wv5k0m1ny1dpnyzfqw4vj8fax4m1a0l6j3prfpx";
       };
       packageRequires = [ ];
       meta = {
@@ -6483,10 +6504,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.8.1";
+      version = "9.8.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-9.8.1.tar";
-        sha256 = "1i7khz2h47byl4kh9kb0y548sw7n4zp6nfldqkvzab4np4snbdk8";
+        url = "https://elpa.gnu.org/packages/org-9.8.3.tar";
+        sha256 = "0csfrn0k1fysjfwf8xmdnmizfjz62scr3kjawpafwv58gvizk32z";
       };
       packageRequires = [ ];
       meta = {
@@ -9163,10 +9184,10 @@
     elpaBuild {
       pname = "termint";
       ename = "termint";
-      version = "0.2";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/termint-0.2.tar";
-        sha256 = "000s1z2535bi5pkg7q3d4y97njy0r5xj51r94a20vjd79jq4227f";
+        url = "https://elpa.gnu.org/packages/termint-0.2.2.tar";
+        sha256 = "0iavnximqsx6vl6yx36n829h67x4pyfmm8xcp5fzjwphdmgfdann";
       };
       packageRequires = [ ];
       meta = {
@@ -9531,10 +9552,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.12.0";
+      version = "0.13.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-0.12.0.tar";
-        sha256 = "0ml92xzbs57npwwyp46p03kd9xi9lhr5hvbrw6nayyc51hm4c7vk";
+        url = "https://elpa.gnu.org/packages/transient-0.13.0.tar";
+        sha256 = "0rwb7l823d4nkk7zmnyi5j7id7kswxrc0h9crqyd63n14w78bksi";
       };
       packageRequires = [
         compat
@@ -10263,10 +10284,10 @@
     elpaBuild {
       pname = "wcheck-mode";
       ename = "wcheck-mode";
-      version = "2021";
+      version = "2026";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar";
-        sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0";
+        url = "https://elpa.gnu.org/packages/wcheck-mode-2026.tar";
+        sha256 = "019lsaihpl9w17qfhn8c5j8rp8nrvlmb16w6r8sb1iril31997sz";
       };
       packageRequires = [ ];
       meta = {

From 7df3dee940ada8711a43bd103e718f0f3c5f0ae5 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 25 Apr 2026 01:16:08 +0800
Subject: [PATCH 011/107] elpaDevelPackages: update on 2026-04-25 (from
 emacs-overlay)

emacs-overlay commit: bbb5148fa2579456dc7da3741e9d8543ce7d3ef1
---
 .../elisp-packages/elpa-devel-generated.nix   | 321 ++++++++++--------
 1 file changed, 171 insertions(+), 150 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index 0495f9258149..2ba64b26a6d8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -333,10 +333,10 @@
     elpaBuild {
       pname = "altcaps";
       ename = "altcaps";
-      version = "1.3.0.0.20260210.221352";
+      version = "1.3.0.0.20260413.54314";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20260210.221352.tar";
-        sha256 = "1m97icn58an0a1x9lhby7870g5m4i7rgkmi61nz24qmrc5pcmqmw";
+        url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20260413.54314.tar";
+        sha256 = "1jj7321nhxy7gk2cchv81nyw8fzzw7zkikgwgnj6k7kki53rhp8c";
       };
       packageRequires = [ ];
       meta = {
@@ -719,10 +719,10 @@
     elpaBuild {
       pname = "beframe";
       ename = "beframe";
-      version = "1.5.0.0.20260204.145843";
+      version = "1.5.0.0.20260413.54824";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260204.145843.tar";
-        sha256 = "1jkirpjfxzxspbz1whf5yjzdzxx10abr9aymks40hh72xyjgida6";
+        url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260413.54824.tar";
+        sha256 = "1nj3gn44bd867yx34d9nzzqcfk5k3fp89wg7k83lpcc7f2a6w3dw";
       };
       packageRequires = [ ];
       meta = {
@@ -1015,10 +1015,10 @@
     elpaBuild {
       pname = "buframe";
       ename = "buframe";
-      version = "0.3.0.20260327.125525";
+      version = "0.3.0.20260415.112855";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/buframe-0.3.0.20260327.125525.tar";
-        sha256 = "0z97kqjzpgp31ik5y8ab50iw7mckx5mc3yrdr4abkl69ii6gw76q";
+        url = "https://elpa.gnu.org/devel/buframe-0.3.0.20260415.112855.tar";
+        sha256 = "1fav3n1r5w0vyvkbblfbi9xnglhmi4bvp6ikixp3lmh8bpf7as2l";
       };
       packageRequires = [ timeout ];
       meta = {
@@ -1106,10 +1106,10 @@
     elpaBuild {
       pname = "cape";
       ename = "cape";
-      version = "2.6.0.20260330.61918";
+      version = "2.6.0.20260419.184703";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-2.6.0.20260330.61918.tar";
-        sha256 = "1w8l2j55zmkbfx1m22fd12xbh9makaxxp97wcc69px1flx0055dh";
+        url = "https://elpa.gnu.org/devel/cape-2.6.0.20260419.184703.tar";
+        sha256 = "143b5kxykz4mgx2y7gq6vidrqnnjnc0ay809hjzbqfmpvlnf86fn";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1483,10 +1483,10 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "30.1.0.1.0.20260328.162400";
+      version = "30.1.0.1.0.20260411.151508";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/compat-30.1.0.1.0.20260328.162400.tar";
-        sha256 = "1m3vchayxp8jzjf4cc3zc7qkgy702nfccbvdvfjjfn71wd37q4ph";
+        url = "https://elpa.gnu.org/devel/compat-30.1.0.1.0.20260411.151508.tar";
+        sha256 = "14vim5vlv57q6zl83lixj2palwbxz2dkbpivyvs56cjwqck41bvd";
       };
       packageRequires = [ seq ];
       meta = {
@@ -1547,10 +1547,10 @@
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "3.4.0.20260407.153027";
+      version = "3.4.0.20260421.111434";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-3.4.0.20260407.153027.tar";
-        sha256 = "0w1hl7lj26bqhnmmmk9rnahapw4pggxyri6ppcxbxx735bpy9c2r";
+        url = "https://elpa.gnu.org/devel/consult-3.4.0.20260421.111434.tar";
+        sha256 = "16gz342an0vsdj7jdy5gcrv8wwcwfqabdzsyyg1dcfzrlmvxvfja";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1570,10 +1570,10 @@
     elpaBuild {
       pname = "consult-denote";
       ename = "consult-denote";
-      version = "0.4.2.0.20260122.100152";
+      version = "0.4.2.0.20260423.93857";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-denote-0.4.2.0.20260122.100152.tar";
-        sha256 = "1d8dq183sc5sc3ki5z602w29f541cs6ljhyx5fwl7rwnj22w6yxx";
+        url = "https://elpa.gnu.org/devel/consult-denote-0.4.2.0.20260423.93857.tar";
+        sha256 = "1fcf1abqg71kp9g0nsxdnmb33m6g4kn0iwgvfd1cqslyhmdkk0c8";
       };
       packageRequires = [
         consult
@@ -1595,10 +1595,10 @@
     elpaBuild {
       pname = "consult-hoogle";
       ename = "consult-hoogle";
-      version = "0.6.0.0.20260226.73407";
+      version = "0.6.0.0.20260410.130304";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-hoogle-0.6.0.0.20260226.73407.tar";
-        sha256 = "1yndkjzbydlyxzgl2zfk5m9w3hh8aq5dk1myjc0xkwczfwbw1gjm";
+        url = "https://elpa.gnu.org/devel/consult-hoogle-0.6.0.0.20260410.130304.tar";
+        sha256 = "1067wh3r087bdvg4zqbzwmzh6qssj7x7y12qs3fh96vpqrjw2a11";
       };
       packageRequires = [ consult ];
       meta = {
@@ -1660,10 +1660,10 @@
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "2.9.0.20260330.62901";
+      version = "2.9.0.20260419.183827";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-2.9.0.20260330.62901.tar";
-        sha256 = "10092p4v9kaz2mlffsq5dpnqna3qbbyx4qivxg4qjpy3w53wbznj";
+        url = "https://elpa.gnu.org/devel/corfu-2.9.0.20260419.183827.tar";
+        sha256 = "06myb0qgv8q3iak83bdpkjmd8vplqcvypl9q1y1h7qfbcy2yvssh";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1877,10 +1877,10 @@
     elpaBuild {
       pname = "cursory";
       ename = "cursory";
-      version = "1.2.0.0.20260111.105552";
+      version = "1.2.0.0.20260413.54607";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260111.105552.tar";
-        sha256 = "0plc6a5rh2wigpif1p9wkvdjqjppakhzkviywzn7z1fxiyrldq2m";
+        url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260413.54607.tar";
+        sha256 = "00cxb53p6l3d395vkmza1zqjrpx9rq65xy5cnv410i7lricrwpfr";
       };
       packageRequires = [ ];
       meta = {
@@ -2075,10 +2075,10 @@
     elpaBuild {
       pname = "denote";
       ename = "denote";
-      version = "4.1.3.0.20260409.181603";
+      version = "4.1.3.0.20260423.182534";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-4.1.3.0.20260409.181603.tar";
-        sha256 = "1mh0vxq1bz20f0d6n3hcrzwgfjva3f17zqkwj9hxm2xw0r9b4jhl";
+        url = "https://elpa.gnu.org/devel/denote-4.1.3.0.20260423.182534.tar";
+        sha256 = "1mh9sl4rhsmxniibrnym69xdwgswij8132b4n7k65lw75y0p05j9";
       };
       packageRequires = [ ];
       meta = {
@@ -2119,10 +2119,10 @@
     elpaBuild {
       pname = "denote-markdown";
       ename = "denote-markdown";
-      version = "0.2.1.0.20260111.93101";
+      version = "0.2.2.0.20260423.181135";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-markdown-0.2.1.0.20260111.93101.tar";
-        sha256 = "0gpqcwpy2x329v73fbg7yq0zzhjy1651iffcf2y6vyirw4yy7mmx";
+        url = "https://elpa.gnu.org/devel/denote-markdown-0.2.2.0.20260423.181135.tar";
+        sha256 = "18l9aymn3v5i3y3g4bx81b16zw4mdgrkkz3939xq5dxy4wwmiqjk";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2514,10 +2514,10 @@
     elpaBuild {
       pname = "dired-preview";
       ename = "dired-preview";
-      version = "0.6.0.0.20260409.181025";
+      version = "0.6.0.0.20260413.54225";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dired-preview-0.6.0.0.20260409.181025.tar";
-        sha256 = "1ryvx8q6sgikf8zl977nhb7nb9f776384lh6aky4nfnlx62sacpb";
+        url = "https://elpa.gnu.org/devel/dired-preview-0.6.0.0.20260413.54225.tar";
+        sha256 = "0x1s8b4swr62a833zszyk9kfnh2fx5kl5rwjdfhm4mgpib50nmcy";
       };
       packageRequires = [ ];
       meta = {
@@ -2612,6 +2612,27 @@
       };
     }
   ) { };
+  dmsg = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dmsg";
+      ename = "dmsg";
+      version = "0.2.0.20260422.105206";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dmsg-0.2.0.20260422.105206.tar";
+        sha256 = "0h8l75k00hh0j2cyc2jwqkrnr7qmkz0jydbhm2qwpm3bb5pyd6bq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/dmsg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   do-at-point = callPackage (
     {
       elpaBuild,
@@ -2957,10 +2978,10 @@
     elpaBuild {
       pname = "eglot";
       ename = "eglot";
-      version = "1.23.0.20260406.115439";
+      version = "1.23.0.20260422.80836";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.23.0.20260406.115439.tar";
-        sha256 = "0wxnvhzl2ygb1c0krrq0zqzkda55l3hqlpicq9yvckfi7d3h62ik";
+        url = "https://elpa.gnu.org/devel/eglot-1.23.0.20260422.80836.tar";
+        sha256 = "1w7pfbx6m68x6anxg1038cah2wbyb3f3mdgsqsrsj0dbh9qwzzq5";
       };
       packageRequires = [
         eldoc
@@ -3200,10 +3221,10 @@
     elpaBuild {
       pname = "emacs-lisp-intro-nl";
       ename = "emacs-lisp-intro-nl";
-      version = "0.0.20260409.83314";
+      version = "0.0.20260419.193604";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260409.83314.tar";
-        sha256 = "1cnr00p1gl6f21p1apnyz2a04zv5xc2c7c1ldkvzadpy9fj0a9r4";
+        url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260419.193604.tar";
+        sha256 = "1spqwayvm830vzsyy7l768yd91f3h8agpd9wpaa6g0pd5pdhh42r";
       };
       packageRequires = [ ];
       meta = {
@@ -3310,10 +3331,10 @@
     elpaBuild {
       pname = "emms";
       ename = "emms";
-      version = "25.0.20260213.170929";
+      version = "26.0.20260414.110541";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/emms-25.0.20260213.170929.tar";
-        sha256 = "1lrwhhaqbf09lwfk65gr7hpwc5z5sigpmna48fjmrmsp8aj99rzq";
+        url = "https://elpa.gnu.org/devel/emms-26.0.20260414.110541.tar";
+        sha256 = "05vp80ybsl37bm0wpwdhdj7qlgw07cik544fwzczg8r49bd2s066";
       };
       packageRequires = [
         cl-lib
@@ -3446,10 +3467,10 @@
     elpaBuild {
       pname = "ess";
       ename = "ess";
-      version = "26.1.0.0.20260408.95243";
+      version = "26.1.0.0.20260423.92659";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ess-26.1.0.0.20260408.95243.tar";
-        sha256 = "0ddkvi7akw7dhjx1spc98s653kp48b327amyhwgw06sgkn868psa";
+        url = "https://elpa.gnu.org/devel/ess-26.1.0.0.20260423.92659.tar";
+        sha256 = "0fmq3fp4dya40ab3rg511i7p3pi2mhx98dvl27fs186ya79bgvgq";
       };
       packageRequires = [ ];
       meta = {
@@ -3784,10 +3805,10 @@
     elpaBuild {
       pname = "fontaine";
       ename = "fontaine";
-      version = "3.0.1.0.20260316.175802";
+      version = "3.0.1.0.20260413.54632";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20260316.175802.tar";
-        sha256 = "0plmi51lsssmz0ccfh05f7rmjfmaqgq7jnlikwm5q8ad6qlwvj2r";
+        url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20260413.54632.tar";
+        sha256 = "1s7wz2807a49vhcj3zv7hx75kz4l9zkhi53fvppab46j2wyaw8qs";
       };
       packageRequires = [ ];
       meta = {
@@ -3895,10 +3916,10 @@
     elpaBuild {
       pname = "futur";
       ename = "futur";
-      version = "1.4.0.20260409.205429";
+      version = "1.4.0.20260423.160640";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/futur-1.4.0.20260409.205429.tar";
-        sha256 = "1crph78sjng309ciyxhcy1ci9l75pqvrq7ac2p4m55dc7yzgkl0i";
+        url = "https://elpa.gnu.org/devel/futur-1.4.0.20260423.160640.tar";
+        sha256 = "04z4660mjgnf5z4qyzbiwdi7cd9b42ncvxrvpxr9i9q51sky72jb";
       };
       packageRequires = [ ];
       meta = {
@@ -4089,10 +4110,10 @@
     elpaBuild {
       pname = "gnosis";
       ename = "gnosis";
-      version = "0.10.3.0.20260406.15023";
+      version = "0.10.3.0.20260420.110309";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gnosis-0.10.3.0.20260406.15023.tar";
-        sha256 = "11ijgpz1pwh7cgj96lhigmh19vrqjysslpkmmrjyihdzmmfzk0wj";
+        url = "https://elpa.gnu.org/devel/gnosis-0.10.3.0.20260420.110309.tar";
+        sha256 = "0inrv51wkjycbxhhlsivfig2479v18jcvps1dq2psjas0r2crsx3";
       };
       packageRequires = [ compat ];
       meta = {
@@ -4297,10 +4318,10 @@
     elpaBuild {
       pname = "greader";
       ename = "greader";
-      version = "0.19.0.0.20260402.161715";
+      version = "0.19.0.0.20260409.233021";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/greader-0.19.0.0.20260402.161715.tar";
-        sha256 = "0fzph8cvyl66sxs5a96hhxgpg30df48nv32d8x29df4piv113zcw";
+        url = "https://elpa.gnu.org/devel/greader-0.19.0.0.20260409.233021.tar";
+        sha256 = "1lq10b8b3nkzf6lx9z1h3cv2537g4ymj5qw6xbclpxzrj07zalg7";
       };
       packageRequires = [
         compat
@@ -4342,10 +4363,10 @@
     elpaBuild {
       pname = "gtags-mode";
       ename = "gtags-mode";
-      version = "1.9.4.0.20251110.175010";
+      version = "1.9.5.0.20260413.115633";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gtags-mode-1.9.4.0.20251110.175010.tar";
-        sha256 = "19c6ccg812lqz28pfx9jjfkms1zvfv8qs6693fd69rggsh55bp43";
+        url = "https://elpa.gnu.org/devel/gtags-mode-1.9.5.0.20260413.115633.tar";
+        sha256 = "00z5b4l05xn73wk50xw34qszv3kg0c6f586cplqwc83dnjhxwcwc";
       };
       packageRequires = [ ];
       meta = {
@@ -4559,10 +4580,10 @@
     elpaBuild {
       pname = "hyperbole";
       ename = "hyperbole";
-      version = "9.0.2pre0.20260410.71604";
+      version = "9.0.2pre0.20260422.74419";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260410.71604.tar";
-        sha256 = "0mnxwiv6l1rpwwnaffhi0sxb5qi58wf8npp05w0swdanim27k7kr";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260422.74419.tar";
+        sha256 = "1k6qcwb9bhf062bd0d6q69n1wbk68bkmb8d30c5hnd32s2m261xp";
       };
       packageRequires = [ ];
       meta = {
@@ -4623,10 +4644,10 @@
     elpaBuild {
       pname = "indent-bars";
       ename = "indent-bars";
-      version = "1.0.0.0.20260120.94117";
+      version = "1.0.0.0.20260418.90339";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/indent-bars-1.0.0.0.20260120.94117.tar";
-        sha256 = "11ffwvv8zmkxbc74ny30cgjpwzv6v0mbdcdr1laadhbhwkdlk8am";
+        url = "https://elpa.gnu.org/devel/indent-bars-1.0.0.0.20260418.90339.tar";
+        sha256 = "0jrdzw4yr1ldcsvc5jix8ay1wfv7fmphc2q82alhv4in247c5sna";
       };
       packageRequires = [ compat ];
       meta = {
@@ -4750,10 +4771,10 @@
     elpaBuild {
       pname = "ivy";
       ename = "ivy";
-      version = "0.15.1.0.20260318.135818";
+      version = "0.15.1.0.20260413.210444";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20260318.135818.tar";
-        sha256 = "19qzzdgkbhl49lv147blb1rznf86mhbm1d1h7gzanva17pc7cpi7";
+        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20260413.210444.tar";
+        sha256 = "1840hsmdaqh4p5l4fbdb9gj95xaga8439zmp39adbvy6xkkqqbl4";
       };
       packageRequires = [ ];
       meta = {
@@ -4892,10 +4913,10 @@
     elpaBuild {
       pname = "jarchive";
       ename = "jarchive";
-      version = "0.11.0.0.20231010.221311";
+      version = "0.12.0.0.20260419.91017";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar";
-        sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5";
+        url = "https://elpa.gnu.org/devel/jarchive-0.12.0.0.20260419.91017.tar";
+        sha256 = "0mdsfvggcv2iyia0vpp1lj1xarg8kjbksvxzl6w2b2q5k8j1gl8f";
       };
       packageRequires = [ ];
       meta = {
@@ -5043,10 +5064,10 @@
     elpaBuild {
       pname = "jsonrpc";
       ename = "jsonrpc";
-      version = "1.0.28.0.20260402.173109";
+      version = "1.0.28.0.20260416.174639";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.28.0.20260402.173109.tar";
-        sha256 = "1fxwnk964n0g3l6f06q323cp9jq12ja2fja6q00bpf9jargjkp57";
+        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.28.0.20260416.174639.tar";
+        sha256 = "0j7y9kcjdai6sd1634ln4ag0fg5x8ljzq50f25nc5miadaq93vw8";
       };
       packageRequires = [ ];
       meta = {
@@ -5150,10 +5171,10 @@
     elpaBuild {
       pname = "kubed";
       ename = "kubed";
-      version = "0.5.1.0.20260327.160729";
+      version = "0.6.1.0.20260413.204601";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/kubed-0.5.1.0.20260327.160729.tar";
-        sha256 = "1i5hn7fl08xqqhhs9ic9frdg3gj65nll2zjvc8wc88yn38c75bav";
+        url = "https://elpa.gnu.org/devel/kubed-0.6.1.0.20260413.204601.tar";
+        sha256 = "1q7ykifs44ywrq94fhvdz4svpxm2j3yj4vmq74lz5d57q702xz9l";
       };
       packageRequires = [ ];
       meta = {
@@ -5333,10 +5354,10 @@
     elpaBuild {
       pname = "lin";
       ename = "lin";
-      version = "2.0.0.0.20260324.81759";
+      version = "2.0.0.0.20260413.54759";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/lin-2.0.0.0.20260324.81759.tar";
-        sha256 = "173s99ccj6v1yalvbniia5bg59y195rjavabaxzjp70ayzb830zz";
+        url = "https://elpa.gnu.org/devel/lin-2.0.0.0.20260413.54759.tar";
+        sha256 = "18im9kd79wvhk92p8wm0hxf67c85g6f2rlppx3dkn0r601hmpv2w";
       };
       packageRequires = [ ];
       meta = {
@@ -5409,10 +5430,10 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.30.1.0.20260409.235755";
+      version = "0.30.1.0.20260417.170756";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.30.1.0.20260409.235755.tar";
-        sha256 = "0cviwq12i6p6s8k58987n43mzrhcilkddflnmwkvalyvpfbsmm1r";
+        url = "https://elpa.gnu.org/devel/llm-0.30.1.0.20260417.170756.tar";
+        sha256 = "01dzr0qli82gdm24fdqiw7gn10w1gallgcss04v5d251idgfh87q";
       };
       packageRequires = [
         compat
@@ -5627,10 +5648,10 @@
     elpaBuild {
       pname = "map";
       ename = "map";
-      version = "3.3.1.0.20260101.125434";
+      version = "3.3.1.0.20260420.130325";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20260101.125434.tar";
-        sha256 = "1darxw7vam0zc0rsxm2v0a239rpc1hnaqqkakmryac2kazbsjg7n";
+        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20260420.130325.tar";
+        sha256 = "1khl72238fzf8jzk3ihq5yl3w8kipr4km5awh4zqhp03skr5kp86";
       };
       packageRequires = [ ];
       meta = {
@@ -5755,10 +5776,10 @@
     elpaBuild {
       pname = "matlab-mode";
       ename = "matlab-mode";
-      version = "8.1.2.0.20260315.82315";
+      version = "8.2.0.0.20260419.100405";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/matlab-mode-8.1.2.0.20260315.82315.tar";
-        sha256 = "06wa3mzqr3scxq5gzh7gwkf148x6iqvymb6bj7yrgnqcnylgy3cw";
+        url = "https://elpa.gnu.org/devel/matlab-mode-8.2.0.0.20260419.100405.tar";
+        sha256 = "114s5ra2h4d8k0qn27blb8bzxjjlcgrrkmg1y647m2kzwfbp8hx5";
       };
       packageRequires = [ ];
       meta = {
@@ -5776,10 +5797,10 @@
     elpaBuild {
       pname = "mct";
       ename = "mct";
-      version = "1.1.0.0.20260204.175531";
+      version = "1.1.0.0.20260413.54251";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/mct-1.1.0.0.20260204.175531.tar";
-        sha256 = "1fd1nd013g3ayd3ckkjp4b6b2nf96rxfjgcs16w0f5x2zxrbkhw0";
+        url = "https://elpa.gnu.org/devel/mct-1.1.0.0.20260413.54251.tar";
+        sha256 = "1wlyg28xcyig05248nic6jia4zw0q5k0rg8l3facskisbhild7dz";
       };
       packageRequires = [ ];
       meta = {
@@ -5925,10 +5946,10 @@
     elpaBuild {
       pname = "minimail";
       ename = "minimail";
-      version = "0.3.0.20260330.82338";
+      version = "0.4.0.20260415.81600";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/minimail-0.3.0.20260330.82338.tar";
-        sha256 = "01fi88flq91m7fhg7q1g7jx4fzli99k9i48bavbsnjyhbz77i8pq";
+        url = "https://elpa.gnu.org/devel/minimail-0.4.0.20260415.81600.tar";
+        sha256 = "1a1mh3g6vfvmlr419iv8fz7hfjb1ddsia26059zj69gqv7fniqbh";
       };
       packageRequires = [ ];
       meta = {
@@ -5969,10 +5990,10 @@
     elpaBuild {
       pname = "minuet";
       ename = "minuet";
-      version = "0.7.1.0.20260318.10537";
+      version = "0.7.1.0.20260424.3009";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/minuet-0.7.1.0.20260318.10537.tar";
-        sha256 = "1s41pg3fpzjkk7qav3z8yqcgr6isx2a8gl63nfcc16m7hc868bga";
+        url = "https://elpa.gnu.org/devel/minuet-0.7.1.0.20260424.3009.tar";
+        sha256 = "0g9vqm9wby07pmhc6ai31krk473lif74273qbjrfzxzqbg4iavbk";
       };
       packageRequires = [
         dash
@@ -6036,10 +6057,10 @@
     elpaBuild {
       pname = "modus-themes";
       ename = "modus-themes";
-      version = "5.2.0.0.20260405.181509";
+      version = "5.2.0.0.20260418.131316";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-5.2.0.0.20260405.181509.tar";
-        sha256 = "0hzl0dppxh91zz868g7cvgrg3dy4whfqll38n39xdqz52wb25vj6";
+        url = "https://elpa.gnu.org/devel/modus-themes-5.2.0.0.20260418.131316.tar";
+        sha256 = "1qcb53pp05bk2fpjmli68kbmpk4wk8b7ll6iimvmgw8nlq4qzlhb";
       };
       packageRequires = [ ];
       meta = {
@@ -6378,10 +6399,10 @@
     elpaBuild {
       pname = "notmuch-indicator";
       ename = "notmuch-indicator";
-      version = "1.3.0.0.20260118.63859";
+      version = "1.3.0.0.20260413.54903";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/notmuch-indicator-1.3.0.0.20260118.63859.tar";
-        sha256 = "037k14ipdns0wwb0qssz805km2fd781y86d7dfwjzbfjpab0b7jy";
+        url = "https://elpa.gnu.org/devel/notmuch-indicator-1.3.0.0.20260413.54903.tar";
+        sha256 = "091rlqqp7ngff0x1f8fh6axyyzbxrdvwnjqyqly5axazv8sm846n";
       };
       packageRequires = [ ];
       meta = {
@@ -6591,10 +6612,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "10.0pre0.20260406.143941";
+      version = "10.0pre0.20260421.184316";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260406.143941.tar";
-        sha256 = "1yfs2s356ngz0h24771px3kqv4n5kp3pvimbl16ai39yq7cz06wd";
+        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260421.184316.tar";
+        sha256 = "0809x9rw2smb5ya3x2272qcjjj6kx6xrj8ajlzzwiz2m1wdhz5w3";
       };
       packageRequires = [ ];
       meta = {
@@ -6832,10 +6853,10 @@
     elpaBuild {
       pname = "org-transclusion";
       ename = "org-transclusion";
-      version = "1.4.0.0.20260310.65912";
+      version = "1.4.0.0.20260417.100318";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20260310.65912.tar";
-        sha256 = "00cbsqj3cvyzsxf3fxq5wxflsah10f8g97iy5ab51kkc9hkqr90g";
+        url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20260417.100318.tar";
+        sha256 = "1vbgvzqaxrih3r749w5hs724aph6xjiqzg6qf8zb5xz0iy2q20yh";
       };
       packageRequires = [ org ];
       meta = {
@@ -7450,10 +7471,10 @@
     elpaBuild {
       pname = "posframe";
       ename = "posframe";
-      version = "1.5.1.0.20260302.25154";
+      version = "1.5.1.0.20260423.21349";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/posframe-1.5.1.0.20260302.25154.tar";
-        sha256 = "0wy3gk16sbx48aw6a9p3w648lcwgcm9lgvp4drgg1ik2r034lbq6";
+        url = "https://elpa.gnu.org/devel/posframe-1.5.1.0.20260423.21349.tar";
+        sha256 = "0ylxj2spphywm7851lyrki34gkcznjd24xpd75f47pa1wcplkc48";
       };
       packageRequires = [ ];
       meta = {
@@ -7621,10 +7642,10 @@
     elpaBuild {
       pname = "pulsar";
       ename = "pulsar";
-      version = "1.3.4.0.20260228.81404";
+      version = "1.3.4.0.20260421.185730";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/pulsar-1.3.4.0.20260228.81404.tar";
-        sha256 = "10s74i456hwxcr909x1ckaaqxfhkpzprv8c7x5ggy1gia4gi8lfg";
+        url = "https://elpa.gnu.org/devel/pulsar-1.3.4.0.20260421.185730.tar";
+        sha256 = "100nyvpnap1bjc5k4ryni0h43dpacw1nbc6kyz73q82m19m78cnx";
       };
       packageRequires = [ ];
       meta = {
@@ -7884,10 +7905,10 @@
     elpaBuild {
       pname = "realgud";
       ename = "realgud";
-      version = "1.6.0.0.20260407.121006";
+      version = "1.6.0.0.20260411.181642";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260407.121006.tar";
-        sha256 = "08ypm3jsgmg7asgh6qbmfvz07clacmpaaphjmf46a7k1vn4lpyk9";
+        url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260411.181642.tar";
+        sha256 = "11rs4xcy7xz2ckvpii33mmy04flwfladpi5j70bxc5anmhn5fh68";
       };
       packageRequires = [
         load-relative
@@ -8573,10 +8594,10 @@
     elpaBuild {
       pname = "site-lisp";
       ename = "site-lisp";
-      version = "0.3.0.0.20251230.232614";
+      version = "0.3.0.0.20260411.104225";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/site-lisp-0.3.0.0.20251230.232614.tar";
-        sha256 = "0j6gv9ccjfix0dslqfkf5n0w2x13k7a1ilq2y09k66ymcyvinkf9";
+        url = "https://elpa.gnu.org/devel/site-lisp-0.3.0.0.20260411.104225.tar";
+        sha256 = "0vasl2ya4vfhprpbhnydkzjm07lsdlfgpsb3gdqzllpd77fmjnfx";
       };
       packageRequires = [ ];
       meta = {
@@ -9399,10 +9420,10 @@
     elpaBuild {
       pname = "termint";
       ename = "termint";
-      version = "0.2.0.20251215.233408";
+      version = "0.2.2.0.20260411.234846";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/termint-0.2.0.20251215.233408.tar";
-        sha256 = "07zysh8rx2lrdkkg9xiqc0wqzqaydl07wsg42rn2jbwm7vd7h3fm";
+        url = "https://elpa.gnu.org/devel/termint-0.2.2.0.20260411.234846.tar";
+        sha256 = "0xsrqxgndzmxskcmfx4184nb7yvwmv9lqdy40cjhpc8f3xwmzqwq";
       };
       packageRequires = [ ];
       meta = {
@@ -9569,10 +9590,10 @@
     elpaBuild {
       pname = "tmr";
       ename = "tmr";
-      version = "1.3.0.0.20260326.104345";
+      version = "1.3.0.0.20260423.190529";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tmr-1.3.0.0.20260326.104345.tar";
-        sha256 = "0b28pbpv0z474kqazx60l26zgqm60naymflx3vidf0gmi5zqh1j5";
+        url = "https://elpa.gnu.org/devel/tmr-1.3.0.0.20260423.190529.tar";
+        sha256 = "1m6ymyrv2fc8j22w12ppj2l1j6cczld8kd6hn2imbxga04knni9z";
       };
       packageRequires = [ ];
       meta = {
@@ -9767,10 +9788,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.12.0.0.20260409.182552";
+      version = "0.13.0.0.20260422.164634";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.12.0.0.20260409.182552.tar";
-        sha256 = "045vj0i21n5p2cxhckr3vpk1vrmh6icj0lsn45jx7c65bxszqxli";
+        url = "https://elpa.gnu.org/devel/transient-0.13.0.0.20260422.164634.tar";
+        sha256 = "1mqky3s852p8fw9h9s2wqn7f40fbk8zy5rz9yxwq88w55nyw2kw5";
       };
       packageRequires = [
         compat
@@ -10124,10 +10145,10 @@
     elpaBuild {
       pname = "valign";
       ename = "valign";
-      version = "3.1.1.0.20251228.153858";
+      version = "3.1.1.0.20260416.235856";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20251228.153858.tar";
-        sha256 = "1ah9qdxlc2m6k536dyc6pfxvh1jmbfxcpcybka4r447dssq5ysfz";
+        url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20260416.235856.tar";
+        sha256 = "1apwa8sb1bpsrkk81q0z9qir71s5naiva16hn2vdjrn4cd1kzcdb";
       };
       packageRequires = [ ];
       meta = {
@@ -10210,10 +10231,10 @@
     elpaBuild {
       pname = "vc-jj";
       ename = "vc-jj";
-      version = "0.5.0.20260407.140853";
+      version = "0.5.0.20260416.141453";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vc-jj-0.5.0.20260407.140853.tar";
-        sha256 = "14yi8wirqbz3k07lxyzm26vif4cny4abfwv5i27wpfzcahb8x0k1";
+        url = "https://elpa.gnu.org/devel/vc-jj-0.5.0.20260416.141453.tar";
+        sha256 = "0x5qj0a77wjfqxyr8wv9gswm205jj52cihlpmbkspn01a93ljr04";
       };
       packageRequires = [ compat ];
       meta = {
@@ -10343,10 +10364,10 @@
     elpaBuild {
       pname = "vertico";
       ename = "vertico";
-      version = "2.8.0.20260330.62818";
+      version = "2.8.0.20260419.183845";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-2.8.0.20260330.62818.tar";
-        sha256 = "0qj9z9r9ili22d3jaxa1br4ldhjx0hfw8wc619idy712g6lh954a";
+        url = "https://elpa.gnu.org/devel/vertico-2.8.0.20260419.183845.tar";
+        sha256 = "0mxhmknbx9sjsvxz9mc5vvg8pag9ijll0s71c2in307scdmp3lvk";
       };
       packageRequires = [ compat ];
       meta = {
@@ -10495,10 +10516,10 @@
     elpaBuild {
       pname = "wcheck-mode";
       ename = "wcheck-mode";
-      version = "2021.0.20260321.190237";
+      version = "2026.0.20260412.44645";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20260321.190237.tar";
-        sha256 = "0q5fwg35dgv886x7fqn6rsyp6yw9qcq4hhamdjdz98r6hg40y666";
+        url = "https://elpa.gnu.org/devel/wcheck-mode-2026.0.20260412.44645.tar";
+        sha256 = "0gbx80sv5kg8jnk5vzr3hr4lc25rhyl6jva14nr2c2v6bidfi97x";
       };
       packageRequires = [ ];
       meta = {

From d98b6568b348a822608fd7aff7c5cbdd4719b8e7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 25 Apr 2026 01:16:08 +0800
Subject: [PATCH 012/107] melpaPackages, melpaStablePackages: update on
 2026-04-25 (from emacs-overlay)

emacs-overlay commit: bbb5148fa2579456dc7da3741e9d8543ce7d3ef1
---
 .../elisp-packages/recipes-archive-melpa.json | 2313 ++++++++++-------
 1 file changed, 1342 insertions(+), 971 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index f2d14052d625..d6637f06ded2 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -318,8 +318,8 @@
   "repo": "abstools/abs-mode",
   "unstable": {
    "version": [
-    20260211,
-    1320
+    20260415,
+    813
    ],
    "deps": [
     "erlang",
@@ -327,8 +327,8 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "aaf97a11ef799d424f34de9a651dcbe601e85b63",
-   "sha256": "0gfn3q11gl2kl885vmcby0w5l7jsm58drq0ksm9qhr0nzjg000zl"
+   "commit": "a4b8d0caa61db2f37b77e15055fad8324c35f4ae",
+   "sha256": "0cwq38g33dxxa2mwyn7h0prlq0gc831b6z2yrpfbvrbvm1iq7jy3"
   },
   "stable": {
    "version": [
@@ -2144,6 +2144,24 @@
    "sha256": "17l6j83i2xm3agrrbmg2pwccim6y9f65b1vsripv95fyxhp6l1mm"
   }
  },
+ {
+  "ename": "agent-recall",
+  "commit": "a135127179bcb1d309be1929c19250df99c9462c",
+  "sha256": "18ph8dhgx3gv82a3cm2d08p197zc3g79dgfcbn3id7wma06znp35",
+  "fetcher": "github",
+  "repo": "Marx-A00/agent-recall",
+  "unstable": {
+   "version": [
+    20260420,
+    1713
+   ],
+   "deps": [
+    "agent-shell"
+   ],
+   "commit": "a90c86c53e65f95fd19c67587ba7d904b939db3d",
+   "sha256": "15p23fvf6mc461j5rl4jzhhq2lkznfllhrcd9pagzzqwp0mjy8l1"
+  }
+ },
  {
   "ename": "agent-shell",
   "commit": "1895e21adfb5e4dfccb4d4db49c213c77fc57727",
@@ -2152,15 +2170,15 @@
   "repo": "xenodium/agent-shell",
   "unstable": {
    "version": [
-    20260408,
-    1635
+    20260423,
+    2254
    ],
    "deps": [
     "acp",
     "shell-maker"
    ],
-   "commit": "7f106a355295d6c0fde5cd589cf566df7850463f",
-   "sha256": "1s1v7jd39jjml9al3vmjrpigg64vy4b9x3y450bhm7gfx59jgj0s"
+   "commit": "21a8c8b4e735cf3f35ac857b4857817971432265",
+   "sha256": "0f8ds25x4fl1195jm4jn13wx791zn76my26f9xnxfslmiam6f36a"
   },
   "stable": {
    "version": [
@@ -2218,6 +2236,40 @@
    "sha256": "1mlvdxs4jbxxfj57h2hc6yapgz4zzqj80k4psds116kpp0y2r5ja"
   }
  },
+ {
+  "ename": "agitjo",
+  "commit": "354d1a22c8a95f74c4826d9e611766bdcfd6fd43",
+  "sha256": "0ps9gx5bbwcagd19c95f015k3fxy6kzr56jw7c1wwmahslmzkgsk",
+  "fetcher": "codeberg",
+  "repo": "halvin/agitjo",
+  "unstable": {
+   "version": [
+    20260415,
+    1451
+   ],
+   "deps": [
+    "magit",
+    "markdown-mode",
+    "transient"
+   ],
+   "commit": "47f20e04ed09724b0859cade3cb52eae31274c13",
+   "sha256": "046fcrhm0fhnq2fygbswbcyl21davbjirjl9mq7cdx5cl5x4kg5q"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "deps": [
+    "magit",
+    "markdown-mode",
+    "transient"
+   ],
+   "commit": "47f20e04ed09724b0859cade3cb52eae31274c13",
+   "sha256": "046fcrhm0fhnq2fygbswbcyl21davbjirjl9mq7cdx5cl5x4kg5q"
+  }
+ },
  {
   "ename": "agtags",
   "commit": "eb6677262303a0cad2d844db77693c00d9bc575a",
@@ -2319,27 +2371,27 @@
   "repo": "tninja/ai-code-interface.el",
   "unstable": {
    "version": [
-    20260410,
-    1636
+    20260423,
+    1511
    ],
    "deps": [
     "magit",
     "transient"
    ],
-   "commit": "7f3f558eb81b724f4f1f0a6bc59a699f4aa890a5",
-   "sha256": "1w9swqy7yqx7dlcs3yf54v43flsmzrq222dqlwc9rq88rf1q8mql"
+   "commit": "bb725e376479d0c6ac50f47fd89b7f8972db2465",
+   "sha256": "0lzxd2v7v5fysna2ywh8zks5s51kf2naqw9mp3mcmbx482n5sv86"
   },
   "stable": {
    "version": [
     1,
-    68
+    74
    ],
    "deps": [
     "magit",
     "transient"
    ],
-   "commit": "a15f64f697604818a3c769a6034dde8d13f6f89d",
-   "sha256": "1p9dhg7q16ynsyvx2f2c14b37cvi59hrvj9sc7c664zv7vmf60br"
+   "commit": "e44a49ef51ab795538cb39238c9290c0ac2783c9",
+   "sha256": "1ra6r227d5b7g0rynb8a3ngb9cpa3zjjjrbvb778bkc3h1fr6mz6"
   }
  },
  {
@@ -3544,28 +3596,28 @@
   "repo": "kickingvegas/anju",
   "unstable": {
    "version": [
-    20260405,
-    131
+    20260424,
+    156
    ],
    "deps": [
     "casual",
     "markdown-mode"
    ],
-   "commit": "9b50c67292189b599dcb17108f93be520caa5647",
-   "sha256": "1da3fq3085pp14rryq9cxc71gwyi2wipfwml361zalx54gpdbk3j"
+   "commit": "7a700608e9143f8e29a533bdeee9a6f175df6d06",
+   "sha256": "1gfwd0j1bwnggj0sjw1kcwx462qcvxjg1px2vfzmsh41zbxlv02x"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "casual",
     "markdown-mode"
    ],
-   "commit": "9b50c67292189b599dcb17108f93be520caa5647",
-   "sha256": "1da3fq3085pp14rryq9cxc71gwyi2wipfwml361zalx54gpdbk3j"
+   "commit": "7a700608e9143f8e29a533bdeee9a6f175df6d06",
+   "sha256": "1gfwd0j1bwnggj0sjw1kcwx462qcvxjg1px2vfzmsh41zbxlv02x"
   }
  },
  {
@@ -4124,11 +4176,11 @@
   "repo": "radian-software/apheleia",
   "unstable": {
    "version": [
-    20260313,
-    35
+    20260422,
+    253
    ],
-   "commit": "e6e5d5523d229735ab5f8ec83e10beefcfd00d76",
-   "sha256": "1yf8ccaidk4swk67bhssgkslb6ymz6smhcqr2mpy13v4dp53zn7g"
+   "commit": "1720200b1271a9e70ebfc86c0f942ff02aefcdd1",
+   "sha256": "19wwb71v7jpwhrk3y1pn39sb0knizfg1vrgscflgvcgk3qc8l3kr"
   },
   "stable": {
    "version": [
@@ -4807,20 +4859,20 @@
   "url": "https://git.isincredibly.gay/srxl/astro-ts-mode.git",
   "unstable": {
    "version": [
-    20250308,
-    2341
+    20260417,
+    101
    ],
-   "commit": "886d692378d0da2071e710c1e6db02e5b2e0dd30",
-   "sha256": "07qdklcw6sfqw9d7yw32qylwaj8w4is6cfm59idhbcgwjlayw08c"
+   "commit": "1d24c9d399dee4cfea6ed9b49d8e08891665e16c",
+   "sha256": "1cm5ykq70d8346kfpd9zghb0pl9a2p4gckbqx44sqjvb5s2kip8w"
   },
   "stable": {
    "version": [
     3,
     0,
-    1
+    2
    ],
-   "commit": "886d692378d0da2071e710c1e6db02e5b2e0dd30",
-   "sha256": "07qdklcw6sfqw9d7yw32qylwaj8w4is6cfm59idhbcgwjlayw08c"
+   "commit": "1d24c9d399dee4cfea6ed9b49d8e08891665e16c",
+   "sha256": "1cm5ykq70d8346kfpd9zghb0pl9a2p4gckbqx44sqjvb5s2kip8w"
   }
  },
  {
@@ -5002,14 +5054,14 @@
   "repo": "Anoncheg1/emacs-async1",
   "unstable": {
    "version": [
-    20250929,
-    1752
+    20260421,
+    2116
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ab8786693f7750f65fbfea07702fece812c57248",
-   "sha256": "0kcgg653bvw9vdvimr1jir04cpgn2iigdjzh763jg8rz6xrjx5gm"
+   "commit": "88cccffe14bdd0a61dbb2e33edf8c335706f24dc",
+   "sha256": "0nljffwjdkcnsp4plkrsm6rfwhpdaixx22507vqf017f0n4jcn71"
   },
   "stable": {
    "version": [
@@ -6236,26 +6288,26 @@
   "repo": "ncaq/auto-sudoedit",
   "unstable": {
    "version": [
-    20230907,
-    724
+    20260420,
+    832
    ],
    "deps": [
     "f"
    ],
-   "commit": "1caa127db200f86d1cfdeaae4410a673f0ae11e0",
-   "sha256": "14rdkb4dg3vszj2yjqdijq6d73qaag0mmn7bl6a2vhc0b60lr5kj"
+   "commit": "b792e82a2e55be18c5fe945213325d6c84a2813c",
+   "sha256": "1d9hkgy19kwcwh7s1gspab6nrnj7s4d0ja0bqdldi5s0whd7iidp"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    2
    ],
    "deps": [
     "f"
    ],
-   "commit": "738fd22452f00fa05daf200f997cb5db2531a211",
-   "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q"
+   "commit": "b792e82a2e55be18c5fe945213325d6c84a2813c",
+   "sha256": "1d9hkgy19kwcwh7s1gspab6nrnj7s4d0ja0bqdldi5s0whd7iidp"
   }
  },
  {
@@ -7282,11 +7334,11 @@
   "repo": "tinted-theming/base16-emacs",
   "unstable": {
    "version": [
-    20260308,
-    202
+    20260419,
+    235
    ],
-   "commit": "bc203c6dd6de644eadda6af53d818bd04ba0d726",
-   "sha256": "03qifq69mhn2gvskzf0pjc2p973m6aa7vkpym4rsk6l8g0rwk4la"
+   "commit": "8461432c62353f302b79bf0b2db2f99b83183dbe",
+   "sha256": "1n36k7fax231x07n82licps5kvm682nz1adr93ly7np5434m0926"
   },
   "stable": {
    "version": [
@@ -7445,6 +7497,30 @@
    "sha256": "1bnv8kkg6yy09kxns78xlbl0vwc5dz0azvgvry2a0361f48f0315"
   }
  },
+ {
+  "ename": "batppuccin",
+  "commit": "3217105e265829ec768b58afcfb75322f4d6fb99",
+  "sha256": "05hm4d9qfcy7ai25qzcbbbmp9xsszy1138kf4069cj0dyw3fjw0p",
+  "fetcher": "github",
+  "repo": "bbatsov/batppuccin-emacs",
+  "unstable": {
+   "version": [
+    20260421,
+    1706
+   ],
+   "commit": "4e9c240c332e745d58cf47ad900fdeefb01f707a",
+   "sha256": "0xlhiybbnxgjgiqh88h9fp8q5gdkgwrjir2pm3afqmrhhzr3d933"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "cc5241879121b30f395327659a3224a91b104a9a",
+   "sha256": "11pgjcg2llkkfjl016i4y2gd17sx3l4x9naks808rkfk9r0an3mm"
+  }
+ },
  {
   "ename": "bats-mode",
   "commit": "d742fb825e163beb33c3873aa48a1c411711e312",
@@ -7522,11 +7598,11 @@
   "repo": "bazelbuild/emacs-bazel-mode",
   "unstable": {
    "version": [
-    20260402,
-    1058
+    20260416,
+    2100
    ],
-   "commit": "7cf45ca39ec415373db2a86134e43aaa5fbf236b",
-   "sha256": "1v8hs6kpnkwsxssrf8m3alhb3cknhjihg98h7xaxf55m6wi13pbc"
+   "commit": "da1b5bb6fae06b3c9805116114da5acfe5e62817",
+   "sha256": "1wr10qva61xqas93ijaf2h0n4nin7g39g96y174njd10p2p9g7zp"
   }
  },
  {
@@ -7908,6 +7984,25 @@
    "sha256": "0i1jgjdv5vsmbryx3qk2a02l7186qd8pmd8ikhz9qmzkxhfmsw45"
   }
  },
+ {
+  "ename": "ben",
+  "commit": "a8c8dab8bcc0d2c4671a42c5c1c7e5613ea22a73",
+  "sha256": "14i42m1m4w22qaa14bbh80gnrix5942d1hwy33rjs1l3nz7cllhp",
+  "fetcher": "codeberg",
+  "repo": "pastor/ben.el",
+  "unstable": {
+   "version": [
+    20260424,
+    826
+   ],
+   "deps": [
+    "inheritenv",
+    "seq"
+   ],
+   "commit": "139dcfef116e376138abddc7cc179cbe68f457fd",
+   "sha256": "0mscx327acxv74c54lnb0xzsqnkbzrkrwngw6qkrkbqsllbyagwc"
+  }
+ },
  {
   "ename": "benchmark-init",
   "commit": "54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0",
@@ -8950,11 +9045,11 @@
   "repo": "gdonald/blackjack-el",
   "unstable": {
    "version": [
-    20230821,
-    41
+    20260418,
+    1402
    ],
-   "commit": "7f9072630a159b59a146346b5dae24ab8fb5f290",
-   "sha256": "1wnm2v9cv0idyks8q6qrxrsby0adpap5ywy9ab602jjidf6ajxm4"
+   "commit": "3930d197d1f8f37de0dbb6c9875ef5279e16cdfa",
+   "sha256": "0zxpiz9kjicyf2lhq2rclj2cqaf3f518xwlm48dcrkr1hjn6yqac"
   },
   "stable": {
    "version": [
@@ -9217,14 +9312,14 @@
   "repo": "lapislazuli/blue.el",
   "unstable": {
    "version": [
-    20260308,
-    905
+    20260422,
+    644
    ],
    "deps": [
     "magit-section"
    ],
-   "commit": "dfac707031b7f460440a088e18b1f6185ff18007",
-   "sha256": "0yczp2jbxz27baangsq5iylskmnkvpds3v08jfmmck1i7shc83c3"
+   "commit": "16c7092e7483cf7b29511374bbc8c80a1359b6b9",
+   "sha256": "1f0glcg6y081wqgidakn56bdy6cx87fxw4zhdxc4l0vcsr98rc7m"
   }
  },
  {
@@ -9627,15 +9722,15 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20260401,
-    1217
+    20260422,
+    1711
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "8d0e26e6c16c1e503785b3e6b62a9a6d55b4e472",
-   "sha256": "094ykn4niknciqy71v74ry70imj6xri6wrm477yavwanzdr4b2rc"
+   "commit": "5aa950cf07c3f16528232a81dcedd792f74c0471",
+   "sha256": "1ygv5hvbr9ygkdab4mqc94f6z7h10yfbllxv8v48wfx902ys4wjs"
   },
   "stable": {
    "version": [
@@ -9713,25 +9808,20 @@
   "repo": "davep/boxquote.el",
   "unstable": {
    "version": [
-    20231216,
-    852
+    20260415,
+    1949
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "8d6c307ab3b783c5042065d0ae54961adb506484",
-   "sha256": "1i3i9v09y6f03w5i9n9n4k9v31bxnsy81ys35iapa918d74lcvf3"
+   "commit": "eb14169161ddeba9a703c42f7352cb52f732cc86",
+   "sha256": "1n9d84mwmniggf4fvwi2chm8vinqf5vl0nn3lg0shd8gi5k1m4gl"
   },
   "stable": {
    "version": [
     2,
-    3
+    4,
+    1
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "fe676396fa7e4372e01bf2c3d9a62e8d53615d46",
-   "sha256": "0d7m9kcwhbgv4pikaa2dzlg9zkmwdhyx2ksn68di6xzbh838892q"
+   "commit": "eb14169161ddeba9a703c42f7352cb52f732cc86",
+   "sha256": "1n9d84mwmniggf4fvwi2chm8vinqf5vl0nn3lg0shd8gi5k1m4gl"
   }
  },
  {
@@ -10190,24 +10280,6 @@
    "sha256": "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28"
   }
  },
- {
-  "ename": "buck",
-  "commit": "b34c31c4ef9c491968e33161fd46f4f3bb761152",
-  "sha256": "0a04y4ki8hx7afvl1n7ma2ivsy8smqm7mxpbi33lp8f6f2zlfs1h",
-  "fetcher": "github",
-  "repo": "emacsattic/buck",
-  "unstable": {
-   "version": [
-    20250620,
-    1333
-   ],
-   "deps": [
-    "ghub"
-   ],
-   "commit": "3b6bd10ad5e7e6bf1ec36dce55b2b77545ec73e2",
-   "sha256": "0dlsrd2kfavvzhdvkjs1j80iaqwjxh4q2ppvihyabli14arjv4k1"
-  }
- },
  {
   "ename": "buckwalter",
   "commit": "7dd38487731cc978e104afa39f8954cfc33ba27f",
@@ -10903,19 +10975,19 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20260409,
-    2354
+    20260411,
+    2019
    ],
-   "commit": "7baf9e5a60f201542309238d77aa6bb35bd77ec0",
-   "sha256": "0gvxlwhzz8ghfhx47n10k57jdaawjmnfwiywdp5m4jhxzn9i4sg2"
+   "commit": "57d03004cc730678bcdefb91ad294824975cfea4",
+   "sha256": "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"
   },
   "stable": {
    "version": [
     1,
-    39
+    40
    ],
-   "commit": "7baf9e5a60f201542309238d77aa6bb35bd77ec0",
-   "sha256": "0gvxlwhzz8ghfhx47n10k57jdaawjmnfwiywdp5m4jhxzn9i4sg2"
+   "commit": "57d03004cc730678bcdefb91ad294824975cfea4",
+   "sha256": "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"
   }
  },
  {
@@ -11539,8 +11611,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20250913,
-    1233
+    20260412,
+    622
    ],
    "deps": [
     "dash",
@@ -11550,13 +11622,13 @@
     "s",
     "transient"
    ],
-   "commit": "99a234167a092bc0017d11c814f0b8c0da53a107",
-   "sha256": "0jkhaf5h2qcqz8nvw80wj0xjazdpm2l9n0d5a41p20gnz54rhkbd"
+   "commit": "af6fc49edf72f0ebc42d9d3983ad00c268541092",
+   "sha256": "0ba6iqhb94a3rlkbp0v3bp6pk68yp7mmxcq8hvl51543q9w88310"
   },
   "stable": {
    "version": [
     2,
-    13,
+    14,
     0
    ],
    "deps": [
@@ -11567,8 +11639,8 @@
     "s",
     "transient"
    ],
-   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
-   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
+   "commit": "926add4f17c1d367d4ea89c33049d2c12ffd7410",
+   "sha256": "1g0jg6a6fgvxd5bsydckbqwf899d2d9732laz4k1k476mbws5dqy"
   }
  },
  {
@@ -11741,14 +11813,14 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20260311,
-    1654
+    20260419,
+    1847
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a326a0575fe5ca574f6607557dbb8bd6ce83dbbd",
-   "sha256": "1a6h79v6jpr0k6p01f4ndfkxbi51yw3wsj94k54b8vasd4kbrhzb"
+   "commit": "2e15e1909754752f66096dde1b8d639d6eb25f35",
+   "sha256": "0lhjavwiyp5vd9i6xcr1g4mcb53fxmqyq0yx5f5sp00mcp6y3kg5"
   },
   "stable": {
    "version": [
@@ -12069,28 +12141,28 @@
   "repo": "kickingvegas/casual",
   "unstable": {
    "version": [
-    20260406,
-    2338
+    20260416,
+    126
    ],
    "deps": [
     "csv-mode",
     "transient"
    ],
-   "commit": "81e032d24c46159cc98ec5248e48ee3659025ad0",
-   "sha256": "1hcpjb33mzqhwkzcsad1nkfp1gr4jd226l8x1fglaynz0a4dkad8"
+   "commit": "6a3fbb40d3369614f36d9a37035942fa57572c5b",
+   "sha256": "06i7zv7x8cs87qjpvsjqg2bi68pyw2j0z9pnzbsjj81pafmm2xdy"
   },
   "stable": {
    "version": [
     2,
-    15,
+    16,
     0
    ],
    "deps": [
     "csv-mode",
     "transient"
    ],
-   "commit": "81e032d24c46159cc98ec5248e48ee3659025ad0",
-   "sha256": "1hcpjb33mzqhwkzcsad1nkfp1gr4jd226l8x1fglaynz0a4dkad8"
+   "commit": "6a3fbb40d3369614f36d9a37035942fa57572c5b",
+   "sha256": "06i7zv7x8cs87qjpvsjqg2bi68pyw2j0z9pnzbsjj81pafmm2xdy"
   }
  },
  {
@@ -12712,16 +12784,16 @@
   "repo": "worr/cfn-mode",
   "unstable": {
    "version": [
-    20260315,
-    907
+    20260419,
+    807
    ],
    "deps": [
     "f",
     "s",
     "yaml-mode"
    ],
-   "commit": "56bec3710bee04349aae12b2d22d0ec875bd7934",
-   "sha256": "17is38g5fi3zhj43bmgxnm48816ba6xvkfzmk935rp7d6dh6xzp9"
+   "commit": "2813707d1f2c98562fa873624abc79ce49db969c",
+   "sha256": "0kc3mb0q86wc9ajmdvb26wpd0fg4gllgg8s3pfb49w8qgz7z02ba"
   },
   "stable": {
    "version": [
@@ -13673,8 +13745,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20260402,
-    444
+    20260417,
+    1318
    ],
    "deps": [
     "clojure-mode",
@@ -13686,8 +13758,8 @@
     "spinner",
     "transient"
    ],
-   "commit": "a569a5ffd9959b3e7a3ada57884b5c00530cbcb3",
-   "sha256": "0giwj6bpmbqbxzhlnfxrq7lyxl8cyri8j9xm19v9fvvrxy1glwgf"
+   "commit": "b9e8a26197f5a2a6a8d1dfb21ef5eae6fe17e0b6",
+   "sha256": "11v3d5gl4p2iqfym9nxcdwyvyyzal9dkri6wwfd74w0cgkgrlw46"
   },
   "stable": {
    "version": [
@@ -14190,6 +14262,25 @@
    "sha256": "1kz2blk3dyzc35wp226ax8g6dipvvnsm1q5s4zf9qf1by96k5qd2"
   }
  },
+ {
+  "ename": "citar-vulpea",
+  "commit": "44ef6cd065f3f462186c7b758b3b9545f4aad95c",
+  "sha256": "1hcpybw8l26abd0ai348z1krqmr2hhax92fnv9h76isagwyq736d",
+  "fetcher": "github",
+  "repo": "fabcontigiani/citar-vulpea",
+  "unstable": {
+   "version": [
+    20260414,
+    1628
+   ],
+   "deps": [
+    "citar",
+    "vulpea"
+   ],
+   "commit": "44ee8c1366687213afdeca20b1889cdcd822237a",
+   "sha256": "1vc34ahbk73c7hg3n1dx29171vl8fcq2lpff5r133p6pj9fzfbkj"
+  }
+ },
  {
   "ename": "citeproc",
   "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1",
@@ -15535,20 +15626,20 @@
   "url": "https://gitlab.kitware.com/cmake/cmake.git",
   "unstable": {
    "version": [
-    20260327,
-    1308
+    20260421,
+    1337
    ],
-   "commit": "3a7d797d5b217e4cf375135831a6424c09df7d29",
-   "sha256": "0lm6y4fwly1j68njpj8g1x4am5w9sllrd8nmd6a07cjx8crbf2fl"
+   "commit": "8d3c68cc0f36108f7ebb23ba7a6bc08b9b1d81e4",
+   "sha256": "15q1qgjsgqzirq6f59q6y402bhcw6q3pvmpdh8zs5va70a37p7j5"
   },
   "stable": {
    "version": [
     4,
     3,
-    1
+    2
    ],
-   "commit": "3a7d797d5b217e4cf375135831a6424c09df7d29",
-   "sha256": "0lm6y4fwly1j68njpj8g1x4am5w9sllrd8nmd6a07cjx8crbf2fl"
+   "commit": "8d3c68cc0f36108f7ebb23ba7a6bc08b9b1d81e4",
+   "sha256": "15q1qgjsgqzirq6f59q6y402bhcw6q3pvmpdh8zs5va70a37p7j5"
   }
  },
  {
@@ -16381,6 +16472,21 @@
    "sha256": "1f0155fyvh1m20ahl6wqask4qx6jp3lfwxj894cda9j4y8gnr5iq"
   }
  },
+ {
+  "ename": "comet-trail",
+  "commit": "ba6a664dd5926c4326acc158d7e518428ff4cd26",
+  "sha256": "1xwvgfj7kd9rm0hcnby1f3x9czra75nmnz75laqvba9my6hcsrba",
+  "fetcher": "git",
+  "url": "https://git.andros.dev/andros/comet-trail.el",
+  "unstable": {
+   "version": [
+    20260413,
+    747
+   ],
+   "commit": "6bb17b3672d421f2456bf69f76138ef5b0f48647",
+   "sha256": "14ni1d417cs1ig53h5nnbsvclv4a92s684fwqbyli3hpaq2banf6"
+  }
+ },
  {
   "ename": "comint-histories",
   "commit": "0402a9b9a24a0431b01873ebe6c3e50748221133",
@@ -18602,20 +18708,20 @@
   "repo": "djgoku/compilation-history",
   "unstable": {
    "version": [
-    20260401,
-    547
+    20260413,
+    2031
    ],
-   "commit": "dba6568dc2c56131d811ff951855e6fb69447ed8",
-   "sha256": "1pbiz3bjfflz4yj9p40kwf1sax98fc2ya6a034fvkrlwyg6vrivv"
+   "commit": "cfc37a18469634696761e239d0517cfb96a2ca40",
+   "sha256": "0m2s9q08lnfqcmkaapzhs8jpimk5cn5c4b27j8968qnv9csb75py"
   },
   "stable": {
    "version": [
     0,
     2,
-    6
+    7
    ],
-   "commit": "dba6568dc2c56131d811ff951855e6fb69447ed8",
-   "sha256": "1pbiz3bjfflz4yj9p40kwf1sax98fc2ya6a034fvkrlwyg6vrivv"
+   "commit": "cfc37a18469634696761e239d0517cfb96a2ca40",
+   "sha256": "0m2s9q08lnfqcmkaapzhs8jpimk5cn5c4b27j8968qnv9csb75py"
   }
  },
  {
@@ -18626,11 +18732,11 @@
   "repo": "jamescherti/compile-angel.el",
   "unstable": {
    "version": [
-    20260326,
-    1633
+    20260421,
+    1222
    ],
-   "commit": "520e516fb794336ddaef4a4e7b02e3e9d60eda04",
-   "sha256": "18bhhsw8qfj4rx6fmvr3cp419pw5yn5lfvdwdi8dcczi8bf1f7dh"
+   "commit": "e17764996ec7a0f74f0ad4399cfdd7e44e11d8ae",
+   "sha256": "054546x4d11mrva52kg8ja3ik13v6yii34pnv56ml5wkscpsq2v9"
   },
   "stable": {
    "version": [
@@ -19185,14 +19291,14 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20260407,
-    1530
+    20260421,
+    1105
    ],
    "deps": [
     "compat"
    ],
-   "commit": "20476c690ce3ecd45460011ce6b03fd58a642181",
-   "sha256": "1sxp7yly3kslbx5lm65k64hcjbzgryzp0nalqnjjk2liarqwyr8c"
+   "commit": "14131ab6247e1b4b0f28134fba5e92a4707dbc1d",
+   "sha256": "01bjr30ka1xljwk93yzfqvb210fyc6ln9jik9gi9cinp27hmaap7"
   },
   "stable": {
    "version": [
@@ -20543,14 +20649,14 @@
   "repo": "minad/corfu",
   "unstable": {
    "version": [
-    20260309,
-    1551
+    20260419,
+    1808
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d2a995c5c732d0fc439efe09440870a9de779a74",
-   "sha256": "0hb9ycq6v28nkx0qbczfks4hz26g1d1bdb48ylxb9pd26irxb9pm"
+   "commit": "1466f6f7effc0a783c8acda66471be0db11f789a",
+   "sha256": "1qsq3cay6khphq008nyfybg4iafsmszk9j4dr35sr1bzfdq0wml2"
   },
   "stable": {
    "version": [
@@ -23393,11 +23499,11 @@
   "repo": "grtcdr/darkman.el",
   "unstable": {
    "version": [
-    20241019,
-    1404
+    20260414,
+    1055
    ],
-   "commit": "beb2186e6eaf13ebe1ae56e460bcd1a4c0cb4f07",
-   "sha256": "0mw1rfv0nmpb2h79wg5mk23wr9cfyhgd6jjaxllr8gabkvajpsvg"
+   "commit": "ee99dfcdc1f48330d0fbb565f8db7664eee34643",
+   "sha256": "0yyhpcqwdcmmc4y40v1kqhxlq81pjw9bnpdv4hkv184jf8b0xicm"
   },
   "stable": {
    "version": [
@@ -23537,11 +23643,11 @@
   "repo": "nameiwillforget/d-emacs",
   "unstable": {
    "version": [
-    20260408,
-    738
+    20260421,
+    833
    ],
-   "commit": "c16b966e91a20472dda2f7d671c7b786eb5c1708",
-   "sha256": "04yqyxd0wn665zjngic8pxw14213cakmh0k6naq875pihiqj6v1k"
+   "commit": "8e23c3b0eda55ba9bcdaffa5ab7f179c23012163",
+   "sha256": "0v7zkxdpcr5wgccvz8yiwahb6j2pl89hsjxhzs7ishakxw41asxa"
   }
  },
  {
@@ -25105,11 +25211,11 @@
   "repo": "johannes-mueller/devcontainer.el",
   "unstable": {
    "version": [
-    20260313,
-    1842
+    20260418,
+    621
    ],
-   "commit": "5758aece4911a1d5f93f6c4fb2f50491021ebf40",
-   "sha256": "0xwdbbf6w18myxh75xnb1b4vrrm30zywz6czkl3lkr62d5066nzi"
+   "commit": "bc598413a18baa3ec9ef7e1a0cf0115685d23a22",
+   "sha256": "029cglg8jgi32p68b7rfpslp55ccfky5pwzmwafz75r07zq15x4z"
   }
  },
  {
@@ -26775,27 +26881,28 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20250212,
-    629
+    20260415,
+    638
    ],
    "deps": [
     "compat",
     "dired-subtree"
    ],
-   "commit": "3bc8927ed4d14a017eefc75d5af65022343e2ac1",
-   "sha256": "0vdx5sm7kg2xwvndhjsmixfwlsj45gz0wi5a670pr25268f47mp4"
+   "commit": "19cdf0b9ed634efb7ae7047861fbcbd9dc0ee2e9",
+   "sha256": "1jsyrj6mam68klb5ygjks98a4npx85d1xx5viwss2c11zk52699r"
   },
   "stable": {
    "version": [
     0,
-    3,
-    0
+    4,
+    1
    ],
    "deps": [
+    "compat",
     "dired-subtree"
    ],
-   "commit": "702165ad53a473992d84e0207b984b9be5114bde",
-   "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp"
+   "commit": "19cdf0b9ed634efb7ae7047861fbcbd9dc0ee2e9",
+   "sha256": "1jsyrj6mam68klb5ygjks98a4npx85d1xx5viwss2c11zk52699r"
   }
  },
  {
@@ -26927,14 +27034,14 @@
   "repo": "Boruch-Baum/emacs-diredc",
   "unstable": {
    "version": [
-    20260317,
-    2222
+    20260414,
+    1238
    ],
    "deps": [
     "key-assist"
    ],
-   "commit": "79a6c6631e8b817419f24d7e85a6f8f75d393e5d",
-   "sha256": "1p5cgi0vs4brz9isj62x4xras1hic1ygnxc7n0wql86aar99j783"
+   "commit": "7bbc7bfa60c2b3c7f39f75e1600b13260315271e",
+   "sha256": "0knsbywpmdb6jbb3frgnl9p6mi6ac2brhajb2rlqxqvr8fx9xz4b"
   },
   "stable": {
    "version": [
@@ -28352,16 +28459,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20260410,
-    332
+    20260411,
+    1454
    ],
    "deps": [
     "compat",
     "nerd-icons",
     "shrink-path"
    ],
-   "commit": "2e70c8411be374ce6e29d06da7103e51982191e8",
-   "sha256": "09p6ar68dvi07k6i6firz0xgkks28f15xn7l7jsq8pfh8kfdxpvd"
+   "commit": "870b4b215fda881d29278d81bbab7f934a9bd8b3",
+   "sha256": "15m4c6bafc742cm3mwq9x889c3s96minp6957ipbxyd6qaxzfjly"
   },
   "stable": {
    "version": [
@@ -28446,11 +28553,11 @@
   "repo": "drghirlanda/dorgygen",
   "unstable": {
    "version": [
-    20260226,
-    245
+    20260422,
+    45
    ],
-   "commit": "577c93529479b42ee6188652a21c5f02aefe43df",
-   "sha256": "1hfa1m28mvrjm7id7ikjnxs6vj3my8clw8aj3lhl90w0ki6qdvd1"
+   "commit": "84815fda133c15fe967c6f132e146992827de1c9",
+   "sha256": "0xsljqndjgz9ccx8nslv9kckb6w8cizcqlqglgg2q7bgmhwhg742"
   }
  },
  {
@@ -29258,20 +29365,20 @@
   "repo": "ocaml/dune",
   "unstable": {
    "version": [
-    20260401,
-    1726
+    20260410,
+    1721
    ],
-   "commit": "8aefc6cb021f4c276859c8c07386d1dfbc58cec8",
-   "sha256": "0bdazsd53w12c0ya62azjc39rziixfdrw1xfdibbw7gxixfyf0kl"
+   "commit": "df26745e52be99ecdb2ff994feab1eacd858b226",
+   "sha256": "0gnv5926xmvsna0bvgymj1rr9awkrc9krij6zbjnx90mcf091bsv"
   },
   "stable": {
    "version": [
     3,
     22,
-    1
+    2
    ],
-   "commit": "8aefc6cb021f4c276859c8c07386d1dfbc58cec8",
-   "sha256": "0bdazsd53w12c0ya62azjc39rziixfdrw1xfdibbw7gxixfyf0kl"
+   "commit": "df26745e52be99ecdb2ff994feab1eacd858b226",
+   "sha256": "0gnv5926xmvsna0bvgymj1rr9awkrc9krij6zbjnx90mcf091bsv"
   }
  },
  {
@@ -29914,20 +30021,20 @@
   "repo": "redguardtoo/eacl",
   "unstable": {
    "version": [
-    20220526,
-    1434
+    20260412,
+    237
    ],
-   "commit": "4fe2cafbfeb73d806ebea8801c3522ff2886f30b",
-   "sha256": "05m121lw90rjs1a6wq8gvqxzydm4940x30xp3kh1v5x4zwwcf03b"
+   "commit": "5a304e4655a28cc817b9a633304bd64a5d5ddf53",
+   "sha256": "145z8qv1xmx0y3g00n2jivhzi8h6zc5ai3wfijmijdam0yg377p5"
   },
   "stable": {
    "version": [
     2,
     2,
-    0
+    2
    ],
-   "commit": "a9485331789de245445b2b4a9d5befc7498628a6",
-   "sha256": "1d2krw9x1mw6jn1q07nbq2qi92fms85q3i9wa2q5drs3368l55vr"
+   "commit": "5a304e4655a28cc817b9a633304bd64a5d5ddf53",
+   "sha256": "145z8qv1xmx0y3g00n2jivhzi8h6zc5ai3wfijmijdam0yg377p5"
   }
  },
  {
@@ -30277,11 +30384,11 @@
   "repo": "jamescherti/easysession.el",
   "unstable": {
    "version": [
-    20260408,
-    1450
+    20260421,
+    1132
    ],
-   "commit": "962cf2c6465acc7ef2d7d260240058a98ec2342d",
-   "sha256": "02z5w31sv091yvzhgri2aaparh6m4nhvrhglqia73ly9p7n6jr6s"
+   "commit": "77a55e7ed2ad0ea5b741193a4e5a91c91021387f",
+   "sha256": "0bzc1078r485177nnfsxxjjjxd502cm850jysg57zbwp1yydmzk4"
   },
   "stable": {
    "version": [
@@ -30464,8 +30571,8 @@
   "repo": "editor-code-assistant/eca-emacs",
   "unstable": {
    "version": [
-    20260409,
-    1748
+    20260423,
+    1754
    ],
    "deps": [
     "compat",
@@ -30474,8 +30581,8 @@
     "markdown-mode",
     "s"
    ],
-   "commit": "73d77d635e0cc6daecef879b32057a6008a724ee",
-   "sha256": "082rw6hj66ni4b6mgz072db7c037dy0nyzwknc7n0cc0a7vmh6ia"
+   "commit": "bd5a72aef67eca944a7ad0d9916eb0d0f0f11f9d",
+   "sha256": "0ngap75h8344csabhmf12y4wdii6rxb94yxvdx8aj31kggxaqn6l"
   },
   "stable": {
    "version": [
@@ -31460,26 +31567,26 @@
   "repo": "mwolson/eglot-python-preset",
   "unstable": {
    "version": [
-    20260403,
-    1656
+    20260424,
+    334
    ],
    "deps": [
     "eglot"
    ],
-   "commit": "cf6c57e2010c2fca8eedc756c4759cbd62a6e206",
-   "sha256": "0jq1i3gmczgrq935vhz0f6rgj5dshbq2lv6wcpl424r2r7fr6n1w"
+   "commit": "8219aa2b3d595af42108881b4d26750ec20105b7",
+   "sha256": "1w4vvhdjdv8ny3wg6nlvwjv7mgz0bkdi9pkvi2krzarsk6wlhiv3"
   },
   "stable": {
    "version": [
     0,
-    5,
-    2
+    6,
+    0
    ],
    "deps": [
     "eglot"
    ],
-   "commit": "cf6c57e2010c2fca8eedc756c4759cbd62a6e206",
-   "sha256": "0jq1i3gmczgrq935vhz0f6rgj5dshbq2lv6wcpl424r2r7fr6n1w"
+   "commit": "8219aa2b3d595af42108881b4d26750ec20105b7",
+   "sha256": "1w4vvhdjdv8ny3wg6nlvwjv7mgz0bkdi9pkvi2krzarsk6wlhiv3"
   }
  },
  {
@@ -31558,14 +31665,14 @@
   "repo": "mwolson/eglot-typescript-preset",
   "unstable": {
    "version": [
-    20260403,
-    1656
+    20260417,
+    1841
    ],
    "deps": [
     "eglot"
    ],
-   "commit": "97c673f6408fa35fe859330f6014c35f9dce15a8",
-   "sha256": "0k12kszfg68q343mww7ivacpkw177ca23878v13b8p00xac86app"
+   "commit": "f789a45d98eb4d5cc8129a34893a91bd36abd09c",
+   "sha256": "1jy3hp621p7lh3zrxs7rgq7kajmxb5wvqjfd4flna4vmxrjg4r3q"
   },
   "stable": {
    "version": [
@@ -31741,54 +31848,68 @@
  },
  {
   "ename": "ekg",
-  "commit": "3ed0179db9417cafa5e5fad7fd5c5148c92f3ecc",
-  "sha256": "024yp9v2drqr3a3pi7j3l3iaqn01hv5j8ggq0618yh1lhcwlv076",
+  "commit": "f0dc28550575927664937b68328761b2c0b1f089",
+  "sha256": "1s7gf6ff592jcnw9pvh7bwgsn77hb9mim0ad0207ckrsz1fv7h8g",
   "fetcher": "github",
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20260408,
-    1810
+    20260415,
+    39
    ],
    "deps": [
     "llm",
     "triples",
     "vui"
    ],
-   "commit": "cda27dc2be9c08b994b9a4dc8b68f16f4e74c19e",
-   "sha256": "0wpbf4vv311d506djips5v8jr3adz59bsnlbcncx2w3ic5gyhl2y"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   },
   "stable": {
    "version": [
     0,
-    8,
+    9,
     0
    ],
    "deps": [
     "llm",
-    "triples"
+    "triples",
+    "vui"
    ],
-   "commit": "f2c52383fe58802807436994709a6f453354690a",
-   "sha256": "0qlg1lksj6cy9fj0ag4c5vr0561j8p52si5hbm571xh40f4pjays"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   }
  },
  {
   "ename": "ekg-agent",
-  "commit": "713b74aa342d53ce85cc0560bad29d4f13e0db4f",
-  "sha256": "0xfkm93f81zjfqmfbik2xjq6skandai5fp44b3kcv6r6libx5z51",
+  "commit": "f0dc28550575927664937b68328761b2c0b1f089",
+  "sha256": "0cswwb0r9b801547ny5jbzhpc16w8nrv0k9x5wfq3mgbkcdzbzs9",
   "fetcher": "github",
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20260408,
-    1810
+    20260415,
+    39
    ],
    "deps": [
     "ekg",
     "futur"
    ],
-   "commit": "cda27dc2be9c08b994b9a4dc8b68f16f4e74c19e",
-   "sha256": "0wpbf4vv311d506djips5v8jr3adz59bsnlbcncx2w3ic5gyhl2y"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
+  },
+  "stable": {
+   "version": [
+    0,
+    9,
+    0
+   ],
+   "deps": [
+    "ekg",
+    "futur"
+   ],
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   }
  },
  {
@@ -31799,24 +31920,28 @@
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20260309,
-    212
+    20260415,
+    39
    ],
    "deps": [
     "denote",
     "ekg"
    ],
-   "commit": "07c630b3227bf8714728d021b4641055def18b31",
-   "sha256": "15cqim8cahaxw030jh78flb73f8n2b9zyrk65lzfndzavqfbjc2m"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   },
   "stable": {
    "version": [
     0,
-    8,
+    9,
     0
    ],
-   "commit": "f2c52383fe58802807436994709a6f453354690a",
-   "sha256": "0qlg1lksj6cy9fj0ag4c5vr0561j8p52si5hbm571xh40f4pjays"
+   "deps": [
+    "denote",
+    "ekg"
+   ],
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   }
  },
  {
@@ -32479,11 +32604,11 @@
   "repo": "casouri/eldoc-box",
   "unstable": {
    "version": [
-    20260309,
-    1639
+    20260415,
+    226
    ],
-   "commit": "8847b1aac2133e8a8211e728807fdd20d332298c",
-   "sha256": "1218a8jhbhyw6vhm53m7i4ra3zn0xl1x8pvjllpa97axjbcs15g9"
+   "commit": "2680a08ff2438ff8c2ea6f8d57f22095f857900c",
+   "sha256": "1iqha79lpydaz2i5dah11zsj060bs1livl3fpi76kh3j5ak6v5id"
   },
   "stable": {
    "version": [
@@ -33084,26 +33209,26 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20260125,
-    2028
+    20260419,
+    349
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "f6ef83c472e6f01d0f60130ecac768462c5a20b7",
-   "sha256": "1a2ymyb6l84jrphrfb8svrm78aq9dpp5k18y112pg19lc6wqwgbv"
+   "commit": "f6d25f6c1c967822e75ff01ad4d57be1c80f480a",
+   "sha256": "05wgqmcdhfq4qmsil2sagzxv43cqf6skn5mfq0n76rf4n6slngns"
   },
   "stable": {
    "version": [
     1,
     2,
-    11
+    12
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "f6ef83c472e6f01d0f60130ecac768462c5a20b7",
-   "sha256": "1a2ymyb6l84jrphrfb8svrm78aq9dpp5k18y112pg19lc6wqwgbv"
+   "commit": "f6d25f6c1c967822e75ff01ad4d57be1c80f480a",
+   "sha256": "05wgqmcdhfq4qmsil2sagzxv43cqf6skn5mfq0n76rf4n6slngns"
   }
  },
  {
@@ -33605,6 +33730,36 @@
    "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma"
   }
  },
+ {
+  "ename": "elixir-iex",
+  "commit": "ed513f41a60afe9e18fc8143c687f6c309436a89",
+  "sha256": "026740s6l8cipbkg95714k04xl9hldjdfb7qaxnxm3qgcp1i3nid",
+  "fetcher": "github",
+  "repo": "mojochao/elixir-iex",
+  "unstable": {
+   "version": [
+    20260412,
+    1946
+   ],
+   "deps": [
+    "eat"
+   ],
+   "commit": "a82808ebb91b9668329459e808a75552d698433d",
+   "sha256": "1zngyvw5b5rhw4vj5b7dpfbagw1sia4m5kqlasc6z80ydv469da3"
+  },
+  "stable": {
+   "version": [
+    0,
+    10,
+    0
+   ],
+   "deps": [
+    "eat"
+   ],
+   "commit": "a82808ebb91b9668329459e808a75552d698433d",
+   "sha256": "1zngyvw5b5rhw4vj5b7dpfbagw1sia4m5kqlasc6z80ydv469da3"
+  }
+ },
  {
   "ename": "elixir-mode",
   "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
@@ -33965,15 +34120,15 @@
   "repo": "youngker/elogcat.el",
   "unstable": {
    "version": [
-    20230121,
-    459
+    20260423,
+    851
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "f2f19d7ab6b77b8fec55cb67524df629fe967891",
-   "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn"
+   "commit": "6bd7bfd75134d615bd49e5eba8a6e639ee0814ac",
+   "sha256": "1siiwizqya94vq2hr28ll3sk5q5w2kyqlj009f0ph8hxk5q22jfl"
   },
   "stable": {
    "version": [
@@ -34140,8 +34295,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20250404,
-    2349
+    20260413,
+    2143
    ],
    "deps": [
     "company",
@@ -34150,8 +34305,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "0b381f55969438ab2ccc2d1a1614045fcf7c9545",
-   "sha256": "0398zwzq5c33fi8icyy2x50q7rs819i5xkpmhbfm1s34m6prv46a"
+   "commit": "777f5a5f951ee4b717856007c337e9f37fd4ea5d",
+   "sha256": "03rkjfi08j5lz0jl0aw66sqc2rbrx55kj6yanxmd6drv63ryd1zj"
   },
   "stable": {
    "version": [
@@ -35014,8 +35169,20 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20260213,
-    2209
+    20260414,
+    1505
+   ],
+   "deps": [
+    "cl-lib",
+    "nadvice",
+    "seq"
+   ],
+   "commit": "6f704fd3c12f35e059700aaeb43ae64c35ad81b2",
+   "sha256": "0walnxi8lmnq4aj1ibk14mfz2qg73ini4dcbiaq4q9kc7mrwqhys"
+  },
+  "stable": {
+   "version": [
+    26
    ],
    "deps": [
     "cl-lib",
@@ -35024,18 +35191,6 @@
    ],
    "commit": "002a8db0913c1780149eb4a9306e6f582efe8974",
    "sha256": "0wn0ky1xpnb2hrlp48i6zr0f48gdnpsy3mzi7cdggx7wmp3cc2xq"
-  },
-  "stable": {
-   "version": [
-    25
-   ],
-   "deps": [
-    "cl-lib",
-    "nadvice",
-    "seq"
-   ],
-   "commit": "1d48a1133db2670d839f2cf2aff17d6c32aeb15f",
-   "sha256": "0pvlkybdpf1bfpjs0np89kfnxj3qjvyawk1g0b2l5jg21k6c20ww"
   }
  },
  {
@@ -35426,28 +35581,28 @@
   "repo": "isamert/empv.el",
   "unstable": {
    "version": [
-    20260406,
-    1740
+    20260419,
+    1452
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "579d9d3802ad449724db7649b90cf3593be92a75",
-   "sha256": "02bwpskklk3wpq3h0y6xzii34qkxfmbgv1wrg8yw2blq1kaghpqc"
+   "commit": "7f8af0b41a83c36acf7fe826839c02ecbffa33fc",
+   "sha256": "09lyvhp719dq5lz1ljzgmpwy30pxlsbccx1kdlkzi26jlgqnki3s"
   },
   "stable": {
    "version": [
     6,
-    1,
+    2,
     0
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "11245762388c03ecdfb550fb1b96978459d68a4f",
-   "sha256": "159s9hyn8z35ja3f297lb2335ihjyp60zkk7lsz8r3jc4vv0kgqs"
+   "commit": "61cc54f8a506b708285a3f7a3fb299616d0fab02",
+   "sha256": "1r6hchdchfpici44dynxa0ivhmmc3hrj1qdvgjvaysqymn1hbz1y"
   }
  },
  {
@@ -35935,8 +36090,8 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20260301,
-    1302
+    20260416,
+    1107
    ],
    "deps": [
     "closql",
@@ -35944,8 +36099,8 @@
     "emacsql",
     "llama"
    ],
-   "commit": "fc3cba38a416ec4e26a7d8eb7bc5ee910e67aa73",
-   "sha256": "1im5di9rgvirzlnkfns6sv6wrn2sfb7k98f4i4b29kh7jwrrwzax"
+   "commit": "f3f8d26401a7a9c49d4b670dbf463dd010c26fae",
+   "sha256": "0n6agpskxxqm5618ajp9wk8i6g047yjf889lw4qp5cb2kdqslfp8"
   },
   "stable": {
    "version": [
@@ -36687,20 +36842,19 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20260407,
-    1222
+    20260420,
+    1445
    ],
-   "commit": "d0083117f9b847a7473eda1c5457a81170b1b586",
-   "sha256": "1512wp3yd5sxqmpgqx45nqgl910r3x6n9vkbz0w5fj25qk1yy8nh"
+   "commit": "a42e46bab47432b988ee60e4c9d915c858bcf32d",
+   "sha256": "0vfzzxs7dv3wadrlgb97fjc7vr8hvwghjz9hynqjvzf2i2ranl4f"
   },
   "stable": {
    "version": [
     28,
-    4,
-    2
+    5
    ],
-   "commit": "002fa5032baa0f6a8c4587c81f60e3273775a4d1",
-   "sha256": "1vsxxia8iri2mpr1xvfvwar4zh05wkaknvbdgp0538g6w8vwbzjx"
+   "commit": "f4506ee46d68694a1d23ca81c314092fd83e8f85",
+   "sha256": "15vjxb10840jvxhnnrgsd2s4j1sclwn5nkfwyd8zdbdcyn6hi203"
   }
  },
  {
@@ -37817,11 +37971,11 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20260408,
-    952
+    20260423,
+    1426
    ],
-   "commit": "d8d8e4e87a663edbeb42d7e43f8096c95bbb6e15",
-   "sha256": "110dm88j2lzkppryzzszsmhlhbf8kdwcay0519krg6j5qy5p0vb9"
+   "commit": "5a09992aa6276fc8626a41d01d58b1d85959edaf",
+   "sha256": "1f238ajfm1qjg5qqkaknw1flvrdxrzhqmsb5mswv00irbagb6bb2"
   },
   "stable": {
    "version": [
@@ -38436,36 +38590,6 @@
    "sha256": "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip"
   }
  },
- {
-  "ename": "evedel",
-  "commit": "5bcbd3b3db68a50d8a67ece2c834d6a91b9ba4b8",
-  "sha256": "00j790q3vvp039vqq8cpdzfcwfyzcv70xmj2dwnpd06iynry3mii",
-  "fetcher": "github",
-  "repo": "daedsidog/evedel",
-  "unstable": {
-   "version": [
-    20250303,
-    1213
-   ],
-   "deps": [
-    "gptel"
-   ],
-   "commit": "d979801f5f496ff20aebf4c3343bffcd0e0d3a0b",
-   "sha256": "0y6q45rzs7sl6gjpvxd8kgg550my2jjg4kmvhj63kvvhxrixv4p3"
-  },
-  "stable": {
-   "version": [
-    0,
-    4,
-    20
-   ],
-   "deps": [
-    "gptel"
-   ],
-   "commit": "86e124da13b7d05b57a750c43bbebbec1874973c",
-   "sha256": "1i7ybd91cc8zdm245nkqnm73irwhbqqb7jj19v8zvf5908nkxzlc"
-  }
- },
  {
   "ename": "evenok",
   "commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1",
@@ -38723,15 +38847,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20260330,
-    1726
+    20260423,
+    438
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "4ad1646964638322302dfb167aec40a2455bfb78",
-   "sha256": "0ajb81dp7qfn5x0bjgjqmwqqvqfmwfpk2rpkd6dl0h0j7bbl1v51"
+   "commit": "2df40737c6cc9ccd8b69462a6f2f6a045c2d7684",
+   "sha256": "1skwz01sjhgha848gk0vw9cbxzkip1nz4hkn629z8jzw25npdna3"
   },
   "stable": {
    "version": [
@@ -40920,19 +41044,19 @@
   "repo": "purcell/exec-path-from-shell",
   "unstable": {
    "version": [
-    20251113,
-    1324
+    20260423,
+    1833
    ],
-   "commit": "7552abf032a383ff761e7d90e6b5cbb4658a728a",
-   "sha256": "1yhgn3va4pm1bfs32yf2z6m23p7s9gdi9kbgj3hycb0h308hxfg6"
+   "commit": "dae820da35ad46234cbca31626ffb6da7928694a",
+   "sha256": "1sdhrwg2yjhsxaanrvf92ywywcn977pj3n1hpmg3k9qxcz2j56kv"
   },
   "stable": {
    "version": [
     2,
-    2
+    3
    ],
-   "commit": "72ede29a0e0467b3b433e8edbee3c79bab005884",
-   "sha256": "15cjwvfv5xdhbym4ms71zdkng4381d3hsdk3kvvx2kycxff52rih"
+   "commit": "dae820da35ad46234cbca31626ffb6da7928694a",
+   "sha256": "1sdhrwg2yjhsxaanrvf92ywywcn977pj3n1hpmg3k9qxcz2j56kv"
   }
  },
  {
@@ -41707,19 +41831,25 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20260409,
-    1306
+    20260413,
+    2137
    ],
-   "commit": "671a6f8350c75fd0b6c68d275db2fde705cb4ecd",
-   "sha256": "1xmcpvmvg7135wdfvy1wyrpkkkni2pncp5ivl60z2plb2l3mf976"
+   "deps": [
+    "modus-themes"
+   ],
+   "commit": "1a6ee167627a4c623f157f3afb5ec12d368889af",
+   "sha256": "13vb0c5v5hd8jzy8cp6r2fv8wixcj5gfl9060d7w0qdf1h6kx6rv"
   },
   "stable": {
    "version": [
-    3,
-    10
+    4,
+    0
    ],
-   "commit": "671a6f8350c75fd0b6c68d275db2fde705cb4ecd",
-   "sha256": "1xmcpvmvg7135wdfvy1wyrpkkkni2pncp5ivl60z2plb2l3mf976"
+   "deps": [
+    "modus-themes"
+   ],
+   "commit": "8f976f810e6f23d2afaaa13f53e11d73e941cbcf",
+   "sha256": "1083ias5bk17vcvpa4xrnpps6r1v46xnzy2b2x0azin0vj9pvc65"
   }
  },
  {
@@ -41806,11 +41936,11 @@
   "repo": "ideasman42/emacs-fancy-fill-paragraph",
   "unstable": {
    "version": [
-    20260331,
-    646
+    20260421,
+    124
    ],
-   "commit": "9f409bf7838d5aa06fc7c5ba7d2aef1fb32cabc2",
-   "sha256": "0z4hz4qz88r6v5m6p4bhgnw1dpd939jir4d8idycf1mmxsji5ng1"
+   "commit": "3f3e8fddc4f69c7c0ff933af58e8c3a71292a7cb",
+   "sha256": "1475h2i8b8b7xawkvawb76yr62y8p603id4lbhrrrrw9wvr7dnj2"
   }
  },
  {
@@ -41993,11 +42123,11 @@
   "repo": "cyberkm/fastbuild-bff-mode",
   "unstable": {
    "version": [
-    20251215,
-    1553
+    20260411,
+    905
    ],
-   "commit": "14f60c94c08c37e45a7d7205867b804dfc059160",
-   "sha256": "02a8zwffdv1dvd9nb34p3206pbg1na1hrbl1i39l9da0vwzi1qzr"
+   "commit": "fa3ea52a7542b3110d0320ba4c48ed5cbfde100b",
+   "sha256": "0iqqivlvfw4123k630h3xwhxawhvpy72y3kfvz8xfsf8r9z20sir"
   }
  },
  {
@@ -42901,11 +43031,11 @@
   "repo": "jming422/fira-code-mode",
   "unstable": {
    "version": [
-    20240228,
-    1728
+    20260413,
+    1901
    ],
-   "commit": "c48f3f16a4b497b9e455966561bbb6638efe4900",
-   "sha256": "0pbbqwms0w7n2blqan7jbk38klc85gwqw3j4w5c90shg9a8xsr01"
+   "commit": "5a8e2e96c40822b8e11a8f16392bc3ccdd6c69fd",
+   "sha256": "1hy4l8055flqg0sxkly7kwszvmy0h1wr31qpdzix2mqsaqmzrim0"
   }
  },
  {
@@ -48851,19 +48981,20 @@
   "repo": "usaoc/elisp-for",
   "unstable": {
    "version": [
-    20230828,
-    832
+    20260417,
+    457
    ],
-   "commit": "c0e9046d363a86a88fdcf73eacc09839aae4dd5a",
-   "sha256": "0wsp9s02kl2py2czmiwrb2nkh0x3y61zps6x84dpjq8yk1xk0y6a"
+   "commit": "2e18cf627ecf4c390e295a73d61ab1eba7d076f4",
+   "sha256": "0zvipypsr8l1cxrggi98zyjd95qqy3wpv5qw0gsdgwrkpmiz3a20"
   },
   "stable": {
    "version": [
     1,
-    4
+    4,
+    1
    ],
-   "commit": "08f65ee62cc4d5fcf5c6eeed5971c43709ff9e00",
-   "sha256": "125lkvvx4k5m24c72bd5z762bvhdd34fx119cwmxjxn3jn6rd47d"
+   "commit": "2e18cf627ecf4c390e295a73d61ab1eba7d076f4",
+   "sha256": "0zvipypsr8l1cxrggi98zyjd95qqy3wpv5qw0gsdgwrkpmiz3a20"
   }
  },
  {
@@ -48955,8 +49086,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20260408,
-    1922
+    20260423,
+    1757
    ],
    "deps": [
     "closql",
@@ -48971,8 +49102,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "69801d0da19d62b4b68b1f1756900e47ce7e8769",
-   "sha256": "10ym872n05nlkd9q1r3dl7vkbniacxm8g9159v56f9z9r6nznwyh"
+   "commit": "3eff1dab171602db9d1b7cfb0e6e7014eac73665",
+   "sha256": "0115af0vg9bsmmizfny3k4k9hlkgclpgq6wd05fv3ibhbhc95n5a"
   },
   "stable": {
    "version": [
@@ -49867,11 +49998,11 @@
   "repo": "bbatsov/fsharp-ts-mode",
   "unstable": {
    "version": [
-    20260330,
-    1735
+    20260424,
+    617
    ],
-   "commit": "9b3e5ca533ebb06e1424db6ccff4f3ec3dde663b",
-   "sha256": "10xsmclvmxny2bgxk4s5vi3bdzpvhqvjwh94gyj5jxvv69xmlawv"
+   "commit": "415dcaf2cb83d98af86ae072a11eae2558047c6c",
+   "sha256": "0z20v2wnqqd672y7mwjgx88nh3pwq7mdvzck1sjpmqq53gb2lgj4"
   },
   "stable": {
    "version": [
@@ -50102,27 +50233,27 @@
   "repo": "jojojames/fussy",
   "unstable": {
    "version": [
-    20260216,
-    27
+    20260424,
+    408
    ],
    "deps": [
     "compat",
     "flx"
    ],
-   "commit": "17ca387c077f47553239816f41d6f0e351a21103",
-   "sha256": "1slbrqsi17zglqy229zggn094w8rckkpdnmnbw5gvhy6z40p5s5c"
+   "commit": "6366161a0e03c6c12aeba872fed3dfdc135bff9c",
+   "sha256": "1hwk15hlq82khx38xriqpd1syfr3zn4m90n65s8ijfjmaysfcg9j"
   },
   "stable": {
    "version": [
     2,
-    1
+    2
    ],
    "deps": [
     "compat",
     "flx"
    ],
-   "commit": "dd66f96400797f8db5e6335617fafe41340df85c",
-   "sha256": "1120ry2aa97jgjlzz0cpwxm0frks2vqp15i6vfjpnvm6fj09pl9m"
+   "commit": "92fb91c034707af77be9869500a5ae1ea0079b7d",
+   "sha256": "1vwxqil4mmll7zdnc1yn8g54kk7p39fyf7y62lxpakij7vxncf43"
   }
  },
  {
@@ -50524,11 +50655,11 @@
   "repo": "godotengine/emacs-gdscript-mode",
   "unstable": {
    "version": [
-    20260407,
-    556
+    20260417,
+    1926
    ],
-   "commit": "4913fdcd5aebab2c13d44a4478af1846aa9583bd",
-   "sha256": "0qxbjxbi0zajbbskppw6a5cpvx21ys1j9plmpqsjlz6fjdfhdmmp"
+   "commit": "f6ee6891e15b4aaf4e159ecf3ab8482da6fe0ea7",
+   "sha256": "1hqrc20cgqgcrbc5wqwldq7f0xxfvm3y6cnxzy4brdvg61hdg82b"
   },
   "stable": {
    "version": [
@@ -50964,14 +51095,14 @@
   "repo": "emacs-geiser/stklos",
   "unstable": {
    "version": [
-    20231004,
-    2013
+    20260411,
+    1308
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "c634fc2049f1616b772f5e9cb78c6171dcc4c34d",
-   "sha256": "0knzjrfkilzksqd482900wbv2p649azmgg5zb65q79mlkqf2qmxp"
+   "commit": "eb8f6d53ec5c4520c590572182f66efa51faf74c",
+   "sha256": "1g3fq9qf1xgsmlgbkgmpdc3679vz1hxqbzxqs4wlrfq2a2fx2q2g"
   },
   "stable": {
    "version": [
@@ -51455,20 +51586,20 @@
   "repo": "dakra/ghostel",
   "unstable": {
    "version": [
-    20260410,
-    634
+    20260423,
+    1706
    ],
-   "commit": "21d8439e62ff4e164d72a71efc1c5df10ab5d111",
-   "sha256": "1z9jv6l8j4zkipgcz1qi5v6cy46spmbjsvawrk55gmbp3fbfw3ax"
+   "commit": "63e008f32e4896ecd18e24ccfc08a3775561722c",
+   "sha256": "13pk32b32p9hw0lw957gha89dinqs8g53v73nqhzq9axrp7m9qp0"
   },
   "stable": {
    "version": [
     0,
-    9,
+    17,
     0
    ],
-   "commit": "698d9f50a54283d8413cad2dc2594e2fb0725f15",
-   "sha256": "0agc79h1xdw06wyzjcchay54wdyrnqr8ykav09dr6i3a5mvdrc8h"
+   "commit": "6117978d2089d807dd457f9cf2d9382a4a4558c6",
+   "sha256": "0mmvwms7r4l1ypvxa10s164a6shqwc7bqvrr1wgqkp5z4wqd9dsk"
   }
  },
  {
@@ -51511,8 +51642,8 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20260401,
-    1239
+    20260423,
+    1634
    ],
    "deps": [
     "compat",
@@ -51520,8 +51651,8 @@
     "llama",
     "treepy"
    ],
-   "commit": "1fb0fba075cb8b80f9819c874be584dffce50b51",
-   "sha256": "0d49qkkza9my2xz1vdyq7l3vmmjbamhsqm9xy7xikisyhsngvj73"
+   "commit": "2b6df7c3f958e64c47151d7d6ef45de38e614936",
+   "sha256": "1mm60zga2flbh2gnv5554if8d6jiwvzw3px8h87zi7y8dx8rkwmw"
   },
   "stable": {
    "version": [
@@ -52199,11 +52330,11 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20251116,
-    105
+    20260411,
+    1730
    ],
-   "commit": "12caebc0982d3401a0b74ccddc2d5a651122de8a",
-   "sha256": "14nmiybixnn3cvvdyp0b7yimhqmj41q3g0c6nz0x4lwjfhl5w7nc"
+   "commit": "b651de43236276cdb18ec7727f645cbf6743a499",
+   "sha256": "1zpws6z5v54g94jnsw78k42apxpffg54dlkm5i8gclsaxhn6xpdg"
   },
   "stable": {
    "version": [
@@ -54227,6 +54358,21 @@
    "sha256": "1fcm65r1sy2fmcp2i7mwc7mxqiaf4aaxda4i2qrm8s25cxsffir7"
   }
  },
+ {
+  "ename": "go-prettify-mode",
+  "commit": "6deff573962e47b665152ad2594bd862348dfa3f",
+  "sha256": "11ycr5937rzljhzgkvf393rm595pla8xqhlgk38y3d5lz44fm379",
+  "fetcher": "codeberg",
+  "repo": "snyssfx/go-prettify-mode.el",
+  "unstable": {
+   "version": [
+    20260422,
+    732
+   ],
+   "commit": "6aafd440383931b368901de66bf974bbd37a45f9",
+   "sha256": "1rrfcnyfqry6ihlkz2w05sgsvcjb8yx74f3dinzpafxa8c2lh9x4"
+  }
+ },
  {
   "ename": "go-projectile",
   "commit": "3559a179be2a5cda71ee0a5a18bead4b3a1a8138",
@@ -54781,14 +54927,14 @@
   "repo": "atykhonov/google-translate",
   "unstable": {
    "version": [
-    20250115,
-    609
+    20260419,
+    134
    ],
    "deps": [
     "popup"
    ],
-   "commit": "e84599df7c70870b33dd6c902b527d7f78310815",
-   "sha256": "1g098rbqqi26bvn0a8cpxwjx3z603n9zn7fakpnrgzz96vqhfxgx"
+   "commit": "47c5719b7dd51a37a6ad270489738187a436d920",
+   "sha256": "00ci21fmss7nisdzp47zzdbvgny6lxps4dcs4mf1bs93dhar3ksk"
   },
   "stable": {
    "version": [
@@ -55071,7 +55217,7 @@
    "version": [
     0,
     53,
-    0
+    1
    ],
    "deps": [
     "dash",
@@ -55079,8 +55225,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "029d112e05adfc13fa458b99bab4260dd08376c1",
-   "sha256": "0av7fc15422kqx8yd38qv9828mi7y788q865qhmgb4wy26aamwzz"
+   "commit": "21f582334c38f866ac587f1489d637440d1428aa",
+   "sha256": "19bwm2sn8g3a85y6kgs3fh40z2xv53k1ipddfb3qdiml1z69f33s"
   }
  },
  {
@@ -55243,15 +55389,15 @@
   "repo": "karthink/gptel",
   "unstable": {
    "version": [
-    20260410,
-    711
+    20260422,
+    756
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "8d6411b5f89d796c817ff79324973b8910e164fe",
-   "sha256": "0zl5qdp9qqh8chadsp2m3jpbpsxlywdlfkax8p97y73q1yias0q6"
+   "commit": "593786fce27b54248d4c0ae19b120cbbcf51aea9",
+   "sha256": "1g436n57r6czk7vrzq8brzvsadrc16p37wicars750i5qhph7f48"
   },
   "stable": {
    "version": [
@@ -55276,8 +55422,8 @@
   "repo": "karthink/gptel-agent",
   "unstable": {
    "version": [
-    20260409,
-    653
+    20260415,
+    611
    ],
    "deps": [
     "compat",
@@ -55285,8 +55431,8 @@
     "orderless",
     "yaml"
    ],
-   "commit": "90aaaede809fa32167507032cddf1fbe769dcd7d",
-   "sha256": "1a6c1rsgndvm1hdkc0107ai57bq2049ia2xi8hpvdik5pkfa0p0y"
+   "commit": "e2ef97d6b566b2ad751c8a0a87b8272710c95808",
+   "sha256": "0k88fav640ckjjv269zx6zlhjghr551bcamx7argvs8i5ca7r9jx"
   }
  },
  {
@@ -55896,15 +56042,15 @@
   "repo": "michelangelo-rodriguez/greader",
   "unstable": {
    "version": [
-    20260401,
-    1337
+    20260409,
+    2330
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "e3f930f6ad3f5296252409d3015d6ecce0a5e91b",
-   "sha256": "08c4i5qbr0ndbbps6y5kpp0lzfmxnwifrxssqkd9qdzj068k69k3"
+   "commit": "4b0deb0b0ef4a73ea8fe9e2b62b45321dd76a609",
+   "sha256": "1f6mz0815v862ppnf67gs13p4mfjykp2iap8iysl8yy999a23bac"
   },
   "stable": {
    "version": [
@@ -56455,24 +56601,6 @@
    "sha256": "1sqnrbhqf6pkf8hqqlw5aqq6z05wddjs4jib5znd637j9ksd546n"
   }
  },
- {
-  "ename": "gtea",
-  "commit": "b34c31c4ef9c491968e33161fd46f4f3bb761152",
-  "sha256": "1fh7xjv6hcnzzjn8yj56r8v0x80y68ymj3rx6p3f2nymhqiypiva",
-  "fetcher": "github",
-  "repo": "emacsattic/gtea",
-  "unstable": {
-   "version": [
-    20250620,
-    1334
-   ],
-   "deps": [
-    "ghub"
-   ],
-   "commit": "942988625b6ff01c958a16899ad7f7113e4b324b",
-   "sha256": "0f90wgp13w1jzqs3iq5yjy6h0wjw72czs5lvjjg20a1rsd4fykcc"
-  }
- },
  {
   "ename": "gtk-pomodoro-indicator",
   "commit": "a58f1acaafc459e055d751acdb68427e4b11275e",
@@ -56535,20 +56663,20 @@
   "repo": "bormoge/guava-themes",
   "unstable": {
    "version": [
-    20260410,
-    838
+    20260421,
+    2012
    ],
-   "commit": "384b4350270931f0fea2e625186a6408e7b47e71",
-   "sha256": "0fc030rhcs51qm00j80sks9jfq9yp7s0c3yhjbmxifss4kvpl0b6"
+   "commit": "de9bbe98c5186ab56cb460c59644bb9da6c6437c",
+   "sha256": "04xf7k1x7l13hzsyi56dzph1nhc6rmanqvdbqv7ngb8kqd810msv"
   },
   "stable": {
    "version": [
     0,
-    13,
-    2
+    15,
+    0
    ],
-   "commit": "4808e3fc9c83615880fa7d201b2f088ebacaed98",
-   "sha256": "1x0mf5jcbz8x5m2b4vifk6jz1w5vbiq6j80i3391ja810pddzfmp"
+   "commit": "50881883b9ca7fbceb9bfedb04d2a16ea01125bb",
+   "sha256": "0pkng9vra4ymjnwys4d3b6ly8marpc6zl6yl02k731lhx3a1kll7"
   }
  },
  {
@@ -57625,11 +57753,11 @@
   "repo": "ErikPrantare/hatty.el",
   "unstable": {
    "version": [
-    20250414,
-    2155
+    20260420,
+    1134
    ],
-   "commit": "20e6a92abd997c655e263cd32d7b5b0550dea409",
-   "sha256": "1hjs0zx810xkaigqwxjpfrx4b7z0kxdl9ll19i9g3nkg1s9arbxr"
+   "commit": "8af8aa074bf56c2aafd81238be2c6c2df6003664",
+   "sha256": "1aq8fiidbw051x5jnjynmq3lgf7kxp226c2vf64s80g25529vzcb"
   },
   "stable": {
    "version": [
@@ -57880,15 +58008,15 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20260214,
-    1432
+    20260424,
+    553
    ],
    "deps": [
     "helm-core",
     "wfnames"
    ],
-   "commit": "9d8de1e0810ef5a5e1f3a46c9461b78b9e86167b",
-   "sha256": "1h6w4dbq8wvy55d2wlac62q0ljd79pc2ygvkkm1i08af427b5w2m"
+   "commit": "c316c0b50317f83d0448d1e49714733215eae133",
+   "sha256": "1zyr0ra1kd4lqphz1f079wf6w0p8mmyn9rm008y61i77p8w3mgfk"
   },
   "stable": {
    "version": [
@@ -58691,14 +58819,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20260201,
-    507
+    20260412,
+    600
    ],
    "deps": [
     "async"
    ],
-   "commit": "dcaa8fb45d4f7d08390d80351a4204f848f2ec90",
-   "sha256": "1hiawmmqg1yvfi1mzjynjbjq2hs2xflzs40a84yk863hzbj056fd"
+   "commit": "8e1be2fdba8d99aab20c31f1bd08535773549fa4",
+   "sha256": "0f6q8wimad16wqarhkzkqyc47maad77r7s9mjlfpfmm3mbbi9ixa"
   },
   "stable": {
    "version": [
@@ -61708,15 +61836,15 @@
   "repo": "emacs-helm/helm-system-packages",
   "unstable": {
    "version": [
-    20260404,
-    605
+    20260411,
+    501
    ],
    "deps": [
     "helm",
     "seq"
    ],
-   "commit": "85372333d09dbf21a68ab982a3fba299461eeb9e",
-   "sha256": "0gx075q2gpvf0z8f5pbhxv3nxwk5hal0kyjaz1lqf0827vxdzkqv"
+   "commit": "ca29a21bb9177ebdb3f0d81a22b80d747d916335",
+   "sha256": "138699l123yad0i88f2khvwxnz0i7xs7yx95zpjxv8xgsxagzmx5"
   },
   "stable": {
    "version": [
@@ -62463,6 +62591,29 @@
    "sha256": "14jlh6x6pp43rw4q88xfz527zaj4r4mbydxyqr9hw6m3ihhq0vq2"
   }
  },
+ {
+  "ename": "hidepass",
+  "commit": "00d0501c18f14b802ff5e94e7fa6c401baf2c4d1",
+  "sha256": "0x3q3ghwc36xc6rk0797l4hxw0l51fvx394rw2j5yss59qc95jaf",
+  "fetcher": "github",
+  "repo": "Anoncheg1/emacs-hidepass",
+  "unstable": {
+   "version": [
+    20260415,
+    1941
+   ],
+   "commit": "0cdc0d7910501d91d5d75ae53a42726d3fca0302",
+   "sha256": "1fv98diy9nj8n8y6ndb3n6vddvbqi539b1q87vsfzfna2gwnrpn6"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "da33a03407f1fd8e23959abbc37ba50ec1317a39",
+   "sha256": "1xjl1z7nxdkc7s18jl4bbvaf3cayki865xm3w3f0py276j7gl1gw"
+  }
+ },
  {
   "ename": "hidepw",
   "commit": "f2ee7663bcedaffa935b8379cc77168035cb1f14",
@@ -63954,6 +64105,21 @@
    "sha256": "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"
   }
  },
+ {
+  "ename": "http-server",
+  "commit": "038be2fbd45ee801be37c42f8cd2ddedd0138f05",
+  "sha256": "0cy94j82qfd7x0riz7mhas52xdbr3nhi0ch0x3whbnpjklhkq6c0",
+  "fetcher": "git",
+  "url": "https://codeberg.org/martenlienen/http-server.el.git",
+  "unstable": {
+   "version": [
+    20260419,
+    1924
+   ],
+   "commit": "973c87b418e59404dcdfe823254e5094adf290f7",
+   "sha256": "1hmkm0wp5g6ac2hdg306sl42v12x3znsz363v75k6fd1qydhkk1v"
+  }
+ },
  {
   "ename": "http-twiddle",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -64332,11 +64498,11 @@
   "url": "https://git.savannah.gnu.org/git/hyperbole.git",
   "unstable": {
    "version": [
-    20260410,
-    716
+    20260422,
+    744
    ],
-   "commit": "ba3fbc79dbc8134d026592daed2ddc531d4ae92a",
-   "sha256": "0xyq6xr385lksc37xcg6x1filz12cqs9c3g7pc3m9qdcjzfz9nxq"
+   "commit": "d16aa9cf3e496aa9a6c20d73f4494e16feb4d092",
+   "sha256": "0iv3sy2zympi1r04aqmlrz64zjf9xy51v6yf329nqybm12mkqgsx"
   },
   "stable": {
    "version": [
@@ -65382,11 +65548,11 @@
   "repo": "creichert/ido-vertical-mode.el",
   "unstable": {
    "version": [
-    20250424,
-    1552
+    20260420,
+    1855
    ],
-   "commit": "35c521789bb009a7f4b0df30b68d595fdbe056a9",
-   "sha256": "1hy8gh9j4q4rfflr84nl8cs3r09f6giyyxw8a9898kh82pg0p78l"
+   "commit": "58ad6d8b645e6211c7c564a4fbebf39a72691c7e",
+   "sha256": "05snsy05s40aki0ss8jv9mmxw7fjys1zl3whrzpj66zvbjvi0nl9"
   },
   "stable": {
    "version": [
@@ -65774,11 +65940,11 @@
   "repo": "QiangF/imbot",
   "unstable": {
    "version": [
-    20260320,
-    1418
+    20260422,
+    1521
    ],
-   "commit": "3da793875b61c9e6c340e06ab40bb4912e202656",
-   "sha256": "1cvn5p27b5h4dfid9xn6qs6rg0cmgrpnlik6hkzyccbs70y39nl4"
+   "commit": "d228085198669c559f670d48251bfc5399e72a63",
+   "sha256": "1jnyxyahzs8hm8bcnafzwxa08gvvqry3xgqaxd627wv5zddkyrbl"
   }
  },
  {
@@ -68055,11 +68221,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20260318,
-    1355
+    20260413,
+    2102
    ],
-   "commit": "1005bff8a700b92dc464f770aff8a0db5b4a1c0b",
-   "sha256": "1ydkzq9hmbwc8xrg5i2j779fwmd7zrhyq6x9xzqlpf6k1j4jcgq5"
+   "commit": "0d02f5063d36ff4fa6138f0973c83c6d3874fba0",
+   "sha256": "11p878gxwbpxkxg01jrvhkxk6wq891qwcyryrasjn4nh3nlc1vvx"
   },
   "stable": {
    "version": [
@@ -70725,20 +70891,20 @@
   "repo": "taku0/json-par",
   "unstable": {
    "version": [
-    20260307,
-    1319
+    20260418,
+    849
    ],
-   "commit": "a90a7e1bb878d2534a490366504dd716b5be6054",
-   "sha256": "1m1hv17p2dxm3rl1gj83fkrnmmmd3c8qmbn57mj53kpcdqjqmf17"
+   "commit": "9e1876e0c2a43d5350307bd834a856ebed54dcc4",
+   "sha256": "1n10zh3kvn87vyi3b44727z98k2jnd1p3mv0zjylggkz6xx9w6bs"
   },
   "stable": {
    "version": [
-    5,
-    1,
+    6,
+    0,
     0
    ],
-   "commit": "1c0e363a8d28bf66187d082c97370c2fa11adfcc",
-   "sha256": "00jig26gjvbfyiixlmbw2wxspnif73hwrwh9j2firj0kvvmq1zzc"
+   "commit": "9e1876e0c2a43d5350307bd834a856ebed54dcc4",
+   "sha256": "1n10zh3kvn87vyi3b44727z98k2jnd1p3mv0zjylggkz6xx9w6bs"
   }
  },
  {
@@ -71832,11 +71998,11 @@
   "repo": "Fabiokleis/kanagawa-emacs",
   "unstable": {
    "version": [
-    20260331,
-    505
+    20260413,
+    1643
    ],
-   "commit": "6f1bf124d0cfad0d081ae4ca9d8b0a25b98f18f6",
-   "sha256": "1fxsp3xv0qgx0g3davi2dp2a054wvzacqrp1kr11gyfvpbai88v7"
+   "commit": "c0ec6694a6574ad2d54ca671de2093c81b54888a",
+   "sha256": "1bk7x77a11nlnfl0z40bvyi0c86vyfncjrk1dggs79qw9bnx04i2"
   }
  },
  {
@@ -72866,11 +73032,11 @@
   "repo": "jamescherti/kirigami.el",
   "unstable": {
    "version": [
-    20260324,
-    100
+    20260416,
+    1901
    ],
-   "commit": "7038a9dcfa7e2d8848817508777d8ad878756cfb",
-   "sha256": "1j6l2nm5jv96636sz9w9yf32vcmkc5n9zylh6k1vf5gidgwlgxni"
+   "commit": "5236f011f420465c2abd853e7f16727c0c8eab7d",
+   "sha256": "1awvliza7fva0a74lf6xqx7gzfbby5kr7z4ki818yd98z4x1rqxf"
   },
   "stable": {
    "version": [
@@ -73386,8 +73552,8 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20260226,
-    2054
+    20260423,
+    1353
    ],
    "deps": [
     "dash",
@@ -73395,8 +73561,8 @@
     "transient",
     "yaml-mode"
    ],
-   "commit": "e32ee261fc5f20110c82746e6d106ada8411b813",
-   "sha256": "0dv9jsdp5maq0x55nzi00qnibszcvy309jl7lnx3lz0cwd40srb3"
+   "commit": "b6581c657830c21a58aba5df5239cf7ece44f1c9",
+   "sha256": "03qrdr0gf5a560ywwjj1xwq9xh19v1rliwjjdklhcq6qacaxvq0k"
   },
   "stable": {
    "version": [
@@ -73677,8 +73843,8 @@
   "repo": "isamert/lab.el",
   "unstable": {
    "version": [
-    20260405,
-    124
+    20260419,
+    1535
    ],
    "deps": [
     "async-await",
@@ -73688,13 +73854,13 @@
     "request",
     "s"
    ],
-   "commit": "953e899dee5a720e7edd94eaeb2a928fef881e0e",
-   "sha256": "03cr31cg5lw30929v6rpcchgplp79v1ppqrd4fglbj84yc0i18q9"
+   "commit": "b91086760688328e032af454c1ca3ae5061356dc",
+   "sha256": "003pm093zrx6qv2sa959sws74a4h0w8g2mcyjyqsvm0xxjshzifw"
   },
   "stable": {
    "version": [
     3,
-    6,
+    7,
     0
    ],
    "deps": [
@@ -73705,8 +73871,8 @@
     "request",
     "s"
    ],
-   "commit": "441228336e1b42e80c79cb7d0386ad423ebda84e",
-   "sha256": "1g9bn2nrxkvagampyclcibnlaalzfc6q32lh6bq5xfz8kbwqqvi8"
+   "commit": "aa3af6f8e2eb16edac2b680ecddf4823f94287de",
+   "sha256": "12xb18ssn5zf9gy2px2x6mnbjh9bny1rf7kldlvv84s86iiqzxpl"
   }
  },
  {
@@ -73795,16 +73961,16 @@
   "repo": "Deducteam/lambdapi",
   "unstable": {
    "version": [
-    20260329,
-    807
+    20260423,
+    1057
    ],
    "deps": [
     "eglot",
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "f8b222c2fe41caca3d7d1de628d4257829329ed4",
-   "sha256": "07axrpf23jdar092jpnabap5shsjlmfghhbwvk806gdh9y8dzh65"
+   "commit": "fbbe050639dfe7c1c1f2be2e6807dd31e3108e5e",
+   "sha256": "11jpn7w0iy4vp555hsc425ipjzsv0ajhph1ih5ajqkn2lxd46b8v"
   },
   "stable": {
    "version": [
@@ -75274,20 +75440,20 @@
   "repo": "merrickluo/liberime",
   "unstable": {
    "version": [
-    20240927,
-    141
+    20260415,
+    754
    ],
-   "commit": "23c0caa1bf73f4e9ab58d52dc46cf21088dc6c54",
-   "sha256": "0zq39p51mnpi3gy6pwkzs7sck56w4y4rwd2cxzm7pk9rldj18ab0"
+   "commit": "6e8cc1cbadaafae5f99524d1d4dc8fcf115685be",
+   "sha256": "0rmbcfna27g4y4s84glbhrzf2lm68b1rq994ca5mg2x2jfrchrv7"
   },
   "stable": {
    "version": [
     0,
     0,
-    6
+    7
    ],
-   "commit": "f13a98ddd7be658e742b0f42988b02db9d779e85",
-   "sha256": "09d9dx4jk8bgbdcn6dh9ar5rs33s2cwz08w211b3kgj41i115gl7"
+   "commit": "6e8cc1cbadaafae5f99524d1d4dc8fcf115685be",
+   "sha256": "0rmbcfna27g4y4s84glbhrzf2lm68b1rq994ca5mg2x2jfrchrv7"
   }
  },
  {
@@ -75545,16 +75711,16 @@
   "repo": "emacs-vs/line-reminder",
   "unstable": {
    "version": [
-    20260406,
-    657
+    20260414,
+    1746
    ],
    "deps": [
     "fringe-helper",
     "ht",
     "ov"
    ],
-   "commit": "ff080f2f1b42c627d4720cd23751b93f5c6457c2",
-   "sha256": "09v1k3ja2ia0ji4q59dlg4vwlbnxl21gwf01zcjy0rw27661hyal"
+   "commit": "9a20500704f5b21772d00e4d0a9ff16dac943400",
+   "sha256": "1chvjhihmjb2hy114mlpbsvdn1h34i7r6lc5d6haqra19m2h9vcr"
   },
   "stable": {
    "version": [
@@ -76710,16 +76876,16 @@
   "repo": "ahyatt/llm-test",
   "unstable": {
    "version": [
-    20260410,
-    537
+    20260413,
+    2012
    ],
    "deps": [
     "futur",
     "llm",
     "yaml"
    ],
-   "commit": "134b73aef30080b54bcebfa1ad42a67017fd561b",
-   "sha256": "0sx8g41alir0v8piaryilsqh9356knkz703klsakm2d2afzggc96"
+   "commit": "b01444d9a7cffd7273162043921cb47eacc48373",
+   "sha256": "1pcvqw0bafzf7qxx5c90h37i54vm7axpl68ixq699idlwg8j1jqy"
   }
  },
  {
@@ -77978,8 +78144,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20260408,
-    702
+    20260423,
+    1033
    ],
    "deps": [
     "dash",
@@ -77990,8 +78156,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "4c74da7ae51145f8e49c3544c90b410d96a742fa",
-   "sha256": "0wkvbwmd89z3rhyzfmpsdxxwk06arblwj1f6ycml68islfbdi1nr"
+   "commit": "74270b286a9c8f1fc56f97dc118ff010880ed3ff",
+   "sha256": "13avmvbldb27pwm8a4s190601jwgzfhpzx86h2yjd6g0vjvx3lkv"
   },
   "stable": {
    "version": [
@@ -78801,14 +78967,14 @@
   "repo": "kmontag/macher",
   "unstable": {
    "version": [
-    20260203,
-    2055
+    20260420,
+    107
    ],
    "deps": [
     "gptel"
    ],
-   "commit": "16672b88967c3ea452d8670285e2ab7fc705ce17",
-   "sha256": "10wz9rdyb3lx7g69wnf7gb305nzgjss9a0rln9ycy54dnhdcwzhp"
+   "commit": "2a4d2ce81076134c7521bfd3a345c5440c440c2f",
+   "sha256": "130i2qzqb9p1k6qznciab2n8m1911pm5yqv13x0fdhfd8nyj4hkj"
   },
   "stable": {
    "version": [
@@ -79070,8 +79236,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20260409,
-    857
+    20260422,
+    2206
    ],
    "deps": [
     "compat",
@@ -79082,8 +79248,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "098e6a02f18d0bee27eab0ad9e3c18a49b18d63d",
-   "sha256": "1dg29vnvhdxh9v3krr8hi1s98hn26hyn8hzpyj3fnqfiv5k3adiw"
+   "commit": "569b9656d6a2c792b07d3980796c76b121c9737e",
+   "sha256": "1y8q8d3lw4yq04kngnskw0yx6x96yzd09052cjx9anyqwcyhbhk8"
   },
   "stable": {
    "version": [
@@ -79142,14 +79308,14 @@
   "repo": "bbw9n/magit-browse-commit",
   "unstable": {
    "version": [
-    20260311,
-    511
+    20260412,
+    1414
    ],
    "deps": [
     "magit"
    ],
-   "commit": "aedf47b76642566de7992f3d6834c7fc8b77d68c",
-   "sha256": "0wh6d1q9gdx7y8j0k65y3zq6k6zi6lizgl4ixjawpsfzqhv7hcay"
+   "commit": "d7b73e3819cf4c6a178aa54f2331d22f41f010df",
+   "sha256": "0j0j1pc563lnsak6ifxjqavizkwpcrvkf0cmzj3gj53nzvp14kfw"
   }
  },
  {
@@ -79766,8 +79932,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20260330,
-    1102
+    20260422,
+    2206
    ],
    "deps": [
     "compat",
@@ -79775,8 +79941,8 @@
     "llama",
     "seq"
    ],
-   "commit": "89a51310bd8f8087c44f7ac5c902cc82dddbbe2a",
-   "sha256": "049pminf51r2dqg2cx0wnhvgswi4rmpr8qj74cgibfr7pnrsjwsl"
+   "commit": "569b9656d6a2c792b07d3980796c76b121c9737e",
+   "sha256": "1y8q8d3lw4yq04kngnskw0yx6x96yzd09052cjx9anyqwcyhbhk8"
   },
   "stable": {
    "version": [
@@ -80047,15 +80213,15 @@
   "repo": "hrishikeshs/magnus",
   "unstable": {
    "version": [
-    20260316,
-    405
+    20260421,
+    201
    ],
    "deps": [
     "transient",
     "vterm"
    ],
-   "commit": "a22c090df03321cc94514d670075ccac3f1988e8",
-   "sha256": "1aa1gixic1vkqnn4b74w65ym9q2wmk26ydc6z86z946c17k26zlx"
+   "commit": "ef87ed770acf3113f060afdd6949ac24ce46dee8",
+   "sha256": "1qlf4vc0r73jh4nxx86dw0f4g6qk4c5ypkwkj591p02x3w7l5a3s"
   }
  },
  {
@@ -80695,11 +80861,11 @@
   "repo": "whhone/markdown-indent-mode",
   "unstable": {
    "version": [
-    20260308,
-    1640
+    20260419,
+    8
    ],
-   "commit": "44aa4ddb57c0a0787302ae4ed3e054d9af12004d",
-   "sha256": "1a3nd1ljqw2f3nkv3h1czhx0w5pm1a441d87prfg23fqc6ym70p6"
+   "commit": "e8d36904be83de7ceb7fdd1c1ddaa59093129b36",
+   "sha256": "1q6yxjcbvnjspfk5vn6rvvx960ipz2i5ncwkzk0am1r7h9xfra86"
   }
  },
  {
@@ -80728,11 +80894,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20260321,
-    143
+    20260423,
+    1508
    ],
-   "commit": "182640f79c3ed66f82f0419f130dffc173ee9464",
-   "sha256": "19svykiccp3ciy660askqb62xvwlgirh9gsbsa0byxqhqr2v454z"
+   "commit": "51ccd3df38d85d0abc9d43d25fc7ea9b9131db45",
+   "sha256": "1a0ah4r2shbjb9gwa5yr534fq2rb6nyf0qbhsqsf0pvwx5lskfr4"
   },
   "stable": {
    "version": [
@@ -81106,10 +81272,10 @@
  },
  {
   "ename": "mason",
-  "commit": "7ac3767ca976c2820c07e0fc43168cdf71a1e875",
-  "sha256": "0q6b6kr9ysn14izc4ah7mbs1vxlpls9zdh5760mnif8a4qzs62a4",
+  "commit": "e0baa2dbf6b88dc5a76c002f5b4ab68dcd57c239",
+  "sha256": "0x6zyir0yjw4jqgivj84dbv8j057knn1hn4h3qsxl0bpxkc65fgq",
   "fetcher": "github",
-  "repo": "deirn/mason.el",
+  "repo": "mason-org/mason.el",
   "unstable": {
    "version": [
     20260409,
@@ -81304,20 +81470,20 @@
   "repo": "mathworks/Emacs-MATLAB-Mode",
   "unstable": {
    "version": [
-    20260315,
-    1223
+    20260419,
+    1224
    ],
-   "commit": "f21e88655823e25c6f72c38c6e508a5dada17088",
-   "sha256": "0174yi7r4qwcgpb46i9szx1b2qc20wkp1laxj00r564119sv1m0r"
+   "commit": "a42d34dfc498b8754ac89512b399b77481791406",
+   "sha256": "020ay6d8hm6z8n6p70yi4hpa0kzbc0dd2kwik3d2jgwdc9s8sb8i"
   },
   "stable": {
    "version": [
     8,
-    1,
-    2
+    2,
+    0
    ],
-   "commit": "f21e88655823e25c6f72c38c6e508a5dada17088",
-   "sha256": "0174yi7r4qwcgpb46i9szx1b2qc20wkp1laxj00r564119sv1m0r"
+   "commit": "a42d34dfc498b8754ac89512b399b77481791406",
+   "sha256": "020ay6d8hm6z8n6p70yi4hpa0kzbc0dd2kwik3d2jgwdc9s8sb8i"
   }
  },
  {
@@ -81577,11 +81743,11 @@
   "repo": "laurynas-biveinis/mcp-server-lib.el",
   "unstable": {
    "version": [
-    20260319,
-    1344
+    20260415,
+    1038
    ],
-   "commit": "69722cd8f6e2c6bb1beb921f0a44a0d71a01902f",
-   "sha256": "01gmsqkgy1ldh37d524nvbz00myz4bszc9hgy4wwda8pv56wwq5g"
+   "commit": "942d0d2da3a6b61be4d4b12e8158f8b0189963a8",
+   "sha256": "0brfaqm0f670zkgqf4k1dww1ji26rmgwpc2xxa3s23cp0csv136h"
   },
   "stable": {
    "version": [
@@ -81770,11 +81936,11 @@
   "repo": "ideasman42/emacs-meep",
   "unstable": {
    "version": [
-    20260403,
-    1210
+    20260423,
+    152
    ],
-   "commit": "73936fe0fc314519ab3a15b59ab1d8557df16a4e",
-   "sha256": "1wdys4h4a6wakkv0nr5xnr5ryzhgz6i23ia3765gl0jzzi91rmap"
+   "commit": "98a8b2bd6384237005e258a647f3d16a90bc0b97",
+   "sha256": "16q48yh2nzrf07x5j7kkb9s0ykdnvkw2glzk2ds3wf6zhq10agjl"
   }
  },
  {
@@ -82510,11 +82676,11 @@
   "repo": "kazu-yamamoto/Mew",
   "unstable": {
    "version": [
-    20260403,
-    320
+    20260424,
+    551
    ],
-   "commit": "ee3d2ac1a898f3fe8e54a6a431053b303faf96e7",
-   "sha256": "01ackbsqwql8qjajgzi8aal5rhgh9k96y3mnanj1lpc3fa0dqa3m"
+   "commit": "b53e86e1a9bd7db8634387ee54e5af62e35925ad",
+   "sha256": "0is3lvaxgsv1qvh3m0qa9s91m7wffsqjnwzyv5csd85xs6rypv16"
   },
   "stable": {
    "version": [
@@ -83252,15 +83418,15 @@
   "repo": "milanglacier/minuet-ai.el",
   "unstable": {
    "version": [
-    20260318,
-    505
+    20260424,
+    430
    ],
    "deps": [
     "dash",
     "plz"
    ],
-   "commit": "1d94d7bea657e5b17b135ec232aeb2d77cf0c5da",
-   "sha256": "1mmxlww28yrzvaqd1n4g05rmniq1x6ywsdd75ap85p7g4cbiqn19"
+   "commit": "36049820ca987c79c87cc4d9f21d16ca23ff8ebb",
+   "sha256": "15165fn161c6fvqcrpfffy7l5abs7zscarzhhvzbwppqk3r9wrq8"
   },
   "stable": {
    "version": [
@@ -84023,6 +84189,25 @@
    "sha256": "057lhrlnyhl0hdp419lvl0fqpkkp3msmzn7gynvqmjig756dra7p"
   }
  },
+ {
+  "ename": "modus-ewal-theme",
+  "commit": "fffc98c3dbde4ac52208e0af28a195c0a85c8f8c",
+  "sha256": "1qqxwlcw3ri95dfdl1fqbphrg8vxbk2rwcp1a25gn3rypzqxxm9v",
+  "fetcher": "github",
+  "repo": "deadendpl/modus-ewal-theme",
+  "unstable": {
+   "version": [
+    20260413,
+    1551
+   ],
+   "deps": [
+    "ewal",
+    "modus-themes"
+   ],
+   "commit": "4e52d98c95fb506daa2eec35c6141171f686649d",
+   "sha256": "0ph4vshvl8knbqhxbklca73zkh0pgihar85lfliyahcr32zfpiax"
+  }
+ },
  {
   "ename": "modus-themes",
   "commit": "aa92d00cfd7b5a62902a04c167679963e059b5d6",
@@ -84031,11 +84216,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20260410,
-    1158
+    20260418,
+    1313
    ],
-   "commit": "df74b73a600e203eefd9bfcc5e31f8c5888032e8",
-   "sha256": "1m3ihmlwa01m11pd05m0z2bixnbgncyyz3mi8fs5d819n0y9y8n8"
+   "commit": "7c2ce1ff0dc25215061d05a9d796d6193f93c84e",
+   "sha256": "0ymzjwqbmszjsy30057m91vwvbqyvprsjd7r0cxigqspk2qabfiy"
   },
   "stable": {
    "version": [
@@ -85814,14 +85999,14 @@
   "repo": "magnars/multiple-cursors.el",
   "unstable": {
    "version": [
-    20260410,
-    1331
+    20260419,
+    931
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "6f984c6e1d5f144027d2b6eafb6b77744fb2f8d5",
-   "sha256": "0h9kvfw6f6if3nkmypff1gcqx6w5id0254z0d7cn5q4gdfq2m9p6"
+   "commit": "94b8b07a4bab87f803123723b68227565429dfa1",
+   "sha256": "1bxj0bcdn4cdvszq67dwxggasv3xs4xh6403ldl4m475i7w5mgx9"
   },
   "stable": {
    "version": [
@@ -86424,11 +86609,11 @@
   "repo": "kenranunderscore/emacs-naga-theme",
   "unstable": {
    "version": [
-    20250608,
-    1926
+    20260422,
+    1017
    ],
-   "commit": "c150b397d1a14e470dd54d2628b2bd9d3e2faad0",
-   "sha256": "1c689cwq9ar9fa8nk9hqnrg3kyrj0cykhwwnmcwgiwxkk1cm53b9"
+   "commit": "1ffb5930e57ee0a1073b206ff09ea25ef542b6bc",
+   "sha256": "11sr87wqv7l4fp9gg4xb29m4n8vd8rhxj834y6nayy88mc3qh2ph"
   }
  },
  {
@@ -87038,11 +87223,11 @@
   "repo": "bbatsov/neocaml",
   "unstable": {
    "version": [
-    20260410,
-    1000
+    20260416,
+    647
    ],
-   "commit": "deb95d8b87641cf31d64487f627d8a51e48ff2e7",
-   "sha256": "0prsi5g8wamh6v4l6jqsws78q63i07gfxkgbvns139fckdssgr2b"
+   "commit": "06794d8d9ae1180a37b71b02ed8eadd464129b73",
+   "sha256": "1wzjsk8252clak794yhk89s2qwgcl95a8mgdyd6wvn4a4bg0ksaw"
   },
   "stable": {
    "version": [
@@ -87140,15 +87325,15 @@
   "repo": "rainstormstudio/nerd-icons-completion",
   "unstable": {
    "version": [
-    20251029,
-    2106
+    20260412,
+    243
    ],
    "deps": [
     "compat",
     "nerd-icons"
    ],
-   "commit": "d09ea987ed3d2cc64137234f27851594050e2b64",
-   "sha256": "022yfkfvcywgjplvsj5xajmc24q1c7yx0l5mvnzagjfdg4iajidv"
+   "commit": "45b585d972192a3eaeb239e15e55de7f46f8920a",
+   "sha256": "0vipmrxmk6i1by32ygqlg3kj2qx9hdz9f8y5pp33g7qvy4vmavw6"
   }
  },
  {
@@ -87189,14 +87374,14 @@
   "repo": "rainstormstudio/nerd-icons-dired",
   "unstable": {
    "version": [
-    20260206,
-    1554
+    20260415,
+    1746
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "929b62f01b93d30a3f42cc507fc45c84a2457b3f",
-   "sha256": "1z7nj89wm4w9c01p69wmxgj57nv4kwc4gkgbpycwv9avj2z4fad7"
+   "commit": "104acd8879528b8115589f35f1bbcbe231ad732f",
+   "sha256": "0qj603mydyi0rq8j84kvh9h20fshvvbr6b42ccijkqjzg4cs4rwv"
   }
  },
  {
@@ -87347,11 +87532,11 @@
   "repo": "Feyorsh/nethack-el",
   "unstable": {
    "version": [
-    20260409,
-    735
+    20260417,
+    234
    ],
-   "commit": "d1688d8d4c0a9cc5ffa7f880138f9fb09d205e64",
-   "sha256": "0f5i1gnv8cd3cxc10y7rjwrxxw6fr7cw6gvs8n4sqjsir6pxwz5w"
+   "commit": "4c6e483966eee5a210b99ea8de34d20146e21237",
+   "sha256": "1x5z3ncla9726pihvfw8qzdbahqii0gfh9wcfh3v03f1ggjim7hh"
   }
  },
  {
@@ -87982,11 +88167,11 @@
   "repo": "nix-community/nix-ts-mode",
   "unstable": {
    "version": [
-    20260215,
-    1421
+    20260423,
+    1718
    ],
-   "commit": "319831712125e8c9e4f14b66def518d7a633685c",
-   "sha256": "0y2l1q3cvap7jjgl47wa78c5kagj6n2lpd3bilkhxn62aj3ahm0y"
+   "commit": "50916188784786ed201a8edc70a5264eefb525e3",
+   "sha256": "14yqs2gibq7fdg79h9mcjrnxm0y6gscbvgzjlkp8gm0dmh2x8b1y"
   },
   "stable": {
    "version": [
@@ -88257,14 +88442,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20260406,
-    907
+    20260415,
+    2031
    ],
    "deps": [
     "compat"
    ],
-   "commit": "7bab26a5912074669aa6b4246f79bbdcfc0f65ba",
-   "sha256": "02h3rrlrjz8ymwb28v7n1lzv3kyvvba3jzzh4i4zhr3925v4chn1"
+   "commit": "3c40e8a1dd7b20c6db90874b7b3088089a48acdc",
+   "sha256": "19pbbhdad38h87mwqrhrzzbi66ml9l94rjyfh6h14xqvhy11z0y4"
   },
   "stable": {
    "version": [
@@ -89480,11 +89665,11 @@
   "repo": "Anoncheg1/emacs-oai",
   "unstable": {
    "version": [
-    20260405,
-    639
+    20260422,
+    858
    ],
-   "commit": "66ebed3e641dae8b1b8ec917a3d0228c5d2c86c6",
-   "sha256": "0cp53niqmcfvamshdpmkpri6nskxi2ygdd4q80s8isymhz916i4n"
+   "commit": "fd2fea7b49a51a1e9d6690d35b1e2f14bf389692",
+   "sha256": "00kfr18vscizfpf80a9n0yjkbrxlq9wkmrxsr0x18n458cck4fr5"
   },
   "stable": {
    "version": [
@@ -91505,20 +91690,20 @@
   "repo": "agzam/occult.el",
   "unstable": {
    "version": [
-    20260405,
-    2236
+    20260421,
+    1414
    ],
-   "commit": "3d626126ede4fd017824d44a24a577fce171bcd0",
-   "sha256": "0xi17kd63ll514jxy215bn1wm0z4wv9di0m0rffc84p1m6x8cbl2"
+   "commit": "74006325af1d96af3f26dc2dbf02baccc03d83f1",
+   "sha256": "02arn9y3i5agp4bg89rs57njqd1cvis2vvnh4l7386v319rcz2v1"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
-   "commit": "cebdb110fe90b24c5616389e0aaa18a936a70848",
-   "sha256": "1k3nl57fp56lf9m1983qwkl20v6qvfiwbi9izr2lgfdkb67lfxg7"
+   "commit": "74006325af1d96af3f26dc2dbf02baccc03d83f1",
+   "sha256": "02arn9y3i5agp4bg89rs57njqd1cvis2vvnh4l7386v319rcz2v1"
   }
  },
  {
@@ -91896,11 +92081,11 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20241030,
-    542
+    20260419,
+    703
    ],
-   "commit": "845eb7a95a3ca3325f1120c654d761b91683f598",
-   "sha256": "0hpw8q4x1ns6l838r2m0zfm7ykxsrfx893bvsn92nsn6k10p0yvr"
+   "commit": "d1bdd439421865c20e907d9abe65840c57411bc9",
+   "sha256": "1x88ncrv2mvj5lxwj79pix33mmlarh073vkx8ghdfhlk8qm05w5a"
   },
   "stable": {
    "version": [
@@ -91920,11 +92105,11 @@
   "repo": "captainflasmr/ollama-buddy",
   "unstable": {
    "version": [
-    20260410,
-    950
+    20260421,
+    1616
    ],
-   "commit": "3a1ac283ad640d66dbf358d6ea441d150e88de0c",
-   "sha256": "1x5sbag04y2vn6prrnssda6fy770wn0gizpa95mcln4vck2bhhpg"
+   "commit": "62451e54c6f523d839d46a779ebd5c03e10c38c1",
+   "sha256": "0n29n43jwscplyr8ybpb4fvsg9wcws7cslahwi9vsq0b6rg0ja2b"
   },
   "stable": {
    "version": [
@@ -92952,30 +93137,30 @@
   "repo": "eyeinsky/org-anki",
   "unstable": {
    "version": [
-    20260209,
-    1249
+    20260423,
+    741
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "8cf3f5eb43cbe256ce892cfc867059e200a1b5bb",
-   "sha256": "1a41z676p41530vdg9kv3izc6mcnwjj7l3xbj245mvqdcyiyk7jz"
+   "commit": "2f44330aa2cd0a1f58259c9d83bb697fb0f7b0cc",
+   "sha256": "0x33724pw8xk6vwksswn7wky1q3n0cxgy0s5s25hxjwzgfg8j4n1"
   },
   "stable": {
    "version": [
     4,
     0,
-    3
+    4
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "8cf3f5eb43cbe256ce892cfc867059e200a1b5bb",
-   "sha256": "1a41z676p41530vdg9kv3izc6mcnwjj7l3xbj245mvqdcyiyk7jz"
+   "commit": "2f44330aa2cd0a1f58259c9d83bb697fb0f7b0cc",
+   "sha256": "0x33724pw8xk6vwksswn7wky1q3n0cxgy0s5s25hxjwzgfg8j4n1"
   }
  },
  {
@@ -95125,14 +95310,14 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20250525,
-    951
+    20260413,
+    1401
    ],
    "deps": [
     "org"
    ],
-   "commit": "8b9b46f988ed69baee0b3db4fde9ee5827587b1e",
-   "sha256": "0ch2g90zqmqk83y7gqdmppn577wksl817p62xa6xsp37raf4r2d7"
+   "commit": "6460f6f2b0835b4b8aa87d5fdf40cac7deb319f5",
+   "sha256": "0f0x893ivkmawhlx1wbj2calng20ln2l8crl73kbgj455nq068j6"
   },
   "stable": {
    "version": [
@@ -95298,15 +95483,15 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20260303,
-    1255
+    20260417,
+    705
    ],
    "deps": [
     "nerd-icons",
     "qrencode"
    ],
-   "commit": "e6351a77366c58f4dd6022eda5fe89aa68bccd74",
-   "sha256": "0d30q8hfprxcz4bd4vjv264a1iavs82ilfq9m7wg1kvq3qyqphgq"
+   "commit": "273e5b250fa2cc9b2dbbb63d9a7225536116fbd7",
+   "sha256": "1zhwq9mlx6bpfvqqgzmk210na7s8z9dc2cgs031by9b983rjh0bs"
   },
   "stable": {
    "version": [
@@ -95391,11 +95576,11 @@
   "repo": "Anoncheg1/emacs-org-links",
   "unstable": {
    "version": [
-    20260329,
-    1731
+    20260423,
+    1949
    ],
-   "commit": "2de5fe6f9616556b0aa0d584930673763430ade9",
-   "sha256": "1g1my6cqcdlc5vms055navjg40mij5d1rdfcw3a4amqpm4fl006b"
+   "commit": "cd2e9c074576e44469d84b5827933a035cf493c5",
+   "sha256": "01z3pph23cciv92l007s0z9rlhfgyj2ihy264s3l02csssnijma7"
   },
   "stable": {
    "version": [
@@ -95939,15 +96124,15 @@
   "repo": "org-noter/org-noter",
   "unstable": {
    "version": [
-    20260108,
-    2346
+    20260413,
+    213
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "81765d267e51efd8b4f5b7276000332ba3eabbf5",
-   "sha256": "06d03bv14awz5vm8y85b2wdg1vf22d4zj5s3bcz8y7qinvyfy9pm"
+   "commit": "ab9628e449d76af8b2e5a9d5fead4e03ca76a03d",
+   "sha256": "1a5q6imw3bcgb6hbz8ns91qlk6qxkzlz071ypd0jkabxs5y04x05"
   },
   "stable": {
    "version": [
@@ -96174,26 +96359,26 @@
   "repo": "skx/org-people",
   "unstable": {
    "version": [
-    20260326,
-    432
+    20260423,
+    1211
    ],
    "deps": [
     "org"
    ],
-   "commit": "95f1695fc8c01eadd1784b1d452e1052596a2149",
-   "sha256": "0czwc9qnax21dwm3mcb8l82dk9fdw7wchk2vpvx5mf811i7gyz6v"
+   "commit": "cc97f09b395f0a805020464f7bc361cb810af7a8",
+   "sha256": "1zviflgykhm1hvvckzqv8056xvl2aw884c8k3yj2j9d0z1dj40n7"
   },
   "stable": {
    "version": [
     2,
     11,
-    0
+    1
    ],
    "deps": [
     "org"
    ],
-   "commit": "95f1695fc8c01eadd1784b1d452e1052596a2149",
-   "sha256": "0czwc9qnax21dwm3mcb8l82dk9fdw7wchk2vpvx5mf811i7gyz6v"
+   "commit": "cc97f09b395f0a805020464f7bc361cb810af7a8",
+   "sha256": "1zviflgykhm1hvvckzqv8056xvl2aw884c8k3yj2j9d0z1dj40n7"
   }
  },
  {
@@ -96960,8 +97145,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20260224,
-    1637
+    20260423,
+    437
    ],
    "deps": [
     "compat",
@@ -96969,8 +97154,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "20934cfb5a2e7ae037ec10bbc81ca97478738178",
-   "sha256": "1wfz4xp6l2jz3a3ji5ss0nq62lixkd2gqd6m9jag4kdic8hyd101"
+   "commit": "d42da0e594b5737d25e3662e482d110f29a2668f",
+   "sha256": "0nvbzz6q4kvv8zqwnlwkk8m469vaf8b8zh0l3d8j2gsk4whn22y3"
   },
   "stable": {
    "version": [
@@ -97456,17 +97641,18 @@
   "repo": "tanrax/org-social.el",
   "unstable": {
    "version": [
-    20260223,
-    924
+    20260418,
+    1402
    ],
    "deps": [
+    "async-http-queue",
     "emojify",
     "org",
     "request",
     "seq"
    ],
-   "commit": "367ab5cf6ae12715bb9cade7a8eb45cf8d7f8723",
-   "sha256": "1aw0zfg898ggyn139n0x2fgaygayl14gv48mq59zw6b8ffkrff52"
+   "commit": "613dcf8b65216a32afee1c42bb3273f6c4e1cd91",
+   "sha256": "14nnnfwp2wqhvv4pcwhasynrjgp6yyqkisfsqmsc87w0akfaziph"
   },
   "stable": {
    "version": [
@@ -97645,11 +97831,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20250320,
-    1842
+    20260413,
+    1402
    ],
-   "commit": "728968e4a84ba28c5acedc54ece17e49d6811ad9",
-   "sha256": "1b07q89j153i7al78cg9pxaz93yk0qbdf4mwaalrwiqfkdbm5msn"
+   "commit": "353fcde0aa27ce11c3513fb4d25ac49fb0b9c57d",
+   "sha256": "01k065g9jw0a21yk63mh0ajf0vzca0w9m7k1i483qjjy5ig9x6ra"
   },
   "stable": {
    "version": [
@@ -99375,11 +99561,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20260330,
-    745
+    20260412,
+    811
    ],
-   "commit": "7a60cba3f26681c4c57ebb79593ff9a8d587db5c",
-   "sha256": "10cc88wrxvlrh48q2sla1zlwaqxcrc0s6nkrxx37kgirdg6wiz6h"
+   "commit": "348394cbd9d8a25b61bccd284196c97a065b7013",
+   "sha256": "1jriyc1ir4agljygsq4qc7qdr57231ba2gy1p64pccad01nkpbxl"
   }
  },
  {
@@ -99420,11 +99606,11 @@
   "repo": "tbanel/orgtbljoin",
   "unstable": {
    "version": [
-    20260330,
-    846
+    20260412,
+    844
    ],
-   "commit": "c4a48b1e5056e58b17231bb672d25c6a3be6e681",
-   "sha256": "1sq46888344akp56p6x7yj9l3h7g7d21n520db2wb6kkhf7vxwrv"
+   "commit": "37883c21e85e71797538d154226e24666bc73047",
+   "sha256": "0asvlwp7z350v7iphmvfrsgqmw8bfgqvi3bcgpxf2w7i6624hdks"
   }
  },
  {
@@ -99930,11 +100116,11 @@
   "repo": "jamescherti/outline-indent.el",
   "unstable": {
    "version": [
-    20260324,
-    59
+    20260416,
+    1902
    ],
-   "commit": "85d1f66e82454829fcda5aa40334bb47be10586c",
-   "sha256": "1r12xvlxr6mylz0jkc63hwdsapw73xcqvqry5xbyqc6d778m0zsz"
+   "commit": "b25886d0b6a6de1b6c3e881230e41b76ad8652e0",
+   "sha256": "1bmfi4bc0zjczivq7dc7zb1z016sswpz83czsfp0ggpm4xfjv79w"
   },
   "stable": {
    "version": [
@@ -100155,8 +100341,8 @@
   "repo": "vale981/overleaf.el",
   "unstable": {
    "version": [
-    20260406,
-    118
+    20260417,
+    1854
    ],
    "deps": [
     "plz",
@@ -100164,8 +100350,8 @@
     "webdriver",
     "websocket"
    ],
-   "commit": "dc88dd79b016c90297912a81035b6ca685cc9136",
-   "sha256": "1c5bvfkf1rsh8rwskf809mi9k8448a46w8wkf5w5af8xwfsd9mng"
+   "commit": "62c31c609d7d96ec6c592eec40fba41735e40875",
+   "sha256": "1bj7jq63v52gn8jaa7bsi22ac321j21cmsxd9vl5kvvagzrjqbiv"
   },
   "stable": {
    "version": [
@@ -100698,16 +100884,16 @@
   "repo": "zzamboni/ox-leanpub",
   "unstable": {
    "version": [
-    20251028,
-    957
+    20260419,
+    2104
    ],
    "deps": [
     "org",
     "ox-gfm",
     "s"
    ],
-   "commit": "c1550a1f828afeee909850f51d7a0219a261e280",
-   "sha256": "1vi91ri2rz3q7z5qlidw357hlvnj7vqpsv85mjlkrwnqlvkkslx1"
+   "commit": "cfd521786c281ad7fa38212016226af80e163329",
+   "sha256": "1mf3s459b4s2ykj9af0j9afx3c77gndnyzlfb38ml2c17pl3jrsa"
   }
  },
  {
@@ -101228,14 +101414,14 @@
   "repo": "jmpunkt/ox-typst",
   "unstable": {
    "version": [
-    20251130,
-    1244
+    20260419,
+    1805
    ],
    "deps": [
     "org"
    ],
-   "commit": "ac8893c79fa85a92a9251a695776971526ba8d76",
-   "sha256": "0fkvkipik2lr97d4ix1zah8qnb48nk44755clmf6yv3xaa2fzxnh"
+   "commit": "d05bdf1676c7564af6d87b438c669e93904c2b10",
+   "sha256": "10y15nhb3lkcykxd12wl8maf7ygvshif6r1nnk4hxjacsa8p6dkc"
   }
  },
  {
@@ -101520,14 +101706,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20260301,
-    1635
+    20260421,
+    2136
    ],
    "deps": [
     "compat"
    ],
-   "commit": "de5b4dada04d85c4df7a424e23a9e637669e4e1e",
-   "sha256": "09m87nd7w327scvjcyv07qgpdz3bqb5cjwlnp6v3q572l2zy2j6p"
+   "commit": "2db42a9050923c2245bb525345a8b12bd6c0973a",
+   "sha256": "15iajmnrgm1lcl792km7c34nfw9r2dhy5hrzpvv4raijvcbhxkpq"
   },
   "stable": {
    "version": [
@@ -102604,28 +102790,28 @@
   "repo": "rjekker/password-store-menu",
   "unstable": {
    "version": [
-    20250706,
-    1858
+    20260423,
+    1011
    ],
    "deps": [
     "password-store",
     "transient"
    ],
-   "commit": "31b0884d1cdc80ad4ee7d84680c11653e659bb18",
-   "sha256": "1jz8r0h2anq5q9nz0klnn2ig89d0d133qq5gmhsgf5j29cbhgphl"
+   "commit": "b007d990f895a9bc41048080cb1dd2c2b7f1b92c",
+   "sha256": "18qxh3n4yh2f5j8knrjizwzcafh010hf5zgaafqgr9zlaaf4hcj0"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
    "deps": [
     "password-store",
     "transient"
    ],
-   "commit": "31b0884d1cdc80ad4ee7d84680c11653e659bb18",
-   "sha256": "1jz8r0h2anq5q9nz0klnn2ig89d0d133qq5gmhsgf5j29cbhgphl"
+   "commit": "b007d990f895a9bc41048080cb1dd2c2b7f1b92c",
+   "sha256": "18qxh3n4yh2f5j8knrjizwzcafh010hf5zgaafqgr9zlaaf4hcj0"
   }
  },
  {
@@ -103998,25 +104184,25 @@
   "repo": "emarsden/pg-el",
   "unstable": {
    "version": [
-    20260328,
-    1624
+    20260418,
+    1149
    ],
    "deps": [
     "peg"
    ],
-   "commit": "67f50311947a54913d91852ebd6880dbe68930bc",
-   "sha256": "0w9a8y3s2dbmpqbbnxycxd38niqq2slzr26bfl4v1pfcm0w7skfz"
+   "commit": "e82be0a8a69042c102119b9c7d59619f3a2277a3",
+   "sha256": "164kfd0lc1qw3wnlxqyjmqd3yhmkkf81qmgdx0kydlrij8a7z594"
   },
   "stable": {
    "version": [
     0,
-    63
+    65
    ],
    "deps": [
     "peg"
    ],
-   "commit": "52888cb6120407654f248877b2a78a75f7df0d99",
-   "sha256": "19hh45mlb4j6a3ys3wvivj0bm5xy5vjwscnvn68b656b5jk5himh"
+   "commit": "e82be0a8a69042c102119b9c7d59619f3a2277a3",
+   "sha256": "164kfd0lc1qw3wnlxqyjmqd3yhmkkf81qmgdx0kydlrij8a7z594"
   }
  },
  {
@@ -104590,30 +104776,30 @@
   "repo": "dnouri/pi-coding-agent",
   "unstable": {
    "version": [
-    20260405,
-    21
+    20260418,
+    1713
    ],
    "deps": [
     "markdown-table-wrap",
     "md-ts-mode",
     "transient"
    ],
-   "commit": "ce067c80306616cc7c3bdf38f4c32c1a1d276e57",
-   "sha256": "1ggay80yn3vv6lmldsmzj6g6hs6zkgp21cw6rrzx7q3hxca2amw9"
+   "commit": "a07e1d0a3a2dbbac6f1d2a92656d2239f0dcb2c7",
+   "sha256": "03cdqhsqml5sbpa2pm06hphavhnyq1b11nany1cpg7hshixz37wr"
   },
   "stable": {
    "version": [
     2,
     2,
-    0
+    1
    ],
    "deps": [
     "markdown-table-wrap",
     "md-ts-mode",
     "transient"
    ],
-   "commit": "ce067c80306616cc7c3bdf38f4c32c1a1d276e57",
-   "sha256": "1ggay80yn3vv6lmldsmzj6g6hs6zkgp21cw6rrzx7q3hxca2amw9"
+   "commit": "ca0d60474cede8198329a939a902f51081543612",
+   "sha256": "16vhk22gdcyl87l1fknkzqkr7nxyqrs2hlghr3vwlmcj9igr4cfa"
   }
  },
  {
@@ -104884,11 +105070,11 @@
   "repo": "themkat/pink-bliss-uwu",
   "unstable": {
    "version": [
-    20251211,
-    1304
+    20260413,
+    1827
    ],
-   "commit": "be3ceccb6fc035ca9dbfff4a54e653b8621f949a",
-   "sha256": "133hpn0c0chs5r9a7a33l0i6jykvhdi3qa02iqnxylai65wr5jbw"
+   "commit": "26e90134adc997c8f6fbf3820fa9198afa6c832b",
+   "sha256": "0hdkpjq8rnr8303glqcl8da9pz4p5122a6isd16j3pdq2nn32mmc"
   }
  },
  {
@@ -106635,6 +106821,24 @@
    "sha256": "1x1nnc0li8jd609lnmmax2hl69wmbq84c6b2mdg0wb7zf0k29lba"
   }
  },
+ {
+  "ename": "popterm",
+  "commit": "e4d79aed1b29079b096ae3453d874fd830b369b7",
+  "sha256": "1k0kzr7ax1mzpv60ln1ky2x06yl7psznga6x4mnh52xxgwh1f95m",
+  "fetcher": "github",
+  "repo": "CsBigDataHub/popterm.el",
+  "unstable": {
+   "version": [
+    20260423,
+    2106
+   ],
+   "deps": [
+    "posframe"
+   ],
+   "commit": "7efcca742ec9a23c2e6e627b2c1d42aa752dea5d",
+   "sha256": "0j0y4rgvrvj3kkr10qyl89nmdp7yzpqa9j1yy2bxaalsff6pbdpd"
+  }
+ },
  {
   "ename": "popup",
   "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
@@ -106922,11 +107126,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20260302,
-    251
+    20260423,
+    213
    ],
-   "commit": "3a80911b2f45ce6926196930bb7d5cc662c7b3c8",
-   "sha256": "1rq90mrxvkyavz6qyv2dfg9spk1yskwaqiixq8diximmc67xqm4h"
+   "commit": "fcf1757baee481f617fbf2dc39f8c561207df263",
+   "sha256": "0r6kr3b5kr34kbcic61qnjyhli9imz6n4arddf3v3c34abamgvdy"
   },
   "stable": {
    "version": [
@@ -107112,10 +107316,10 @@
  },
  {
   "ename": "ppcompile",
-  "commit": "33213ca9e98ba41787d1617e6effb4c228d6c8f4",
-  "sha256": "14wwy6mp0ih9szx6jx6z0s3pdzgwj8m0ihn0apl37ivypmyzzcnb",
+  "commit": "779b9f02eefa485afd560316f364c20296cfe0d8",
+  "sha256": "0wjpk8hrb03rkkynrp68favg8mx48byw9ankhnckwd99yyl9bn4h",
   "fetcher": "github",
-  "repo": "whatacold/ppcompile",
+  "repo": "kenhuang-io/ppcompile",
   "unstable": {
    "version": [
     20220619,
@@ -107189,8 +107393,8 @@
   "repo": "blahgeek/emacs-pr-review",
   "unstable": {
    "version": [
-    20260323,
-    1418
+    20260423,
+    953
    ],
    "deps": [
     "ghub",
@@ -107198,8 +107402,8 @@
     "magit-section",
     "markdown-mode"
    ],
-   "commit": "1bb67e6a10869ccef75812f421d35b0366d95cf5",
-   "sha256": "0crwh6dkh4rp7wlphaw74mnw6dh851l7xm01i6prx5pil02nwcbd"
+   "commit": "23dcb45979e58c971d1d9a94f0af819f5d04d583",
+   "sha256": "08gw1bb87f9rs812adfadqzccm63pm06mr7b4g0dnji1sclzfryv"
   },
   "stable": {
    "version": [
@@ -107983,20 +108187,20 @@
   "repo": "jabbo/project-butler",
   "unstable": {
    "version": [
-    20240718,
-    1920
+    20260412,
+    1017
    ],
-   "commit": "7a20dd1e0672942ba971978baffa063b399151ef",
-   "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p"
+   "commit": "87e5c035a4602fa4400a44a3dd413dfbf5e5c2e4",
+   "sha256": "1bglmadx8d6kx98sldx53v4na0i14l8vqwppd9agi6nrdw8bk9mn"
   },
   "stable": {
    "version": [
     0,
     4,
-    0
+    1
    ],
-   "commit": "7a20dd1e0672942ba971978baffa063b399151ef",
-   "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p"
+   "commit": "87e5c035a4602fa4400a44a3dd413dfbf5e5c2e4",
+   "sha256": "1bglmadx8d6kx98sldx53v4na0i14l8vqwppd9agi6nrdw8bk9mn"
   }
  },
  {
@@ -108133,14 +108337,14 @@
   "repo": "harrybournis/project.el-rails",
   "unstable": {
    "version": [
-    20260201,
-    1909
+    20260415,
+    1855
    ],
    "deps": [
     "inflections"
    ],
-   "commit": "653e31a0b7b08445fa3efc41d741d642a46f9903",
-   "sha256": "0lk65na3l5ww1f45bv6d4zrjsbvf15lbly4val03cal9f15nds7k"
+   "commit": "d066f984eb88c6d239d19adbf8025bcafe665d53",
+   "sha256": "175vsmf3zgl7qi8sa4pnhzjk0b3qr1a02pg16nlxa0ci4kx59x34"
   }
  },
  {
@@ -110548,11 +110752,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20260131,
-    1655
+    20260410,
+    1849
    ],
-   "commit": "2a6fdb1c823bf8125f6354727db63c8894092821",
-   "sha256": "07bpqfg11xrcsmbqmchgm77gi8ljgnn3wfajd4wbfh3w65yfcfdi"
+   "commit": "c6f7bcd79d43b2a4915b75c481355601f95968a0",
+   "sha256": "09hhiwsk08c34h8v98q1s4g09byvj3r1dn18agl4x1v2528fiszk"
   },
   "stable": {
    "version": [
@@ -110644,6 +110848,29 @@
    "sha256": "0ww0qf9hsd8j31dc0p3fmsiqsir3mqbd4pwv4i29qidmbgrk3cv0"
   }
  },
+ {
+  "ename": "python-unicode-escape",
+  "commit": "02a68ff9693c954000b2573677aba6ddbdf58fb8",
+  "sha256": "050x40gdbswqq7nx0rgrvz2p5ab9pwivw9xw0nvk6wmc3kwhq95d",
+  "fetcher": "github",
+  "repo": "jb3/python-unicode-escape",
+  "unstable": {
+   "version": [
+    20260412,
+    2143
+   ],
+   "commit": "5ccc09f6bb773d6aa649aa569cf16099c2d85d0a",
+   "sha256": "09f6z62dkak3nllyvgf6657ihmar0w9i5a4x7hddaafx5rf6bn27"
+  },
+  "stable": {
+   "version": [
+    0,
+    5
+   ],
+   "commit": "5ccc09f6bb773d6aa649aa569cf16099c2d85d0a",
+   "sha256": "09f6z62dkak3nllyvgf6657ihmar0w9i5a4x7hddaafx5rf6bn27"
+  }
+ },
  {
   "ename": "python-view-data",
   "commit": "0e0050389c09b1e678f444b67d91f1596d9cc48c",
@@ -110791,11 +111018,11 @@
   "repo": "psaris/q-mode",
   "unstable": {
    "version": [
-    20260402,
-    210
+    20260418,
+    249
    ],
-   "commit": "2cc0745bf0cc4251db39b109e9d068eb5794d1eb",
-   "sha256": "0p77qgjvszyc8bslbd6z1sxkbnlygspd4ql6s4gg88ahirz7hi36"
+   "commit": "7690b9569892bf5e5f87cae290cb6a861cd1deeb",
+   "sha256": "0m9rxh51pny3cpiy4x24qqpgpfbaibdfv1yh5ckzy8hqcgkxq222"
   }
  },
  {
@@ -112203,16 +112430,16 @@
   "repo": "realgud/realgud",
   "unstable": {
    "version": [
-    20260407,
-    1610
+    20260411,
+    2216
    ],
    "deps": [
     "load-relative",
     "loc-changes",
     "test-simple"
    ],
-   "commit": "e391200705804aa035627672f5ae62d3c3113b16",
-   "sha256": "0pn2kmplbd88cnk106dv51x9p5gc6nw61crqakk0nz0wy1rs42q9"
+   "commit": "34a9065d1695c3b4bfbae076440397ad24bc8faf",
+   "sha256": "1bwdmkj0imlarki09k5i1lrhk3c1rqa899zy6n8j76xpcc57jqwl"
   },
   "stable": {
    "version": [
@@ -113761,11 +113988,11 @@
   "repo": "jjlee/rescript-mode",
   "unstable": {
    "version": [
-    20260405,
-    1650
+    20260419,
+    1929
    ],
-   "commit": "f19e2638b6b34d323096597464f422d9e2ad795f",
-   "sha256": "1lzb67va7y0acdsrq9i03i1ww03mw81nsn0v55zl0p1zjwrmffkg"
+   "commit": "202cf1202f286b4440980e46c0a0c0a8003f7ec6",
+   "sha256": "0xfrqf61y70dl600p7pqg7fmykv5jwmis2m8r3dxgxajw84vl80j"
   }
  },
  {
@@ -114520,6 +114747,36 @@
    "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237"
   }
  },
+ {
+  "ename": "rimel",
+  "commit": "9071d1f195bcc22bbfb9c4486e5a8a5ec0d477c3",
+  "sha256": "197r8a0s0ixkkq8gh0ia23q42wgh9mxzq9pakma6wdxjljggqm5f",
+  "fetcher": "github",
+  "repo": "jixiuf/rimel",
+  "unstable": {
+   "version": [
+    20260420,
+    1036
+   ],
+   "deps": [
+    "liberime"
+   ],
+   "commit": "1b7e6c7c626b36a7f80e8c388454bb4562da11e9",
+   "sha256": "00arwm2r3m80lq41ywdn0220a12ski8iwigxnr83wfh771kb2iw1"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "liberime"
+   ],
+   "commit": "3531488f0304edb547dcad5309287d9cbc6c5e24",
+   "sha256": "06w69470dwwg16qx7yv14ig9yx409aawcx91i4abcfy8f6msxk4g"
+  }
+ },
  {
   "ename": "rinari",
   "commit": "4b243a909faa71e14ee7ca4f307df8e8136e5d7c",
@@ -114816,6 +115073,21 @@
    "sha256": "0id77k08ckr9780wbwhl5adbd7fin6lwgxi1m71fd1d9lxx9ai5x"
   }
  },
+ {
+  "ename": "rocq-timing",
+  "commit": "6ff99a634aeba7f30c346de94e5c2d4a19424e98",
+  "sha256": "02r9xp5hdpvy0vnxijhfyc30hzq188kr948jlaa31n5wbgncz2qv",
+  "fetcher": "github",
+  "repo": "Chobbes/rocq-timing-el",
+  "unstable": {
+   "version": [
+    20260417,
+    1401
+   ],
+   "commit": "5423ac37dc6a6abff74e59ac299b57746462bd02",
+   "sha256": "18jxv247ls7f1cd2lq6lrgk8qk2jg8mdavqmks8xvv2bxyk46hp7"
+  }
+ },
  {
   "ename": "roguel-ike",
   "commit": "2db1979e039e466268ca7c264988792d3046e19a",
@@ -115101,11 +115373,14 @@
   "repo": "Thaodan/rpm-spec-mode",
   "unstable": {
    "version": [
-    20250329,
-    139
+    20260423,
+    902
    ],
-   "commit": "8cd329b78c7bc6285b7b9f2c65a58a9e778a59ca",
-   "sha256": "02ll930smiixlgaf3bxs2g30gc5alc1yd1fv8spx6d4hxrp9jvy5"
+   "deps": [
+    "compat"
+   ],
+   "commit": "90c1beceff24b9f0e02c5a141efd466d5763f957",
+   "sha256": "1ili8vmq756n103fikp0vjrl47g0c46kcfzc0agw0syhndi74rvp"
   },
   "stable": {
    "version": [
@@ -115858,11 +116133,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20260227,
-    539
+    20260416,
+    505
    ],
-   "commit": "668069ad8b6ca20bd0d2334db1c0d046809affd6",
-   "sha256": "1gw3nl846bkaxp1fcq4ig5gwxrd8374x03r1d7qywbd6k0ac1m0m"
+   "commit": "06cf08810018f54bf5246d8db155c90ab60d381f",
+   "sha256": "18khvsny09dbxbhfi3fl7dyy06n69p7xl5b84brfqcl9w8rgbcmr"
   },
   "stable": {
    "version": [
@@ -116538,11 +116813,11 @@
   "repo": "yoshinari-nomura/scad-ts-mode",
   "unstable": {
    "version": [
-    20260202,
-    1350
+    20260418,
+    410
    ],
-   "commit": "afaf52a34050aa1f7da12b85b25f20beffb08e2f",
-   "sha256": "0f023iw8bkyxpy78q2wqpgrn9q8hf5nqwh8y264m3nlyp2nvn8rl"
+   "commit": "9a61e0ad7a9cf2c4274553a35fc8643506d40c68",
+   "sha256": "0s3pwn37inlaz9lbpk0fgaqnnvq64is7v69fi2vdrg1hjca3k8s0"
   }
  },
  {
@@ -116697,11 +116972,11 @@
   "repo": "emacs-pe/scihub.el",
   "unstable": {
    "version": [
-    20250104,
+    20260131,
     420
    ],
-   "commit": "899d9144f7f88925a48257dfee28988628df084d",
-   "sha256": "16vz0i0zfv6fap8dff7fy2x84rmw33kmqabr99c7x92qyjl66g95"
+   "commit": "9bbc142be1dceff6705120017b75eeac3671cb36",
+   "sha256": "0ldhch4chnn0dc5g2j3yff1id345pmlgdkn65fp5g2fc120yzlb4"
   }
  },
  {
@@ -117332,36 +117607,32 @@
  },
  {
   "ename": "sekka",
-  "commit": "350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6",
-  "sha256": "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp",
+  "commit": "02b81b5a89165f9c871027a29ccfad9d7dc16733",
+  "sha256": "1jb56mk8h1s2brp6ln1d657vkcw466xzkl6qfz3qh4nffrmbqg3h",
   "fetcher": "github",
   "repo": "kiyoka/sekka",
   "unstable": {
    "version": [
-    20170803,
-    1247
+    20260422,
+    1428
    ],
    "deps": [
-    "cl-lib",
-    "concurrent",
     "popup"
    ],
-   "commit": "d1fd5d47aacba723631d5d374169a45ff2051c41",
-   "sha256": "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"
+   "commit": "78dfe17b2e04b03b6248e39814f84a77b4f6f2b7",
+   "sha256": "1blfj3qgm1kjk7hki7b6n0d6gixy84pa8mzlcqi0hjgdzm8yl5sp"
   },
   "stable": {
    "version": [
-    1,
-    8,
-    0
+    2,
+    0,
+    1
    ],
    "deps": [
-    "cl-lib",
-    "concurrent",
     "popup"
    ],
-   "commit": "d1fd5d47aacba723631d5d374169a45ff2051c41",
-   "sha256": "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"
+   "commit": "d55f6df4ef13090b7c556d6791c91a24c9bb107b",
+   "sha256": "14wka3l93v6w8q6vqwxd97a6qyixrbbm57g5qbzh1ck8yyq6wamv"
   }
  },
  {
@@ -118417,11 +118688,11 @@
   "stable": {
    "version": [
     0,
-    89,
-    2
+    90,
+    1
    ],
-   "commit": "ea186d05578a3b005b035df5042dff931aa72cb6",
-   "sha256": "0cvxy8i8zd2ria7z9zc7i0ql9jxf14zsc11nm242wz414mblwmqk"
+   "commit": "38951e875c1203f1dd6d4a4a3bc57e6a7ffc066a",
+   "sha256": "06ibxnb765sjcxjv2w923cnjr9664qp2pf7w3wxdp8vrbxg1s670"
   }
  },
  {
@@ -118741,11 +119012,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20260408,
-    652
+    20260416,
+    105
    ],
-   "commit": "ac4aeb3f7bf6d5a32127062b0ae311785fbc36ff",
-   "sha256": "0nh1cgh9dq8wm4ydb27zj2v1v3wczqx6dql6cz6azma10w1484l7"
+   "commit": "d62c1225a1a9634eb5c6a76ba2b1460961befd08",
+   "sha256": "0drvaqmy8pnbhikcvmnwlbmjq0mafxq074958chggbqrjlrn9199"
   }
  },
  {
@@ -119217,6 +119488,21 @@
    "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr"
   }
  },
+ {
+  "ename": "sidebuf",
+  "commit": "dbca8509a7a84b72e718af0c476e62991c5080a7",
+  "sha256": "1m8q3iz286k8i7w5z90an4zxk433c2iw6pf0vl753r3a64pqx3d6",
+  "fetcher": "github",
+  "repo": "rain-64/sidebuf",
+  "unstable": {
+   "version": [
+    20260415,
+    2249
+   ],
+   "commit": "89ca26d1859e89759f00065c07904d3ef5c80a4f",
+   "sha256": "19hfypy9ca0rnh66pfyzm2g93dn0q3iak4mgs8nx9vgnwsrc64sz"
+  }
+ },
  {
   "ename": "sidecar-locals",
   "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489",
@@ -119853,11 +120139,14 @@
   "repo": "captainflasmr/simply-annotate",
   "unstable": {
    "version": [
-    20260409,
-    1122
+    20260422,
+    1527
    ],
-   "commit": "dd3883222a4e214e82323bb091587aa48750ce71",
-   "sha256": "1qvg5alykhrsx7j69m69h87f6pyi00c2v1v6wk6pcw5sn37mh6j4"
+   "deps": [
+    "transient"
+   ],
+   "commit": "fe7ed2ebcda0d1899f97f06191adbf260cc5b1eb",
+   "sha256": "0c3lwzcz6lcf1jdyxlln0npdlvnc3npz0743cjzkwy757wbdnlvs"
   },
   "stable": {
    "version": [
@@ -120192,8 +120481,8 @@
   "repo": "emacs-slack/emacs-slack",
   "unstable": {
    "version": [
-    20260316,
-    1316
+    20260417,
+    1053
    ],
    "deps": [
     "alert",
@@ -120205,8 +120494,8 @@
     "ts",
     "websocket"
    ],
-   "commit": "b4a360cdff4ca5e51a1eb9b1503b390423750a2c",
-   "sha256": "10igds0b3ix6vylfh7agjmmzqn09k9gg6kyzl15q0bpyv0p5v4jr"
+   "commit": "904741295a5df0e6a127cacaf60a567924bb27f3",
+   "sha256": "0n6z7p9b3n8mlwkwzv6b588lcla9d0izmrhf8p5ajlr1pf979i92"
   }
  },
  {
@@ -120264,14 +120553,14 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20260329,
-    2133
+    20260421,
+    2256
    ],
    "deps": [
     "macrostep"
    ],
-   "commit": "b2832e7f37d712e23493b51662bc01d7bbd96e55",
-   "sha256": "1p2yhanmbw3l0cicmsdgjm1a307vvk287r3vzzgz0g16nb8b223k"
+   "commit": "b18fc71ab25ad8dd16e008ad6ed1ac1eb34be736",
+   "sha256": "0d27fqnbsl4ispi722b8q7bsd4n32rccm0p0hysq7q0b2ml2kg1g"
   },
   "stable": {
    "version": [
@@ -120522,25 +120811,19 @@
   "repo": "davep/slstats.el",
   "unstable": {
    "version": [
-    20170823,
-    849
+    20260414,
+    1947
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e9696066abf3f2b7b818a57c062530dfd9377033",
-   "sha256": "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83"
+   "commit": "d6f0c7428e886a39e6061d093b4ef7d8d240ba0d",
+   "sha256": "1b9dk0pi9mb4ns5ym3xgmfzi3d50r8dbxppk7arb0fa89lapp2la"
   },
   "stable": {
    "version": [
     1,
-    10
+    11
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e9696066abf3f2b7b818a57c062530dfd9377033",
-   "sha256": "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83"
+   "commit": "d6f0c7428e886a39e6061d093b4ef7d8d240ba0d",
+   "sha256": "1b9dk0pi9mb4ns5ym3xgmfzi3d50r8dbxppk7arb0fa89lapp2la"
   }
  },
  {
@@ -122675,11 +122958,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20251221,
-    1656
+    20260414,
+    2052
    ],
-   "commit": "5635d6bbc76e6f06b99fa5dac6e6fd6675459ca6",
-   "sha256": "0mbz0j605hw82a13ky2shqr2va0ddzrvzdpp4lbgpfiinm5f8a6m"
+   "commit": "789d20c55cd01f757929d0232dd1d5227c84ad7e",
+   "sha256": "0zxydjg954kaqsc5xi4yzr0b78nk4mxvbl5ch4yw6zv15h99n68i"
   },
   "stable": {
    "version": [
@@ -122827,11 +123110,11 @@
   "repo": "ideasman42/emacs-spatial-navigate",
   "unstable": {
    "version": [
-    20251229,
-    1145
+    20260420,
+    428
    ],
-   "commit": "9f61d3894c2f77b5fafa3f3529a39cb29cd67bc7",
-   "sha256": "039vch5s45z1966sxg73ymzd7525alnnj0lvxwhqj3ncb3w0416v"
+   "commit": "764cf2ea5ded501493bfd543c5a290b8cda847d5",
+   "sha256": "0dqa4lfw8kmnpnmf62s5p0z6y15k26c5y7vfqcv32apqzynqvkva"
   }
  },
  {
@@ -122872,11 +123155,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20260306,
-    122
+    20260424,
+    159
    ],
-   "commit": "65773b1b0b96c8c35d068da08dd68d6839bbb076",
-   "sha256": "12k7gci3vn84wxnpjlz5628nyvg5dxj14808k3yxxzv5p1vg3gz7"
+   "commit": "2cc92e11cc1b6007d8ffdd18c541e9ac126664ed",
+   "sha256": "01qk8zkm9kla42dabpjh04s2p8zmx7qfh27i7h5i5as0d4b3wgkh"
   }
  },
  {
@@ -123868,11 +124151,11 @@
   "repo": "WardBrian/stan-ts-mode",
   "unstable": {
    "version": [
-    20260320,
-    1817
+    20260421,
+    1440
    ],
-   "commit": "14e85d2dd8930935899db4c3156db21c7980c613",
-   "sha256": "1d2j27sxqaxha0ibhi2g043g221r0cws8clhsv0xdvnz1nl81vqs"
+   "commit": "96c039101367b854834a0f37761f8df18f18085b",
+   "sha256": "0mmb00sws09vzbq8ry7i00730hyirkwhfpxsv7yydsarci38s2hx"
   },
   "stable": {
    "version": [
@@ -124546,11 +124829,11 @@
   "repo": "jamescherti/stripspace.el",
   "unstable": {
    "version": [
-    20260324,
-    55
+    20260422,
+    1404
    ],
-   "commit": "e77dadb7ad15e8eeff8c874118f8ce461b70dd44",
-   "sha256": "0vh45vhk873mqg2m9f6ym7n19r9d9wndd9zdr0g000qdbvmrmn9v"
+   "commit": "5dd864613dc2743d0970684de7c8c01a431f1ffa",
+   "sha256": "0l1rkgj5m0cka1y2qnxhisy8sx6qldw66k0bdrf1nib9dxfw3cyn"
   },
   "stable": {
    "version": [
@@ -124562,6 +124845,21 @@
    "sha256": "0vh45vhk873mqg2m9f6ym7n19r9d9wndd9zdr0g000qdbvmrmn9v"
   }
  },
+ {
+  "ename": "struct-completion",
+  "commit": "8c63f6cc2b3598f8536e0460ae84ee328dcb97bc",
+  "sha256": "0x9509zr4zmr1wypdzmhlbf3qlc0dkfh7vncbvlppq4ac55j5rcg",
+  "fetcher": "github",
+  "repo": "gggion/struct-completion.el",
+  "unstable": {
+   "version": [
+    20260408,
+    1712
+   ],
+   "commit": "68cc1742a8efa8967b76befe7df5473f7708a21c",
+   "sha256": "13psr7cfyn0pxxisgsgnbxibznzs4gzj9yzkgdl25w10pq93ll5c"
+  }
+ },
  {
   "ename": "structurizr",
   "commit": "86528fe9acbadf6b826c01700941e3cf66361faf",
@@ -124940,8 +125238,8 @@
   "repo": "kiyoka/Sumibi",
   "unstable": {
    "version": [
-    20260408,
-    1334
+    20260417,
+    1157
    ],
    "deps": [
     "deferred",
@@ -124949,8 +125247,8 @@
     "popup",
     "unicode-escape"
    ],
-   "commit": "e52bd87416458bd8bb920b33fac9afdee27140d5",
-   "sha256": "0zbpycvymqhjx8jrfq9rszl9yyvjjk35a2fkd45ghg7kfcqhlsk3"
+   "commit": "366cf1a2a9f408cc34c1412a4b06dfe01f46d97f",
+   "sha256": "0z6g97975y2vchr2bkks4v18pk9zlcpgrffm53f4jvqjgp7pdxas"
   },
   "stable": {
    "version": [
@@ -125235,8 +125533,8 @@
   "repo": "isamert/swagg.el",
   "unstable": {
    "version": [
-    20251110,
-    2034
+    20260419,
+    1333
    ],
    "deps": [
     "compat",
@@ -125245,8 +125543,8 @@
     "s",
     "yaml"
    ],
-   "commit": "87bd1f698bc4c77a1c0d6b252e15f4ee345d2afa",
-   "sha256": "1xlknc7j5vz1sv5gwr8v6vyfginflsksjyzx6qz1svibkdwp223g"
+   "commit": "efc457f6ab95814d806b43f1b83edfa8273f7f0c",
+   "sha256": "1786vnf6ifpnp3rbllbdzipqzv1gmj2r904kkkjkmwjkjjiz03x3"
   },
   "stable": {
    "version": [
@@ -125806,14 +126104,14 @@
   "repo": "wolray/symbol-overlay",
   "unstable": {
    "version": [
-    20240913,
-    1624
+    20260423,
+    1454
    ],
    "deps": [
     "seq"
    ],
-   "commit": "6151f4279bd94b5960149596b202cdcb45cacec2",
-   "sha256": "0xqzn4j27xny3gmjan9phcl60zipp49p79nv57i7mpz8y0qahc59"
+   "commit": "253b957f5082603708b469d02ae8c31c58292823",
+   "sha256": "18w7qa959na5c9rvjarrnmb3l63pdfrfv865i3nb6lx7ap6iw2jc"
   },
   "stable": {
    "version": [
@@ -125910,11 +126208,11 @@
   "repo": "zk-phi/symon",
   "unstable": {
    "version": [
-    20260301,
-    1008
+    20260411,
+    1454
    ],
-   "commit": "0d580532853999c7f6caa6de8c7acac4c151f340",
-   "sha256": "1bqwacn8hhjr9lmsz1sq6min9qrc9zcmbjj9mmgsm0a39ifszhwk"
+   "commit": "294668d63da642276a0003cb4e9d6f8b40a13788",
+   "sha256": "0k9rhhmqhv2i38bms9vlagkjw8cb6y5lmjw8yw45z7zkj03bdwpw"
   },
   "stable": {
    "version": [
@@ -126482,8 +126780,8 @@
   "repo": "mattfidler/tabbar-ruler.el",
   "unstable": {
    "version": [
-    20160802,
-    307
+    20260417,
+    2349
    ],
    "deps": [
     "cl-lib",
@@ -126491,8 +126789,8 @@
     "powerline",
     "tabbar"
    ],
-   "commit": "535568189aa12a3eff7f977d2783e57b6a65ab6a",
-   "sha256": "1csj6qhwihdf4kfahcqhm163isiwac08w4nqid1hnca184bfk6xm"
+   "commit": "2b72193e4fa9665236ec5dd17c47d0cf91ccc977",
+   "sha256": "04y6yrgqvap4gkn0c1py8qx1vp9gpnhs5xaf82qb1ak903hwwms4"
   },
   "stable": {
    "version": [
@@ -126845,6 +127143,30 @@
    "sha256": "0llk7lan5wjpc51s833b0d0kx94gvai4g0h5qmz56qjlzlx0lb1c"
   }
  },
+ {
+  "ename": "taskjuggler-mode",
+  "commit": "a5b095a1b3624890f531078974fd0eb523db9482",
+  "sha256": "01haqjgjnwya3aq5vy21npszr9x0l9xqs68lbc3wjvvk4j18756m",
+  "fetcher": "github",
+  "repo": "devrintalen/taskjuggler-mode.el",
+  "unstable": {
+   "version": [
+    20260423,
+    1854
+   ],
+   "commit": "49d3cdf2dbf4c27e037bb4c96bb0cc6d2e000fab",
+   "sha256": "1v5hln35qwy97qnc7nrql3mr53j8q2zkadnf49mw9zdw5psl383b"
+  },
+  "stable": {
+   "version": [
+    0,
+    5,
+    2
+   ],
+   "commit": "9a43c9dcf36b52d302d41aeaf6ad62aa6776a966",
+   "sha256": "1qj57mk2qz9wwihj5jlgx4ngf4b33n581cpwvpmbidi6rj1dwb77"
+  }
+ },
  {
   "ename": "taskpaper-mode",
   "commit": "f969b1cd58dfd22041a8a2b116db0f48e321e546",
@@ -126853,11 +127175,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20260117,
-    1144
+    20260414,
+    1851
    ],
-   "commit": "19828a8048b0b7803a1b597e5bea26da9edf2895",
-   "sha256": "1lppb3kj53rc5ansnajcx6m1friy7g60qqbghpaw4hc5lw9kq22z"
+   "commit": "809c15fe893bb4ffa17bf515908a37c97e74afb9",
+   "sha256": "1gd3ip106zdwqhk39jsj2xhsn0c6wa65g6navkiy6z3gb95gs3ha"
   },
   "stable": {
    "version": [
@@ -127059,15 +127381,15 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20260409,
-    1708
+    20260416,
+    546
    ],
    "deps": [
     "transient",
     "visual-fill-column"
    ],
-   "commit": "59e919e65ef123fd26c937a9bbba1aaf80b96458",
-   "sha256": "1rbhkvhmnzb2fsgjia6x37x661l7gpmz2bv2pah4952q58vlvx7p"
+   "commit": "5196e752b1dae4367d446a3fcc6169e6a7533093",
+   "sha256": "1l6lsbzha40nvbwiaqiva96vp5iyjjqls761ggzfl3bkrslk53vq"
   },
   "stable": {
    "version": [
@@ -127709,19 +128031,20 @@
   "repo": "milanglacier/termint.el",
   "unstable": {
    "version": [
-    20251216,
-    434
+    20260412,
+    348
    ],
-   "commit": "d70d34745499d30490c7b31d014cb544ce086533",
-   "sha256": "04rq4a8jwacz05bh3qnpin7mmvlyy43wdh1vxq5yzpcazdd0skhj"
+   "commit": "689549245bb6dc0429d8af06c4830c92b09f4667",
+   "sha256": "1ggxqb9b7kv32rns9gagggmq0fsj9a8i3jkhqhfwz0c75fv05jlw"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
-   "commit": "b69db24ddbcd4b5973b3ae8e7f8b3c12dd0546b3",
-   "sha256": "1d98n5jqfiilp7pz9fkqd6vy7lx4i1xdgps7f90ach3grv2dwm49"
+   "commit": "689549245bb6dc0429d8af06c4830c92b09f4667",
+   "sha256": "1ggxqb9b7kv32rns9gagggmq0fsj9a8i3jkhqhfwz0c75fv05jlw"
   }
  },
  {
@@ -128524,21 +128847,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20260406,
-    813
+    20260420,
+    1434
    ],
-   "commit": "a7c84a7072e9b839def6239da266315c08bce5fa",
-   "sha256": "0ipqrkm5xv5sln3rc3zayv1zaq9vh7j9z7xz8rnld4ls1sa76cyg"
+   "commit": "075dc1f32336878453b628373e8e0b29775a60d3",
+   "sha256": "08l5hjwyfb4fm8zyp5im66r2mzbd72kz7z3ircsxzzf1zwaznn6f"
   },
   "stable": {
    "version": [
     2026,
     4,
-    6,
+    20,
     0
    ],
-   "commit": "a7c84a7072e9b839def6239da266315c08bce5fa",
-   "sha256": "0ipqrkm5xv5sln3rc3zayv1zaq9vh7j9z7xz8rnld4ls1sa76cyg"
+   "commit": "075dc1f32336878453b628373e8e0b29775a60d3",
+   "sha256": "08l5hjwyfb4fm8zyp5im66r2mzbd72kz7z3ircsxzzf1zwaznn6f"
   }
  },
  {
@@ -128751,11 +129074,11 @@
   "repo": "ctanas/tiles",
   "unstable": {
    "version": [
-    20260315,
-    2112
+    20260412,
+    1929
    ],
-   "commit": "f77e2cf19b4895cd7da50922db3a622e3b848ec8",
-   "sha256": "0yyxdl2qvncghhic7h9n99hv7hqxkrq075d9m35ipiqr36461867"
+   "commit": "149a5015b3d2a2ebdd15660cab9c736549af7532",
+   "sha256": "19fmzw46vyfz6kz4ksmm5w4c6vmkyjacsqznbf0d8d9qsmy1nyf8"
   }
  },
  {
@@ -129595,6 +129918,30 @@
    "sha256": "0x9ayvd8fvgnyp2zgck3dnhs2ib3lrcwbgcdypzq6mhzfs1a2651"
   }
  },
+ {
+  "ename": "tokyo-night",
+  "commit": "d33bde292749000d39db643c5747ba3a9486f835",
+  "sha256": "1cbdz14lx4a5v6mgfsnd2rh5782pvvgy78550qbifq1gf8syddfi",
+  "fetcher": "github",
+  "repo": "bbatsov/tokyo-night-emacs",
+  "unstable": {
+   "version": [
+    20260421,
+    1234
+   ],
+   "commit": "8d30673c060ab791818e9ac3fd96ebeba93b926d",
+   "sha256": "1zgjhb9ngdll284h5gf0mdjikfgifrb1z55ydmd8vcm17b83sd48"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "17856a5d0184512c165f06b32e0749230318086a",
+   "sha256": "0jbjvl70yvlqcz0xsgm0wf8s72j3pxnljxl4jdilhdqj7mfadba4"
+  }
+ },
  {
   "ename": "tomatinho",
   "commit": "3fe20de5b2b5e5abe5be7468cea7c87f5b26b237",
@@ -130312,21 +130659,21 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20260401,
-    2145
+    20260422,
+    1646
    ],
    "deps": [
     "compat",
     "cond-let",
     "seq"
    ],
-   "commit": "8b14203107950d6eba0e17d14867e05547725219",
-   "sha256": "0khb5pzipnhb21s7wdq42mx9pbsq6fqljz3xhqdsgbjbxx1p6fcl"
+   "commit": "cd97319a851db9b2ed3faecdb735c6d089edf4e1",
+   "sha256": "18pay3a7qbxw3ci2y11d3pvzbdkp8q1n4xyr4zhz1vg2n36vj56c"
   },
   "stable": {
    "version": [
     0,
-    12,
+    13,
     0
    ],
    "deps": [
@@ -130334,8 +130681,8 @@
     "cond-let",
     "seq"
    ],
-   "commit": "1f7039ef8d548d6fe858084fcbeae7588eba4190",
-   "sha256": "1z5nqmjzwgyq1gdg2v9qmxjk8m9k74l9pz4w6qa95grpsddpb68j"
+   "commit": "cd97319a851db9b2ed3faecdb735c6d089edf4e1",
+   "sha256": "18pay3a7qbxw3ci2y11d3pvzbdkp8q1n4xyr4zhz1vg2n36vj56c"
   }
  },
  {
@@ -130790,26 +131137,26 @@
   "repo": "emacs-tree-sitter/tree-sitter-langs",
   "unstable": {
    "version": [
-    20260405,
-    1707
+    20260420,
+    54
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "af477536132d2df4ddd2754b4a53e32b914a84cc",
-   "sha256": "02g5xwbq2m2m09296i9kfiy1sr212lr33x3j1gs6f9anw0kyq622"
+   "commit": "0c9390a5ec483a63c9cecd57be71520b20a858c5",
+   "sha256": "08jsvkjnqywgar2yv2a8vz85hwfiasa849dwixhrvavfqd2ss1d9"
   },
   "stable": {
    "version": [
     0,
     13,
-    41
+    45
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "af477536132d2df4ddd2754b4a53e32b914a84cc",
-   "sha256": "02g5xwbq2m2m09296i9kfiy1sr212lr33x3j1gs6f9anw0kyq622"
+   "commit": "0c9390a5ec483a63c9cecd57be71520b20a858c5",
+   "sha256": "08jsvkjnqywgar2yv2a8vz85hwfiasa849dwixhrvavfqd2ss1d9"
   }
  },
  {
@@ -131461,6 +131808,30 @@
    "sha256": "09xjwyy388gc8bg3jvr21jaahfapfrr9jjiclq8qqx93pxz4lvfz"
   }
  },
+ {
+  "ename": "trust-manager",
+  "commit": "420c42f0bf4fb2be86fd3103b0f35bfcb48184b4",
+  "sha256": "1nsm0xb6ls8vkc987ajs4qrbaclim5fc9m1i77mfwbz0znmwn32r",
+  "fetcher": "github",
+  "repo": "eshelyaron/trust-manager",
+  "unstable": {
+   "version": [
+    20260422,
+    952
+   ],
+   "commit": "3a702921eaa65ce8de552e88f6280786a645252d",
+   "sha256": "1c6v36fa8j9q0j8s5i1kdw4gkqmv6qldsswdccvyfcmbyl2wr3dw"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    0
+   ],
+   "commit": "3a702921eaa65ce8de552e88f6280786a645252d",
+   "sha256": "1c6v36fa8j9q0j8s5i1kdw4gkqmv6qldsswdccvyfcmbyl2wr3dw"
+  }
+ },
  {
   "ename": "truthy",
   "commit": "f7a7e319dbe17e2b31353e7d7cab51d557d86e9d",
@@ -133096,14 +133467,14 @@
   "repo": "tbanel/uniline",
   "unstable": {
    "version": [
-    20260407,
-    1917
+    20260411,
+    1423
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "be9f828997049c1a3bc5851e1e04f6b90a64555a",
-   "sha256": "11rph2f7npyq1dpc6sikpj5ipf7ci6k0xj2kj86k1nadvci0iv4q"
+   "commit": "14a0949539679e89f706601a501ae8a8d090c71f",
+   "sha256": "1fcqr4q5dc9kfzqp6b9wfqma4qbb6dmjia639wfgdj3xqxa8ygl7"
   }
  },
  {
@@ -133477,25 +133848,25 @@
   "repo": "mekeor/unspecified-theme",
   "unstable": {
    "version": [
-    20251203,
-    2130
+    20260417,
+    842
    ],
    "deps": [
     "most-faces"
    ],
-   "commit": "f403d8f304d319729466fe019a74402d526ab0ee",
-   "sha256": "0cafm2vmm8225wf6212ylbcf4c8qnc539j4fl3459jqzs9pbg0n3"
+   "commit": "50f87d04741e3fd6404c629a647299ae9e4f2f1d",
+   "sha256": "0w2xx24gq0hk3kxsryggl213mr38gbq3xnsxs80bhx854plv3f4z"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
    "deps": [
     "most-faces"
    ],
-   "commit": "f403d8f304d319729466fe019a74402d526ab0ee",
-   "sha256": "0cafm2vmm8225wf6212ylbcf4c8qnc539j4fl3459jqzs9pbg0n3"
+   "commit": "50f87d04741e3fd6404c629a647299ae9e4f2f1d",
+   "sha256": "0w2xx24gq0hk3kxsryggl213mr38gbq3xnsxs80bhx854plv3f4z"
   }
  },
  {
@@ -133748,11 +134119,11 @@
   "repo": "domq/use-package-treesit",
   "unstable": {
    "version": [
-    20260118,
-    1521
+    20260416,
+    1048
    ],
-   "commit": "c4c2b251f3c932edc87ade3523700782c0cafcd2",
-   "sha256": "0jxxgd1lkpllzg7aasj3fqqi3k590yv256ryi2n4q5fn442irgs7"
+   "commit": "398ca0df10f2894b87c07073a446a53d943a6c18",
+   "sha256": "0kpnac51ykmhkirz7shryasd7h2gvkfrhyysy55bpn8swdzknawm"
   }
  },
  {
@@ -134343,11 +134714,11 @@
   "repo": "tarsius/vcomp",
   "unstable": {
    "version": [
-    20240302,
-    2255
+    20260420,
+    1508
    ],
-   "commit": "99831d234481a61488aca4b96b842b63a79c732a",
-   "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7"
+   "commit": "213c3f6b085182d20065caa1c53b6a543ca42694",
+   "sha256": "1ajfpxnpbg92r2dvz9jfk2fxii079gif5sar8r6pvhqyh7868yrk"
   },
   "stable": {
    "version": [
@@ -134659,11 +135030,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20260223,
-    2349
+    20260414,
+    1812
    ],
-   "commit": "0625fb314341a479dd472ae5e7f10375c1988131",
-   "sha256": "0njf304naa33l6cvgjh2zmblz46g27nszpf16hmyhfz3i92gzc6y"
+   "commit": "ffe668c20120ba215f14d6d5720e327fbadbd10d",
+   "sha256": "0bvz5y05b6kvax4yak193ki8mja8v544ycg31i70863q6p356vhy"
   },
   "stable": {
    "version": [
@@ -134891,14 +135262,14 @@
   "repo": "minad/vertico",
   "unstable": {
    "version": [
-    20260309,
-    1549
+    20260419,
+    1808
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0b96e8f169653cba6530da1ab0a1c28ffa44b180",
-   "sha256": "0kia499sijkmpj5l9r0r3pwc1kjyvbfxc15k85dyfq9dvc4z1drr"
+   "commit": "daa0dddeb5bc152e13ec4f166cc2f84150b7a2e8",
+   "sha256": "1vlhmvjsgcsfhpd2hcfq1zlz0r2pb6ww1rhra17kdf5cg0dnns2q"
   },
   "stable": {
    "version": [
@@ -135711,11 +136082,11 @@
   "repo": "ianyepan/vscode-dark-plus-emacs-theme",
   "unstable": {
    "version": [
-    20260219,
-    434
+    20260420,
+    8
    ],
-   "commit": "37f16729ee196dbfc533b02adea3d2129bdd8585",
-   "sha256": "1aphhpisg20cclclnygf8wrkrw9rxh2b653jnr86ikjki6j8sw98"
+   "commit": "082b012d203fed17d54b4a3b7437db545f15ddbb",
+   "sha256": "0mik95vf8nc61g33jfmb885jrrk64xghzx0ip443gigdr1pbs2yk"
   },
   "stable": {
    "version": [
@@ -135831,14 +136202,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20260110,
-    529
+    20260420,
+    1244
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "81d031f153c5fa656c744cd518b7d54c54506706",
-   "sha256": "1p9q4c2lrwckswk33wv4rymm8ixq6chn3bpzz577qs1q408sq34m"
+   "commit": "80989c6ca35416a5c85fa76277ef49a13c3eac11",
+   "sha256": "1941hls4lz4a4ww4jmns23zydzl3z948w72m7ji22y0f0hppf1af"
   }
  },
  {
@@ -136276,11 +136647,11 @@
   "repo": "darkstego/wakib-keys",
   "unstable": {
    "version": [
-    20250405,
-    1416
+    20260420,
+    1927
    ],
-   "commit": "07258b0293c9f31ba11bd89298b9f90eb232a94c",
-   "sha256": "0b3a800165rx58dvvsmlvz3gkxdgnimkxzdpxxzc1msac7dccl7b"
+   "commit": "39a8cd3c61b4d2b1f93e2de8e56906f4a648959b",
+   "sha256": "14q6a5w58sgvvpry4k1rkv8xhpxpw59qv3kri5ymd75q397g7icn"
   },
   "stable": {
    "version": [
@@ -138292,14 +138663,14 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20260301,
-    1317
+    20260417,
+    751
    ],
    "deps": [
     "compat"
    ],
-   "commit": "64211dcb815f2533ac3d2a7e56ff36ae804d8338",
-   "sha256": "0gxmmzx7z84d4684q58ijms7d555ngasvzhfz2gna9awly5qig6z"
+   "commit": "d0935036eb894680d8ca1a4d1ed8e8d5d90005e5",
+   "sha256": "15vvc6awlk8mzqqfqn7n3k349skzg0jk645sjgmzq1sfig4yfcsy"
   },
   "stable": {
    "version": [
@@ -139019,14 +139390,14 @@
   "repo": "cjennings/emacs-wttrin",
   "unstable": {
    "version": [
-    20260404,
-    2146
+    20260422,
+    507
    ],
    "deps": [
     "xterm-color"
    ],
-   "commit": "a0f1b4f07c98ab3d4d4b50a330822d0991b733a7",
-   "sha256": "1b28z8zl53lf5cvybynsnkhs85jz346y7vvhd32l1ypwsr7s0p4d"
+   "commit": "9958ec4c4396ae8435f7e1818ff383c05df47a14",
+   "sha256": "1i4k7aj2w5mawfc9h8h7s5c3r886bmzxf4ai2q1caarhckb81wj3"
   },
   "stable": {
    "version": [
@@ -140063,11 +140434,11 @@
   "repo": "yoshiki/yaml-mode",
   "unstable": {
    "version": [
-    20241003,
-    153
+    20260420,
+    156
    ],
-   "commit": "d91f878729312a6beed77e6637c60497c5786efa",
-   "sha256": "0r5jx5rbgbhn5klhw76mcqmnkaxyc5y1lmp91fs0anw4qfy0f4h7"
+   "commit": "62cbd80507765aa8326bd6aef3aacd8d9be2d71a",
+   "sha256": "1n7hl80nqnc92bppj7iv8sr1phk3124529zr15n3lr31fydamsdg"
   },
   "stable": {
    "version": [
@@ -140300,8 +140671,8 @@
  },
  {
   "ename": "yasnippet",
-  "commit": "5d1927dc3351d3522de1baccdc4ce200ba52bd6e",
-  "sha256": "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds",
+  "commit": "21d2caa9d9414345d3ec10bbf74cb26a204446c3",
+  "sha256": "00qc0kkz74wljmsxjwn8xh5yj556fp3qpbd0p3anz80vspkbpvyq",
   "fetcher": "github",
   "repo": "joaotavora/yasnippet",
   "unstable": {

From 6e402d03fa9450ef9f708b8f32ab1f33e2c111cd Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 25 Apr 2026 01:16:08 +0800
Subject: [PATCH 013/107] nongnuPackages: update on 2026-04-25 (from
 emacs-overlay)

emacs-overlay commit: bbb5148fa2579456dc7da3741e9d8543ce7d3ef1
---
 .../emacs/elisp-packages/nongnu-generated.nix | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 12c42b25af99..e5dfa1df3392 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -473,7 +473,6 @@
   ) { };
   boxquote = callPackage (
     {
-      cl-lib ? null,
       elpaBuild,
       fetchurl,
       lib,
@@ -481,12 +480,12 @@
     elpaBuild {
       pname = "boxquote";
       ename = "boxquote";
-      version = "2.3";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";
-        sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy";
+        url = "https://elpa.nongnu.org/nongnu/boxquote-2.4.1.tar";
+        sha256 = "18gwx8dh2xbr90m1mvmp5jb8ssyn5cmq833sd4nsa76i021yh1l6";
       };
-      packageRequires = [ cl-lib ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu/boxquote.html";
         license = lib.licenses.free;
@@ -502,10 +501,10 @@
     elpaBuild {
       pname = "buttercup";
       ename = "buttercup";
-      version = "1.39";
+      version = "1.40";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/buttercup-1.39.tar";
-        sha256 = "0a2yj10jrql77l0dqyf95yzb6cd8z7z9p9jjc6lb7z8j26m208sj";
+        url = "https://elpa.nongnu.org/nongnu/buttercup-1.40.tar";
+        sha256 = "09r1yp05m7p6906isz1x6dhc7mrxsdisxa19a8py73gqsm1ymf1c";
       };
       packageRequires = [ ];
       meta = {
@@ -567,10 +566,10 @@
     elpaBuild {
       pname = "casual";
       ename = "casual";
-      version = "2.15.0";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/casual-2.15.0.tar";
-        sha256 = "1ydd6ilxh5msh5l1f86b2mi963hls4m5aipshfc0bygwfh83m7s0";
+        url = "https://elpa.nongnu.org/nongnu/casual-2.16.0.tar";
+        sha256 = "1s0d5c3aacyh1n5qy7ka4xwnmdbx3qrh0z0z41bc958zmay6mgpa";
       };
       packageRequires = [
         csv-mode
@@ -4483,10 +4482,10 @@
     elpaBuild {
       pname = "pg";
       ename = "pg";
-      version = "0.64";
+      version = "0.65";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/pg-0.64.tar";
-        sha256 = "1dip1s8l2im8j40hgn3jrqrb8mbly2wfd5fy4vmz9mn4axnxdvkn";
+        url = "https://elpa.nongnu.org/nongnu/pg-0.65.tar";
+        sha256 = "1gf93xsldhx105r5m03hiq3lzlzb3r5pjd3j99jl0gs3z8pmn8ic";
       };
       packageRequires = [ peg ];
       meta = {
@@ -5266,10 +5265,10 @@
     elpaBuild {
       pname = "subed";
       ename = "subed";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/subed-1.4.1.tar";
-        sha256 = "11rg436w2rdcpiix5hzmdb7r736nhiqpm4h8b18ac7dv6nnjjnwd";
+        url = "https://elpa.nongnu.org/nongnu/subed-1.4.2.tar";
+        sha256 = "0crpgxqk164z602iajhx7b0zxdjs5f9g8hv0q6n1vjrsby87pl1x";
       };
       packageRequires = [ ];
       meta = {
@@ -6090,10 +6089,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "28.11.20260215192642";
+      version = "28.11.20260416140940";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260215192642.tar";
-        sha256 = "0k0p60wirvp36ifaqkq6420rxfj1ys4cb8j34q7rhcbdfw1cp9dd";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260416140940.tar";
+        sha256 = "0zzdwrd4h12bqlxzpj7xs4m5cdgx9nbljrnyld6qs5b19352izyl";
       };
       packageRequires = [ ];
       meta = {

From e295e3111b1bcab220088e32de6e6ff1b00586d8 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 25 Apr 2026 01:16:08 +0800
Subject: [PATCH 014/107] nongnuDevelPackages: update on 2026-04-25 (from
 emacs-overlay)

emacs-overlay commit: bbb5148fa2579456dc7da3741e9d8543ce7d3ef1
---
 .../elisp-packages/nongnu-devel-generated.nix | 192 +++++++++---------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
index ef6b6334b37e..f870cacfbf89 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -473,7 +473,6 @@
   ) { };
   boxquote = callPackage (
     {
-      cl-lib ? null,
       elpaBuild,
       fetchurl,
       lib,
@@ -481,12 +480,12 @@
     elpaBuild {
       pname = "boxquote";
       ename = "boxquote";
-      version = "2.3.0.20231216.85245";
+      version = "2.4.1.0.20260415.194925";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/boxquote-2.3.0.20231216.85245.tar";
-        sha256 = "1b5kqxpvxfzq8n0q1bqjbyb0vmrsdm02qfai28ihxqixk4q8czbi";
+        url = "https://elpa.nongnu.org/nongnu-devel/boxquote-2.4.1.0.20260415.194925.tar";
+        sha256 = "1ywdip0h1cip8wbva4dwva2gss7wakjapf8fqc795d9izyvgmx0f";
       };
-      packageRequires = [ cl-lib ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu-devel/boxquote.html";
         license = lib.licenses.free;
@@ -502,10 +501,10 @@
     elpaBuild {
       pname = "buttercup";
       ename = "buttercup";
-      version = "1.39.0.20260409.235427";
+      version = "1.40.0.20260411.203013";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.39.0.20260409.235427.tar";
-        sha256 = "03fk6mhf67jccilkjfs7jwzs6la4ry4z8s5v1q7fci2jic3911y8";
+        url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.40.0.20260411.203013.tar";
+        sha256 = "13s30dv7vhzbm80f4brza2mk7lpf3l7ffbzbjv4ln2s8rgsh6g64";
       };
       packageRequires = [ ];
       meta = {
@@ -567,10 +566,10 @@
     elpaBuild {
       pname = "casual";
       ename = "casual";
-      version = "2.15.0.0.20260406.163831";
+      version = "2.16.0.0.20260415.182614";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/casual-2.15.0.0.20260406.163831.tar";
-        sha256 = "14vgq4q3k264aizqxjlfjjm5s4m7089nj3pjbjvzzs4kfkhpnqkk";
+        url = "https://elpa.nongnu.org/nongnu-devel/casual-2.16.0.0.20260415.182614.tar";
+        sha256 = "0a0ba4b506pbv4nff8qspqjfzlfng77i3nqs3vwg1ybz6rhj7cwj";
       };
       packageRequires = [
         csv-mode
@@ -620,10 +619,10 @@
     elpaBuild {
       pname = "cider";
       ename = "cider";
-      version = "1.22.0snapshot0.20260402.44710";
+      version = "1.22.0snapshot0.20260420.43551";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.22.0snapshot0.20260402.44710.tar";
-        sha256 = "01i63fnilk7s1yswpbwxx2v0h8dafyyang2b23z15j0qhk18frlv";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.22.0snapshot0.20260420.43551.tar";
+        sha256 = "14vhww7sm3hzvrag671m8l4sbh4mi4iy395vnqhpyn6wxp0z9m91";
       };
       packageRequires = [
         clojure-mode
@@ -713,10 +712,10 @@
     elpaBuild {
       pname = "cond-let";
       ename = "cond-let";
-      version = "0.2.2.0.20260201.150042";
+      version = "0.2.2.0.20260420.135245";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cond-let-0.2.2.0.20260201.150042.tar";
-        sha256 = "0fy4kji48wj5v1jf78kmd011v5v4q5b5n32mhhixv83243hng2fb";
+        url = "https://elpa.nongnu.org/nongnu-devel/cond-let-0.2.2.0.20260420.135245.tar";
+        sha256 = "1zm81zgmf5k6akh4pngjln1xp7p561h97hkcrsbc78v7nq48x8kb";
       };
       packageRequires = [ ];
       meta = {
@@ -1665,10 +1664,10 @@
     elpaBuild {
       pname = "evil-matchit";
       ename = "evil-matchit";
-      version = "4.1.0.0.20260409.93607";
+      version = "4.1.0.0.20260412.3556";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-4.1.0.0.20260409.93607.tar";
-        sha256 = "0yn15q7vd5gq2ks4gnrgpsh1np26wwgl3s99plbsr3bzhgr0phxl";
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-4.1.0.0.20260412.3556.tar";
+        sha256 = "0pzpzlix9l3rv1g1giibhhmxwczsg8i0zjibjszds0agcyl2p7dg";
       };
       packageRequires = [ ];
       meta = {
@@ -1799,10 +1798,10 @@
     elpaBuild {
       pname = "exec-path-from-shell";
       ename = "exec-path-from-shell";
-      version = "2.2.0.20251113.132402";
+      version = "2.2.0.20260423.183347";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20251113.132402.tar";
-        sha256 = "0brfbnxa36rvql03l7pq8wja520yjzmayhfxzh94sirs4f3s5yhl";
+        url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20260423.183347.tar";
+        sha256 = "0s80hah6795p2k97qpnqj3baaw1cy9c54g38vbcczq4mn8faimk6";
       };
       packageRequires = [ ];
       meta = {
@@ -2367,10 +2366,10 @@
     elpaBuild {
       pname = "geiser-stklos";
       ename = "geiser-stklos";
-      version = "1.8.0.20240521.161150";
+      version = "1.8.0.20260411.100856";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos-1.8.0.20240521.161150.tar";
-        sha256 = "13y0p8iqm4lrjg5ksb8d3rgpmjs0kwak7zicdq5m7sx1x511znd7";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos-1.8.0.20260411.100856.tar";
+        sha256 = "0mv74swpi87jkn3zmvljayppr3wn01niv9lnnhsdz29wb7gn9x0f";
       };
       packageRequires = [ geiser ];
       meta = {
@@ -2620,10 +2619,10 @@
     elpaBuild {
       pname = "gptel";
       ename = "gptel";
-      version = "0.9.9.4.0.20260410.1136";
+      version = "0.9.9.4.0.20260422.5643";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.4.0.20260410.1136.tar";
-        sha256 = "0z9wxzqmlm9r0pnmsgfjd4cpnywg42b6ip8pcy2732v9sry88mfh";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.4.0.20260422.5643.tar";
+        sha256 = "07drqy9aksqsvfgg7a6r7bp430qccs6bngrs367dp0vr46mx6kw0";
       };
       packageRequires = [
         compat
@@ -2817,10 +2816,10 @@
     elpaBuild {
       pname = "helm";
       ename = "helm";
-      version = "4.0.6.0.20260214.143216";
+      version = "4.0.6.0.20260424.61638";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.6.0.20260214.143216.tar";
-        sha256 = "0v1j7vvpw5m6cjrbmzbjssw8n7r4ipxkzwl13z351lqx81q27p9b";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.6.0.20260424.61638.tar";
+        sha256 = "1h45ffmj2myiv1yg0gy1kfxwky41xfzdzy4vhzc67w1a6g6kh9jq";
       };
       packageRequires = [
         helm-core
@@ -2842,10 +2841,10 @@
     elpaBuild {
       pname = "helm-core";
       ename = "helm-core";
-      version = "4.0.6.0.20260214.143216";
+      version = "4.0.6.0.20260424.61638";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.6.0.20260214.143216.tar";
-        sha256 = "09rmliclxhzbai5cgy3f1bg1y9nk6a3xig79iz6yxfc26qs1kkh2";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.6.0.20260424.61638.tar";
+        sha256 = "1484qsigbybnxlcb0jrx8v62fa7dqv7szia7p1lghp3q76cjlfv7";
       };
       packageRequires = [ async ];
       meta = {
@@ -3162,10 +3161,10 @@
     elpaBuild {
       pname = "isl";
       ename = "isl";
-      version = "1.6.0.20260225.43822";
+      version = "1.6.0.20260414.62054";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/isl-1.6.0.20260225.43822.tar";
-        sha256 = "05fq6l8c8w4bkfkh2cmmmdnjwa6hmfpv00avkp6r5fz4v9fnkvwq";
+        url = "https://elpa.nongnu.org/nongnu-devel/isl-1.6.0.20260414.62054.tar";
+        sha256 = "149fcgwl3r5wiw8zwb1cgy4g96nv90a8wpjk8qh0dgcdz1vgsiqq";
       };
       packageRequires = [ ];
       meta = {
@@ -3231,10 +3230,10 @@
     elpaBuild {
       pname = "jabber";
       ename = "jabber";
-      version = "0.10.5.0.20260410.45349";
+      version = "0.10.5.0.20260423.192938";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260410.45349.tar";
-        sha256 = "07nnqk811i6vvzanqh4ymnj43797fahic1n8h4pazdpibx71p0g2";
+        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260423.192938.tar";
+        sha256 = "1q79iv4znishj6rdz1m76r0c8h72i2g47xfh6xfw2gqxbkkyilv3";
       };
       packageRequires = [ fsm ];
       meta = {
@@ -3586,10 +3585,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "4.5.0.0.20260409.85727";
+      version = "4.5.0.0.20260422.220622";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.5.0.0.20260409.85727.tar";
-        sha256 = "1hpmc3v9pgdlrkddxikj238r7z6fhpfspx083jrjn51pcpjinkyp";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.5.0.0.20260422.220622.tar";
+        sha256 = "1sm2ixy8hnamzvapy4i2j58ydharg47xb3s1981yr2d948dl2kxd";
       };
       packageRequires = [
         compat
@@ -3619,10 +3618,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "4.5.0.0.20260409.85727";
+      version = "4.5.0.0.20260422.220622";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.5.0.0.20260409.85727.tar";
-        sha256 = "0kxyw9c6xm6v8pzh575ys0w56pdjgyr4b9x1i9qwnv8yhampp2y0";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.5.0.0.20260422.220622.tar";
+        sha256 = "13hzbc26wi6llab43gy8m6jpnm5faji7bqk5xlaxwinfqhzjfb2a";
       };
       packageRequires = [
         compat
@@ -3645,10 +3644,10 @@
     elpaBuild {
       pname = "markdown-mode";
       ename = "markdown-mode";
-      version = "2.9alpha0.20260321.14320";
+      version = "2.9alpha0.20260423.150805";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260321.14320.tar";
-        sha256 = "1a0a9d199fkkxv73fdvy1x985r0x5z4q1s48axgwh7rsv24pvbqp";
+        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260423.150805.tar";
+        sha256 = "1ap384fyxbny1pn59grjj6x8y29hcfl1vlhim4r177j2killr4sh";
       };
       packageRequires = [ ];
       meta = {
@@ -3849,10 +3848,10 @@
     elpaBuild {
       pname = "multiple-cursors";
       ename = "multiple-cursors";
-      version = "1.5.0.0.20260117.123334";
+      version = "1.5.0.0.20260419.93113";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.5.0.0.20260117.123334.tar";
-        sha256 = "1qnn3zx296zjvs9y10gq9a7n9ja68ipsvk0qbh48ib6z8n0b4sgh";
+        url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.5.0.0.20260419.93113.tar";
+        sha256 = "0qbgka567dd72y9mlm46kwf11rdjk9s94z4vqn73kmk0k15zjg82";
       };
       packageRequires = [ cl-lib ];
       meta = {
@@ -4075,10 +4074,10 @@
     elpaBuild {
       pname = "org-journal";
       ename = "org-journal";
-      version = "2.2.0.0.20251203.115702";
+      version = "2.2.0.0.20260413.140147";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20251203.115702.tar";
-        sha256 = "1rdrkfhk9rj7a7r520x1n7i3ddpd122gknvw7bi1ab76rnq95zyl";
+        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20260413.140147.tar";
+        sha256 = "164mdrjiziklhvsz98i9pb01520y8r81ji7vbzkvpnxp1ia8a2m4";
       };
       packageRequires = [ org ];
       meta = {
@@ -4461,10 +4460,10 @@
     elpaBuild {
       pname = "pg";
       ename = "pg";
-      version = "0.64.0.20260406.70807";
+      version = "0.65.0.20260421.212130";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.64.0.20260406.70807.tar";
-        sha256 = "1cb0grckwbh5xibka5nsxzl3r65hiph4xc1dph3y5la503czjj9h";
+        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.65.0.20260421.212130.tar";
+        sha256 = "13a88q1hx7mkc58a3ry5ym56kn5ppqr32j18n2ms69a5if301nhs";
       };
       packageRequires = [ peg ];
       meta = {
@@ -4793,6 +4792,7 @@
   ) { };
   rpm-spec-mode = callPackage (
     {
+      compat,
       elpaBuild,
       fetchurl,
       lib,
@@ -4800,12 +4800,12 @@
     elpaBuild {
       pname = "rpm-spec-mode";
       ename = "rpm-spec-mode";
-      version = "0.16.0.20250329.13938";
+      version = "0.16.0.20260423.74352";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20250329.13938.tar";
-        sha256 = "1gmqnv1ckypns7aiz4w5kb3l8m66bfxlw8z19i3ag5im8rlpc9lp";
+        url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20260423.74352.tar";
+        sha256 = "0pqq31x60g3ig7fmd4jh7kjz051m020kqs3pfpbiznwhjh8v63ad";
       };
-      packageRequires = [ ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode.html";
         license = lib.licenses.free;
@@ -4842,10 +4842,10 @@
     elpaBuild {
       pname = "rust-mode";
       ename = "rust-mode";
-      version = "1.0.6.0.20260227.53908";
+      version = "1.0.6.0.20260416.50503";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20260227.53908.tar";
-        sha256 = "06ajn9j2dyjbqm87800fbqa0ixrvxz44x23cxp1901vrqwfdmw60";
+        url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20260416.50503.tar";
+        sha256 = "12bcjfi7s7gisx31rwncvcs7j7m57kcs7rs5jfhmmpfsm8n24yba";
       };
       packageRequires = [ ];
       meta = {
@@ -5038,10 +5038,10 @@
     elpaBuild {
       pname = "slime";
       ename = "slime";
-      version = "2.32snapshot0.20260329.213326";
+      version = "2.32snapshot0.20260421.225639";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260329.213326.tar";
-        sha256 = "0327cbysrbizyf3r8crlmcd1wdsxkk29df98gwrrr1w6cvx3162v";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260421.225639.tar";
+        sha256 = "0gqj2nd82wljvfrqwah3qczkjq8q4i1k3cprypydxzlfh45k13jf";
       };
       packageRequires = [ macrostep ];
       meta = {
@@ -5123,10 +5123,10 @@
     elpaBuild {
       pname = "spacemacs-theme";
       ename = "spacemacs-theme";
-      version = "0.2.0.20251221.165628";
+      version = "0.2.0.20260414.205200";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20251221.165628.tar";
-        sha256 = "16d4g4cyjij8s7pzf0g0pnbsfxzxw8lwdamwaq4whmn5g320yb28";
+        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20260414.205200.tar";
+        sha256 = "076nbpp16wy6j9ic3bhj9cj58bmah6ivhh842lkh7y7lgp6f7q7j";
       };
       packageRequires = [ ];
       meta = {
@@ -5249,10 +5249,10 @@
     elpaBuild {
       pname = "subed";
       ename = "subed";
-      version = "1.4.1.0.20260403.230353";
+      version = "1.4.2.0.20260418.123100";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.4.1.0.20260403.230353.tar";
-        sha256 = "0cwp2cyhxiv4wl2rq7jip9864hcbhh3af9prmm347jkxv9wzhyk7";
+        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.4.2.0.20260418.123100.tar";
+        sha256 = "1xdz1vglwza0lik5zqx6f8x8w3a7yq8x7wkd7zr5k932pjmhqbnd";
       };
       packageRequires = [ ];
       meta = {
@@ -5314,10 +5314,10 @@
     elpaBuild {
       pname = "symbol-overlay";
       ename = "symbol-overlay";
-      version = "4.3.0.20240913.162400";
+      version = "4.3.0.20260423.145452";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20240913.162400.tar";
-        sha256 = "0i5rs6cqfjl1c6m8wf0wwlzbsc7zvw9x0b8g8rds9n5c23b7gv15";
+        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20260423.145452.tar";
+        sha256 = "16gm3gj84wd7v6qhf3p0sz2jgbbyi60kqwkb41rfiz7n79qlijpg";
       };
       packageRequires = [ seq ];
       meta = {
@@ -5575,10 +5575,10 @@
     elpaBuild {
       pname = "treesit-fold";
       ename = "treesit-fold";
-      version = "0.2.1.0.20260226.70748";
+      version = "0.2.1.0.20260417.100827";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20260226.70748.tar";
-        sha256 = "017af28xvnkqzqwxzcwiw4hsvmfwvbn1np5gqc54fybrpa9lkkzs";
+        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20260417.100827.tar";
+        sha256 = "04v6yqj6a4aahff2kbpmj3k8jzqxa6idfgpfsd6l98yb3kqldil7";
       };
       packageRequires = [ ];
       meta = {
@@ -5660,10 +5660,10 @@
     elpaBuild {
       pname = "typst-ts-mode";
       ename = "typst-ts-mode";
-      version = "0.12.2.0.20260330.125224";
+      version = "0.12.2.0.20260415.103532";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260330.125224.tar";
-        sha256 = "0qjbypy1jxy7jcpvqh49b8d3b276qgbzlpj09g0bw9dz2g0mp6pr";
+        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260415.103532.tar";
+        sha256 = "190jabvm3p74cd96rrbj45y68myg32zvlxjrq01zvi3jv29xbpf6";
       };
       packageRequires = [ ];
       meta = {
@@ -5808,10 +5808,10 @@
     elpaBuild {
       pname = "vm";
       ename = "vm";
-      version = "8.3.3snapshot0.20260225.71602";
+      version = "8.3.3snapshot0.20260420.63204";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260225.71602.tar";
-        sha256 = "1w6p8cygsvwzzci2fjjy4rysb6n888frsa1ay99p66x8kq5s7n50";
+        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260420.63204.tar";
+        sha256 = "03804kmfwp994szv5gdgsg1sxmmdhzam8aq17r402chj6lhpla1x";
       };
       packageRequires = [ vcard ];
       meta = {
@@ -5940,10 +5940,10 @@
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.4.9.0.20260301.131715";
+      version = "3.4.9.0.20260422.182143";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.9.0.20260301.131715.tar";
-        sha256 = "1cf3xgaqbczsd77h5psdk6q5407nrmkzj9s5zf77g7zs0xwdi317";
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.9.0.20260422.182143.tar";
+        sha256 = "10zb39gwdbamb11msxkayzspi09fpagip93xm90lc39w850xmbbm";
       };
       packageRequires = [ compat ];
       meta = {
@@ -6050,10 +6050,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "28.11.20260215192642.0.20260215.201333";
+      version = "28.11.20260416140940.0.20260416.141130";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260215192642.0.20260215.201333.tar";
-        sha256 = "08pdqfglkl150pw43llm5z3a2mpzdil315a732i7fa4a27qwkxfn";
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260416140940.0.20260416.141130.tar";
+        sha256 = "0mrfn3z60jgk2f9lccb3qcaa52rvh366ys97ypz5lgjlxal1sr5r";
       };
       packageRequires = [ ];
       meta = {
@@ -6114,10 +6114,10 @@
     elpaBuild {
       pname = "yaml-mode";
       ename = "yaml-mode";
-      version = "0.0.16.0.20241003.15333";
+      version = "0.0.16.0.20260420.21817";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20241003.15333.tar";
-        sha256 = "1c6lid3iwxa911zk579rvy1dq8azq6xmp0s6lahchkcq40dvbjl5";
+        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20260420.21817.tar";
+        sha256 = "1lbh8w21g897zvi9lys47kj5vkgpr9ifp8lgpr5jcxvsrj0xbayv";
       };
       packageRequires = [ ];
       meta = {

From e949b6dc1d696bffeb504ce7fa409d12d313350a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 25 Apr 2026 09:06:57 -0400
Subject: [PATCH 015/107] nixos/fontconfig: default `useEmbeddedBitmaps` to
 `true` unconditionally

See https://github.com/NixOS/nixpkgs/pull/454989#pullrequestreview-4169977261
---
 nixos/modules/config/fonts/fontconfig.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 9316b739fda2..62214cacc101 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -518,8 +518,7 @@ in
 
         useEmbeddedBitmaps = lib.mkOption {
           type = lib.types.bool;
-          default = lib.versionAtLeast config.system.stateVersion "26.05";
-          defaultText = lib.literalExpression "lib.versionAtLeast config.system.stateVersion \"26.05\"";
+          default = true;
           description = "Use embedded bitmaps in fonts like Calibri.";
         };
 

From 3603c9b403333304be83769edb0c3f51d71c38de Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Tue, 24 Jun 2025 10:03:26 -0400
Subject: [PATCH 016/107] python3Packages.rtf-tokenize: init at 1.0.0

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 .../python-modules/rtf-tokenize/default.nix   | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/rtf-tokenize/default.nix

diff --git a/pkgs/development/python-modules/rtf-tokenize/default.nix b/pkgs/development/python-modules/rtf-tokenize/default.nix
new file mode 100644
index 000000000000..f6701180dabc
--- /dev/null
+++ b/pkgs/development/python-modules/rtf-tokenize/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  versionCheckHook,
+  which,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "rtf-tokenize";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "rtf_tokenize";
+    tag = finalAttrs.version;
+    hash = "sha256-zwD2sRYTY1Kmm/Ag2hps9VRdUyQoi4zKtDPR+F52t9A=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    which
+  ];
+
+  versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}";
+
+  preInstallCheck = ''
+    versionCheckProgram="$(which ls)"
+  '';
+
+  pythonImportsCheck = [ "rtf_tokenize" ];
+
+  meta = {
+    description = "Simple RTF tokenizer package for Python";
+    homepage = "https://github.com/openstenoproject/rtf_tokenize";
+    license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/rtf_tokenize/issues/1
+    maintainers = with lib.maintainers; [ pandapip1 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d66783552dc8..bf439af16afe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17157,6 +17157,8 @@ self: super: with self; {
 
   rtb-data = callPackage ../development/python-modules/rtb-data { };
 
+  rtf-tokenize = callPackage ../development/python-modules/rtf-tokenize { };
+
   rtfde = callPackage ../development/python-modules/rtfde { };
 
   rtfunicode = callPackage ../development/python-modules/rtfunicode { };

From 4d05dc3e571388c5314ccc07e747a6097dab13c1 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Tue, 24 Jun 2025 10:31:05 -0400
Subject: [PATCH 017/107] python3Packages.plover-stroke: init at 1.1.0

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 .../python-modules/plover-stroke/default.nix  | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-stroke/default.nix

diff --git a/pkgs/development/python-modules/plover-stroke/default.nix b/pkgs/development/python-modules/plover-stroke/default.nix
new file mode 100644
index 000000000000..a97dfa33f5bd
--- /dev/null
+++ b/pkgs/development/python-modules/plover-stroke/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pytest-qt,
+  pyside6,
+  versionCheckHook,
+  which,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "plover-stroke";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "plover_stroke";
+    tag = finalAttrs.version;
+    hash = "sha256-A75OMzmEn0VmDAvmQCp6/7uptxzwWJTwsih3kWlYioA=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-qt
+    pyside6
+  ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    which
+  ];
+
+  versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}";
+
+  preInstallCheck = ''
+    versionCheckProgram="$(which ls)"
+  '';
+
+  pythonImportsCheck = [ "plover_stroke" ];
+
+  meta = {
+    description = "Helper class for working with steno strokes";
+    homepage = "https://github.com/openstenoproject/plover_stroke";
+    license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/plover_stroke/issues/4
+    maintainers = with lib.maintainers; [ pandapip1 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf439af16afe..455b6d84bcf2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12664,6 +12664,8 @@ self: super: with self; {
 
   plotpy = callPackage ../development/python-modules/plotpy { };
 
+  plover-stroke = callPackage ../development/python-modules/plover-stroke { };
+
   pluggy = callPackage ../development/python-modules/pluggy { };
 
   pluginbase = callPackage ../development/python-modules/pluginbase { };

From 02ee7668c7d6ca1e4387a10779f88dda64b13d1f Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 09:40:20 -0400
Subject: [PATCH 018/107] plover.dev: unbork

---
 pkgs/applications/misc/plover/default.nix | 98 ++++++++++++++---------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index fc0ff2a6b9f9..92c2a95d8f3a 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,20 +1,70 @@
 {
   lib,
   config,
+  stdenv,
+  buildPythonPackage ? python3Packages.buildPythonPackage,
   fetchFromGitHub,
+  versionCheckHook,
   python3Packages,
-  wmctrl,
-  qtbase,
-  mkDerivationWith,
+  libsForQt5,
 }:
 
 {
-  dev =
-    with python3Packages;
-    mkDerivationWith buildPythonPackage rec {
+  dev = (
+    buildPythonPackage rec {
       pname = "plover";
       version = "4.0.2";
-      format = "setuptools";
+      pyproject = true;
+
+      src = fetchFromGitHub {
+        owner = "openstenoproject";
+        repo = "plover";
+        tag = "v${version}";
+        hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
+      };
+
+      postPatch = ''
+        sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
+      '';
+
+      build-system = with python3Packages; [
+        babel
+        setuptools
+        pyqt5
+        wheel
+      ];
+      dependencies = with python3Packages; [
+        appdirs
+        evdev
+        pyqt5
+        pyserial
+        plover-stroke
+        rtf-tokenize
+        setuptools
+        wcwidth
+        xlib
+      ];
+      nativeBuildInputs = with libsForQt5; [
+        wrapQtAppsHook
+      ];
+
+      nativeCheckInputs = with python3Packages; [
+        pytestCheckHook
+        versionCheckHook
+        pytest-qt
+        mock
+      ];
+
+      # Segfaults?!
+      disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ];
+
+      preFixup = ''
+        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+      '';
+
+      dontWrapQtApps = true;
+
+      pythonImportsCheck = [ "plover" ];
 
       meta = {
         broken = stdenv.hostPlatform.isDarwin;
@@ -25,38 +75,8 @@
         ];
         license = lib.licenses.gpl2;
       };
-
-      src = fetchFromGitHub {
-        owner = "openstenoproject";
-        repo = "plover";
-        tag = "v${version}";
-        sha256 = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
-      };
-
-      # I'm not sure why we don't find PyQt5 here but there's a similar
-      # sed on many of the platforms Plover builds for
-      postPatch = "sed -i /PyQt5/d setup.cfg";
-
-      nativeCheckInputs = [
-        pytest
-        mock
-      ];
-      propagatedBuildInputs = [
-        babel
-        pyqt5
-        xlib
-        pyserial
-        appdirs
-        wcwidth
-        setuptools
-      ];
-
-      dontWrapQtApps = true;
-
-      preFixup = ''
-        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-      '';
-    };
+    }
+  );
 }
 // lib.optionalAttrs config.allowAliases {
   stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca575294d8bc..04f00495197a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10132,7 +10132,7 @@ with pkgs;
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
 
-  plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
+  plover = callPackage ../applications/misc/plover { };
 
   # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules

From 1e116a46a71a21c02869159992aeaf927ac42492 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 09:43:11 -0400
Subject: [PATCH 019/107] plover.dev: fix license

---
 pkgs/applications/misc/plover/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 92c2a95d8f3a..372ff9e51e13 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -73,7 +73,7 @@
           twey
           kovirobi
         ];
-        license = lib.licenses.gpl2;
+        license = licenses.gpl2Plus;
       };
     }
   );

From 3113377e4bfb732630cbfcf425a41daf82ffedb1 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 09:44:02 -0400
Subject: [PATCH 020/107] plover.dev: get rid of with lib in meta

---
 pkgs/applications/misc/plover/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 372ff9e51e13..5a1cea4226a7 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -73,7 +73,7 @@
           twey
           kovirobi
         ];
-        license = licenses.gpl2Plus;
+        license = lib.licenses.gpl2Plus;
       };
     }
   );

From e27c0ae0d5128e835caa212da367ea9f427cce19 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 09:44:28 -0400
Subject: [PATCH 021/107] plover.dev: add additional meta information

---
 pkgs/applications/misc/plover/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 5a1cea4226a7..dcdf08f8814b 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -67,13 +67,16 @@
       pythonImportsCheck = [ "plover" ];
 
       meta = {
-        broken = stdenv.hostPlatform.isDarwin;
         description = "OpenSteno Plover stenography software";
+        homepage = "https://www.openstenoproject.org/plover/";
+        mainProgram = "plover";
         maintainers = with lib.maintainers; [
           twey
           kovirobi
         ];
         license = lib.licenses.gpl2Plus;
+        platforms = lib.platforms.unix;
+        broken = stdenv.hostPlatform.isDarwin;
       };
     }
   );

From f8b3c814a19c9dbd1284262270a6012d0f64333d Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 09:44:42 -0400
Subject: [PATCH 022/107] plover.dev: add pandapip1 to maintainers

---
 pkgs/applications/misc/plover/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index dcdf08f8814b..a26ffa27ea8a 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -73,6 +73,7 @@
         maintainers = with lib.maintainers; [
           twey
           kovirobi
+          pandapip1
         ];
         license = lib.licenses.gpl2Plus;
         platforms = lib.platforms.unix;

From 907c48e3ca7606f0357982b5960fc3abcedd2316 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 09:49:06 -0400
Subject: [PATCH 023/107] plover.dev: add better parameterization

---
 pkgs/applications/misc/plover/default.nix | 33 +++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index a26ffa27ea8a..ec14f6f94d48 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -2,13 +2,36 @@
   lib,
   config,
   stdenv,
-  buildPythonPackage ? python3Packages.buildPythonPackage,
+  plover,
   fetchFromGitHub,
+  fetchpatch,
   versionCheckHook,
   python3Packages,
   libsForQt5,
 }:
 
+let
+  inherit (python3Packages)
+    buildPythonPackage
+    appdirs
+    babel
+    evdev
+    mock
+    pyqt5
+    pyserial
+    pytestCheckHook
+    pytest-qt
+    plover-stroke
+    rtf-tokenize
+    setuptools
+    wcwidth
+    wheel
+    xlib
+    ;
+  inherit (libsForQt5)
+    wrapQtAppsHook
+    ;
+in
 {
   dev = (
     buildPythonPackage rec {
@@ -27,13 +50,13 @@
         sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
       '';
 
-      build-system = with python3Packages; [
+      build-system = [
         babel
         setuptools
         pyqt5
         wheel
       ];
-      dependencies = with python3Packages; [
+      dependencies = [
         appdirs
         evdev
         pyqt5
@@ -44,11 +67,11 @@
         wcwidth
         xlib
       ];
-      nativeBuildInputs = with libsForQt5; [
+      nativeBuildInputs = [
         wrapQtAppsHook
       ];
 
-      nativeCheckInputs = with python3Packages; [
+      nativeCheckInputs = [
         pytestCheckHook
         versionCheckHook
         pytest-qt

From c6f8d43c60b48924870fe07f495af5669f63789c Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 27 Jun 2025 10:16:37 -0400
Subject: [PATCH 024/107] plover.dev: rename to plover

---
 pkgs/applications/misc/plover/default.nix | 131 +++++++++++-----------
 1 file changed, 67 insertions(+), 64 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index ec14f6f94d48..af6620404e52 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -3,6 +3,7 @@
   config,
   stdenv,
   plover,
+  buildPythonPackage ? python3Packages.buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
   versionCheckHook,
@@ -32,79 +33,81 @@ let
     wrapQtAppsHook
     ;
 in
-{
-  dev = (
-    buildPythonPackage rec {
-      pname = "plover";
-      version = "4.0.2";
-      pyproject = true;
+buildPythonPackage rec {
+  pname = "plover";
+  version = "4.0.2";
+  pyproject = true;
 
-      src = fetchFromGitHub {
-        owner = "openstenoproject";
-        repo = "plover";
-        tag = "v${version}";
-        hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
-      };
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "plover";
+    tag = "v${version}";
+    hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
+  };
 
-      postPatch = ''
-        sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
-      '';
+  postPatch = ''
+    sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
+  '';
 
-      build-system = [
-        babel
-        setuptools
-        pyqt5
-        wheel
-      ];
-      dependencies = [
-        appdirs
-        evdev
-        pyqt5
-        pyserial
-        plover-stroke
-        rtf-tokenize
-        setuptools
-        wcwidth
-        xlib
-      ];
-      nativeBuildInputs = [
-        wrapQtAppsHook
-      ];
+  build-system = [
+    babel
+    setuptools
+    pyqt5
+    wheel
+  ];
+  dependencies = [
+    appdirs
+    evdev
+    pyqt5
+    pyserial
+    plover-stroke
+    rtf-tokenize
+    setuptools
+    wcwidth
+    xlib
+  ];
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ];
 
-      nativeCheckInputs = [
-        pytestCheckHook
-        versionCheckHook
-        pytest-qt
-        mock
-      ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+    pytest-qt
+    mock
+  ];
 
-      # Segfaults?!
-      disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ];
+  # Segfaults?!
+  disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ];
 
-      preFixup = ''
-        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-      '';
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
 
-      dontWrapQtApps = true;
+  dontWrapQtApps = true;
 
-      pythonImportsCheck = [ "plover" ];
+  pythonImportsCheck = [ "plover" ];
 
-      meta = {
-        description = "OpenSteno Plover stenography software";
-        homepage = "https://www.openstenoproject.org/plover/";
-        mainProgram = "plover";
-        maintainers = with lib.maintainers; [
-          twey
-          kovirobi
-          pandapip1
-        ];
-        license = lib.licenses.gpl2Plus;
-        platforms = lib.platforms.unix;
-        broken = stdenv.hostPlatform.isDarwin;
-      };
-    }
-  );
+  meta = {
+    description = "OpenSteno Plover stenography software";
+    homepage = "https://www.openstenoproject.org/plover/";
+    mainProgram = "plover";
+    maintainers = with lib.maintainers; [
+      twey
+      kovirobi
+      pandapip1
+    ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
 }
 // lib.optionalAttrs config.allowAliases {
-  stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
+  # TODO: After 26.05 branch-off, remove these aliases
+  dev =
+    if lib.versionOlder "25.05" lib.version then
+      throw "plover.dev was renamed. Use plover-dev instead." # added 2025-06-05`
+    else
+      plover;
+  stable = throw "plover.stable was renamed. Use plover instead."; # added 2022-06-05; updated 2025-06-27
 }

From 0954aa206e197559dc7982212ed2ce1319949cd2 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sun, 28 Sep 2025 19:13:04 -0700
Subject: [PATCH 025/107] python3Packages.plover_4: move from plover.dev

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 .../python-modules/plover/4.nix}              | 41 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-packages.nix            |  4 ++
 3 files changed, 20 insertions(+), 27 deletions(-)
 rename pkgs/{applications/misc/plover/default.nix => development/python-modules/plover/4.nix} (82%)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/development/python-modules/plover/4.nix
similarity index 82%
rename from pkgs/applications/misc/plover/default.nix
rename to pkgs/development/python-modules/plover/4.nix
index af6620404e52..9c3cd4926213 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/development/python-modules/plover/4.nix
@@ -3,36 +3,27 @@
   config,
   stdenv,
   plover,
-  buildPythonPackage ? python3Packages.buildPythonPackage,
+  buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
   versionCheckHook,
-  python3Packages,
-  libsForQt5,
+  appdirs,
+  babel,
+  evdev,
+  mock,
+  pyqt5,
+  pyserial,
+  pytestCheckHook,
+  pytest-qt,
+  plover-stroke,
+  rtf-tokenize,
+  setuptools,
+  wcwidth,
+  wheel,
+  xlib,
+  wrapQtAppsHook,
 }:
 
-let
-  inherit (python3Packages)
-    buildPythonPackage
-    appdirs
-    babel
-    evdev
-    mock
-    pyqt5
-    pyserial
-    pytestCheckHook
-    pytest-qt
-    plover-stroke
-    rtf-tokenize
-    setuptools
-    wcwidth
-    wheel
-    xlib
-    ;
-  inherit (libsForQt5)
-    wrapQtAppsHook
-    ;
-in
 buildPythonPackage rec {
   pname = "plover";
   version = "4.0.2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04f00495197a..7eb9ca19ac99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10132,8 +10132,6 @@ with pkgs;
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
 
-  plover = callPackage ../applications/misc/plover { };
-
   # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules
   profanity = callPackage ../applications/networking/instant-messengers/profanity (
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 455b6d84bcf2..50ad5bc32506 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12666,6 +12666,10 @@ self: super: with self; {
 
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };
 
+  plover_4 = callPackage ../development/python-modules/plover/4.nix {
+    inherit (pkgs.libsForQt5) wrapQtAppsHook;
+  };
+
   pluggy = callPackage ../development/python-modules/pluggy { };
 
   pluginbase = callPackage ../development/python-modules/pluginbase { };

From 188701672b4babf83cbae557a211e2fb209dba2e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 01:19:10 +0800
Subject: [PATCH 026/107] python3Packages.plover: init referencing
 python3Packages.plover_4

---
 pkgs/top-level/python-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50ad5bc32506..a93996c4edad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12664,6 +12664,14 @@ self: super: with self; {
 
   plotpy = callPackage ../development/python-modules/plotpy { };
 
+  # Plover 5 moves from PyQt5 to PySide6,
+  # which is a backward-incompatible change to praphical plugins.
+  # Use Plover 4 for now (2026-04-26),
+  # as the upstream still warns about this in every Plover 5 release,
+  # List of unsupported plugins:
+  # https://github.com/opensteno/plover_plugins_registry/blob/master/unsupported.json
+  plover = plover_4;
+
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };
 
   plover_4 = callPackage ../development/python-modules/plover/4.nix {

From 14b4884f7adb0b89bac98c34bc9e1606ebdc60f1 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 01:36:07 +0800
Subject: [PATCH 027/107] plover: init referencing python3Packages.plover with
 aliases

Co-authored-by: Gavin John <gavinnjohn@gmail.com>
---
 pkgs/by-name/pl/plover/package.nix           | 17 +++++++++++++++++
 pkgs/development/python-modules/plover/4.nix | 11 -----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/pl/plover/package.nix

diff --git a/pkgs/by-name/pl/plover/package.nix b/pkgs/by-name/pl/plover/package.nix
new file mode 100644
index 000000000000..8753ebb0316c
--- /dev/null
+++ b/pkgs/by-name/pl/plover/package.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  python3Packages,
+  # For aliases
+  plover,
+}:
+python3Packages.toPythonApplication python3Packages.plover
+# Aliases to now-dropped plover.stable and plover.dev
+# Added 2026-04-22
+# TODO(@ShamrockLee): remove after Nixpkgs 25.11 EOL
+// lib.optionalAttrs (config.allowAliases && !(lib.oldestSupportedReleaseIsAtLeast 2605)) {
+  dev =
+    lib.throwIf (lib.oldestSupportedReleaseIsAtLeast 2511) "plover.dev was renamed. Use plover instead."
+      plover; # Added 2026-04-26
+  stable = throw "plover.stable was renamed. Use plover instead."; # Added 2022-06-05; updated 2026-04-26
+}
diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix
index 9c3cd4926213..4d65eb0875eb 100644
--- a/pkgs/development/python-modules/plover/4.nix
+++ b/pkgs/development/python-modules/plover/4.nix
@@ -1,8 +1,6 @@
 {
   lib,
-  config,
   stdenv,
-  plover,
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
@@ -93,12 +91,3 @@ buildPythonPackage rec {
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
-// lib.optionalAttrs config.allowAliases {
-  # TODO: After 26.05 branch-off, remove these aliases
-  dev =
-    if lib.versionOlder "25.05" lib.version then
-      throw "plover.dev was renamed. Use plover-dev instead." # added 2025-06-05`
-    else
-      plover;
-  stable = throw "plover.stable was renamed. Use plover instead."; # added 2022-06-05; updated 2025-06-27
-}

From 12e0d3a21cd44ec08f5561e86c7defff4ce4e83e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 01:39:57 +0800
Subject: [PATCH 028/107] python3Packages.plover_4: modernise

Remove unused set pattern from override interface.
Use fixed-point arguments when calling buildPythonPackage.
Use structured attributes.
---
 pkgs/development/python-modules/plover/4.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix
index 4d65eb0875eb..ee32e2f50da1 100644
--- a/pkgs/development/python-modules/plover/4.nix
+++ b/pkgs/development/python-modules/plover/4.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   versionCheckHook,
   appdirs,
   babel,
@@ -22,7 +21,9 @@
   wrapQtAppsHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
   pname = "plover";
   version = "4.0.2";
   pyproject = true;
@@ -30,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstenoproject";
     repo = "plover";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
   };
 
@@ -90,4 +91,4 @@ buildPythonPackage rec {
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From 15655c9b0d97245be3a8dbcc3863ea584830f783 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 02:06:35 +0800
Subject: [PATCH 029/107] python3Packages.plover_4: add ShamrockLee to
 maintainers

---
 pkgs/development/python-modules/plover/4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix
index ee32e2f50da1..bda985cb0122 100644
--- a/pkgs/development/python-modules/plover/4.nix
+++ b/pkgs/development/python-modules/plover/4.nix
@@ -86,6 +86,7 @@ buildPythonPackage (finalAttrs: {
       twey
       kovirobi
       pandapip1
+      ShamrockLee
     ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;

From 5f6315fba0e92733fb9da6e0f185a628d267a013 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 01:44:27 +0800
Subject: [PATCH 030/107] python3Packages.plover_5: copy from
 python3Packages.plover_4

---
 pkgs/development/python-modules/plover/5.nix | 95 ++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover/5.nix

diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix
new file mode 100644
index 000000000000..bda985cb0122
--- /dev/null
+++ b/pkgs/development/python-modules/plover/5.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  versionCheckHook,
+  appdirs,
+  babel,
+  evdev,
+  mock,
+  pyqt5,
+  pyserial,
+  pytestCheckHook,
+  pytest-qt,
+  plover-stroke,
+  rtf-tokenize,
+  setuptools,
+  wcwidth,
+  wheel,
+  xlib,
+  wrapQtAppsHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "plover";
+  version = "4.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "plover";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
+  };
+
+  postPatch = ''
+    sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
+  '';
+
+  build-system = [
+    babel
+    setuptools
+    pyqt5
+    wheel
+  ];
+  dependencies = [
+    appdirs
+    evdev
+    pyqt5
+    pyserial
+    plover-stroke
+    rtf-tokenize
+    setuptools
+    wcwidth
+    xlib
+  ];
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+    pytest-qt
+    mock
+  ];
+
+  # Segfaults?!
+  disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
+  dontWrapQtApps = true;
+
+  pythonImportsCheck = [ "plover" ];
+
+  meta = {
+    description = "OpenSteno Plover stenography software";
+    homepage = "https://www.openstenoproject.org/plover/";
+    mainProgram = "plover";
+    maintainers = with lib.maintainers; [
+      twey
+      kovirobi
+      pandapip1
+      ShamrockLee
+    ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})

From a005a75d69c663a75bd3b209d2fa5de40624b34c Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 02:01:12 +0800
Subject: [PATCH 031/107] python3Packages.plover_5: init

Co-authored-by: Gavin John <gavinnjohn@gmail.com>
---
 pkgs/development/python-modules/plover/5.nix | 47 +++++++++++++++++---
 pkgs/top-level/python-packages.nix           |  4 ++
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix
index bda985cb0122..45899b201b7a 100644
--- a/pkgs/development/python-modules/plover/5.nix
+++ b/pkgs/development/python-modules/plover/5.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  buildPackages,
   buildPythonPackage,
   fetchFromGitHub,
   versionCheckHook,
@@ -8,16 +9,24 @@
   babel,
   evdev,
   mock,
-  pyqt5,
+  packaging,
+  pkginfo,
+  psutil,
+  pygments,
   pyserial,
+  pyside6,
   pytestCheckHook,
   pytest-qt,
   plover-stroke,
+  readme-renderer,
+  requests-cache,
+  requests-futures,
   rtf-tokenize,
   setuptools,
   wcwidth,
   wheel,
   xlib,
+  qtbase,
   wrapQtAppsHook,
 }:
 
@@ -25,37 +34,61 @@ buildPythonPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "plover";
-  version = "4.0.2";
+  version = "5.0.0.dev2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openstenoproject";
     repo = "plover";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
+    hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0=";
   };
 
+  # pythonRelaxDeps seemingly doesn't work here
   postPatch = ''
-    sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
+    sed -i 's/,<77//g' pyproject.toml
+    sed -i /PySide6-Essentials/d pyproject.toml
   '';
 
   build-system = [
     babel
     setuptools
-    pyqt5
+    pyside6
     wheel
+
+    # Replacement for missing pyside6-essentials tools,
+    # workaround for https://github.com/NixOS/nixpkgs/issues/277849.
+    # Ideally this would be solved in pyside6 itself but I spent four
+    # hours trying to untangle its build system before giving up. If
+    # anyone wants to spend the time fixing it feel free to request
+    # me (@Pandapip1) as a reviewer.
+    (buildPackages.writeShellScriptBin "pyside6-uic" ''
+      exec ${qtbase}/libexec/uic -g python "$@"
+    '')
+    (buildPackages.writeShellScriptBin "pyside6-rcc" ''
+      exec ${qtbase}/libexec/rcc -g python "$@"
+    '')
   ];
   dependencies = [
     appdirs
     evdev
-    pyqt5
+    packaging
+    pkginfo
+    psutil
+    pygments
     pyserial
+    pyside6
     plover-stroke
+    qtbase
+    readme-renderer
+    requests-cache
+    requests-futures
     rtf-tokenize
     setuptools
     wcwidth
     xlib
-  ];
+  ]
+  ++ readme-renderer.optional-dependencies.md;
   nativeBuildInputs = [
     wrapQtAppsHook
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a93996c4edad..debe4b242966 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12678,6 +12678,10 @@ self: super: with self; {
     inherit (pkgs.libsForQt5) wrapQtAppsHook;
   };
 
+  plover_5 = callPackage ../development/python-modules/plover/5.nix {
+    inherit (pkgs.qt6) qtbase wrapQtAppsHook;
+  };
+
   pluggy = callPackage ../development/python-modules/pluggy { };
 
   pluginbase = callPackage ../development/python-modules/pluginbase { };

From 318747e3c22fa4af72a9dba4804db36b71814022 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 02:09:54 +0800
Subject: [PATCH 032/107] plover_4: init referencing python3Packages.plover_4

---
 pkgs/by-name/pl/plover_4/package.nix | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 pkgs/by-name/pl/plover_4/package.nix

diff --git a/pkgs/by-name/pl/plover_4/package.nix b/pkgs/by-name/pl/plover_4/package.nix
new file mode 100644
index 000000000000..eed2b2361775
--- /dev/null
+++ b/pkgs/by-name/pl/plover_4/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.plover_4

From e2acb5061abf30cd6f0358f07bb0d6da632af4ae Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Apr 2026 02:11:44 +0800
Subject: [PATCH 033/107] plover_5: init referencing python3Packages.plover_5

---
 pkgs/by-name/pl/plover_5/package.nix | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 pkgs/by-name/pl/plover_5/package.nix

diff --git a/pkgs/by-name/pl/plover_5/package.nix b/pkgs/by-name/pl/plover_5/package.nix
new file mode 100644
index 000000000000..20ecfa171780
--- /dev/null
+++ b/pkgs/by-name/pl/plover_5/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.plover_5

From 10d240d417961ab700b99adc5a87e2d3d43ddbb1 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 25 Apr 2026 11:19:51 -0400
Subject: [PATCH 034/107] aprutil: unbreak Darwin/LLVM compilation

---
 pkgs/by-name/ap/aprutil/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ap/aprutil/package.nix b/pkgs/by-name/ap/aprutil/package.nix
index f140e7a61493..58af8e3fba42 100644
--- a/pkgs/by-name/ap/aprutil/package.nix
+++ b/pkgs/by-name/ap/aprutil/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   makeWrapper,
   apr,
   expat,
@@ -35,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-libxcrypt-build.patch
     # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors.
     ./clang-bdb.patch
+    # Fix error with missing function prototype
+    (fetchpatch {
+      url = "https://github.com/apache/apr-util/commit/e67caa006c75181b45b761cd50294cb3c8e18f1a.patch?full_index=1";
+      hash = "sha256-fwKT7mGPHIgJ5uG/KAOOE/38FSNfow+GJgHCxcp9mgI=";
+    })
   ]
   ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch;
 

From c4ab7684495355d7b721157e70482021a2f05c51 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 25 Apr 2026 11:19:51 -0400
Subject: [PATCH 035/107] aprutil: unvendor patch

---
 pkgs/by-name/ap/aprutil/clang-bdb.patch | 12 ------------
 pkgs/by-name/ap/aprutil/package.nix     |  6 +++++-
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/by-name/ap/aprutil/clang-bdb.patch

diff --git a/pkgs/by-name/ap/aprutil/clang-bdb.patch b/pkgs/by-name/ap/aprutil/clang-bdb.patch
deleted file mode 100644
index 02e9c8378c63..000000000000
--- a/pkgs/by-name/ap/aprutil/clang-bdb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/build/dbm.m4 b/build/dbm.m4
---- a/build/dbm.m4	2013-11-23 13:00:53.000000000 -0500
-+++ b/build/dbm.m4	2023-10-22 20:16:37.764571446 -0400
-@@ -235,7 +235,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <$apu_try_berkeley_db_header>
--main ()
-+int main ()
- {
-   int major, minor, patch;
- 
diff --git a/pkgs/by-name/ap/aprutil/package.nix b/pkgs/by-name/ap/aprutil/package.nix
index 58af8e3fba42..1426ed26556f 100644
--- a/pkgs/by-name/ap/aprutil/package.nix
+++ b/pkgs/by-name/ap/aprutil/package.nix
@@ -35,7 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./fix-libxcrypt-build.patch
     # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors.
-    ./clang-bdb.patch
+    (fetchpatch {
+      url = "https://github.com/apache/apr-util/commit/2d838ff7319bd384a0b177f40ac19c4b6c81436d.patch?full_index=1";
+      hash = "sha256-/N6V5D1d9R6AVjHUwy3Ne839D3ZSsF3Hpn8W9sx1sXM=";
+      excludes = [ "CHANGES" ];
+    })
     # Fix error with missing function prototype
     (fetchpatch {
       url = "https://github.com/apache/apr-util/commit/e67caa006c75181b45b761cd50294cb3c8e18f1a.patch?full_index=1";

From 706cd17dbdb6c4b264a80fe1579341d5d05f4376 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 7 Feb 2026 14:05:19 +0100
Subject: [PATCH 036/107] mnemosyne: clean up

---
 pkgs/by-name/mn/mnemosyne/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mn/mnemosyne/package.nix b/pkgs/by-name/mn/mnemosyne/package.nix
index 29b7309a5289..150c42dd3eb9 100644
--- a/pkgs/by-name/mn/mnemosyne/package.nix
+++ b/pkgs/by-name/mn/mnemosyne/package.nix
@@ -2,6 +2,7 @@
   python3Packages,
   fetchurl,
   anki,
+  qt6,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
@@ -11,12 +12,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${finalAttrs.version}/Mnemosyne-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-zI79iuRXb5S0Y87KfdG+HKc0XVNQOAcBR7Zt/OdaBP4=";
+    hash = "sha256-zI79iuRXb5S0Y87KfdG+HKc0XVNQOAcBR7Zt/OdaBP4=";
   };
 
-  nativeBuildInputs = with python3Packages; [ pyqtwebengine.wrapQtAppsHook ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
 
-  buildInputs = [ anki ];
+  buildInputs = [
+    anki
+    qt6.qtbase
+  ];
 
   propagatedBuildInputs = with python3Packages; [
     cheroot
@@ -31,11 +35,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     webob
   ];
 
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace '("", ["/usr/local/bin/mplayer"])' ""
-  '';
-
   # No tests/ directory in tarball
   doCheck = false;
 

From 3601a8430bde4d11753ad3145520df65f11e7fe2 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 7 Feb 2026 14:45:49 +0100
Subject: [PATCH 037/107] gitqlient: 1.6.3 -> 1.6.3-unstable-2025-09-11,
 migrate to qt6, unbreak

---
 .../dont-attempt-submodule-update.patch       | 24 ++++++++++++++++
 .../gi/gitqlient/install-to-store.patch       | 28 +++++++++++++++++++
 pkgs/by-name/gi/gitqlient/package.nix         | 28 +++++++++++--------
 3 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch
 create mode 100644 pkgs/by-name/gi/gitqlient/install-to-store.patch

diff --git a/pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch b/pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch
new file mode 100644
index 000000000000..3a335a12fe17
--- /dev/null
+++ b/pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 697b90dd..d3e75d2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,19 +28,6 @@ add_compile_definitions(SHA_VER="${GQ_SHA}")
+ add_compile_definitions(VER="${VERSION}")
+ add_compile_definitions(QT_DEPRECATED_WARNINGS)
+ 
+-if (NOT EXISTS "${PROJECT_SOURCE_DIR}/src/AuxiliarCustomWidgets/.git" OR
+-    NOT EXISTS "${PROJECT_SOURCE_DIR}/src/QLogger/.git" OR
+-    NOT EXISTS "${PROJECT_SOURCE_DIR}/src/QPinnableTabWidget/.git" OR
+-    NOT EXISTS "${PROJECT_SOURCE_DIR}/src/git/.git")
+-    message(STATUS "Submodule update:")
+-    execute_process(COMMAND git submodule update --init --recursive
+-                    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+-    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+-        message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+-    endif()
+-endif()
+-
+ find_package(Qt6 COMPONENTS Core Widgets Network REQUIRED)
+ 
+ file(GLOB SRC_FILES
diff --git a/pkgs/by-name/gi/gitqlient/install-to-store.patch b/pkgs/by-name/gi/gitqlient/install-to-store.patch
new file mode 100644
index 000000000000..0b0059393c8e
--- /dev/null
+++ b/pkgs/by-name/gi/gitqlient/install-to-store.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d3e75d2f..c8d56287 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    target_link_options(${PROJECT_NAME} PUBLIC "-no-pie")
+    
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+-   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install/usr)
+ 
+    install(
+       PROGRAMS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}
+@@ -250,7 +249,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+      include(CPack)
+ 
+ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+    install(
+        TARGETS ${PROJECT_NAME}
+        RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+@@ -260,7 +258,6 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    include(InstallRequiredSystemLibraries)
+ 
+-   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+    install(
+        TARGETS ${PROJECT_NAME}
+        RUNTIME DESTINATION .
diff --git a/pkgs/by-name/gi/gitqlient/package.nix b/pkgs/by-name/gi/gitqlient/package.nix
index 75d9dc1f4cb2..a787c695cb05 100644
--- a/pkgs/by-name/gi/gitqlient/package.nix
+++ b/pkgs/by-name/gi/gitqlient/package.nix
@@ -2,39 +2,45 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libsForQt5,
+  qt6,
+  cmake,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitqlient";
-  version = "1.6.3";
+  version = "1.6.3-unstable-2025-09-11"; # cmake does not install correctly on tagged release
 
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    tag = "v${finalAttrs.version}";
+    rev = "faa3e2c19205123944bb88427a569c6f1b4366a1";
     fetchSubmodules = true;
-    hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
+    hash = "sha256-CBgzTwJWssL0NaNqfesHkOG4pi6QQYxjxWHFcG00U0U=";
   };
 
+  patches = [
+    # fetcher removes .git directory, but cmake attempts to update submodules if .git is missing
+    ./dont-attempt-submodule-update.patch
+    # install logic in unstable is slightly better, but still attempts to install to source tree, not store
+    ./install-to-store.patch
+  ];
+
   nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.wrapQtAppsHook
+    cmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.qtwebengine
-  ];
-
-  qmakeFlags = [
-    "GitQlient.pro"
+    qt6.qtbase
   ];
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # QCheckBox::stateChanged is deprecated
+
   meta = {
     homepage = "https://github.com/francescmm/GitQlient";
     description = "Multi-platform Git client written with Qt";

From a6da95906d59ec88f8349111133f27fe986e7028 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 11 Feb 2026 10:52:25 +0100
Subject: [PATCH 038/107] lgogdownloader-gui: migrate to qt6

---
 pkgs/by-name/lg/lgogdownloader/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index ee4303e2a6a0..4d5e9212bf81 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -13,7 +13,7 @@
   tinyxml-2,
   help2man,
   html-tidy,
-  libsForQt5,
+  qt6,
   testers,
 
   enableGui ? false,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     help2man
     html-tidy
   ]
-  ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
+  ++ lib.optional enableGui qt6.wrapQtAppsHook;
 
   buildInputs = [
     boost
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     tinyxml-2
   ]
   ++ lib.optionals enableGui [
-    libsForQt5.qtbase
-    libsForQt5.qtwebengine
+    qt6.qtbase
+    qt6.qtwebengine
   ];
 
   cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";

From 0d32b50a808d5cb676371b77a52095342c1fa92d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 21:54:07 +0000
Subject: [PATCH 039/107] homer: 26.4.1 -> 26.4.2

---
 pkgs/by-name/ho/homer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 370f4316e979..91f8b7fc6529 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
-  version = "26.4.1";
+  version = "26.4.2";
 
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
     rev = "v${version}";
-    hash = "sha256-zb6A0h0OuSUxh43tO/ksKXvkjrJMwNCsRJwgIy7eXpk=";
+    hash = "sha256-XQjXRckrZ9LhAFp/v/OUJJ80odS5mXhQserPNx0mvwM=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-7BLQHmnw+FfUm9R5//8kEBusM2O+wbTF5joHo60zKfQ=";
+    hash = "sha256-rDKnaIE1ZQ2I83RdlHWtgoMcDoFe7tE102LP2+SPmFg=";
   };
 
   nativeBuildInputs = [

From 83abb365aa596e2c639901e06358476c081fc713 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 22:16:11 +0000
Subject: [PATCH 040/107] spruce: 1.32.0 -> 1.35.0

---
 pkgs/by-name/sp/spruce/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix
index a838870a66c4..178e5edea914 100644
--- a/pkgs/by-name/sp/spruce/package.nix
+++ b/pkgs/by-name/sp/spruce/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spruce";
-  version = "1.32.0";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "geofffranks";
     repo = "spruce";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KTitSKzXa2HudgByLl5P1cWBr0BxxuOO1GRKI26galE=";
+    hash = "sha256-+vWevbRp6SyyCxj/EzzyLkqNsF/E4Zyk7qwI5oCDvdk=";
   };
 
   vendorHash = null;

From 12f553550f8fa63fb0e18d00ce769a4860ab4334 Mon Sep 17 00:00:00 2001
From: x7c2d <me@x7c2d.net>
Date: Sat, 25 Apr 2026 23:06:57 +0000
Subject: [PATCH 041/107] nixos/systemd-networkd: add new options for v260

systemd 260 introduces some new linkConfig options to configure ethernet
devices and a new [MobileNetwork] section (and options) to configure
cellular network connections using a new integration with ModemManager.

- https://github.com/systemd/systemd/releases/tag/v260
---
 nixos/lib/systemd-network-units.nix    |  4 ++
 nixos/modules/system/boot/networkd.nix | 58 ++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/nixos/lib/systemd-network-units.nix b/nixos/lib/systemd-network-units.nix
index 5d3e9b3c9351..ada010e2c58d 100644
--- a/nixos/lib/systemd-network-units.nix
+++ b/nixos/lib/systemd-network-units.nix
@@ -413,6 +413,10 @@ in
       [QuickFairQueueingClass]
       ${attrsToSection def.quickFairQueueingConfigClass}
     ''
+    + optionalString (def.mobileNetworkConfig != { }) ''
+      [MobileNetwork]
+      ${attrsToSection def.mobileNetworkConfig}
+    ''
     + flip concatMapStrings def.bridgeVLANs (x: ''
       [BridgeVLAN]
       ${attrsToSection x}
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 0c74115c15a4..177478f28ac8 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -180,6 +180,12 @@ let
           "StatisticsBlockCoalesceSec"
           "MDI"
           "SR-IOVVirtualFunctions"
+          "ScatterGather"
+          "ScatterGatherFragmentList"
+          "TCPECNSegmentationOffload"
+          "TCPMangleIdSegmentationOffload"
+          "GenericReceiveOffloadList"
+          "GenericReceiveOffloadUDPForwarding"
         ])
         (assertValueOneOf "MACAddressPolicy" [
           "persistent"
@@ -271,6 +277,12 @@ let
           "auto"
         ])
         (assertRange "SR-IOVVirtualFunctions" 0 2147483647)
+        (assertValueOneOf "ScatterGather" boolValues)
+        (assertValueOneOf "ScatterGatherFragmentList" boolValues)
+        (assertValueOneOf "TCPECNSegmentationOffload" boolValues)
+        (assertValueOneOf "TCPMangleIdSegmentationOffload" boolValues)
+        (assertValueOneOf "GenericReceiveOffloadList" boolValues)
+        (assertValueOneOf "GenericReceiveOffloadUDPForwarding" boolValues)
       ];
 
       sectionSR-IOV = checkUnitConfig "SR-IOV" [
@@ -2413,6 +2425,38 @@ let
         (assertInt "PVID")
         (assertRange "PVID" 0 4094)
       ];
+
+      sectionMobileNetwork = checkUnitConfig "MobileNetwork" [
+        (assertOnlyFields [
+          "APN"
+          "AllowedAuthenticationMechanisms"
+          "User"
+          "Password"
+          "IPFamily"
+          "AllowRoaming"
+          "PIN"
+          "OperatorId"
+          "RouteMetric"
+          "UseGateway"
+        ])
+        (assertValuesSomeOfOr "AllowedAuthenticationMechanisms" [
+          "none"
+          "pap"
+          "chap"
+          "mschap"
+          "mschapv2"
+          "eap"
+        ] "")
+        (assertValueOneOf "IPFamily" [
+          "ipv4"
+          "ipv6"
+          "both"
+          "any"
+        ])
+        (assertValueOneOf "AllowRoaming" boolValues)
+        (assertRange "RouteMetric" 0 4294967295)
+        (assertValueOneOf "UseGateway" boolValues)
+      ];
     };
   };
 
@@ -3747,6 +3791,20 @@ let
       '';
     };
 
+    mobileNetworkConfig = mkOption {
+      default = { };
+      example = {
+        APN = "access-point-name";
+        AllowRoaming = false;
+      };
+      type = types.addCheck (types.attrsOf unitOption) check.network.sectionMobileNetwork;
+      description = ''
+        Each attribute in this set specifies an option in the
+        `[MobileNetwork]` section of the unit.  See
+        {manpage}`systemd.network(5)` for details.
+      '';
+    };
+
     name = mkOption {
       type = types.nullOr types.str;
       default = null;

From b503a42d98c36aa5c53a310490c670dcacb80d95 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 26 Apr 2026 04:47:41 +0200
Subject: [PATCH 042/107] qtcreator: 19.0.0 -> 19.0.1

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/qt/qtcreator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qt/qtcreator/package.nix b/pkgs/by-name/qt/qtcreator/package.nix
index c74f7f13fbc2..1eb30a7702cc 100644
--- a/pkgs/by-name/qt/qtcreator/package.nix
+++ b/pkgs/by-name/qt/qtcreator/package.nix
@@ -21,10 +21,10 @@
 }:
 let
   pname = "qtcreator";
-  version = "19.0.0";
+  version = "19.0.1";
   src = fetchurl {
     url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
-    hash = "sha256-9/ab0AdGKkYGeHwTDoNYPbRBbfYnv3d9M5RPI8rqz20=";
+    hash = "sha256-IAVmOmlQOyQETf7QdwajTETKvBn0dqwcEUTe8cSr+r4=";
   };
   goModules =
     (buildGoModule {

From 94df4ec48a991038e4b2acda0d168a7b664d785a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 02:55:48 +0000
Subject: [PATCH 043/107] koffan: 2.9.0 -> 2.10.0

---
 pkgs/by-name/ko/koffan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koffan/package.nix b/pkgs/by-name/ko/koffan/package.nix
index 05fa4eeb5bbe..8e883fb669b1 100644
--- a/pkgs/by-name/ko/koffan/package.nix
+++ b/pkgs/by-name/ko/koffan/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "koffan";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "PanSalut";
     repo = "Koffan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GZmw4UoHoCeLhzAn0GWXR6c/61bYxtngGC2cND+XS5c=";
+    hash = "sha256-euGjcluk2xC+RgryFscP29ONT2prqR0/UxeqMosb2l4=";
   };
 
   vendorHash = "sha256-BYehi5LQQ0MIsKG/fN3DHaQwKVmxUFrvWGrKZeKj+ow=";

From db42215bf65ef80df2c2fd4c5459d8dda40b2627 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 05:46:27 +0000
Subject: [PATCH 044/107] hyprwayland-scanner: 0.4.5 -> 0.4.6

---
 pkgs/by-name/hy/hyprwayland-scanner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
index d414e1af2629..52dc4fed646d 100644
--- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix
+++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
@@ -9,13 +9,13 @@
 }:
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprwayland-scanner";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprwayland-scanner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=";
+    hash = "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=";
   };
 
   nativeBuildInputs = [

From 3025b736d82908ac0b9ea89ca6711ad390b94851 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 06:06:50 +0000
Subject: [PATCH 045/107] python3Packages.pyexploitdb: 0.3.23 -> 0.3.24

---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 1a3956ed65e8..5cdfe0270eb6 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyexploitdb";
-  version = "0.3.23";
+  version = "0.3.24";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-RS1nAIjuCmznq8rQ82lNWT2CVGxahRiH0RrBjDIPwJo=";
+    hash = "sha256-MIjqkn6oYYQWp6AezsXG0GGURCVavOJYzBpqJNPSEyo=";
   };
 
   build-system = [ setuptools ];

From 018bac795f2436bd1b021f707b2087eb28f58fa8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 06:52:44 +0000
Subject: [PATCH 046/107] python3Packages.pubnub: 10.6.2 -> 10.6.3

---
 pkgs/development/python-modules/pubnub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix
index 657b8dce7c2a..21e5bb6928a8 100644
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pubnub";
-  version = "10.6.2";
+  version = "10.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pubnub";
     repo = "python";
     tag = finalAttrs.version;
-    hash = "sha256-YEcxDFO3UK7U17YgIENoxYN/hxqFw58cA2Dg4WJCOvU=";
+    hash = "sha256-gfbHYNP9qOq4FRr+YLwaAOg7XHhcDTanpotp9JMOpfA=";
   };
 
   pythonRelaxDeps = [ "httpx" ];

From 3d7b59797a8160b9c5b2e57a212fadc905b03e57 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Fri, 24 Apr 2026 17:56:27 +0800
Subject: [PATCH 047/107] kmscon: 9.3.4 -> 9.3.5

Diff: https://github.com/kmscon/kmscon/compare/v9.3.4...v9.3.5

Changelog: https://github.com/kmscon/kmscon/releases/tag/v9.3.5
---
 pkgs/by-name/km/kmscon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index 5298f0b2391d..bcecb5c8b5eb 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -29,13 +29,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "kmscon";
-  version = "9.3.4";
+  version = "9.3.5";
 
   src = fetchFromGitHub {
     owner = "kmscon";
     repo = "kmscon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S6a/m2gfYOsacq4uq3d05WZPH1C8RQowmZM7f6On4ic=";
+    hash = "sha256-QBN1rSDmwVg7cgljhe6kVIg/xLoolmOPqS8JXZuQiXs=";
   };
 
   strictDeps = true;

From 1cb208a3ec083d5e24432855e99933ac95dd4251 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 08:21:53 +0000
Subject: [PATCH 048/107] sigma-cli: 3.0.1 -> 3.0.2

---
 pkgs/by-name/si/sigma-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 2020e082cb7d..1cdb5ff94d00 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sigma-cli";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
     tag = "v${version}";
-    hash = "sha256-BBuiLQXGUc3hDF/Dnbs6dNHBMqz43ZtrtnPXTz8r3kQ=";
+    hash = "sha256-46M/WD2BIPMpABai4WZBmxjgI+skwcaRJwPFGXje5y4=";
   };
 
   pythonRelaxDeps = [ "click" ];

From 82c72823c063b15f0f802eb96a1b843833136066 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 26 Apr 2026 10:27:12 +0100
Subject: [PATCH 049/107] mutt: 2.3.1 -> 2.3.2

Changes: http://www.mutt.org/
---
 pkgs/by-name/mu/mutt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mutt/package.nix b/pkgs/by-name/mu/mutt/package.nix
index 352787135a33..29ef1c0cd5ad 100644
--- a/pkgs/by-name/mu/mutt/package.nix
+++ b/pkgs/by-name/mu/mutt/package.nix
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "2.3.1";
+  version = "2.3.2";
   outputs = [
     "out"
     "doc"
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    hash = "sha256-Rw17Dj0TSgX7gGTe3XR3Gwa81jnID8zXdz3DIqr7t7Y=";
+    hash = "sha256-m096RC5BwFd3S6fDb6Qaui7dLnoSqGAx5uuxE7qyx54=";
   };
 
   patches = [

From 850a398b99302fec5cd632a09cd80027d46743a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 09:31:22 +0000
Subject: [PATCH 050/107] pydeps: 3.0.3 -> 3.0.6

---
 pkgs/development/python-modules/pydeps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix
index fb962113ee73..e6d61b347e5d 100644
--- a/pkgs/development/python-modules/pydeps/default.nix
+++ b/pkgs/development/python-modules/pydeps/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydeps";
-  version = "3.0.3";
+  version = "3.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thebjorn";
     repo = "pydeps";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7wMqDhBuGDmWHeaBE3Hs50FGO0vPvrNLQNGC+9u3jAs=";
+    hash = "sha256-/Ie75jQWG3t4cGMRMVPJ7r6aBdm4hC7/CgwmuOUk4BA=";
   };
 
   build-system = [ setuptools ];

From 61eb775af1a1db29025dcdc14584713fdff9c0c0 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 18 Apr 2026 20:56:41 +0200
Subject: [PATCH 051/107] wasm-pack: add hythera as maintainer

---
 pkgs/by-name/wa/wasm-pack/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix
index 1f02c433b15f..7c5aef4d7e72 100644
--- a/pkgs/by-name/wa/wasm-pack/package.nix
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/wasm-bindgen/wasm-pack/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/wasm-bindgen/wasm-pack/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Utility that builds rust-generated WebAssembly package";
     mainProgram = "wasm-pack";
     homepage = "https://github.com/wasm-bindgen/wasm-pack";
@@ -40,6 +40,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = [ lib.maintainers.dhkl ];
+    maintainers = with lib.maintainers; [
+      dhkl
+      hythera
+    ];
   };
 })

From d4956bb361b6f3eb689e313b9fa0c27d7dddd93e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 12 Jan 2026 14:49:32 +0800
Subject: [PATCH 052/107] tests.overriding: add overridePythonAttrs-plain

---
 pkgs/test/overriding.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index e207e8280545..b536097cad85 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -465,6 +465,10 @@ let
         expr = (applyOverridePythonAttrs (applyOverridePythonAttrs package-stub)).overridePythonAttrsFlag;
         expected = 2;
       };
+      overridePythonAttrs-plain = {
+        expr = (package-stub.overridePythonAttrs { overridePythonAttrsFlag = 0; }).overridePythonAttrsFlag;
+        expected = 0;
+      };
       overrideAttrs-overridePythonAttrs-test-overrideAttrs = {
         expr = {
           inherit (applyOverridePythonAttrs (overrideAttrsFooBar package-stub))

From e7eb6868d56c37c2837990e223a398d966d59e6d Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Fri, 9 Jan 2026 11:53:23 +0800
Subject: [PATCH 053/107] overridePythonAttrs: support extension-style newArgs

Allow overridePythonAttrs to take `finalAttrs: args: { }`.
---
 .../python/python-packages-base.nix           | 18 +++++++++++++++--
 pkgs/test/overriding.nix                      | 20 +++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 6fbeb7301215..ff841bfacf2a 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -24,10 +24,24 @@ let
       let
         result = f origArgs;
         overrideWith =
+          # Preserve the plain arguments whenever possible,
+          # as `overrideStdenvCompat` works more reliably with `args.stdenv`
+          # than `result.__stdenvPythonCompat`.
+          # TODO(@ShamrockLee): After `overrideStdenvCompat` is fully deprecated,
+          # simplify as
+          # ```nix
+          # newArgs: lib.extends (lib.toExtension newArgs) origArgs
+          # ```
           if lib.isFunction origArgs then
-            newArgs: lib.extends (_: lib.toFunction newArgs) origArgs
+            newArgs: lib.extends (lib.toExtension newArgs) origArgs
           else
-            newArgs: origArgs // lib.toFunction newArgs origArgs;
+            newArgs:
+            if !(lib.isFunction newArgs) then
+              origArgs // newArgs
+            else if !(lib.isFunction (newArgs origArgs)) then
+              origArgs // newArgs origArgs
+            else
+              finalAttrs: origArgs // newArgs finalAttrs origArgs;
       in
       if lib.isAttrs result then
         result
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index b536097cad85..5e6fe09b7890 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -434,6 +434,14 @@ let
         p.overridePythonAttrs (previousAttrs: {
           overridePythonAttrsFlag = previousAttrs.overridePythonAttrsFlag or 0 + 1;
         });
+      applyOverridePythonAttrsFP =
+        p:
+        p.overridePythonAttrs (
+          finalAttrs: previousAttrs: {
+            overridePythonAttrsFlag = previousAttrs.overridePythonAttrsFlag or 0 + 1;
+            overridePythonAttrsFlagP1 = finalAttrs.overridePythonAttrsFlag + 1;
+          }
+        );
       overrideAttrsFooBar =
         drv:
         drv.overrideAttrs (
@@ -469,6 +477,18 @@ let
         expr = (package-stub.overridePythonAttrs { overridePythonAttrsFlag = 0; }).overridePythonAttrsFlag;
         expected = 0;
       };
+      overridePythonAttrs-finalAttrs = {
+        expr = {
+          inherit (applyOverridePythonAttrsFP package-stub)
+            overridePythonAttrsFlag
+            overridePythonAttrsFlagP1
+            ;
+        };
+        expected = {
+          overridePythonAttrsFlag = 1;
+          overridePythonAttrsFlagP1 = 2;
+        };
+      };
       overrideAttrs-overridePythonAttrs-test-overrideAttrs = {
         expr = {
           inherit (applyOverridePythonAttrs (overrideAttrsFooBar package-stub))

From 947e720bb4ed743c621039a701fee38141ca32ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sun, 26 Apr 2026 11:34:58 +0100
Subject: [PATCH 054/107] xdg-desktop-portal-hyprland: 1.3.11 -> 1.3.12

---
 .../hyprwm/xdg-desktop-portal-hyprland/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index dffe4664239a..755258e07856 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -28,13 +28,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-hyprland";
-  version = "1.3.11";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "xdg-desktop-portal-hyprland";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=";
+    hash = "sha256-B7nwX0PE0KBo1/ZtuwJtA7dBG6gdPW5tSBb0skY8DHA=";
   };
 
   depsBuildBuild = [

From 192343cd24bdd5edb86a9a7df81c037ad04753b1 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sat, 25 Apr 2026 14:17:23 +0800
Subject: [PATCH 055/107] nixos/kmscon: spawn kmscon on tty1 only if the
 display manager is disabled

---
 nixos/modules/services/ttys/kmscon.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index cc69137a6345..85b47e1b62ce 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -156,7 +156,9 @@ in
 
     # tty1 is special: logind does not spawn autovt@tty1, it expects a static
     # pull-in via getty.target. With getty@ suppressed, we must replace it.
-    systemd.services."kmsconvt@tty1".wantedBy = [ "getty.target" ];
+    systemd.services."getty.target".wants = lib.mkIf (!config.services.displayManager.enable) [
+      "kmsconvt@tty1.service"
+    ];
 
     systemd.suppressedSystemUnits = [ "getty@.service" ];
 

From 6b0cc41224cc42a5f2517af95e9f1a832a6632f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 11:49:20 +0000
Subject: [PATCH 056/107] mongodb-compass: 1.49.4 -> 1.49.5

---
 pkgs/by-name/mo/mongodb-compass/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 8fbe6ae691ba..ee6f8d238a0e 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -52,7 +52,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.49.4";
+  version = "1.49.5";
 
   selectSystem =
     attrs:
@@ -67,9 +67,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-TsALgtCUIHjv6auOIOJjng/B23gcSJMG7x1wBOfOZn4=";
-      x86_64-darwin = "sha256-AaZOxMIG8QL5ee8A5pDXtt7w0LWTA1Y6oItCdZyN9Us=";
-      aarch64-darwin = "sha256-J4yxRvZr9xcIRYmIIE+InB8cH51if+bpUbt/hniGovU=";
+      x86_64-linux = "sha256-CuNY+hzTF2jxZEMSOZkiexGw+1QSGmZ8HDPbD4CGnqU=";
+      x86_64-darwin = "sha256-qbNnu6HK7ajKaXak3raOj1xAlE2bUqN9SsGcs+YbjE8=";
+      aarch64-darwin = "sha256-+ECujuOErLrwJ3j/7SbjgCHTh9QxmDFj8G52IhWOR3E=";
     };
   };
 

From bba77e69fc1642c39698af393c4e379cfe26cf8e Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Sat, 25 Apr 2026 18:35:30 -0300
Subject: [PATCH 057/107] python3Packages.aioboto3: disable DynamoDB tests with
 aiobotocore 3.x

DynamoDB tests fail with aiobotocore 3.x due to HTTP header issue with
moto: 'Duplicate Server header found'. This is the same issue that
causes aiobotocore itself to disable its DynamoDB tests.

Fixes 7 test failures:
- test_dynamo_resource_query
- test_dynamo_resource_put
- test_dynamo_resource_batch_write_flush_on_exit_context
- test_dynamo_resource_batch_write_flush_amount
- test_flush_doesnt_reset_item_buffer
- test_dynamo_resource_property
- test_dynamo_resource_waiter
---
 pkgs/development/python-modules/aioboto3/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index 38aa46b44f53..b22ca1c0420b 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -75,6 +75,17 @@ buildPythonPackage (finalAttrs: {
     "test_s3_copy_multipart"
     "test_s3_download_file_404"
     "test_s3_upload_file"
+  ]
+  ++ [
+    # DynamoDB tests fail with aiobotocore 3.x due to HTTP header issue with moto:
+    # "Duplicate 'Server' header found" - same issue as aiobotocore disables
+    "test_dynamo_resource_query"
+    "test_dynamo_resource_put"
+    "test_dynamo_resource_batch_write_flush_on_exit_context"
+    "test_dynamo_resource_batch_write_flush_amount"
+    "test_flush_doesnt_reset_item_buffer"
+    "test_dynamo_resource_property"
+    "test_dynamo_resource_waiter"
   ];
 
   pythonImportsCheck = [ "aioboto3" ];

From 77f5f853a23305ac4c72e4584854a69a362c8354 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 11:58:48 +0000
Subject: [PATCH 058/107] gpxsee: 16.3 -> 16.6

---
 pkgs/by-name/gp/gpxsee/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index 579f0b279f6b..fcd13b6d82a7 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "16.3";
+  version = "16.6";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-24kfNtjD4zV2eTufDErPDt2O9ON1hvhWOPRaPBCxxEI=";
+    hash = "sha256-7OUYDkBfj+7B3Uu4BAsxlJJmrI3PifWLilazqj5PBx4=";
   };
 
   buildInputs = [

From 2fbc4f46188649b69c52c7abfe2063764f3156d8 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 26 Apr 2026 17:29:25 +1000
Subject: [PATCH 059/107] lgogdownloader: fix build, c++17 and matching jsoncpp
 ABI

lgogdownloader: force C++17 in CMakeLists.txt to fix build with jsoncpp
---
 pkgs/by-name/lg/lgogdownloader/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index ee4303e2a6a0..eb1502cbcc9c 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-dVEV2smZxB6+Utm9FApiFydAS3hLm4y9YZja1B/PiEk=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "set_property(TARGET \''${PROJECT_NAME} PROPERTY CXX_STANDARD 11)" "set_property(TARGET \''${PROJECT_NAME} PROPERTY CXX_STANDARD 17)"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -52,7 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtwebengine
   ];
 
-  cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
+  cmakeFlags = [
+    (lib.cmakeBool "USE_QT_GUI" enableGui)
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17")
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DJSONCPP_HAS_STRING_VIEW=1")
+  ];
 
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };

From 97d8c3106eadab431a5315a98a700fb900f2fca2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 12:21:15 +0000
Subject: [PATCH 060/107] beeper: 4.2.653 -> 4.2.770

---
 pkgs/by-name/be/beeper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 1fa9d17a8e8b..0711a6a089f1 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.2.653";
+  version = "4.2.770";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-+CNPeLE+FeMVWKbTwU4mrRwwWZhNm5sHsaRBAG1wuEs=";
+    hash = "sha256-0x1p61zIkAGpBG0dyRwLqoKbhqI3EGTtqpdYr5sxhog=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From 98e608cdc7d25f7372b31dd18f03795c8c9321ff Mon Sep 17 00:00:00 2001
From: Saad Nadeem <saadndm.sn@gmail.com>
Date: Fri, 24 Apr 2026 09:58:29 -0400
Subject: [PATCH 061/107] vimPlugins.fff-nvim: 0.5.2 -> 0.6.4

---
 .../non-generated/fff-nvim/default.nix        | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 6bd7b2f4aca2..14a30d0d410a 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -5,24 +5,26 @@
   nix-update-script,
   openssl,
   perl,
-  zig_0_15,
+  zig,
+  gitMinimal,
   pkg-config,
   stdenv,
   vimUtils,
+  writableTmpDirAsHomeHook,
 }:
 let
-  version = "0.5.2";
+  version = "0.6.4";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
     tag = "v${version}";
-    hash = "sha256-rv33dRf53m9iJwRl56z9oU0EuY1wUChsZyHOi/3gv4A=";
+    hash = "sha256-vu5yqOvVAPXHMi8sZFQuH9rNsFDffh3Ja74Be0Cs64c=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-ylQtZa3ZRs38mhge5tLLCRpnUdHYSjuZOwU+/6TO8Cw=";
+    cargoHash = "sha256-w6KwiE0rAT00fiRa1rT8uthVgcMB7EFGoG3+M5MYEBo=";
 
     cargoBuildFlags = [
       "-p"
@@ -42,8 +44,17 @@ let
       pkg-config
       perl
       rustPlatform.bindgenHook
+      writableTmpDirAsHomeHook
     ];
 
+    # Some tests need git
+    nativeCheckInputs = [ gitMinimal ];
+
+    # Tests need these permissions in order to use the FSEvents API on macOS.
+    sandboxProfile = ''
+      (allow mach-lookup (global-name "com.apple.FSEvents"))
+    '';
+
     buildInputs = [
       openssl
     ];
@@ -59,7 +70,7 @@ let
       # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
       RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
 
-      ZIG = lib.getExe zig_0_15; # zlob requires zig
+      ZIG = lib.getExe zig; # zlob requires zig
     };
   };
 in

From 3aeb74e6d2795ff280b1fe7f9123689e9bb61d22 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Apr 2026 14:24:13 +0200
Subject: [PATCH 062/107] solanum: replace hyperscan with vectorscan

Part of #310772.
---
 pkgs/by-name/so/solanum/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index 32f48513a0d5..453271b0cdc7 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -12,7 +12,7 @@
 
   # runtime
   lksctp-tools,
-  hyperscan,
+  vectorscan,
   libxcrypt,
   openssl,
   pkg-config,
@@ -62,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    hyperscan
     libxcrypt
     openssl
     sqlite
+    vectorscan
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     lksctp-tools

From 2317d15496ece5c515d270d6ff4a17e6d2640ae4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Apr 2026 14:25:07 +0200
Subject: [PATCH 063/107] solanum: set main program

---
 pkgs/by-name/so/solanum/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index 453271b0cdc7..99a98f909532 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/solanum-ircd/solanum";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ hexa ];
+    mainProgram = "solanum";
     platforms = lib.platforms.unix;
   };
 })

From 523bab8632c8ec3819bedefd33daa33d4fc8c06b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 12:28:12 +0000
Subject: [PATCH 064/107] kcl-kafka: 0.17.0 -> 0.18.0

---
 pkgs/by-name/kc/kcl-kafka/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kc/kcl-kafka/package.nix b/pkgs/by-name/kc/kcl-kafka/package.nix
index ed2e0ccf2b41..cb7307a5f2f8 100644
--- a/pkgs/by-name/kc/kcl-kafka/package.nix
+++ b/pkgs/by-name/kc/kcl-kafka/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kcl-kafka";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "twmb";
     repo = "kcl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P55k9PIUDtYMzgPHCQYQLNgprnC9MDUX6ZfgZhI9fC0=";
+    hash = "sha256-BCLwgDDVp3mqQEJnPt97nEbpaYmm8a7jzO45Vn2bUaQ=";
   };
 
-  vendorHash = "sha256-o7iSFI0zRwjlE2MVqKSpPMowR4mD2zW6wez4sqNX4Cw=";
+  vendorHash = "sha256-FTh3YLfWL1L4WiRcaz5beS4/mHbtPEXG8V85VmSndWo=";
 
   subPackages = [ "." ];
 

From 64aec86c56701c12297a30466e663c24e8b946eb Mon Sep 17 00:00:00 2001
From: Seercat3160 <76834828+Seercat3160@users.noreply.github.com>
Date: Fri, 24 Apr 2026 19:34:20 +1000
Subject: [PATCH 065/107] rstudio{,-server}: 2026.01.1+403 -> 2026.04.0+526

---
 pkgs/by-name/rs/rstudio/dont-npm-ci.patch     | 10 ++---
 .../rs/rstudio/dont-yarn-install.patch        | 16 ++++----
 pkgs/by-name/rs/rstudio/package.nix           | 40 ++++++++++---------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/rs/rstudio/dont-npm-ci.patch b/pkgs/by-name/rs/rstudio/dont-npm-ci.patch
index b0552fb4ee67..d31e05c1862c 100644
--- a/pkgs/by-name/rs/rstudio/dont-npm-ci.patch
+++ b/pkgs/by-name/rs/rstudio/dont-npm-ci.patch
@@ -1,8 +1,8 @@
 diff --git a/src/node/desktop/CMakeLists.txt b/src/node/desktop/CMakeLists.txt
-index bccf5b3..71e10a7 100644
+index 7917f0b59e..38d0023922 100644
 --- a/src/node/desktop/CMakeLists.txt
 +++ b/src/node/desktop/CMakeLists.txt
-@@ -117,11 +117,7 @@ file(MAKE_DIRECTORY "${ELECTRON_BINARY_DIR}")
+@@ -201,11 +201,7 @@ file(MAKE_DIRECTORY "${ELECTRON_BINARY_DIR}")
  file(
     COPY "${CMAKE_CURRENT_SOURCE_DIR}/"
     DESTINATION "${ELECTRON_BINARY_DIR}/"
@@ -16,13 +16,13 @@ index bccf5b3..71e10a7 100644
  configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main/build-info.ts.in
 diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
-index df92166..47ca4b4 100644
+index 613361fb8a..0b186c9a76 100644
 --- a/src/node/desktop/package.json
 +++ b/src/node/desktop/package.json
-@@ -10,7 +10,7 @@
-   "scripts": {
+@@ -11,7 +11,7 @@
      "clean": "ts-node scripts/clean.ts",
      "lint": "eslint ./src ./test",
+     "typecheck": "tsc --noEmit",
 -    "package": "npm ci && electron-forge package",
 +    "package": "electron-forge package",
      "start": "electron-forge start -- --no-sandbox",
diff --git a/pkgs/by-name/rs/rstudio/dont-yarn-install.patch b/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
index 72a5e1c9050b..bbb98b414e40 100644
--- a/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
+++ b/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
@@ -1,16 +1,18 @@
 diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index 27ffe33..4218678 100644
+index abf850ee3d..3e3d5fea57 100644
 --- a/src/gwt/build.xml
 +++ b/src/gwt/build.xml
-@@ -139,11 +139,6 @@
+@@ -267,13 +267,6 @@
        <echo message="panmirror minify: ${panmirror.minify}"/>
  
        <mkdir dir="${panmirror.build.dir}"/>
--      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
--         <arg value="install"/>
--         <arg value="--network-timeout"/>
--         <arg value="240000"/>
--      </exec>
+-      <retry retrycount="3">
+-         <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
+-            <arg value="install"/>
+-            <arg value="--network-timeout"/>
+-            <arg value="240000"/>
+-         </exec>
+-      </retry>
        <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
           <arg value="build"/>
           <arg value="--minify"/>
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 77838da0eec0..58d2d4ebbeda 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -17,15 +17,16 @@
   git,
   jdk,
   makeWrapper,
-  nodejs-slim,
+  nodejs,
   npmHooks,
+  python3,
   xcbuild,
   yarn,
   yarnConfigHook,
   zip,
 
-  boost187,
-  electron_38,
+  boost190,
+  electron_39,
   fontconfig,
   gnumake,
   hunspellDicts,
@@ -44,7 +45,8 @@
 }:
 
 let
-  electron = electron_38;
+  electron = electron_39;
+  boost = boost190;
 
   mathJaxSrc = fetchzip {
     url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
@@ -62,8 +64,8 @@ let
     owner = "quarto-dev";
     repo = "quarto";
     # Note: rev should ideally be the last commit of the release/rstudio-[codename] branch
-    rev = "591b3520eafbb4da7b26b9f31aac6948801f19d8";
-    hash = "sha256-scdm66Ekfjp5wdNDXcVZA5ZhNgFvuf/kIBF56HrE8uM=";
+    rev = "8c1669f3095c5afee6bcd98a659d51a43300bda9";
+    hash = "sha256-01urKiFz5iDtW8r+w7zwUDXUOKZIOhi/ip329RsuQ+Q=";
   };
 
   hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
@@ -85,13 +87,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rstudio";
-  version = "2026.01.1+403";
+  version = "2026.04.0+526";
 
   src = fetchFromGitHub {
     owner = "rstudio";
     repo = "rstudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s+t48LLvxdit6US6MB4DvpEZtUY6SSK5Qha1k4VW0Qk=";
+    hash = "sha256-6oHH3C3/MGFSOuI+FvyrLyOKRyy455Wkr75ZL8ZeiWg=";
   };
 
   # sources fetched into _deps via cmake's FetchContent
@@ -123,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     dontBuild = true;
     dontFixup = true;
 
-    outputHash = "sha256-t2kWnviFMw7TdxaJpiGDXe0M5HSIGD7o5hqWiPKUdOc=";
+    outputHash = "sha256-XzSDU4GVY6OrIFG4qCWUF94nV6fcz9zyFSlSvttVrYw=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -135,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
     ant
     jdk
 
-    nodejs-slim
+    nodejs
     yarn
     yarnConfigHook
     zip
@@ -145,12 +147,12 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!server) [
     makeWrapper
-    (nodejs-slim.python.withPackages (ps: [ ps.setuptools ]))
+    (python3.withPackages (ps: [ ps.setuptools ]))
     npmHooks.npmConfigHook
   ];
 
   buildInputs = [
-    boost187
+    boost
     libuuid
     openssl
     R
@@ -249,7 +251,7 @@ stdenv.mkDerivation (finalAttrs: {
     name = "rstudio-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     postPatch = "cd ${finalAttrs.npmRoot}";
-    hash = "sha256-7gXLCFhan/TCTlc2okMWuWzfRYXmuwcqhmGKAqJOEM0=";
+    hash = "sha256-lO+wJk0HWYrKO1Rqz8laVpZK5RUfA9ijYvtPEtVf1r4=";
   };
 
   preConfigure = ''
@@ -285,12 +287,12 @@ stdenv.mkDerivation (finalAttrs: {
 
     # node used by cmake and node used for distribution
     # version in cmake/globals.cmake
-    RSTUDIO_NODE_VERSION="22.13.1"
-    RSTUDIO_INSTALLED_NODE_VERSION="22.21.1"
+    RSTUDIO_NODE_VERSION="22.22.2"
+    RSTUDIO_INSTALLED_NODE_VERSION="22.22.2"
 
     mkdir -p dependencies/common/node
-    ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_NODE_VERSION
-    ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed
+    ln -s ${nodejs} dependencies/common/node/$RSTUDIO_NODE_VERSION
+    ln -s ${nodejs} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed
 
   ''
   + lib.optionalString (!server) ''
@@ -314,7 +316,9 @@ stdenv.mkDerivation (finalAttrs: {
     rm -r electron-dist
 
     # force @electron/packager to use our electron instead of downloading it
-    substituteInPlace node_modules/@electron/packager/dist/packager.js \
+    substituteInPlace \
+      node_modules/@electron/packager/dist/packager.js \
+      node_modules/@electron-forge/core/node_modules/@electron/packager/dist/packager.js \
       --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'"
 
     # now that we patched everything, we still have to run the scripts we ignored with --ignore-scripts

From fbdd89e999208175ca2dc639cbe44ec8d6eef634 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 13:55:55 +0000
Subject: [PATCH 066/107] outline: 1.6.1 -> 1.7.0

---
 pkgs/by-name/ou/outline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ou/outline/package.nix b/pkgs/by-name/ou/outline/package.nix
index 1e1f4f06797c..ec6bc3802090 100644
--- a/pkgs/by-name/ou/outline/package.nix
+++ b/pkgs/by-name/ou/outline/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "outline";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-T9oMnDYbkT50IOCflL7tay0iUXui7sW+gxddGKOvzbk=";
+    hash = "sha256-QFzLHWmU2DrmKAR5ZKAtnHXZdBfgUfGpTJ6c1zi7//k=";
   };
 
   missingHashes = ./missing-hashes.json;
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-4JmXn8/R0IssZrVyk6OMo5ZsSdo+Wmcr6cvuviMi4GA=";
+    hash = "sha256-07/cWCIAsT+zZR6BKEirGfRFw3UaImMMJPSYvmN4g7E=";
   };
 
   buildPhase = ''

From ac04430cec25be0c66df016f30ebcef661ce035f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 14:09:47 +0000
Subject: [PATCH 067/107] git-cliff: 2.12.0 -> 2.13.1

---
 pkgs/by-name/gi/git-cliff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index 371c003691ec..88023fb1703f 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-cliff";
-  version = "2.12.0";
+  version = "2.13.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "git-cliff";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8t7Bx3dPktSMxfWjaEeXxt3edt9Va7g5XZjE756EfY0=";
+    hash = "sha256-OFVJUZ3jSuDlHYIl/8KmJJW5ZbVI12wn+bVx9XeOkvI=";
   };
 
-  cargoHash = "sha256-0/NjvX3MnIgRfsE6PyYzPZ94/p2RR8PPvCntT6pPfbU=";
+  cargoHash = "sha256-wkSLz6WGsfYZobbrOaDV79Xl7f4/nDkP3z8ZFP1Cn54=";
 
   # attempts to run the program on .git in src which is not deterministic
   doCheck = false;

From 9b65faeee0da071522ab2b069823fa02fecf1c75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 15:21:16 +0000
Subject: [PATCH 068/107] code-cursor: 3.1.15 -> 3.2.11

---
 pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 0e4f95c305e6..a1cb12b238da 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.1.15",
+  "version": "3.2.11",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/linux/x64/Cursor-3.1.15-x86_64.AppImage",
-      "hash": "sha256-7Lgrb0SAkkm8+LZInhXLrQHoDLJa63+KvGStp03jepc="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/linux/x64/Cursor-3.2.11-x86_64.AppImage",
+      "hash": "sha256-xRtrBvyhG97qHzZTufiEdfRIFyIWSvodIgX5J9ToNWo="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/linux/arm64/Cursor-3.1.15-aarch64.AppImage",
-      "hash": "sha256-kZf4qmOdtp3HFe/L6yehZ0cg5DklJwg+Lmnlhn6KBRM="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/linux/arm64/Cursor-3.2.11-aarch64.AppImage",
+      "hash": "sha256-T16gRDEGGahpvHsewPv5EBoGJeu6bONuYOenK6frDkg="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-GIBT7DU+J/hQ/qbDUdgRrO24z66JASQlfRpVFBsCiw0="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-zPLh24QI76ORzpCQUV30oB5RtRo7rVcOPY6oK05LngI="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-NouEzXpKO2A3/y8FCNTXspm+Rim6a5Yi1yS1kLeevi8="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-XeA1/kyZiKAS7op3QXm76clOB+UYTNj4mWIwRV1ISYY="
     }
   }
 }

From 6b6d15b8208b68aa358277bc85d3dc1333a6334b Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 25 Apr 2026 01:48:13 +0300
Subject: [PATCH 069/107] fetchPnpmDeps: deprecate fetcherVersion = 1, schedule
 removal for 26.11

fetcherVersion = 1 was kept around for backwards compatibility while
callers migrated to 2/3.

Emit a `lib.warnIf` warning pointing at the affected pname whenever v1
is used.

After 26.11 ships, a follow-up PR should drop 1 from
`supportedFetcherVersions` and clean up the dead v1 code paths in
default.nix, pnpm-config-hook.sh and serve.nix.

Also rewrite the manual section to recommend fetcherVersion = 3 for new
packages and mark v1 as deprecated/scheduled-for-removal in the
version history.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../javascript.section.md                     |  23 +-
 doc/release-notes/rl-2605.section.md          |   6 +
 .../node/fetch-pnpm-deps/default.nix          | 226 +++++++++---------
 3 files changed, 127 insertions(+), 128 deletions(-)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index abacb7e2f9c8..362130e5ba5f 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -483,40 +483,29 @@ In this example, `prePnpmInstall` will be run by both `pnpmConfigHook` and by th
 
 #### pnpm `fetcherVersion` {#javascript-pnpm-fetcherVersion}
 
-This is the version of the output of `fetchPnpmDeps`, if you haven't set it already, you can use `1` with your current hash:
+This is the version of the output of `fetchPnpmDeps`. New packages should use `3`:
 
 ```nix
 {
   # ...
   pnpmDeps = fetchPnpmDeps {
     # ...
-    fetcherVersion = 1;
-    hash = "..."; # you can use your already set hash here
-  };
-}
-```
-
-After upgrading to a newer `fetcherVersion`, you need to regenerate the hash:
-
-```nix
-{
-  # ...
-  pnpmDeps = fetchPnpmDeps {
-    # ...
-    fetcherVersion = 2;
+    fetcherVersion = 3;
     hash = "..."; # clear this hash and generate a new one
   };
 }
 ```
 
+When upgrading to a newer `fetcherVersion`, you need to regenerate the hash.
+
 This variable ensures that we can make changes to the output of `fetchPnpmDeps` without breaking existing hashes.
 Changes can include workarounds or bug fixes to existing PNPM issues.
 
 ##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}
 
-- 1: Initial version, nothing special
+- 1: Initial version, nothing special. **Deprecated: Scheduled for removal in the 26.11 release.**. New packages must not use this value.
 - 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)
-- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950)
+- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950). **Recommended**
 
 ### Yarn {#javascript-yarn}
 
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index b133b37cd5c7..40f605b2315d 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -298,6 +298,12 @@
 
 - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.
 
+- `fetchPnpmDeps`' `fetcherVersion = 1` is deprecated and scheduled for removal
+  in the 26.11 release. A deprecation warning has been added. Packages still on
+  `fetcherVersion = 1` should migrate to `fetcherVersion = 3` and regenerate
+  their hashes. See the [pnpm `fetcherVersion`
+  section](#javascript-pnpm-fetcherVersion) of the manual for details.
+
 - `buildNpmPackage` now supports `npmDepsFetcherVersion` (and `fetchNpmDeps` now supports `fetcherVersion`). Set to `2` to enable packument caching, which fixes builds for projects using npm workspaces.
 
 - Added `dell-bios-fan-control` package and service.
diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index 529370d302d9..582ea2715011 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -61,139 +61,143 @@ in
       "fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
     ) true;
 
-    stdenvNoCC.mkDerivation (
-      finalAttrs:
+    lib.warnIf (fetcherVersion == 1)
+      "fetchPnpmDeps: `fetcherVersion = 1` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
+
+      stdenvNoCC.mkDerivation
       (
-        args'
-        // {
-          name = "${pname}-pnpm-deps";
+        finalAttrs:
+        (
+          args'
+          // {
+            name = "${pname}-pnpm-deps";
 
-          nativeBuildInputs = [
-            cacert
-            jq
-            moreutils
-            pnpm # from args
-            yq
-            zstd
-          ]
-          ++ args.nativeBuildInputs or [ ];
+            nativeBuildInputs = [
+              cacert
+              jq
+              moreutils
+              pnpm # from args
+              yq
+              zstd
+            ]
+            ++ args.nativeBuildInputs or [ ];
 
-          impureEnvVars =
-            lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ] ++ args.impureEnvVars or [ ];
+            impureEnvVars =
+              lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ] ++ args.impureEnvVars or [ ];
 
-          installPhase = ''
-            runHook preInstall
+            installPhase = ''
+              runHook preInstall
 
-            lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)"
-            if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then
-              echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!"
-              exit 1
-            fi
+              lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)"
+              if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then
+                echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!"
+                exit 1
+              fi
 
-            export HOME=$(mktemp -d)
+              export HOME=$(mktemp -d)
 
-            # For fetcherVersion < 3, the pnpm store files are placed directly into $out.
-            # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out,
-            # without distributing the uncompressed store files.
-            if [[ ${toString fetcherVersion} -ge 3 ]]; then
-              mkdir $out
-              storePath=$(mktemp -d)
-            else
-              storePath=$out
-            fi
+              # For fetcherVersion < 3, the pnpm store files are placed directly into $out.
+              # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out,
+              # without distributing the uncompressed store files.
+              if [[ ${toString fetcherVersion} -ge 3 ]]; then
+                mkdir $out
+                storePath=$(mktemp -d)
+              else
+                storePath=$out
+              fi
 
-            # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
-            # any pnpm command would fail in that directory, the following disables this
-            pushd ..
-            pnpm config set manage-package-manager-versions false
-            popd
+              # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
+              # any pnpm command would fail in that directory, the following disables this
+              pushd ..
+              pnpm config set manage-package-manager-versions false
+              popd
 
-            pnpm config set store-dir $storePath
-            # Some packages produce platform dependent outputs. We do not want to cache those in the global store
-            pnpm config set side-effects-cache false
-            # As we pin pnpm versions, we don't really care about updates
-            pnpm config set update-notifier false
-            # Run any additional pnpm configuration commands that users provide.
-            ${prePnpmInstall}
-            # pnpm is going to warn us about using --force
-            # --force allows us to fetch all dependencies including ones that aren't meant for our host platform
-            pnpm install \
-                --force \
-                --ignore-scripts \
-                ${lib.escapeShellArgs filterFlags} \
-                ${lib.escapeShellArgs pnpmInstallFlags} \
-                --registry="$NIX_NPM_REGISTRY" \
-                --frozen-lockfile
+              pnpm config set store-dir $storePath
+              # Some packages produce platform dependent outputs. We do not want to cache those in the global store
+              pnpm config set side-effects-cache false
+              # As we pin pnpm versions, we don't really care about updates
+              pnpm config set update-notifier false
+              # Run any additional pnpm configuration commands that users provide.
+              ${prePnpmInstall}
+              # pnpm is going to warn us about using --force
+              # --force allows us to fetch all dependencies including ones that aren't meant for our host platform
+              pnpm install \
+                  --force \
+                  --ignore-scripts \
+                  ${lib.escapeShellArgs filterFlags} \
+                  ${lib.escapeShellArgs pnpmInstallFlags} \
+                  --registry="$NIX_NPM_REGISTRY" \
+                  --frozen-lockfile
 
-            # Store newer fetcherVersion in case pnpmConfigHook also needs it
-            if [[ ${toString fetcherVersion} -gt 1 ]]; then
-              echo ${toString fetcherVersion} > $out/.fetcher-version
-            fi
+              # Store newer fetcherVersion in case pnpmConfigHook also needs it
+              if [[ ${toString fetcherVersion} -gt 1 ]]; then
+                echo ${toString fetcherVersion} > $out/.fetcher-version
+              fi
 
-            runHook postInstall
-          '';
+              runHook postInstall
+            '';
 
-          fixupPhase = ''
-            runHook preFixup
+            fixupPhase = ''
+              runHook preFixup
 
-            # Remove timestamp and sort the json files
-            rm -rf $storePath/{v3,v10}/tmp
-            for f in $(find $storePath -name "*.json"); do
-              jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
-            done
+              # Remove timestamp and sort the json files
+              rm -rf $storePath/{v3,v10}/tmp
+              for f in $(find $storePath -name "*.json"); do
+                jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
+              done
 
-            # This folder contains symlinks to /build/source which we don't need
-            # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0
-            rm -rf $storePath/{v3,v10}/projects
+              # This folder contains symlinks to /build/source which we don't need
+              # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0
+              rm -rf $storePath/{v3,v10}/projects
 
-            # Ensure consistent permissions
-            # NOTE: For reasons not yet fully understood, pnpm might create files with
-            # inconsistent permissions, for example inside the ubuntu-24.04
-            # github actions runner.
-            # To ensure stable derivations, we need to set permissions
-            # consistently, namely:
-            # * All files with `-exec` suffix have 555.
-            # * All other files have 444.
-            # * All folders have 555.
-            # See https://github.com/NixOS/nixpkgs/pull/350063
-            # See https://github.com/NixOS/nixpkgs/issues/422889
-            if [[ ${toString fetcherVersion} -ge 2 ]]; then
-              find $storePath -type f -name "*-exec" -print0 | xargs -0 chmod 555
-              find $storePath -type f -not -name "*-exec" -print0 | xargs -0 chmod 444
-              find $storePath -type d -print0 | xargs -0 chmod 555
-            fi
+              # Ensure consistent permissions
+              # NOTE: For reasons not yet fully understood, pnpm might create files with
+              # inconsistent permissions, for example inside the ubuntu-24.04
+              # github actions runner.
+              # To ensure stable derivations, we need to set permissions
+              # consistently, namely:
+              # * All files with `-exec` suffix have 555.
+              # * All other files have 444.
+              # * All folders have 555.
+              # See https://github.com/NixOS/nixpkgs/pull/350063
+              # See https://github.com/NixOS/nixpkgs/issues/422889
+              if [[ ${toString fetcherVersion} -ge 2 ]]; then
+                find $storePath -type f -name "*-exec" -print0 | xargs -0 chmod 555
+                find $storePath -type f -not -name "*-exec" -print0 | xargs -0 chmod 444
+                find $storePath -type d -print0 | xargs -0 chmod 555
+              fi
 
-            if [[ ${toString fetcherVersion} -ge 3 ]]; then
-              (
-                cd $storePath
+              if [[ ${toString fetcherVersion} -ge 3 ]]; then
+                (
+                  cd $storePath
 
-                # Build a reproducible tarball, per instructions at https://reproducible-builds.org/docs/archives/
-                tar --sort=name \
-                  --mtime="@$SOURCE_DATE_EPOCH" \
-                  --owner=0 --group=0 --numeric-owner \
-                  --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
-                  --zstd -cf $out/pnpm-store.tar.zst .
-              )
-            fi
+                  # Build a reproducible tarball, per instructions at https://reproducible-builds.org/docs/archives/
+                  tar --sort=name \
+                    --mtime="@$SOURCE_DATE_EPOCH" \
+                    --owner=0 --group=0 --numeric-owner \
+                    --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+                    --zstd -cf $out/pnpm-store.tar.zst .
+                )
+              fi
 
-            runHook postFixup
-          '';
+              runHook postFixup
+            '';
 
-          passthru = args.passthru or { } // {
-            inherit fetcherVersion;
-            serve = callPackage ./serve.nix {
-              inherit pnpm; # from args
-              pnpmDeps = finalAttrs.finalPackage;
+            passthru = args.passthru or { } // {
+              inherit fetcherVersion;
+              serve = callPackage ./serve.nix {
+                inherit pnpm; # from args
+                pnpmDeps = finalAttrs.finalPackage;
+              };
             };
-          };
 
-          dontConfigure = true;
-          dontBuild = true;
-          outputHashMode = "recursive";
-        }
-        // hash'
+            dontConfigure = true;
+            dontBuild = true;
+            outputHashMode = "recursive";
+          }
+          // hash'
+        )
       )
-    )
   );
 
   pnpmConfigHook = makeSetupHook {

From 67b0620e08a20c3e6d739b33e4dbdc8a86c43cf7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 15:51:09 +0000
Subject: [PATCH 070/107] cargo-show-asm: 0.2.57 -> 0.2.58

---
 pkgs/by-name/ca/cargo-show-asm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 01e4e49c080c..f4d6eed82599 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-show-asm";
-  version = "0.2.57";
+  version = "0.2.58";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-V4RCO+Nd8w3nd4ZeOOlyf6ApzVeZcGqzEMwzznTOtAE=";
+    hash = "sha256-WC6bAmvAYK0erGbzQ20uoezmbwkUxAMByeoHuYqJxsU=";
   };
 
-  cargoHash = "sha256-ObLN2NfMonQ6IkKN3tnwTuQFd4lSn7sC3QAtRr9ALcE=";
+  cargoHash = "sha256-IDCTjuTBxjzIh9M9k9I+DRO+zOMtkKwi6FbTiXFXMJo=";
 
   nativeBuildInputs = [
     installShellFiles

From e3aedf557275e4b4f292bc8332caacb7607e7673 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 16:33:33 +0000
Subject: [PATCH 071/107] python3Packages.imap-tools: 1.12.0 -> 1.12.1

---
 pkgs/development/python-modules/imap-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 93277ee7733b..3e49ffcad2c7 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "imap-tools";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ikvk";
     repo = "imap_tools";
     tag = "v${version}";
-    hash = "sha256-EUAt1M9ez5T/y02xHbyl/U/dkBHri92C6hTxY8iCplc=";
+    hash = "sha256-VNH3aUqIa7hSJr6A7SJUSad1JkKD1D0QZ3WKQuOQoeE=";
   };
 
   build-system = [ setuptools ];

From b89e7484773785ba3496b9774138742903d8033f Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 26 Apr 2026 19:05:13 +0300
Subject: [PATCH 072/107] home-assistant-matter-hub: init at 2.0.41

---
 .../ho/home-assistant-matter-hub/package.nix  | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 pkgs/by-name/ho/home-assistant-matter-hub/package.nix

diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
new file mode 100644
index 000000000000..6323bcf13e15
--- /dev/null
+++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nodejs,
+  pnpm_10,
+  pnpmConfigHook,
+  fetchPnpmDeps,
+  makeWrapper,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "home-assistant-matter-hub";
+  version = "2.0.41";
+
+  src = fetchFromGitHub {
+    owner = "RiDDiX";
+    repo = "home-assistant-matter-hub";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+W0HjULERuW+RY7938xGnEXwmCpkumLpUlZmvfuhX2Y=";
+  };
+
+  # The bundled cli.js imports transitive dependencies (e.g. @noble/curves)
+  # directly, so we need a flat node_modules tree for Node's resolver to
+  # find them.
+  pnpmInstallFlags = [ "--shamefully-hoist" ];
+  pnpmWorkspaces = [ "home-assistant-matter-hub..." ];
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmInstallFlags
+      pnpmWorkspaces
+      ;
+    fetcherVersion = 3;
+    hash = "sha256-1DaR4q1QH07UR+EchfDI92bTdRY4C2IaGIRj426DURI=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Workspace package.json files all carry "0.0.0"; the real version is
+  # injected at release time via APP_VERSION (consumed by vite for the
+  # frontend bundle and by the backend at runtime).
+  env.APP_VERSION = finalAttrs.version;
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm_10
+    pnpmConfigHook
+    makeWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm --filter home-assistant-matter-hub... run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/apps/home-assistant-matter-hub
+
+    tar -xf apps/home-assistant-matter-hub/package.tgz \
+      --strip-components=1 \
+      -C $out/share/apps/home-assistant-matter-hub
+
+    # pnpm cannot recursively prune monorepos, so we follow pnpm's
+    # recommendation of removing all node_modules and reinstalling
+    # only the production dependencies we need.
+    find . -name node_modules -type d -prune -exec rm -rf {} +
+    pnpm install --offline --prod --filter-prod home-assistant-matter-hub --shamefully-hoist
+
+    # Workspace symlinks under apps/home-assistant-matter-hub/node_modules use
+    # relative paths into the top-level node_modules/.pnpm store, so we keep
+    # the original directory layout under $out/share.
+    mv node_modules $out/share/
+    mv apps/home-assistant-matter-hub/node_modules $out/share/apps/home-assistant-matter-hub/
+
+    makeWrapper ${lib.getExe nodejs} "$out/bin/home-assistant-matter-hub" \
+      --add-flags "$out/share/apps/home-assistant-matter-hub/dist/backend/cli.js" \
+      --set NODE_ENV production \
+      --set APP_VERSION ${finalAttrs.version}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Publish your home-assistant instance using Matter";
+    homepage = "https://riddix.github.io/home-assistant-matter-hub/";
+    changelog = "https://github.com/RiDDiX/home-assistant-matter-hub/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      kranzes
+      marie
+    ];
+    mainProgram = "home-assistant-matter-hub";
+    inherit (nodejs.meta) platforms;
+  };
+})

From 3128eb648bf6f5814e298f3bc37af6e66240afd0 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 26 Apr 2026 19:05:27 +0300
Subject: [PATCH 073/107] nixos/home-assistant-matter-hub: init

---
 nixos/modules/module-list.nix                 |   1 +
 .../home-assistant-matter-hub.nix             | 100 ++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 nixos/modules/services/home-automation/home-assistant-matter-hub.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 746c8b05a964..17c41960c5b3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -728,6 +728,7 @@
   ./services/home-automation/esphome.nix
   ./services/home-automation/evcc.nix
   ./services/home-automation/govee2mqtt.nix
+  ./services/home-automation/home-assistant-matter-hub.nix
   ./services/home-automation/home-assistant.nix
   ./services/home-automation/homebridge.nix
   ./services/home-automation/matter-server.nix
diff --git a/nixos/modules/services/home-automation/home-assistant-matter-hub.nix b/nixos/modules/services/home-automation/home-assistant-matter-hub.nix
new file mode 100644
index 000000000000..465707642f15
--- /dev/null
+++ b/nixos/modules/services/home-automation/home-assistant-matter-hub.nix
@@ -0,0 +1,100 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.home-assistant-matter-hub;
+  settingsFormat = pkgs.formats.json { };
+  configFile = settingsFormat.generate "home-assistant-matter-hub.json" cfg.settings;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    kranzes
+    marie
+  ];
+
+  options.services.home-assistant-matter-hub = {
+    enable = lib.mkEnableOption "home-assistant-matter-hub, a Matter bridge for Home Assistant";
+
+    package = lib.mkPackageOption pkgs "home-assistant-matter-hub" { };
+
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to open the Matter commissioning ports (UDP/TCP 5540) in the
+        firewall.
+      '';
+    };
+
+    accessTokenFile = lib.mkOption {
+      type = lib.types.externalPath;
+      example = "/run/secrets/home-assistant-matter-hub-token";
+      description = ''
+        Path to a file containing a Home Assistant long-lived access token.
+        The file is loaded as a systemd credential and read into
+        `HAMH_HOME_ASSISTANT_ACCESS_TOKEN` at service start.
+      '';
+    };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = settingsFormat.type;
+        options = {
+          homeAssistantUrl = lib.mkOption {
+            type = lib.types.str;
+            example = lib.literalExpression "config.services.home-assistant.config.homeassistant.internal_url";
+            description = "HTTP URL of the Home Assistant instance to bridge.";
+          };
+
+          httpPort = lib.mkOption {
+            type = lib.types.port;
+            default = 8482;
+            description = "Port the web interface listens on.";
+          };
+        };
+      };
+      default = { };
+      example = lib.literalExpression ''
+        {
+          homeAssistantUrl = config.services.home-assistant.config.homeassistant.internal_url;
+        }
+      '';
+      description = ''
+        Configuration written to a JSON file and passed to
+        `home-assistant-matter-hub start --config`. Keys use camelCase, matching
+        the long-form CLI flags. See
+        <https://riddix.github.io/home-assistant-matter-hub/getting-started/installation#23-configuration-options>
+        for the full list of options.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall = lib.mkIf cfg.openFirewall {
+      allowedTCPPorts = [ 5540 ];
+      allowedUDPPorts = [ 5540 ];
+    };
+
+    systemd.services.home-assistant-matter-hub = {
+      description = "Home Assistant Matter Hub";
+      documentation = [ "https://riddix.github.io/home-assistant-matter-hub/" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      script = ''
+        export HAMH_HOME_ASSISTANT_ACCESS_TOKEN=$(systemd-creds cat HAMH_HOME_ASSISTANT_ACCESS_TOKEN)
+        exec ${lib.getExe cfg.package} start --config=${configFile} --storage-location="$1"
+      '';
+      scriptArgs = "%S/home-assistant-matter-hub";
+
+      serviceConfig = {
+        LoadCredential = [ "HAMH_HOME_ASSISTANT_ACCESS_TOKEN:${cfg.accessTokenFile}" ];
+        DynamicUser = true;
+        StateDirectory = "home-assistant-matter-hub";
+      };
+    };
+  };
+}

From c6da7ad6a43d23cadfd929862c929460026bfd2c Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 3 Apr 2026 14:54:49 +0200
Subject: [PATCH 074/107] libirc: unstable-2022-10-15 -> 0-unstable-2025-11-09,
 move to qt6

---
 .../li/libirc/package.nix}                    | 19 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 9 deletions(-)
 rename pkgs/{development/libraries/libirc/default.nix => by-name/li/libirc/package.nix} (69%)

diff --git a/pkgs/development/libraries/libirc/default.nix b/pkgs/by-name/li/libirc/package.nix
similarity index 69%
rename from pkgs/development/libraries/libirc/default.nix
rename to pkgs/by-name/li/libirc/package.nix
index 1ef0b14efa48..291ec2bedf1d 100644
--- a/pkgs/development/libraries/libirc/default.nix
+++ b/pkgs/by-name/li/libirc/package.nix
@@ -3,30 +3,35 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation {
   pname = "libirc";
-  version = "unstable-2022-10-15";
+  version = "0-unstable-2025-11-09";
 
   src = fetchFromGitHub {
     owner = "grumpy-irc";
     repo = "libirc";
-    rev = "734082ffffb6d6744070c75587159d927342edea";
-    sha256 = "Qi/YKLlau0rdQ9XCMyreQdv4ctQWHFIoE3YlW6QnbSI=";
+    rev = "59c6d81242910d8205b94acadf54cec0d2313884";
+    hash = "sha256-C7bO2Dwa6p7/bUh73JJCup2biIm9UShOUSxL9uCShqg=";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  dontWrapQtApps = true; # library only
+
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace-fail 'cmake_minimum_required(VERSION 3.0)' 'cmake_minimum_required(VERSION 3.10)'
   '';
 
   cmakeFlags = [
-    "-DQT5_BUILD=1"
-    "-DQt5Core_DIR=${qtbase.dev}/lib/cmake/Qt5Core"
-    "-DQt5Network_DIR=${qtbase.dev}/lib/cmake/Qt5Network"
+    (lib.cmakeBool "QT6_BUILD" true)
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17") # supposedly required for Qt
   ];
 
   preFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca575294d8bc..ce4c374213ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2842,8 +2842,6 @@ with pkgs;
     eri3PureSh = false;
   };
 
-  libirc = libsForQt5.callPackage ../development/libraries/libirc { };
-
   libportal-gtk3 = libportal.override { variant = "gtk3"; };
   libportal-gtk4 = libportal.override { variant = "gtk4"; };
   libportal-qt5 = libportal.override { variant = "qt5"; };

From 98a01c4e415e5bb6eb78b5bbc452e590fab26072 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 3 Apr 2026 14:55:41 +0200
Subject: [PATCH 075/107] huggle: 3.4.13 -> 3.4.14, move to qt6

---
 .../hu}/huggle/00-remove-third-party.patch         |  0
 .../misc => by-name/hu}/huggle/01-extensions.patch |  0
 .../default.nix => by-name/hu/huggle/package.nix}  | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/misc => by-name/hu}/huggle/00-remove-third-party.patch (100%)
 rename pkgs/{applications/misc => by-name/hu}/huggle/01-extensions.patch (100%)
 rename pkgs/{applications/misc/huggle/default.nix => by-name/hu/huggle/package.nix} (87%)

diff --git a/pkgs/applications/misc/huggle/00-remove-third-party.patch b/pkgs/by-name/hu/huggle/00-remove-third-party.patch
similarity index 100%
rename from pkgs/applications/misc/huggle/00-remove-third-party.patch
rename to pkgs/by-name/hu/huggle/00-remove-third-party.patch
diff --git a/pkgs/applications/misc/huggle/01-extensions.patch b/pkgs/by-name/hu/huggle/01-extensions.patch
similarity index 100%
rename from pkgs/applications/misc/huggle/01-extensions.patch
rename to pkgs/by-name/hu/huggle/01-extensions.patch
diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/by-name/hu/huggle/package.nix
similarity index 87%
rename from pkgs/applications/misc/huggle/default.nix
rename to pkgs/by-name/hu/huggle/package.nix
index 59d375ed1cf9..70455ca0f352 100644
--- a/pkgs/applications/misc/huggle/default.nix
+++ b/pkgs/by-name/hu/huggle/package.nix
@@ -6,26 +6,25 @@
   ncurses,
   which,
   cmake,
-  wrapQtAppsHook,
-  qtwebengine,
+  qt6,
   yaml-cpp,
   libirc,
 }:
 
 stdenv.mkDerivation rec {
   pname = "huggle";
-  version = "3.4.13";
+  version = "3.4.14";
 
   src = fetchFromGitHub {
     owner = "huggle";
     repo = "huggle3-qt-lx";
     rev = version;
-    sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY=";
+    hash = "sha256-obArs5NqjHbuWv+zNGAuulHQz6MUIejRqNvg2l5eZxc=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     pkg-config
     which
     cmake
@@ -33,7 +32,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     yaml-cpp
-    qtwebengine
+    qt6.qtmultimedia
+    qt6.qtwebengine
     libirc
   ];
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     "-S"
     "/build/source/src"
     "-DINSTALL_DATA_DIR=bin"
-    "-DQT5_BUILD=ON"
+    "-DQT6_BUILD=ON"
     "-DWEB_ENGINE=ON"
     "-DBUILD_SHARED_LIBS=OFF"
     "-Wno-dev"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce4c374213ca..8038e21799d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9562,8 +9562,6 @@ with pkgs;
 
   hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;
 
-  huggle = libsForQt5.callPackage ../applications/misc/huggle { };
-
   hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
   hyperglot = with python3Packages; toPythonApplication hyperglot;

From b79b8c660edf2200f24d028adda6437711672d5f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 26 Apr 2026 16:28:04 +0200
Subject: [PATCH 076/107] libopenshot-audio: migrate to by-name

---
 .../default.nix => by-name/li/libopenshot-audio/package.nix}    | 1 +
 pkgs/top-level/qt5-packages.nix                                 | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{development/libraries/libopenshot-audio/default.nix => by-name/li/libopenshot-audio/package.nix} (97%)

diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/by-name/li/libopenshot-audio/package.nix
similarity index 97%
rename from pkgs/development/libraries/libopenshot-audio/default.nix
rename to pkgs/by-name/li/libopenshot-audio/package.nix
index b1d41c673c56..7288bf804841 100644
--- a/pkgs/development/libraries/libopenshot-audio/default.nix
+++ b/pkgs/by-name/li/libopenshot-audio/package.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     );
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   doCheck = true;
 
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 0daf7f661e54..0cd7dcd2efcd 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -110,8 +110,6 @@ makeScopeWithSplicing' {
 
         libopenshot = callPackage ../development/libraries/libopenshot { };
 
-        libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { };
-
         libqglviewer = callPackage ../development/libraries/libqglviewer { };
 
         libqofono = callPackage ../development/libraries/libqofono { };

From 6f2929f0c2415f5366350e9e128c8b10971d5c60 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 26 Apr 2026 16:29:40 +0200
Subject: [PATCH 077/107] libopenshot: 0.4.0 -> 0.7.0-unstable-2026-04-21,
 migrate to qt6

---
 .../li}/libopenshot/0001-link-magickcore.diff |  0
 .../li/libopenshot/package.nix}               | 24 ++++++++-----------
 pkgs/top-level/qt5-packages.nix               |  2 --
 3 files changed, 10 insertions(+), 16 deletions(-)
 rename pkgs/{development/libraries => by-name/li}/libopenshot/0001-link-magickcore.diff (100%)
 rename pkgs/{development/libraries/libopenshot/default.nix => by-name/li/libopenshot/package.nix} (78%)

diff --git a/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff b/pkgs/by-name/li/libopenshot/0001-link-magickcore.diff
similarity index 100%
rename from pkgs/development/libraries/libopenshot/0001-link-magickcore.diff
rename to pkgs/by-name/li/libopenshot/0001-link-magickcore.diff
diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/by-name/li/libopenshot/package.nix
similarity index 78%
rename from pkgs/development/libraries/libopenshot/default.nix
rename to pkgs/by-name/li/libopenshot/package.nix
index 841190c1fc90..4d9bdabc6166 100644
--- a/pkgs/development/libraries/libopenshot/default.nix
+++ b/pkgs/by-name/li/libopenshot/package.nix
@@ -13,21 +13,21 @@
   llvmPackages,
   pkg-config,
   python3,
-  qtbase,
-  qtmultimedia,
+  qt6,
   swig,
   zeromq,
+  resvg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenshot";
-  version = "0.4.0";
+  version = "0.7.0-unstable-2026-04-21";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-zroTnJRYIIglhha6jQvaVNTgnIV6kUWcu7s5zEvgH6Q=";
+    rev = "a58565292cb84438b1c6a039c343b4c65003bd82";
+    hash = "sha256-zUzyi/VydrxDLCY7E/LBr7+btthOjal3c7md6PTXQWA=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -35,13 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-link-magickcore.diff
   ];
 
-  postPatch = ''
-    # Fix FFmpeg 8.0 API compatibility (FF_PROFILE_* -> AV_PROFILE_*)
-    substituteInPlace src/FFmpegWriter.cpp \
-      --replace-fail "FF_PROFILE_H264_BASELINE" "AV_PROFILE_H264_BASELINE" \
-      --replace-fail "FF_PROFILE_H264_CONSTRAINED" "AV_PROFILE_H264_CONSTRAINED"
-  '';
-
   nativeBuildInputs = [
     cmake
     doxygen
@@ -56,9 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
     jsoncpp
     libopenshot-audio
     python3
-    qtbase
-    qtmultimedia
+    qt6.qtbase
+    qt6.qtmultimedia
     zeromq
+    resvg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
@@ -68,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   dontWrapQtApps = true;
 
@@ -78,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_PYTHON" true)
     (lib.cmakeOptionType "filepath" "PYTHON_EXECUTABLE" (lib.getExe python3))
     (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages)
+    "-DUSE_QT6=ON"
   ];
 
   passthru = {
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 0cd7dcd2efcd..13b52c3035f0 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -108,8 +108,6 @@ makeScopeWithSplicing' {
 
         liblastfm = callPackage ../development/libraries/liblastfm { };
 
-        libopenshot = callPackage ../development/libraries/libopenshot { };
-
         libqglviewer = callPackage ../development/libraries/libqglviewer { };
 
         libqofono = callPackage ../development/libraries/libqofono { };

From e217a25c1baa503e10fbeaf361cc25a8a00ab5e4 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 3 Feb 2026 20:34:24 +0100
Subject: [PATCH 078/107] openshot-qt: 3.3.0 -> 3.5.1-unstable-2026-04-22,
 migrate to qt6

---
 .../op/openshot-qt/package.nix}               | 46 +++++--------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 11 insertions(+), 37 deletions(-)
 rename pkgs/{applications/video/openshot-qt/default.nix => by-name/op/openshot-qt/package.nix} (60%)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/by-name/op/openshot-qt/package.nix
similarity index 60%
rename from pkgs/applications/video/openshot-qt/default.nix
rename to pkgs/by-name/op/openshot-qt/package.nix
index d65bde5d4c85..7e84ad63bed9 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/by-name/op/openshot-qt/package.nix
@@ -1,33 +1,23 @@
 {
   lib,
-  stdenv,
-  mkDerivationWith,
   fetchFromGitHub,
   doxygen,
   gtk3,
   libopenshot,
-  python3,
-  qtbase,
-  qtsvg,
-  qtwayland,
-  wayland,
-  waylandSupport ? stdenv.hostPlatform.isLinux,
   wrapGAppsHook3,
+  python3Packages,
 }:
 
-let
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "openshot-qt";
-  version = "3.3.0";
+  version = "3.5.1-unstable-2026-04-22";
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
-    tag = "v${version}";
-    hash = "sha256-+QI1772ys1Czd+KSVBAdAUjLg9mUcMZs+UhkNljY7nQ=";
+    rev = "930ff919762570eaf35a879574da8f8da9f196be";
+    hash = "sha256-o0BPEzkEAyoZkPkiR9G8i2nANgDFI4wjD5b9hGOqB0c=";
   };
-in
-mkDerivationWith python3.pkgs.buildPythonApplication {
   format = "setuptools";
-  inherit pname version src;
 
   outputs = [ "out" ]; # "lib" can't be split
 
@@ -38,43 +28,29 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
 
   buildInputs = [
     gtk3
-  ]
-  ++ lib.optionals waylandSupport [
-    qtwayland
-    wayland
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
     httplib2
     libopenshot
-    pyqtwebengine
     pyzmq
     requests
     sip
+    pyside6
   ];
 
   strictDeps = true;
 
-  preConfigure = ''
-    # the builder tries to create caching directories during install
-    export HOME=$(mktemp -d)
-  '';
-
   doCheck = false;
 
   dontWrapGApps = true;
   dontWrapQtApps = true;
 
+  # https://github.com/OpenShot/openshot-qt/blob/930ff919762570eaf35a879574da8f8da9f196be/src/launch.py#L86
+  # imports qt_api.py from its own site-packages directory
   postFixup = ''
     wrapProgram $out/bin/openshot-qt \
-  ''
-  # Fix toolbar icons on Darwin
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \
-  ''
-  + ''
-    "''${gappsWrapperArgs[@]}" \
-    "''${qtWrapperArgs[@]}"
+      --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}/openshot_qt"
   '';
 
   passthru = {
@@ -97,4 +73,4 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8038e21799d1..0e930be30fd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4325,8 +4325,6 @@ with pkgs;
   graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
   buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { };
 
-  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
-
   inherit (callPackage ../development/compilers/julia { })
     julia_110-bin
     julia_111-bin

From 2cd13120677124fc1e56b97644f20731f6f8e3de Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 15 Apr 2026 10:13:43 +0200
Subject: [PATCH 079/107] psi-plus: 1.5.2115 -> 1.5.2139, migrate to qt6

Co-Authored-by: LunNova <github@lunnova.dev>
---
 .../ps/psi-plus/package.nix}                  | 55 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 24 insertions(+), 33 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/psi-plus/default.nix => by-name/ps/psi-plus/package.nix} (73%)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/by-name/ps/psi-plus/package.nix
similarity index 73%
rename from pkgs/applications/networking/instant-messengers/psi-plus/default.nix
rename to pkgs/by-name/ps/psi-plus/package.nix
index 8c36016dbd47..e3bd2832f90e 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/by-name/ps/psi-plus/package.nix
@@ -3,25 +3,15 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qtimageformats,
-  qtx11extras,
-  qttools,
-  libidn,
-  qca-qt5,
+  qt6,
+  kdePackages,
   libxscrnsaver,
   hunspell,
-  libsecret,
   libgcrypt,
   libgpg-error,
   usrsctp,
-  qtkeychain,
 
   chatType ? "basic", # See the assertion below for available options
-  qtwebkit,
-  qtwebengine,
 
   enablePlugins ? true,
   html-tidy,
@@ -34,12 +24,17 @@
   gst_all_1,
   enablePsiMedia ? false,
   pkg-config,
+
+  # For tests
+  psi-plus,
 }:
 
+assert lib.assertMsg (lib.toLower chatType != "webkit")
+  "psi-plus: chatType = \"webkit\" was removed because qtwebkit had known vulns and has no Qt6 equivalent. Use chatType = \"webengine\" instead.";
+
 assert builtins.elem (lib.toLower chatType) [
   "basic" # Basic implementation, no web stuff involved
-  "webkit" # Legacy one, based on WebKit (see https://wiki.qt.io/Qt_WebKit)
-  "webengine" # QtWebEngine (see https://wiki.qt.io/QtWebEngine)
+  "webengine"
 ];
 
 assert enablePsiMedia -> enablePlugins;
@@ -47,43 +42,40 @@ assert enablePsiMedia -> enablePlugins;
 stdenv.mkDerivation rec {
   pname = "psi-plus";
 
-  version = "1.5.2115";
+  version = "1.5.2139";
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
-    rev = version;
-    sha256 = "sha256-4is3ksl6IsYP1L0WhTT/56QUtR+EC1X6Lftre2BO6pM=";
+    tag = version;
+    hash = "sha256-wgR809rOtcKvim2gPm9MeiB67pU+EiRktpW5BCJqWs8=";
   };
 
   cmakeFlags = [
     "-DCHAT_TYPE=${chatType}"
     "-DENABLE_PLUGINS=${if enablePlugins then "ON" else "OFF"}"
     "-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}"
+    "-DUSE_QT6=ON"
   ];
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ]
   ++ lib.optionals enablePsiMedia [
     pkg-config
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
-    qtimageformats
-    qtx11extras
-    libidn
-    qca-qt5
+    qt6.qtbase
+    qt6.qtmultimedia
+    kdePackages.qca
     libxscrnsaver
     hunspell
-    libsecret
     libgcrypt
     libgpg-error
     usrsctp
-    qtkeychain
+    kdePackages.qtkeychain
   ]
   ++ lib.optionals voiceMessagesSupport [
     gst_all_1.gst-plugins-base
@@ -95,11 +87,8 @@ stdenv.mkDerivation rec {
     libotr
     libomemo-c
   ]
-  ++ lib.optionals (chatType == "webkit") [
-    qtwebkit
-  ]
   ++ lib.optionals (chatType == "webengine") [
-    qtwebengine
+    qt6.qtwebengine
   ];
 
   preFixup = lib.optionalString voiceMessagesSupport ''
@@ -108,6 +97,10 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  passthru.tests = {
+    webengine = psi-plus.override { chatType = "webengine"; };
+  };
+
   meta = {
     homepage = "https://psi-plus.com";
     description = "XMPP (Jabber) client based on Qt5";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e930be30fd5..ea02d454ca3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10138,8 +10138,6 @@ with pkgs;
 
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
 
-  psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
-
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
   puredata-with-plugins =

From a9b6cc5d7c8cc2b0b5ada92afa7d6fb4c7fcfb1f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 14 Jan 2026 23:35:14 +0100
Subject: [PATCH 080/107] gpsbabel: remove map preview to avoid qtwebengine dep

---
 pkgs/by-name/gp/gpsbabel/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gp/gpsbabel/package.nix b/pkgs/by-name/gp/gpsbabel/package.nix
index e2695b1a155f..ededbc422855 100644
--- a/pkgs/by-name/gp/gpsbabel/package.nix
+++ b/pkgs/by-name/gp/gpsbabel/package.nix
@@ -9,7 +9,6 @@
   shapelib,
   zlib,
   withGUI ? false,
-  withMapPreview ? (!stdenv.hostPlatform.isDarwin),
   withDoc ? false,
   docbook_xml_dtd_45,
   docbook_xsl,
@@ -73,8 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     shapelib
     zlib
   ]
-  ++ lib.optional withGUI libsForQt5.qtserialport
-  ++ lib.optional (withGUI && withMapPreview) libsForQt5.qtwebengine;
+  ++ lib.optional withGUI libsForQt5.qtserialport;
 
   nativeCheckInputs = [
     libxml2
@@ -90,8 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
     "WITH_SHAPELIB=pkgconfig"
     "WITH_ZLIB=pkgconfig"
   ]
-  ++ lib.optionals (withGUI && !withMapPreview) [
-    "CONFIG+=disable-mappreview"
+  ++ lib.optionals withGUI [
+    "CONFIG+=disable-mappreview" # would require qt5 webengine
   ];
 
   makeFlags =

From c1834898ebdc484ae4f68ce0395a3de336108f77 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Feb 2026 22:49:56 +0100
Subject: [PATCH 081/107] python3Packages.pyside2: fully disable webengine

---
 pkgs/development/python-modules/pyside2/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index 4a0215fe59da..560221978cca 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -7,7 +7,6 @@
   ninja,
   qt5,
   shiboken2,
-  withWebengine ? false, # vulnerable, so omit by default
 }:
 stdenv.mkDerivation rec {
   pname = "pyside2";
@@ -81,9 +80,6 @@ stdenv.mkDerivation rec {
       qtsvg
       qt3d
     ])
-    ++ lib.optionals withWebengine [
-      qt5.qtwebengine
-    ]
     ++ (with python.pkgs; [ setuptools ]);
 
   propagatedBuildInputs = [ shiboken2 ];

From 4043181fb3453862080d60e17fc4fc01d61e0235 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Feb 2026 22:23:45 +0100
Subject: [PATCH 082/107] vivisect: fully disable gui

---
 pkgs/development/python-modules/vivisect/default.nix |  9 +++++----
 pkgs/top-level/all-packages.nix                      | 10 +++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index 2402baf230f9..c72d74d9c01d 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -8,7 +8,7 @@
   pyasn1-modules,
   pycparser,
   pyqt5,
-  pyqtwebengine,
+  # pyqtwebengine, # removed
   withGui ? false,
   wrapQtAppsHook,
   setuptools,
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = lib.optionals withGui [
     wrapQtAppsHook
   ];
 
@@ -48,10 +48,10 @@ buildPythonPackage rec {
 
   optional-dependencies.gui = [
     pyqt5
-    pyqtwebengine
+    # pyqtwebengine
   ];
 
-  postFixup = ''
+  postFixup = lib.optionalString withGui ''
     wrapQtApp $out/bin/vivbin
   '';
 
@@ -66,5 +66,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/vivisect/vivisect/blob/v${version}/CHANGELOG.rst";
     license = lib.licenses.asl20;
     maintainers = [ ];
+    broken = withGui; # https://github.com/vivisect/vivisect/issues/683
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea02d454ca3c..4ec64347056a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12086,7 +12086,15 @@ with pkgs;
 
   vimb = wrapFirefox vimb-unwrapped { };
 
-  vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });
+  vivisect =
+    with python3Packages;
+    toPythonApplication (
+      vivisect.override {
+        # https://github.com/vivisect/vivisect/issues/683
+        # gui currently requires qt5 webengine, which has been removed
+        # withGui = true;
+      }
+    );
 
   py-wacz = with python3Packages; toPythonApplication wacz;
 

From 1e224dab1e3b587c952e4139ce3592a7400b2a60 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 17 Apr 2026 10:03:54 +0200
Subject: [PATCH 083/107] supercollider: remove qt5 webengine support

---
 pkgs/development/interpreters/supercollider/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index d963a31ea02f..24a047691af6 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -16,7 +16,6 @@
   libxt,
   qtbase,
   qttools,
-  qtwebengine,
   readline,
   qtwebsockets,
   qtwayland,
@@ -27,7 +26,6 @@
   supercolliderPlugins,
   writeText,
   runCommand,
-  withWebengine ? false, # vulnerable, so disabled by default
 }:
 
 stdenv.mkDerivation rec {
@@ -82,7 +80,6 @@ stdenv.mkDerivation rec {
     qtwayland
     readline
   ]
-  ++ lib.optional withWebengine qtwebengine
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
 
   hardeningDisable = [ "stackprotector" ];
@@ -90,7 +87,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DSC_WII=OFF"
     "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
-    (lib.cmakeBool "SC_USE_QTWEBENGINE" withWebengine)
+    (lib.cmakeBool "SC_USE_QTWEBENGINE" false)
   ];
 
   passthru = {

From 5a306a774696046dfa0a4fe2ba14826f2be4cd6a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 22:13:06 +0200
Subject: [PATCH 084/107] nixos/globalprotect-vpn: drop

---
 nixos/modules/module-list.nix                 |  1 -
 nixos/modules/rename.nix                      |  7 +++
 .../services/networking/globalprotect-vpn.nix | 62 -------------------
 3 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 nixos/modules/services/networking/globalprotect-vpn.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 746c8b05a964..71252674c417 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1212,7 +1212,6 @@
   ./services/networking/geph.nix
   ./services/networking/ghostunnel.nix
   ./services/networking/git-daemon.nix
-  ./services/networking/globalprotect-vpn.nix
   ./services/networking/gns3-server.nix
   ./services/networking/gnunet.nix
   ./services/networking/go-autoconfig.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index bd9f0dea099d..352cdf9b7f7f 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -214,6 +214,13 @@ in
     ] "The fourStoreEndpoint module has been removed")
     (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
+    (mkRemovedOptionModule
+      [
+        "services"
+        "globalprotect"
+      ]
+      "The corresponding package was removed from nixpkgs, as it depended on qt5 webengine. A replacements based on tauri exist upstream, but requires non-trivial maintainance in nixpkgs to update."
+    )
     (mkRemovedOptionModule
       [
         "services"
diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix
deleted file mode 100644
index 626a9cd0130d..000000000000
--- a/nixos/modules/services/networking/globalprotect-vpn.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.services.globalprotect;
-
-  execStart =
-    if cfg.csdWrapper == null then
-      "${pkgs.globalprotect-openconnect}/bin/gpservice"
-    else
-      "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}";
-in
-
-{
-  options.services.globalprotect = {
-    enable = lib.mkEnableOption "globalprotect";
-
-    settings = lib.mkOption {
-      description = ''
-        GlobalProtect-openconnect configuration. For more information, visit
-        <https://github.com/yuezk/GlobalProtect-openconnect/wiki/Configuration>.
-      '';
-      default = { };
-      example = {
-        "vpn1.company.com" = {
-          openconnect-args = "--script=/path/to/vpnc-script";
-        };
-      };
-      type = lib.types.attrs;
-    };
-
-    csdWrapper = lib.mkOption {
-      description = ''
-        A script that will produce a Host Integrity Protection (HIP) report,
-        as described at <https://www.infradead.org/openconnect/hip.html>
-      '';
-      default = null;
-      example = lib.literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"'';
-      type = lib.types.nullOr lib.types.path;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.dbus.packages = [ pkgs.globalprotect-openconnect ];
-
-    environment.etc."gpservice/gp.conf".text = lib.generators.toINI { } cfg.settings;
-
-    systemd.services.gpservice = {
-      description = "GlobalProtect openconnect DBus service";
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "com.yuezk.qt.GPService";
-        ExecStart = execStart;
-      };
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-    };
-  };
-}

From 1c1a5b59c35f40302ae114c1facdd0ad9588e540 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 22:15:00 +0200
Subject: [PATCH 085/107] globalprotect-openconnect: drop

---
 .../globalprotect-openconnect/default.nix     | 54 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 pkgs/tools/networking/globalprotect-openconnect/default.nix

diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix
deleted file mode 100644
index cc470829875f..000000000000
--- a/pkgs/tools/networking/globalprotect-openconnect/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  cmake,
-  qtwebsockets,
-  qtwebengine,
-  qtkeychain,
-  wrapQtAppsHook,
-  openconnect,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "globalprotect-openconnect";
-  version = "1.4.9";
-
-  src = fetchurl {
-    url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
-    hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    wrapQtAppsHook
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.16")
-  ];
-
-  buildInputs = [
-    openconnect
-    qtwebsockets
-    qtwebengine
-    qtkeychain
-  ];
-
-  patchPhase = ''
-    substituteInPlace GPService/gpservice.h \
-      --replace-fail /usr/local/bin/openconnect ${openconnect}/bin/openconnect;
-    substituteInPlace GPService/CMakeLists.txt \
-      --replace-fail /etc/gpservice $out/etc/gpservice;
-    # Force minimum CMake version to 3.16 to avoid policy warnings
-    find . -name "CMakeLists.txt" -exec sed -i 's/cmake_minimum_required(VERSION [^)]*)/cmake_minimum_required(VERSION 3.16)/g' {} \;
-  '';
-
-  meta = {
-    description = "GlobalProtect VPN client (GUI) for Linux based on OpenConnect that supports SAML auth mode";
-    homepage = "https://github.com/yuezk/GlobalProtect-openconnect";
-    license = lib.licenses.gpl3Only;
-    maintainers = [ lib.maintainers.jerith666 ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 06f793f6b8d7..9fa7e9f9816a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -836,6 +836,7 @@ mapAliases {
   glew-egl = throw "'glew-egl' has been renamed to/replaced by 'glew'"; # Converted to throw 2025-10-27
   glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27
   glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27
+  globalprotect-openconnect = throw "'globalprotect-openconnect' was removed because it was unmaintained in Nixpkgs and needed upgrading to the Tauri rewrite, as the old version depends on the removed Qt 5 WebEngine"; # Added 2026-04-26
   glxinfo = throw "'glxinfo' has been renamed to/replaced by 'mesa-demos'"; # Converted to throw 2025-10-27
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
   gmu = throw "'gmu' has been removed as it was broken and unmaintained in Nixpkgs"; # Added 2026-04-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ec64347056a..9d1043ce0185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3475,10 +3475,6 @@ with pkgs;
 
   inherit (openconnectPackages) openconnect openconnect_openssl;
 
-  globalprotect-openconnect =
-    libsForQt5.callPackage ../tools/networking/globalprotect-openconnect
-      { };
-
   buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
 
   woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };

From 1b80c670e46b2d5c42466413ff21b0c2eafcd188 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 15 Jan 2026 19:55:29 +0100
Subject: [PATCH 086/107] pyqt5-stubs: drop

---
 .../python-modules/pyqt5-stubs/default.nix    | 63 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyqt5-stubs/default.nix

diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix
deleted file mode 100644
index fa7eec78b08b..000000000000
--- a/pkgs/development/python-modules/pyqt5-stubs/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  pyqt5,
-  pyqt3d,
-  pyqtchart,
-  pyqtdatavisualization,
-  pyqtwebengine,
-}:
-
-buildPythonPackage rec {
-  pname = "pyqt5-stubs";
-  version = "5.15.6.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "python-qt-tools";
-    repo = "PyQt5-stubs";
-    rev = version;
-    hash = "sha256-qWnvlHnFRy8wbZJ28C0pYqAxod623Epe5z5FZufheDc=";
-  };
-  postPatch = ''
-    # pulls in a dependency to mypy, but we don't want to run linters
-    rm tests/test_stubs.py
-  ''
-  + lib.optionalString (!pyqt5.connectivityEnabled) ''
-    rm tests/qflags/test_QtBluetooth_*
-    rm tests/qflags/test_QtNfc_*
-  ''
-  + lib.optionalString (!pyqt5.locationEnabled) ''
-    rm tests/qflags/test_QtLocation_*
-    rm tests/qflags/test_QtPositioning_*
-  ''
-  + lib.optionalString (!pyqt5.multimediaEnabled) ''
-    rm tests/qflags/test_QtMultimedia_*
-  ''
-  + lib.optionalString (!pyqt5.serialPortEnabled) ''
-    rm tests/qflags/test_QtSerialPort_*
-  ''
-  + lib.optionalString (!pyqt5.toolsEnabled) ''
-    rm tests/qflags/test_QtDesigner_*
-  '';
-
-  pythonImportsCheck = [ "PyQt5-stubs" ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pyqt5
-    pyqt3d
-    pyqtchart
-    pyqtdatavisualization
-    pyqtwebengine
-  ];
-
-  meta = {
-    description = "Stubs for PyQt5";
-    homepage = "https://github.com/python-qt-tools/PyQt5-stubs";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ _999eagle ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index ae8183aec273..4005ae4e0701 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -428,6 +428,7 @@ mapAliases {
   pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
+  pyqt5-stubs = throw "'pyqt5-stubs' has been removed as it was unused and depended on vulnerable qt5 webengine"; # Added 2026-01-15
   pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
   pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
   pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been renamed to/replaced by 'pyqt5-webkit'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d66783552dc8..3432fc11befd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14734,8 +14734,6 @@ self: super: with self; {
     inherit (pkgs) mesa;
   };
 
-  pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { };
-
   # `pyqt5-webkit` should not be used by python libraries in
   # pkgs/development/python-modules/*. Putting this attribute in
   # `propagatedBuildInputs` may cause collisions.

From 4142633ab2e6a3145873f17005ece448dffc0e1a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 21:22:43 +0200
Subject: [PATCH 087/107] notepadqq: drop

Unmaintained upstream [1], depends on qmake and qt5 webengine.

[1] https://github.com/notepadqq/notepadqq/commit/b426303b5df28b63b6316308927f62db072c27e6
---
 .../editors/notepadqq/default.nix             | 72 -------------------
 .../editors/notepadqq/fix-configure.patch     | 22 ------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 pkgs/applications/editors/notepadqq/default.nix
 delete mode 100644 pkgs/applications/editors/notepadqq/fix-configure.patch

diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
deleted file mode 100644
index 43f2aef74697..000000000000
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  which,
-  qttools,
-  wrapQtAppsHook,
-  libuchardet,
-  qtbase,
-  qtsvg,
-  qtwebengine,
-  qtwebsockets,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "notepadqq";
-  # shipping a beta build as there's no proper release which supports qtwebengine
-  version = "2.0.0-beta";
-
-  src = fetchFromGitHub {
-    owner = "notepadqq";
-    repo = "notepadqq";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE=";
-  };
-
-  patches = [
-    # Fix: chmod in the Makefile fails randomly
-    # Move it to preFixup instead
-    ./fix-configure.patch
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    which
-    qttools
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libuchardet
-    qtbase
-    qtsvg
-    qtwebengine
-    qtwebsockets
-  ];
-
-  strictDeps = false; # breaks qmake
-
-  preConfigure = ''
-    export LRELEASE="lrelease"
-  '';
-
-  dontWrapQtApps = true;
-
-  preFixup = ''
-    chmod +x $out/bin/notepadqq
-    wrapQtApp $out/bin/notepadqq
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "https://notepadqq.com/";
-    description = "Notepad++-like editor for the Linux desktop";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.rszibele ];
-    mainProgram = "notepadqq";
-  };
-})
diff --git a/pkgs/applications/editors/notepadqq/fix-configure.patch b/pkgs/applications/editors/notepadqq/fix-configure.patch
deleted file mode 100644
index 56c0eaadd5e0..000000000000
--- a/pkgs/applications/editors/notepadqq/fix-configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/ui/ui.pro b/src/ui/ui.pro
-index a1346eb..f8052a2 100644
---- a/src/ui/ui.pro
-+++ b/src/ui/ui.pro
-@@ -293,16 +293,9 @@ unix:!macx {
-     appstream.path = "$$INSTALL_ROOT$$PREFIX/share/metainfo/"
-     appstream.files += "$$INSTALLFILESDIR/notepadqq.appdata.xml"
- 
--    # == Dummy target used to fix permissions at the end of the install ==
--    # A random path. Without one, qmake refuses to create the rule.
--    set_permissions.path = "$$INSTALL_ROOT$$PREFIX/bin/"
--    # We want to keep $$INSTALL_ROOT as a variable in the makefile, so we use $(INSTALL_ROOT)
--    unix:set_permissions.extra = chmod 755 $(INSTALL_ROOT)\"$$PREFIX/bin/notepadqq\"
--
-     # MAKE INSTALL
-     INSTALLS += target \
-          icon_h16 icon_h22 icon_h24 icon_h32 icon_h48 icon_h64 icon_h96 icon_h128 icon_h256 icon_h512 icon_hscalable \
--         misc_data launch shortcuts appstream \
--         set_permissions
-+         misc_data launch shortcuts appstream
- 
- }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9fa7e9f9816a..6466cb041a55 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1501,6 +1501,7 @@ mapAliases {
   nomacs-qt6 = nomacs; # Added 2025-08-30
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   notary = throw "'notary' has been removed due to being archived upstream. Consider using 'notation' instead."; # Added 2025-11-13
+  notepadqq = throw "'notepadqq' has been removed due to upstream stopping maintenance in 2023."; # Added 2026-02-10
   notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
   noto-fonts-emoji = throw "'noto-fonts-emoji' has been renamed to/replaced by 'noto-fonts-color-emoji'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d1043ce0185..2cc92f7d4673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10033,8 +10033,6 @@ with pkgs;
 
   ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { };
 
-  notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
-
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
     pythonPackages = python3Packages;
   };

From b822c71ba3fe00622d8c6bb0f5e5d34d213598b1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 21:23:37 +0200
Subject: [PATCH 088/107] orange{3,-{canvas-core,widget-base}}: drop

Parts depended on qt5 webengine, and the rest was unused libraries
---
 .../orange-canvas-core/default.nix            | 113 ---------
 .../orange-widget-base/default.nix            |  71 ------
 .../python-modules/orange3/default.nix        | 230 ------------------
 pkgs/top-level/python-aliases.nix             |   3 +
 pkgs/top-level/python-packages.nix            |   6 -
 5 files changed, 3 insertions(+), 420 deletions(-)
 delete mode 100644 pkgs/development/python-modules/orange-canvas-core/default.nix
 delete mode 100644 pkgs/development/python-modules/orange-widget-base/default.nix
 delete mode 100644 pkgs/development/python-modules/orange3/default.nix

diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix
deleted file mode 100644
index ed660f4c85d3..000000000000
--- a/pkgs/development/python-modules/orange-canvas-core/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-  trubar,
-
-  # dependencies
-  anyqt,
-  cachecontrol,
-  commonmark,
-  dictdiffer,
-  docutils,
-  filelock,
-  lockfile,
-  numpy,
-  packaging,
-  pip,
-  qasync,
-  requests,
-  requests-cache,
-  truststore,
-  typing-extensions,
-
-  # tests
-  qt5,
-  pyqt5,
-  pytest-qt,
-  pytestCheckHook,
-
-  stdenv,
-  gitUpdater,
-}:
-
-buildPythonPackage rec {
-  pname = "orange-canvas-core";
-  version = "0.2.8";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "biolab";
-    repo = "orange-canvas-core";
-    tag = version;
-    hash = "sha256-hrL8tVomTyQkk6Taz+RZ39gb7s1qpY0WsqIuvyml5Yw=";
-  };
-
-  build-system = [
-    setuptools
-    trubar
-  ];
-
-  dependencies = [
-    anyqt
-    commonmark
-    dictdiffer
-    docutils
-    filelock
-    lockfile
-    numpy
-    packaging
-    pip
-    qasync
-    requests
-    requests-cache
-    truststore
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [ "orangecanvas" ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
-    export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
-    export QT_QPA_PLATFORM=offscreen
-  '';
-
-  nativeCheckInputs = [
-    pyqt5
-    pytest-qt
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # Failed: CALL ERROR: Exceptions caught in Qt event loop
-    "test_create_new_window"
-    "test_dont_load_swp_on_new_window"
-    "test_editlinksnode"
-    "test_flattened"
-    "test_links_edit"
-    "test_links_edit_widget"
-    "test_new_window"
-    "test_toolbox"
-    "test_tooltree_registry"
-    "test_widgettoolgrid"
-  ];
-
-  passthru.updateScript = gitUpdater { };
-
-  disabledTestPaths = [ "orangecanvas/canvas/items/tests/test_graphicstextitem.py" ];
-
-  meta = {
-    description = "Orange framework for building graphical user interfaces for editing workflows";
-    homepage = "https://github.com/biolab/orange-canvas-core";
-    changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${src.tag}";
-    license = [ lib.licenses.gpl3 ];
-    maintainers = [ ];
-    # Segmentation fault during tests
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-}
diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix
deleted file mode 100644
index dbf027a8d181..000000000000
--- a/pkgs/development/python-modules/orange-widget-base/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  lib,
-  gitUpdater,
-  stdenv,
-  buildPythonPackage,
-  setuptools,
-  fetchFromGitHub,
-  pyqt5,
-  pyqtwebengine,
-  matplotlib,
-  orange-canvas-core,
-  pyqtgraph,
-  typing-extensions,
-  qt5,
-  pytestCheckHook,
-  pytest-qt,
-  appnope,
-}:
-
-buildPythonPackage rec {
-  pname = "orange-widget-base";
-  version = "4.27.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "biolab";
-    repo = "orange-widget-base";
-    tag = version;
-    hash = "sha256-RTPzdeqz7HRyH726qXC0FMrAcwk6qZ8gmkXL7s5bl74=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    matplotlib
-    orange-canvas-core
-    pyqt5
-    pyqtgraph
-    pyqtwebengine
-    typing-extensions
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ];
-
-  pythonImportsCheck = [ "orangewidget" ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
-    export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
-    export QT_QPA_PLATFORM=offscreen
-  '';
-
-  nativeCheckInputs = [
-    pytest-qt
-    pytestCheckHook
-  ];
-
-  disabledTestPaths = [
-    "orangewidget/report/tests/test_report.py"
-    "orangewidget/tests/test_widget.py"
-  ];
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = {
-    description = "Implementation of the base OWBaseWidget class and utilities for use in Orange Canvas workflows";
-    homepage = "https://github.com/biolab/orange-widget-base";
-    license = [ lib.licenses.gpl3Plus ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix
deleted file mode 100644
index 7959fca6cf8c..000000000000
--- a/pkgs/development/python-modules/orange3/default.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  oldest-supported-numpy,
-  setuptools,
-
-  # nativeBuildInputs
-  copyDesktopItems,
-  cython,
-  qt5,
-  recommonmark,
-  sphinx,
-
-  # dependencies
-  baycomp,
-  bottleneck,
-  catboost,
-  chardet,
-  httpx,
-  joblib,
-  keyring,
-  keyrings-alt,
-  matplotlib,
-  numpy,
-  openpyxl,
-  opentsne,
-  orange-canvas-core,
-  orange-widget-base,
-  pandas,
-  pip,
-  pyqt5,
-  pyqtgraph,
-  pyqtwebengine,
-  python-louvain,
-  pyyaml,
-  qtconsole,
-  requests,
-  scikit-learn,
-  scipy,
-  serverfiles,
-  xgboost,
-  xlrd,
-  xlsxwriter,
-
-  makeDesktopItem,
-
-  # passthru
-  gitUpdater,
-  python,
-  pytest-qt,
-  pytestCheckHook,
-}:
-
-let
-  self = buildPythonPackage rec {
-    pname = "orange3";
-    version = "3.40.0";
-    pyproject = true;
-
-    src = fetchFromGitHub {
-      owner = "biolab";
-      repo = "orange3";
-      tag = version;
-      hash = "sha256-AOQGqOYaP3bPZtgjsVCxhA1T34Y9EIR5VeMwhZWmI88=";
-    };
-
-    build-system = [
-      oldest-supported-numpy
-      setuptools
-    ];
-
-    postPatch = ''
-      substituteInPlace pyproject.toml \
-          --replace-fail 'cython>=3.0' 'cython'
-
-      # disable update checking
-      echo -e "def check_for_updates():\n\tpass" >> Orange/canvas/__main__.py
-    '';
-
-    nativeBuildInputs = [
-      copyDesktopItems
-      cython
-      qt5.wrapQtAppsHook
-      recommonmark
-      sphinx
-    ];
-
-    enableParallelBuilding = true;
-
-    pythonRelaxDeps = [ "scikit-learn" ];
-
-    dependencies = [
-      baycomp
-      bottleneck
-      catboost
-      chardet
-      httpx
-      joblib
-      keyring
-      keyrings-alt
-      matplotlib
-      numpy
-      openpyxl
-      opentsne
-      orange-canvas-core
-      orange-widget-base
-      pandas
-      pip
-      pyqt5
-      pyqtgraph
-      pyqtwebengine
-      python-louvain
-      pyyaml
-      qtconsole
-      requests
-      scikit-learn
-      scipy
-      serverfiles
-      setuptools
-      xgboost
-      xlrd
-      xlsxwriter
-    ];
-
-    # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py)
-    doCheck = false;
-
-    # FIXME: pythonRelaxDeps is not relaxing the scikit-learn version constraint, had to disable this
-    dontCheckRuntimeDeps = true;
-
-    pythonImportsCheck = [
-      "Orange"
-      "Orange.data._variable"
-    ];
-
-    desktopItems = [
-      (makeDesktopItem {
-        name = "orange";
-        exec = "orange-canvas";
-        desktopName = "Orange Data Mining";
-        genericName = "Data Mining Suite";
-        comment = "Explore, analyze, and visualize your data";
-        icon = "orange-canvas";
-        mimeTypes = [ "application/x-extension-ows" ];
-        categories = [
-          "Science"
-          "Education"
-          "ArtificialIntelligence"
-          "DataVisualization"
-          "NumericalAnalysis"
-          "Qt"
-        ];
-        keywords = [
-          "Machine Learning"
-          "Scientific Visualization"
-          "Statistical Analysis"
-        ];
-      })
-    ];
-
-    postInstall = ''
-      wrapProgram $out/bin/orange-canvas \
-        "${"$"}{qtWrapperArgs[@]}"
-      mkdir -p $out/share/icons/hicolor/{256x256,48x48}/apps
-      cp distribute/icon-256.png $out/share/icons/hicolor/256x256/apps/orange-canvas.png
-      cp distribute/icon-48.png $out/share/icons/hicolor/48x48/apps/orange-canvas.png
-    '';
-
-    passthru = {
-      updateScript = gitUpdater { };
-      tests.unittests = stdenv.mkDerivation {
-        name = "${self.name}-tests";
-        inherit (self) src;
-
-        preCheck = ''
-          export HOME=$(mktemp -d)
-          export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
-          export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
-          export QT_QPA_PLATFORM=offscreen
-
-          rm Orange -rf
-          cp -r ${self}/${python.sitePackages}/Orange .
-          chmod +w -R .
-
-          substituteInPlace Orange/classification/tests/test_xgb_cls.py \
-            --replace-fail test_learners mk_test_learners
-
-          substituteInPlace Orange/modelling/tests/test_xgb.py \
-            --replace-fail test_learners mk_test_learners
-
-          substituteInPlace Orange/**/tests/*.py \
-            --replace-fail test_filename filename_test
-
-          # TODO: debug why orange is crashing on GC, may be a upstream issue
-          chmod +x Orange/__init__.py
-          echo "import gc; gc.disable()" | tee -a Orange/__init__.py
-
-        '';
-
-        nativeBuildInputs = [
-          pytest-qt
-          pytestCheckHook
-        ];
-
-        postCheck = ''
-          touch $out
-        '';
-
-        doBuild = false;
-        doInstall = false;
-
-        buildInputs = [ self ];
-      };
-    };
-
-    meta = {
-      description = "Data mining and visualization toolbox for novice and expert alike";
-      homepage = "https://orangedatamining.com/";
-      changelog = "https://github.com/biolab/orange3/blob/${src.tag}/CHANGELOG.md";
-      license = [ lib.licenses.gpl3Plus ];
-      maintainers = [ ];
-      mainProgram = "orange-canvas";
-    };
-  };
-in
-self
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 4005ae4e0701..2b9ccd75a3c4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -362,6 +362,9 @@ mapAliases {
   openai-triton-no-cuda = throw "'openai-triton-no-cuda' has been renamed to/replaced by 'triton-no-cuda'"; # Converted to throw 2025-10-29
   openbabel-bindings = openbabel; # added 2025-09-17
   opsdroid_get_image_size = throw "'opsdroid_get_image_size' has been renamed to/replaced by 'opsdroid-get-image-size'"; # Converted to throw 2025-10-29
+  orange3 = throw "'orange3' has been removed as it was unmaintained and depended on qt5 webengine"; # Added 2026-02-10
+  orange-canvas-core = throw "'orange-canvas-core' has been removed as it was unmaintained and unused outside orange3"; # Added 2026-02-10
+  orange-widgets-base = throw "'orange-widgets-base' has been removed as it was unmaintained and depended on qt5 webengine"; # Added 2026-02-10
   orderedset = throw "orderedset has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
   paho-mqtt_2 = throw "'paho-mqtt_2' has been renamed to/replaced by 'paho-mqtt'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3432fc11befd..66a1c21a6ad2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11873,12 +11873,6 @@ self: super: with self; {
 
   oralb-ble = callPackage ../development/python-modules/oralb-ble { };
 
-  orange-canvas-core = callPackage ../development/python-modules/orange-canvas-core { };
-
-  orange-widget-base = callPackage ../development/python-modules/orange-widget-base { };
-
-  orange3 = callPackage ../development/python-modules/orange3 { };
-
   oras = callPackage ../development/python-modules/oras { };
 
   orbax-checkpoint = callPackage ../development/python-modules/orbax-checkpoint { };

From 0dcbfd038c9a0f699b54d7f551c7895d05663ce5 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Feb 2026 22:45:15 +0100
Subject: [PATCH 089/107] python3Packages.pyqtwebengine: drop

---
 .../python-modules/pyqtwebengine/default.nix  | 112 ------------------
 pkgs/top-level/python-aliases.nix             |   1 +
 pkgs/top-level/python-packages.nix            |   4 -
 3 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyqtwebengine/default.nix

diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
deleted file mode 100644
index 295f8d3ad991..000000000000
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  lib,
-  setuptools,
-  stdenv,
-  fetchPypi,
-  pkg-config,
-  libsForQt5,
-  darwin,
-  buildPythonPackage,
-  python,
-  isPy27,
-  pyqt5,
-  sip,
-  pyqt-builder,
-  mesa,
-}:
-
-let
-  inherit (darwin) autoSignDarwinBinariesHook;
-in
-buildPythonPackage (
-  rec {
-    pname = "pyqtwebengine";
-    version = "5.15.7";
-    pyproject = true;
-
-    disabled = isPy27;
-
-    src = fetchPypi {
-      pname = "PyQtWebEngine";
-      inherit version;
-      hash = "sha256-8SGsbkovlqwolhm8/Df2Tmg2LySjRlU/XWxC76Qiik0=";
-    };
-
-    postPatch = ''
-      substituteInPlace pyproject.toml \
-        --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]"
-    '';
-
-    outputs = [
-      "out"
-      "dev"
-    ];
-
-    nativeBuildInputs = [
-      pkg-config
-      libsForQt5.qmake
-      libsForQt5.wrapQtAppsHook
-    ]
-    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      python.pythonOnBuildForHost.pkgs.sip
-    ]
-    ++ [
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      libsForQt5.qtwebengine
-      pyqt-builder
-      setuptools
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ];
-
-    buildInputs = [
-      sip
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      libsForQt5.qtwebengine
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      libsForQt5.qtwebchannel
-      libsForQt5.qtdeclarative
-    ];
-
-    propagatedBuildInputs = [ pyqt5 ];
-
-    dontWrapQtApps = true;
-
-    # Avoid running qmake, which is in nativeBuildInputs
-    dontConfigure = true;
-
-    # Checked using pythonImportsCheck
-    doCheck = false;
-
-    pythonImportsCheck = [
-      "PyQt5.QtWebEngine"
-      "PyQt5.QtWebEngineWidgets"
-    ];
-
-    enableParallelBuilding = true;
-
-    passthru = {
-      inherit (libsForQt5) wrapQtAppsHook;
-    };
-
-    meta = {
-      description = "Python bindings for Qt5";
-      homepage = "http://www.riverbankcomputing.co.uk";
-      license = lib.licenses.gpl3;
-      hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms mesa.meta.platforms;
-    };
-  }
-  // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-    # TODO: figure out why the env hooks aren't adding these inclusions automatically
-    env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
-      "-I${lib.getDev libsForQt5.qtbase}/include/QtPrintSupport/"
-      "-I${lib.getDev libsForQt5.qtwebchannel}/include/QtWebChannel/"
-    ];
-  }
-)
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 2b9ccd75a3c4..51ad92ac4720 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -435,6 +435,7 @@ mapAliases {
   pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
   pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
   pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been renamed to/replaced by 'pyqt5-webkit'"; # Converted to throw 2025-10-29
+  pyqtwebengine = "'pyqtwebengine' has been removed as it depended on the removed qt5 webengine"; # Added 2026-02-10
   pyramid_beaker = throw "'pyramid_beaker' has been renamed to/replaced by 'pyramid-beaker'"; # Converted to throw 2025-10-29
   pyramid_chameleon = throw "'pyramid_chameleon' has been renamed to/replaced by 'pyramid-chameleon'"; # Converted to throw 2025-10-29
   pyramid_exclog = throw "'pyramid_exclog' has been renamed to/replaced by 'pyramid-exclog'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66a1c21a6ad2..4e7d0bb7d0b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14777,10 +14777,6 @@ self: super: with self; {
 
   pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
 
-  pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine {
-    inherit (pkgs) mesa;
-  };
-
   pyquaternion = callPackage ../development/python-modules/pyquaternion { };
 
   pyquery = callPackage ../development/python-modules/pyquery { };

From 9d1e315721203fb71803251f8e0e9318306bdc5b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Feb 2026 22:54:43 +0100
Subject: [PATCH 090/107] kchmviewer: drop

---
 pkgs/by-name/kc/kchmviewer/package.nix | 81 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 pkgs/by-name/kc/kchmviewer/package.nix

diff --git a/pkgs/by-name/kc/kchmviewer/package.nix b/pkgs/by-name/kc/kchmviewer/package.nix
deleted file mode 100644
index 3e84705d0992..000000000000
--- a/pkgs/by-name/kc/kchmviewer/package.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  qt5,
-  chmlib,
-  libzip,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "kchmviewer";
-  version = "8.0";
-
-  src = fetchFromGitHub {
-    owner = "gyunaev";
-    repo = "kchmviewer";
-    tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw=";
-  };
-
-  patches = [
-    # remove unused webkit
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch";
-      hash = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28=";
-    })
-    # QtWebengine fixes
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch";
-      hash = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY=";
-    })
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch";
-      hash = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY=";
-    })
-    # Fix build on macOS
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/b68ed6fe72eaf9ee4e7e42925f5071fbd02dc6b3.patch";
-      hash = "sha256-sJA0RE0Z83tYv0S42yQYWKKeLhW+YDsrxLkY5aMKKT4=";
-    })
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/d307e4e829c5a6f57ab0040f786c3da7fd2f0a99.patch";
-      hash = "sha256-FWYfqG8heL6AnhevueCWHQc+c6Yj4+DuIdjIwXVZ+O4=";
-    })
-  ];
-
-  buildInputs = [
-    chmlib
-    libzip
-    qt5.qtwebengine
-  ];
-
-  nativeBuildInputs = [
-    qt5.qmake
-    qt5.wrapQtAppsHook
-  ];
-
-  postInstall =
-    if stdenv.hostPlatform.isDarwin then
-      ''
-        mkdir -p $out/{Applications,bin}
-        mv bin/kchmviewer.app $out/Applications
-        ln -s $out/Applications/kchmviewer.app/Contents/MacOS/kchmviewer $out/bin/kchmviewer
-      ''
-    else
-      ''
-        install -Dm755 bin/kchmviewer -t $out/bin
-        install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps
-        install -Dm644 packages/kchmviewer.desktop -t $out/share/applications
-      '';
-
-  meta = {
-    description = "CHM (Winhelp) files viewer";
-    mainProgram = "kchmviewer";
-    homepage = "http://www.ulduzsoft.com/linux/kchmviewer/";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ sikmir ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6466cb041a55..16d4ed6e27b0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1000,6 +1000,7 @@ mapAliases {
   karing = throw "'karing' has been removed, as it is unmaintained in nixpkgs"; # Added 2026-01-31
   katawa-shoujo = throw "'katawa-shoujo' has been removed, as it bundles insecure Python 2. You may install 'katawa-shoujo-re-engineered' instead, which is an updated version remade by Fleeting Heartbeat Studios."; # Added 2026-03-27
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
+  kchmviewer = throw "'kchmviewer' has been removed as it was unmaintained upstream since 2022 and depended on qt5 webengine. Consider switching to 'uchmviewer', a fork of 'kchmviewer'."; # Added 2026-02-10
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
   keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08

From 9d952d2ee0239ae8a5cf6aa5edb301359bf789de Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 10 Feb 2026 23:27:02 +0100
Subject: [PATCH 091/107] mellowplayer: drop

see also https://gitlab.com/ColinDuquesnoy/MellowPlayer/-/commit/8506a91d961da7d0b061b2784392c5b7c4b6d211
---
 pkgs/by-name/me/mellowplayer/package.nix | 75 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 pkgs/by-name/me/mellowplayer/package.nix

diff --git a/pkgs/by-name/me/mellowplayer/package.nix b/pkgs/by-name/me/mellowplayer/package.nix
deleted file mode 100644
index 89429be73733..000000000000
--- a/pkgs/by-name/me/mellowplayer/package.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  stdenv,
-  cmake,
-  fetchFromGitLab,
-  lib,
-  libnotify,
-  pkg-config,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "MellowPlayer";
-  version = "3.6.8";
-
-  src = fetchFromGitLab {
-    owner = "ColinDuquesnoy";
-    repo = "MellowPlayer";
-    tag = finalAttrs.version;
-    hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libnotify
-    libsForQt5.qtbase
-    libsForQt5.qtdeclarative
-    libsForQt5.qtgraphicaleffects
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qttools
-    libsForQt5.qtwebengine
-  ];
-
-  doCheck = true;
-
-  cmakeFlags = [ "-DBUILD_TESTS=ON" ];
-
-  preCheck = ''
-    # Running the tests requires a location at the home directory for logging.
-    export HOME="$NIX_BUILD_TOP/home"
-    mkdir -p "$HOME/.local/share/MellowPlayer.Tests/MellowPlayer.Tests/Logs"
-
-    # Without this, the tests fail because they cannot create the QT Window
-    export QT_QPA_PLATFORM=offscreen
-  ''
-  # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?
-  + (builtins.concatStringsSep "\n" (
-    lib.lists.flatten (
-      map (pkg: [
-        (lib.optionalString (pkg ? qtPluginPrefix) ''
-          export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
-        '')
-
-        (lib.optionalString (pkg ? qtQmlPrefix) ''
-          export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
-        '')
-      ]) finalAttrs.buildInputs
-    )
-  ));
-
-  meta = {
-    inherit (libsForQt5.qtbase.meta) platforms;
-    broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore
-
-    description = "Cloud music integration for your desktop";
-    mainProgram = "MellowPlayer";
-    homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ kalbasit ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 16d4ed6e27b0..d4b2ef19f55e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1349,6 +1349,7 @@ mapAliases {
   mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
   meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
+  mellowplayer = throw "'mellowplayer' has been removed as it was discontinued upstream in 2021."; # Added 2026-02-10
   melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
   melonDS = warnAlias "'melonDS' has been renamed to 'melonds'" melonds; # Added 2026-02-08
   meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21

From b466dce63d2dc936e6c0f0f7ea93b5bc553aa855 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 11 Feb 2026 10:05:00 +0100
Subject: [PATCH 092/107] clipgrab: drop

---
 pkgs/applications/video/clipgrab/default.nix  | 96 -------------------
 .../video/clipgrab/yt-dlp-path.patch          | 86 -----------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 184 deletions(-)
 delete mode 100644 pkgs/applications/video/clipgrab/default.nix
 delete mode 100644 pkgs/applications/video/clipgrab/yt-dlp-path.patch

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
deleted file mode 100644
index b3f633374529..000000000000
--- a/pkgs/applications/video/clipgrab/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  makeDesktopItem,
-  ffmpeg,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  qtdeclarative,
-  qtlocation,
-  qtquickcontrols2,
-  qtwebchannel,
-  qtwebengine,
-  yt-dlp,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "clipgrab";
-  version = "3.9.7";
-
-  src = fetchurl {
-    sha256 = "sha256-9H8raJd6MyyFICY8WUZQGLJ4teKPJUiQfqbu1HWAVIw=";
-    # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
-    url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
-  };
-
-  buildInputs = [
-    ffmpeg
-    qtbase
-    qtdeclarative
-    qtlocation
-    qtquickcontrols2
-    qtwebchannel
-    qtwebengine
-  ];
-  nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
-  ];
-
-  patches = [
-    ./yt-dlp-path.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace youtube_dl.cpp \
-      --replace 'QString YoutubeDl::path = QString();' \
-                'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");'
-  ''
-  + lib.optionalString (ffmpeg != null) ''
-    substituteInPlace converter_ffmpeg.cpp \
-      --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
-      --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
-  '';
-
-  qmakeFlags = [ "clipgrab.pro" ];
-
-  desktopItem = makeDesktopItem rec {
-    name = "clipgrab";
-    exec = name;
-    icon = name;
-    desktopName = "ClipGrab";
-    comment = meta.description;
-    genericName = "Web video downloader";
-    categories = [
-      "Qt"
-      "AudioVideo"
-      "Audio"
-      "Video"
-    ];
-  };
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 clipgrab $out/bin/clipgrab
-    install -Dm644 icon.png $out/share/pixmaps/clipgrab.png
-    cp -r ${desktopItem}/share/applications $out/share
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Video downloader for YouTube and other sites";
-    longDescription = ''
-      ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
-      Dailymotion and many other online video sites. It converts downloaded
-      videos to MPEG4, MP3 or other formats in just one easy step.
-    '';
-    homepage = "https://clipgrab.org/";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    mainProgram = "clipgrab";
-  };
-}
diff --git a/pkgs/applications/video/clipgrab/yt-dlp-path.patch b/pkgs/applications/video/clipgrab/yt-dlp-path.patch
deleted file mode 100644
index 5a9a4b6dcc48..000000000000
--- a/pkgs/applications/video/clipgrab/yt-dlp-path.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/main.cpp
-+++ b/main.cpp
-@@ -91,14 +91,5 @@ int main(int argc, char *argv[])
-         w.show();
-     }
- 
--    QTimer::singleShot(0, [=] {
--       cg->getUpdateInfo();
--       QObject::connect(cg, &ClipGrab::updateInfoProcessed, [cg] {
--           bool force = QSettings().value("forceYoutubeDlDownload", false).toBool();
--           if (force) QSettings().setValue("forceYoutubeDlDownload", false);
--           cg->downloadYoutubeDl(force);
--       });
--    });
--
-     return app.exec();
- }
---- a/youtube_dl.cpp
-+++ b/youtube_dl.cpp
-@@ -8,52 +8,16 @@ YoutubeDl::YoutubeDl()
- QString YoutubeDl::path = QString();
- 
- QString YoutubeDl::find(bool force) {
--    if (!force && !path.isEmpty()) return path;
--
--    // Prefer downloaded youtube-dl
--    QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp");
--    QProcess* process = instance(localPath, QStringList() << "--version");
--    process->start();
--    process->waitForFinished();
--    process->deleteLater();
--    if (process->state() != QProcess::NotRunning) process->kill();
--    if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
--        path = localPath;
--        return path;
--    }
--
--    // Try system-wide youtube-dlp installation
--    QString globalPath = QStandardPaths::findExecutable("yt-dlp");
--    process = instance(globalPath, QStringList() << "--version");
--    process->start();
--    process->waitForFinished();
--    process->deleteLater();
--    if (process->state() != QProcess::NotRunning) process->kill();
--    if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
--        path = globalPath;
--        return path;
--    }
--
--    return "";
-+    // We supply yt-dlp from nixpkgs, so the downloading
-+    // machinery is not needed anymore.
-+    (void)force;
-+    return path;
- }
- 
- QProcess* YoutubeDl::instance(QStringList arguments) {
--    return instance(find(), arguments);
--}
--
--QProcess* YoutubeDl::instance(QString path, QStringList arguments) {
-     QProcess *process = new QProcess();
- 
--    QString execPath = QCoreApplication::applicationDirPath();
--    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
--    env.insert("PATH", execPath + ":" + env.value("PATH"));
--    process->setEnvironment(env.toStringList());
--
--    #if defined Q_OS_WIN
--        process->setProgram(execPath + "/python/python.exe");
--    #else
--        process->setProgram(QStandardPaths::findExecutable("python3"));
--    #endif
-+    process->setProgram(path);
- 
-     QSettings settings;
-     QStringList proxyArguments;
-@@ -81,7 +45,7 @@ QProcess* YoutubeDl::instance(QString path, QStringList arguments) {
-         networkArguments << "--force-ipv4";
-     }
- 
--    process->setArguments(QStringList() << path << arguments << proxyArguments << networkArguments);
-+    process->setArguments(QStringList() << arguments << proxyArguments << networkArguments);
-     return process;
- }
- 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d4b2ef19f55e..08e8f08234a1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -508,6 +508,7 @@ mapAliases {
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
+  clipgrab = throw "'clipgrab' has been removed, as it was unmaintained in nixpkgs since 2022 and depended on vulnerable qt5 webengine."; # Added 2026-02-11
   cloudlogoffline = throw "cloudlogoffline has been removed"; # Added 2025-05-18
   clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12
   clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cc92f7d4673..4b0c89740a47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9168,8 +9168,6 @@ with pkgs;
 
   chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or { });
 
-  clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
-
   cni = callPackage ../applications/networking/cluster/cni { };
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { };
 

From c6c169dbbc23f78de0f113f50c72a8518c42f43f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 21:24:34 +0200
Subject: [PATCH 093/107] yacas-gui: drop

Upstream is planning deprecation of the gui entirely, see https://github.com/grzegorzmazur/yacas/issues/361.
---
 pkgs/by-name/ya/yacas/package.nix | 9 +--------
 pkgs/top-level/aliases.nix        | 1 +
 pkgs/top-level/all-packages.nix   | 5 -----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ya/yacas/package.nix b/pkgs/by-name/ya/yacas/package.nix
index 7f63de413cae..51914b99cceb 100644
--- a/pkgs/by-name/ya/yacas/package.nix
+++ b/pkgs/by-name/ya/yacas/package.nix
@@ -5,7 +5,6 @@
   fetchpatch,
   cmake,
   perl,
-  enableGui ? false,
   enableJupyter ? true,
   boost,
   jsoncpp,
@@ -14,7 +13,6 @@
   enableJava ? false,
   openjdk,
   gtest,
-  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   cmakeFlags = [
-    "-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}"
+    "-DENABLE_CYACAS_GUI=OFF"
     "-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}"
     "-DENABLE_JYACAS=${if enableJava then "ON" else "OFF"}"
     "-DENABLE_CYACAS_UNIT_TESTS=ON"
@@ -66,11 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
   ]
-  ++ lib.optionals enableGui [
-    libsForQt5.qtbase
-    libsForQt5.wrapQtAppsHook
-    libsForQt5.qtwebengine
-  ]
   ++ lib.optionals enableJupyter [
     boost
     jsoncpp
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08e8f08234a1..5bb80894aed3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2498,6 +2498,7 @@ mapAliases {
   xxHash = warnAlias "'xxHash' has been renamed to 'xxhash'" xxhash; # Added 2026-02-12
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
+  yacas-gui = throw "'yacas-gui' has been removed, as it depended on qt5 webengine. Upstream is considering deprecation of the gui entirely, see https://github.com/grzegorzmazur/yacas/issues/361."; # Added 2026-02-11
   yafaray-core = throw "'yafaray-core' has been renamed to/replaced by 'libyafaray'"; # Converted to throw 2025-10-27
   yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b0c89740a47..a8b53072898d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11682,11 +11682,6 @@ with pkgs;
     lisp-compiler = ecl;
   };
 
-  yacas-gui = yacas.override {
-    enableGui = true;
-    enableJupyter = false;
-  };
-
   ### SCIENCE / MISC
 
   boinc-headless = boinc.override { headless = true; };

From d51e8c2db132c53671477e2b56b922bb73a30763 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 21:50:18 +0200
Subject: [PATCH 094/107] eagle: drop

See also the autodesk announcement [1].

[1] https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html
---
 .../science/electronics/eagle/eagle.nix       | 138 ------------------
 .../science/electronics/eagle/eagle7_fixer.c  | 134 -----------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 1 insertion(+), 274 deletions(-)
 delete mode 100644 pkgs/applications/science/electronics/eagle/eagle.nix
 delete mode 100644 pkgs/applications/science/electronics/eagle/eagle7_fixer.c

diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
deleted file mode 100644
index 5ce67c09a684..000000000000
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  wrapQtAppsHook,
-  makeDesktopItem,
-  libxrender,
-  libxrandr,
-  libxcursor,
-  libx11,
-  libxext,
-  libxi,
-  libxcb,
-  libGL,
-  glib,
-  nss,
-  nspr,
-  expat,
-  alsa-lib,
-  qtbase,
-  qtdeclarative,
-  qtsvg,
-  qtlocation,
-  qtwebchannel,
-  qtwebengine,
-}:
-
-let
-  libPath = lib.makeLibraryPath [
-    libxrender
-    libxrandr
-    libxcursor
-    libx11
-    libxext
-    libxi
-    libxcb
-    libGL
-    glib
-    nss
-    nspr
-    expat
-    alsa-lib
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtlocation
-    qtwebchannel
-    qtwebengine
-  ];
-in
-stdenv.mkDerivation rec {
-  pname = "eagle";
-  version = "9.6.2";
-
-  src = fetchurl {
-    url = "https://eagle-updates.circuits.io/downloads/${
-      builtins.replaceStrings [ "." ] [ "_" ] version
-    }/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
-    sha256 = "18syygnskl286kn8aqfzzdsyzq59d2w19y1h1ynyxsnrvkyv71h0";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "eagle";
-    exec = "eagle";
-    icon = "eagle";
-    comment = "Schematic capture and PCB layout";
-    desktopName = "Eagle";
-    genericName = "Schematic editor";
-    categories = [ "Development" ];
-  };
-
-  nativeBuildInputs = [ wrapQtAppsHook ];
-
-  buildInputs = [
-    libxrender
-    libxrandr
-    libxcursor
-    libx11
-    libxext
-    libxi
-    libxcb
-    libGL
-    glib
-    nss
-    nspr
-    expat
-    alsa-lib
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtlocation
-    qtwebchannel
-    qtwebengine
-  ];
-
-  installPhase = ''
-    # Extract eagle tarball
-    mkdir "$out"
-    tar -xzf "$src" -C "$out"
-
-    # Install manpage
-    mkdir -p "$out"/share/man/man1
-    ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
-
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${libPath}:$out/eagle-${version}/lib:${lib.getLib stdenv.cc.cc}/lib" \
-      "$out"/eagle-${version}/eagle
-
-    mkdir -p "$out"/bin
-    ln -s "$out"/eagle-${version}/eagle "$out"/bin/eagle
-
-    # Remove bundled libraries that are available in nixpkgs
-    # TODO: There still may be unused bundled libraries
-    rm "$out"/eagle-${version}/lib/libQt5*.so.5
-    rm "$out"/eagle-${version}/lib/{libxcb-*.so.*,libX*.so.*,libxshmfence.so.1}
-    rm "$out"/eagle-${version}/lib/{libEGL.so.1,libglapi.so.0,libgbm.so.1}
-
-    # No longer needed (we don't use the bundled Qt libraries)
-    rm -r "$out"/eagle-${version}/libexec
-    rm -r "$out"/eagle-${version}/plugins
-
-    # Make desktop item
-    mkdir -p "$out"/share/applications
-    cp "$desktopItem"/share/applications/* "$out"/share/applications/
-    mkdir -p "$out"/share/pixmaps
-    ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/pixmaps/eagle.png
-  '';
-
-  meta = {
-    description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)";
-    homepage = "https://www.autodesk.com/products/eagle/overview";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/science/electronics/eagle/eagle7_fixer.c b/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
deleted file mode 100644
index da9da4dcbd3a..000000000000
--- a/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * LD_PRELOAD trick to make Eagle (schematic editor and PCB layout tool from
- * CadSoft) work from a read-only installation directory.
- *
- * When Eagle starts, it looks for the license file in <eagle>/bin/eagle.key
- * (where <eagle> is the install path). If eagle.key is not found, Eagle checks
- * for write access to <eagle>/bin/, shows a license dialog to the user and
- * then attempts to write a license file to <eagle>/bin/.
- *
- * This will of course fail when Eagle is installed in the read-only Nix store.
- * Hence this library that redirects accesses to the those paths in the
- * following way:
- *
- *   <eagle>/bin              => $HOME
- *   <eagle>/bin/eagle.key    => $HOME/.eagle.key
- *
- * Also, if copying an example project to ~/eagle/ (in the Eagle GUI), Eagle
- * chmod's the destination with read-only permission bits (presumably because
- * the source is read-only) and fails to complete the copy operation.
- * Therefore, the mode argument in calls to chmod() is OR'ed with the S_IWUSR
- * bit (write by owner).
- *
- * Usage:
- *   gcc -shared -fPIC -DEAGLE_PATH="$out/eagle-${version}" eagle_fixer.c -o eagle_fixer.so -ldl
- *   LD_PRELOAD=$PWD/eagle_fixer.so ./result/bin/eagle
- *
- * To see the paths that are modified at runtime, set the environment variable
- * EAGLE_FIXER_DEBUG to 1.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <limits.h>
-#include <sys/stat.h>
-
-#ifndef EAGLE_PATH
-#error Missing EAGLE_PATH, path to the eagle-${version} installation directory.
-#endif
-
-typedef FILE *(*fopen_func_t)(const char *path, const char *mode);
-typedef int (*access_func_t)(const char *pathname, int mode);
-typedef int (*chmod_func_t)(const char *path, mode_t mode);
-
-/*
- * Map <eagle>/bin to $HOME and <eagle>/bin/eagle.key to $HOME/.eagle.key
- *
- * Path is truncated if bigger than PATH_MAX. It's not threadsafe, but that's
- * OK.
- */
-static const char *redirect(const char *pathname)
-{
-	static char buffer[PATH_MAX];
-	const char *homepath;
-	const char *new_path;
-	static int have_warned;
-
-	homepath = getenv("HOME");
-	if (!homepath) {
-		homepath = "/";
-		if (!have_warned && getenv("EAGLE_FIXER_DEBUG")) {
-			fprintf(stderr, "eagle_fixer: HOME is unset, using \"/\" (root) instead.\n");
-			have_warned = 1;
-		}
-	}
-
-	new_path = pathname;
-	if (strcmp(EAGLE_PATH "/bin", pathname) == 0) {
-		/* redirect to $HOME */
-		new_path = homepath;
-	} else if (strcmp(EAGLE_PATH "/bin/eagle.key", pathname) == 0) {
-		/* redirect to $HOME/.eagle.key */
-		snprintf(buffer, PATH_MAX, "%s/.eagle.key", homepath);
-		buffer[PATH_MAX-1] = '\0';
-		new_path = buffer;
-	}
-
-	return new_path;
-}
-
-FILE *fopen(const char *pathname, const char *mode)
-{
-	FILE *fp;
-	const char *path;
-	fopen_func_t orig_fopen;
-
-	orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen");
-	path = redirect(pathname);
-	fp = orig_fopen(path, mode);
-
-	if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
-		fprintf(stderr, "eagle_fixer: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp);
-	}
-
-	return fp;
-}
-
-int access(const char *pathname, int mode)
-{
-	int ret;
-	const char *path;
-	access_func_t orig_access;
-
-	orig_access = (access_func_t)dlsym(RTLD_NEXT, "access");
-	path = redirect(pathname);
-	ret = orig_access(path, mode);
-
-	if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
-		fprintf(stderr, "eagle_fixer: access(\"%s\", %d) => \"%s\": ret=%d\n", pathname, mode, path, ret);
-	}
-
-	return ret;
-}
-
-int chmod(const char *pathname, mode_t mode)
-{
-	int ret;
-	mode_t new_mode;
-	chmod_func_t orig_chmod;
-
-	orig_chmod = (chmod_func_t)dlsym(RTLD_NEXT, "chmod");
-	new_mode = mode | S_IWUSR;
-	ret = orig_chmod(pathname, new_mode);
-
-	if (getenv("EAGLE_FIXER_DEBUG")) {
-		fprintf(stderr, "eagle_fixer: chmod(\"%s\", %o) => %o: ret=%d\n", pathname, mode, new_mode, ret);
-	}
-
-	return ret;
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5bb80894aed3..28c08e1c34e8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -633,6 +633,7 @@ mapAliases {
   dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27
   dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13
   e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15
+  eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26
   eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
   ebpf-verifier = warnAlias "'ebpf-verifier' has been renamed to 'prevail'" prevail; # Added 2026-04-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8b53072898d..a8c6eb06b071 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11610,8 +11610,6 @@ with pkgs;
   simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
   simulide_1_2_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.2.0"; };
 
-  eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
-
   degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
 
   geda = callPackage ../applications/science/electronics/geda {

From 037574333e983c8446efc7eb6d2b55cdf44b8944 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 3 Apr 2026 15:03:10 +0200
Subject: [PATCH 095/107] qt5.qtwebview: drop

---
 .../libraries/qt-5/5.15/default.nix           |  1 -
 .../libraries/qt-5/modules/qtwebview.nix      | 23 -------------------
 pkgs/top-level/aliases.nix                    |  2 ++
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/modules/qtwebview.nix

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 2408c9607ab1..6bb41d3a21bd 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -334,7 +334,6 @@ let
       qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { };
       qtwebkit = callPackage ../modules/qtwebkit.nix { };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix { };
-      qtwebview = callPackage ../modules/qtwebview.nix { };
       qtx11extras = callPackage ../modules/qtx11extras.nix { };
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { };
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
deleted file mode 100644
index d9fa0e6fe25c..000000000000
--- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  stdenv,
-  qtModule,
-  qtdeclarative,
-  qtwebengine,
-}:
-
-qtModule {
-  pname = "qtwebview";
-  propagatedBuildInputs = [
-    qtdeclarative
-    qtwebengine
-  ];
-  outputs = [
-    "out"
-    "dev"
-    "bin"
-  ];
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_LDFLAGS = "-framework CoreFoundation -framework WebKit";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 28c08e1c34e8..7b636efd9c3b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -195,6 +195,8 @@ let
       neochat # Added 2025-07-04
       itinerary # Added 2025-07-04
       libquotient # Added 2025-07-04
+      qtwebengine # Added 2026-01-15
+      qtwebview # Added 2026-04-03
       ;
 
     kexi = throw ""; # Added 2025-08-21

From 65f12fd82d0a57e45aa19df2fcbe637366849028 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 15 Apr 2026 09:59:34 +0200
Subject: [PATCH 096/107] mindforger: drop

---
 .../editors/mindforger/default.nix            | 118 ------------------
 .../mindforger/hunspell_pkgconfig.patch       |  23 ----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 1 insertion(+), 143 deletions(-)
 delete mode 100644 pkgs/applications/editors/mindforger/default.nix
 delete mode 100644 pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch

diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
deleted file mode 100644
index f9dbc2383f26..000000000000
--- a/pkgs/applications/editors/mindforger/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  curl,
-  fetchFromGitHub,
-  hunspell,
-  pkg-config,
-  qmake,
-  qtbase,
-  qtwebengine,
-  wrapGAppsHook3,
-  wrapQtAppsHook,
-}:
-let
-  version = "2.0.0";
-  srcs = {
-    mindforger = fetchFromGitHub {
-      owner = "dvorka";
-      repo = "mindforger";
-      rev = version;
-      sha256 = "sha256-+8miV2xuQcaWGdWCEXPIg6EXjAHtgD9pX7Z8ZNhpMjA=";
-    };
-    cmark-gfm = fetchFromGitHub {
-      owner = "dvorka";
-      repo = "cmark";
-      rev = "4ca8688093228c599432a87d7bd945804c573d51";
-      sha256 = "sha256-0WiG8aot8mc0h1BKPgC924UKQrgunZvKKBy9bD7nhoQ=";
-    };
-    mindforger-repository = fetchFromGitHub {
-      owner = "dvorka";
-      repo = "mindforger-repository";
-      rev = "ec81a27e5de6408bbcd3f6d7733a7c6f3b52e433";
-      sha256 = "sha256-JGTP1He7G2Obmsav64Lf7BLHp8OTvPtg38VHsrEC36o=";
-    };
-  };
-in
-stdenv.mkDerivation {
-  pname = "mindforger";
-  inherit version;
-
-  src = srcs.mindforger;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qmake
-    wrapGAppsHook3
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    curl
-    hunspell
-    qtbase
-    qtwebengine
-  ];
-
-  # Disable the cmake hook (so we don't try to build MindForger with it), and
-  # build MindForger's internal fork of cmark-gfm ahead of MindForger itself.
-  #
-  # Moreover unpack the docs that are needed for the MacOS build.
-  postUnpack = ''
-    cp -TR ${srcs.cmark-gfm} $sourceRoot/deps/cmark-gfm
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    cp -TR ${srcs.mindforger-repository} $sourceRoot/doc
-  '';
-  dontUseCmakeConfigure = true;
-  preBuild = ''
-    (
-          mkdir deps/cmark-gfm/build &&
-          cd deps/cmark-gfm/build &&
-          cmake -DCMARK_TESTS=OFF -DCMARK_SHARED=OFF .. &&
-          cmake --build . --parallel
-      )'';
-
-  doCheck = true;
-
-  patches = [
-    ./hunspell_pkgconfig.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace lib/src/install/installer.cpp --replace /usr "$out"
-    substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
-    for f in app/app.pro lib/lib.pro; do
-      substituteInPlace "$f" --replace "QMAKE_CXX = g++" ""
-    done
-  '';
-
-  qmakeFlags = [
-    "-r"
-    "mindforger.pro"
-    "CONFIG+=mfnoccache"
-    "CONFIG+=mfwebengine"
-  ];
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir "$out"/Applications
-    mv app/mindforger.app "$out"/Applications/
-  '';
-
-  meta = {
-    description = "Thinking Notebook & Markdown IDE";
-    longDescription = ''
-      MindForger is actually more than an editor or IDE - it's human
-      mind inspired personal knowledge management tool
-    '';
-    homepage = "https://www.mindforger.com";
-    license = lib.licenses.gpl2Plus;
-    platforms = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-    maintainers = with lib.maintainers; [ cyplo ];
-    mainProgram = "mindforger";
-  };
-}
diff --git a/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch b/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
deleted file mode 100644
index babbf3e42589..000000000000
--- a/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/app/app.pro b/app/app.pro
-index 89ff5c0b..9625ecd1 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -159,12 +159,13 @@ macx {
- 
- } else:unix {
-     # pkgconfig-based configuration does not work @ Ubuntu
--    #  CONFIG += link_pkgconfig
--    #  PKGCONFIG += hunspell
-+    # but does on NixOS
-+    CONFIG += link_pkgconfig
-+    PKGCONFIG += hunspell
- 
--    # hardcoded paths are (unfortunately) more robust:
--    INCLUDEPATH += /usr/include/hunspell
--    LIBS += -lhunspell
-+    # Where hardcoded paths are (unfortunately) more robust^W^W^W^Wannoying:
-+    #  INCLUDEPATH += /usr/include/hunspell
-+    #  LIBS += -lhunspell
- 
-     HEADERS += \
-       ./src/qt/spelling/dictionary_provider_hunspell.h \
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7b636efd9c3b..b185767d25cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1369,6 +1369,7 @@ mapAliases {
   migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
   mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20
   mime-types = throw "'mime-types' has been renamed to/replaced by 'mailcap'"; # Converted to throw 2025-10-27
+  mindforger = throw "'mindforger' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-15
   minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06
   minetest = throw "'minetest' has been renamed to/replaced by 'luanti'"; # Converted to throw 2025-10-27
   minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8c6eb06b071..8c2a3fa8cd27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9509,8 +9509,6 @@ with pkgs;
 
   minari = python3Packages.toPythonApplication python3Packages.minari;
 
-  mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
-
   molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
 
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };

From 7ed9218538c231557b20778c274c3bcb2b04f1c2 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 15 Apr 2026 10:09:03 +0200
Subject: [PATCH 097/107] psi: drop

---
 .../instant-messengers/psi/default.nix        | 55 -------------------
 .../psi/fix-cmake-hunspell-1.7.patch          | 12 ----
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/psi/default.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
deleted file mode 100644
index 3b6d1ddab889..000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  qtbase,
-  wrapQtAppsHook,
-  qtmultimedia,
-  qtx11extras,
-  qttools,
-  qtwebengine,
-  libidn,
-  qca-qt5,
-  libxscrnsaver,
-  hunspell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "psi";
-  version = "1.5";
-  src = fetchFromGitHub {
-    owner = "psi-im";
-    repo = "psi";
-    rev = version;
-    sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
-    fetchSubmodules = true;
-  };
-  patches = [
-    ./fix-cmake-hunspell-1.7.patch
-  ];
-  nativeBuildInputs = [
-    cmake
-    qttools
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtx11extras
-    qtwebengine
-    libidn
-    qca-qt5
-    libxscrnsaver
-    hunspell
-  ];
-
-  meta = {
-    homepage = "https://psi-im.org";
-    description = "XMPP (Jabber) client";
-    mainProgram = "psi";
-    maintainers = [ lib.maintainers.raskin ];
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
deleted file mode 100644
index 7d5711a6f2bc..000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/modules/FindHunspell.cmake b/cmake/modules/FindHunspell.cmake
-index a2d180b3..3a5aef3a 100644
---- a/cmake/modules/FindHunspell.cmake
-+++ b/cmake/modules/FindHunspell.cmake
-@@ -64,6 +64,7 @@ set(HUNSPELL_NAMES
- 	hunspell-1.4
- 	hunspell-1.5
- 	hunspell-1.6
-+	hunspell-1.7
- 	libhunspell${d}
- )
- find_library(
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b185767d25cf..677f85857f6c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1701,6 +1701,7 @@ mapAliases {
   protonvpn-gui = warnAlias "'protonvpn-gui' has been renamed to/replaced by 'proton-vpn'" proton-vpn; # Added 2026-02-23
   proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27
   pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-12
+  psi = throw "'psi' has been removed as it depended on EOL qt5 webengine. Consider moving to psi-plus, a somewhat more maintained fork."; # Added 2026-04-15
   pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-12
   purescript-psa = throw "'purescript-psa' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12
   purple-discord = throw "'purple-discord' has been renamed to/replaced by 'pidginPackages.purple-discord'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c2a3fa8cd27..a2d1743877de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10126,8 +10126,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
-
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
   puredata-with-plugins =

From 00a14d17f5073358181a989acbb5618d33b8a062 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 17 Apr 2026 09:59:09 +0200
Subject: [PATCH 098/107] semantik: drop

---
 pkgs/applications/office/semantik/default.nix | 102 ------------------
 pkgs/applications/office/semantik/qt5.patch   |  79 --------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 1 insertion(+), 183 deletions(-)
 delete mode 100644 pkgs/applications/office/semantik/default.nix
 delete mode 100644 pkgs/applications/office/semantik/qt5.patch

diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix
deleted file mode 100644
index f3c0260ed765..000000000000
--- a/pkgs/applications/office/semantik/default.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  wafHook,
-  pkg-config,
-  cmake,
-  wrapQtAppsHook,
-  qtbase,
-  python3,
-  qtwebengine,
-  qtsvg,
-  ncurses6,
-  kio,
-  kauth,
-  kiconthemes,
-  kconfigwidgets,
-  kxmlgui,
-  kcoreaddons,
-  kconfig,
-  kwidgetsaddons,
-  ki18n,
-  sonnet,
-  kdelibs4support,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "semantik";
-  version = "1.2.10";
-
-  src = fetchFromGitLab {
-    owner = "ita1024";
-    repo = "semantik";
-    rev = "semantik-${version}";
-    hash = "sha256-qJ6MGxnxXcibF2qXZ2w7Ey/aBIEIx8Gg0dM2PnCl09Y=";
-  };
-
-  patches = [
-    ./qt5.patch
-  ];
-
-  postPatch = ''
-    echo "${lib.getDev qtwebengine}"
-    substituteInPlace wscript \
-      --replace @Qt5Base_dev@ "${lib.getDev qtbase}" \
-      --replace @KF5KIOCore_dev@ "${lib.getDev kio}" \
-      --replace @KF5Auth_dev@ "${lib.getDev kauth}" \
-      --replace @KF5IconThemes_dev@ "${lib.getDev kiconthemes}" \
-      --replace @KF5ConfigWidgets_dev@ "${lib.getDev kconfigwidgets}" \
-      --replace @KF5XmlGui_dev@ "${lib.getDev kxmlgui}" \
-      --replace @KF5CoreAddons_dev@ "${lib.getDev kcoreaddons}" \
-      --replace @KF5Config_dev@ "${lib.getDev kconfig}" \
-      --replace @KF5WidgetsAddons_dev@ "${lib.getDev kwidgetsaddons}" \
-      --replace @KF5I18n_dev@ "${lib.getDev ki18n}" \
-      --replace @KF5SonnetUi_dev@ "${lib.getDev sonnet}" \
-      --replace @Qt5Svg@ "${qtsvg}" \
-      --replace @Qt5Svg_dev@ "${lib.getDev qtsvg}" \
-      --replace @Qt5WebEngine@ "${qtwebengine}" \
-      --replace @Qt5WebEngine_dev@ "${lib.getDev qtwebengine}" \
-      --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support"
-  '';
-
-  nativeBuildInputs = [
-    (lib.getDev qtsvg)
-    (lib.getLib qtsvg)
-    python3
-    pkg-config
-    wafHook
-    cmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qtbase
-    qtwebengine
-    qtsvg
-    ncurses6
-    kio
-    kauth
-    kiconthemes
-    kconfigwidgets
-    kxmlgui
-    kcoreaddons
-    kconfig
-    kwidgetsaddons
-    ki18n
-    sonnet
-    kdelibs4support
-  ];
-
-  wafConfigureFlags = [
-    "--qtlibs=${lib.getLib qtbase}/lib"
-  ];
-
-  meta = {
-    description = "Mind-mapping application for KDE";
-    license = lib.licenses.mit;
-    homepage = "https://waf.io/semantik.html";
-    platforms = lib.platforms.linux;
-    mainProgram = "semantik";
-  };
-}
diff --git a/pkgs/applications/office/semantik/qt5.patch b/pkgs/applications/office/semantik/qt5.patch
deleted file mode 100644
index c5d5f3f1306f..000000000000
--- a/pkgs/applications/office/semantik/qt5.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --color -ur a/wscript b/wscript
---- a/wscript	2020-08-17 19:49:43.389864343 +0200
-+++ b/wscript	2020-08-18 00:22:51.172556519 +0200
-@@ -149,6 +149,26 @@
- 	if not conf.env.QT_LRELEASE: conf.fatal('Semantik requires the program lrelease (from the Qt linguist package? - compilation only)')
- 	conf.find_program('python3', var='PYTHON')
- 	conf.load('python')
-+	conf.env.HAVE_QT5SVG = 1
-+	conf.env.DEFINES_QT5SVG = [ 'QT_SVG_LIB' ]
-+	conf.env.INCLUDES_QT5SVG = [ '@Qt5Svg_dev@/include/QtSvg' ]
-+	conf.env.LIBPATH_QT5SVG = '@Qt5Svg@/lib'
-+	conf.env.LIB_QT5SVG = [ 'Qt5Svg', 'Qt5Core', 'Qt5Gui', 'Qt5Widgets' ]
-+	conf.env.HAVE_QT5WEBENGINEWIDGETS = 1
-+	conf.env.DEFINES_QT5WEBENGINEWIDGETS = [ 'QT_WEBENGINEWIDGETS_LIB' ]
-+	conf.env.INCLUDES_QT5WEBENGINEWIDGETS = [ '@Qt5WebEngine_dev@/include/QtWebEngineWidgets' ]
-+	conf.env.LIBPATH_QT5WEBENGINEWIDGETS = '@Qt5WebEngine@/lib'
-+	conf.env.LIB_QT5WEBENGINEWIDGETS = [
-+		'Qt5WebEngineWidgets',
-+		'Qt5Core',
-+		'Qt5Gui',
-+		'Qt5WebEngineCore',
-+		'Qt5Widgets',
-+		'Qt5Network',
-+		'Qt5Quick',
-+		'Qt5PrintSupport'
-+	]
-+	print("conf.env.LIB_QT5SVG : ",conf.env)
- 	if not conf.env.LIB_QT5SVG: conf.fatal('Could not find Qt5Svg - Semantik requires Qt >= 5')
- 	if not conf.env.LIB_QT5WEBENGINEWIDGETS: conf.fatal('Could not find Qt5WebEngineWidgets - check `pkg-config --libs Qt5WebEngineWidgets`')
- 	if not conf.env.LIB_QT5DBUS: conf.fatal('Install Qt Dbus')
-@@ -186,7 +206,11 @@
- 		raise ValueError('Could not find QT_HOST_DATA')
- 
- 	specpath = conf.cmd_and_log(conf.env.QMAKE + ['-query', 'QMAKE_SPEC'], quiet=0, stdout=True)
-+	path = "@Qt5Base_dev@"
-+	print("\n\n[log] specpath = ",specpath,"\n")
-+	print("\n\n[log] path = ",path,"\n")
- 	specpath = os.path.join(path, 'mkspecs', specpath.strip())
-+	print("\n\n[log] specpath = ",specpath,"\n")
- 	if not os.path.exists(specpath):
- 		raise ValueError('No spec path, cannot build')
- 
-@@ -196,17 +220,29 @@
- 
- 	conf.env.append_value('INCLUDES_KDECORE', specpath)
- 
--	libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
--		'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
--		'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
--		'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore']
-+	libs = {
-+            'KF5KIOCore': '@KF5KIOCore_dev@',
-+            'KF5Auth': '@KF5Auth_dev@',
-+            'KF5KIOWidgets': '@KF5KIOCore_dev@',
-+            'KF5IconThemes': '@KF5IconThemes_dev@',
-+            'KF5ConfigWidgets': '@KF5ConfigWidgets_dev@',
-+            'KF5XmlGui': '@KF5XmlGui_dev@',
-+            'KF5CoreAddons': '@KF5CoreAddons_dev@',
-+            'KF5ConfigGui': '@KF5Config_dev@',
-+            'KF5ConfigCore': '@KF5Config_dev@',
-+            'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
-+            'KF5I18n': '@KF5I18n_dev@',
-+            'KF5SonnetUi': '@KF5SonnetUi_dev@',
-+            'KF5AuthCore': '@KF5Auth_dev@',
-+        }
- 
--	for lib in libs:
-+	for lib,mkspec_path in libs.items():
-+		print("[log] mkspec : ", mkspec_path)
- 		name = lib[3:]
- 		if not name.startswith('K') and name != 'SonnetUi':
- 			name = 'K' + name
--
--		p = '%s/qt_%s.pri' % (path, name)
-+		p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
-+		print("[log] path :",path,", name : ",name)
- 		try:
- 			code = Utils.readf(p)
- 		except EnvironmentError:
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 677f85857f6c..a8cab77119af 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1824,6 +1824,7 @@ mapAliases {
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
+  semantik = throw "'semantik' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17
   semiphemeral = throw "'semiphemeral' has been removed as it is archived upstream"; # Added 2025-11-06
   sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
   sequoia-sqop = sequoia-sop; # Added 2026-01-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2d1743877de..f9b4e0066152 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5919,8 +5919,6 @@ with pkgs;
 
   seer = libsForQt5.callPackage ../development/tools/misc/seer { };
 
-  semantik = libsForQt5.callPackage ../applications/office/semantik { };
-
   sbt = callPackage ../development/tools/build-managers/sbt { };
   sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;

From f8da8aa947c6afaf1815d09b65b590b533b7fa14 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 17 Apr 2026 10:22:05 +0200
Subject: [PATCH 099/107] gfie: drop

---
 pkgs/by-name/gf/gfie/package.nix | 51 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 pkgs/by-name/gf/gfie/package.nix

diff --git a/pkgs/by-name/gf/gfie/package.nix b/pkgs/by-name/gf/gfie/package.nix
deleted file mode 100644
index 81f0a0052ce6..000000000000
--- a/pkgs/by-name/gf/gfie/package.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  dpkg,
-  autoPatchelfHook,
-  qt5,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gfie";
-  version = "4.2";
-
-  src = fetchurl {
-    url = "http://greenfishsoftware.org/dl/gfie/gfie-${finalAttrs.version}.deb";
-    hash = "sha256-hyL0t66jRTVF1Hq2FRUobsfjLGmYgsMGDE/DBdoXhCI=";
-  };
-
-  unpackCmd = "dpkg -x $curSrc source";
-
-  nativeBuildInputs = [
-    dpkg
-    autoPatchelfHook
-    qt5.wrapQtAppsHook
-  ];
-
-  buildInputs = with qt5; [
-    qtbase
-    qtsvg
-    qtwebengine
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    mv usr/share opt $out
-    ln -s $out/opt/gfie-${finalAttrs.version}/gfie $out/bin/gfie
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Powerful image editor, especially suitable for creating icons, cursors, animations and icon libraries";
-    homepage = "https://greenfishsoftware.org/gfie.php";
-    license = with lib.licenses; [ unfree ];
-    maintainers = with lib.maintainers; [ pluiedev ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "gfie";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a8cab77119af..a3920ad4effa 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -818,6 +818,7 @@ mapAliases {
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
   gensgs = throw "gensgs has been removed as it was unmaintained, abandoned upstream since 2009 and relied on gtk2"; # Added 2025-10-29
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
+  gfie = throw "'gfie' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17
   gfn-electron = throw "gfn-electron has been removed from Nixpkgs as it's abandoned upstream"; # Added 2025-11-05
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08

From a73cea5776df92f536a56ad206d99939d1584b54 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 17 Apr 2026 10:27:53 +0200
Subject: [PATCH 100/107] luminanceHDR: drop

---
 .../graphics/luminance-hdr/default.nix        | 90 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 pkgs/applications/graphics/luminance-hdr/default.nix

diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
deleted file mode 100644
index 26c974ed4ad5..000000000000
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  fetchFromGitHub,
-  fetchpatch,
-  pkg-config,
-  boost,
-  exiv2,
-  fftwFloat,
-  gsl,
-  ilmbase,
-  lcms2,
-  libraw,
-  libtiff,
-  openexr,
-  libsForQt5,
-  eigen,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "luminance-hdr";
-  version = "2.6.1.1";
-
-  src = fetchFromGitHub {
-    owner = "LuminanceHDR";
-    repo = "LuminanceHDR";
-    rev = "v.${finalAttrs.version}";
-    sha256 = "sha256-PWqtYGx8drfMVp7D7MzN1sIUTQ+Xz5yyeHN87p2r6PY=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "exiv2-0.28.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/2e4a7321c7d20a52da104f4aa4dc76ac7224d94b/exiv2-0.28.patch";
-      hash = "sha256-Hj+lqAd5VuTjmip8Po7YiGOWWDxnu4IMXOiEFBukXpk=";
-    })
-    (fetchpatch {
-      name = "luminance-hdr-Fix-building-with-Boost-1.85.0.patch";
-      url = "https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f76b0edca4352cf701c1557d0c0e796c4f.patch";
-      hash = "sha256-jzyfKFmmzo6WUOUn33gr1g4MbSVpRfKLUIi49PSF5cg=";
-    })
-    # Fix lots of errors of form:
-    #     include/boost/math/tools/type_traits.hpp:208:12: error: 'is_final' has not been declared in 'std'
-    (fetchpatch {
-      name = "luminancehdr-fix-boost-1.87.0-compilation.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/luminancehdr-fix-boost-1.87.0-compilation.patch";
-      hash = "sha256-bKJhENnOWNwKUUSrSUF9fS1Por1A7exYAeiuCa2fRJY=";
-    })
-    # Fix error:
-    #     /build/source/src/Libpfs/manip/gamma_levels.cpp:136:25: error: call of overloaded 'clamp(float, float, float)' is ambiguous
-    (fetchpatch {
-      name = "luminancehdr-clamp.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/clamp.patch";
-      hash = "sha256-iAcZV1lFREPzjA9J3feSdhyTougvQA11I0IQRRYOmxY=";
-    })
-  ];
-
-  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtdeclarative
-    libsForQt5.qttools
-    libsForQt5.qtwebengine
-    eigen
-    boost
-    exiv2
-    fftwFloat
-    gsl
-    ilmbase
-    lcms2
-    libraw
-    libtiff
-    openexr
-  ];
-
-  nativeBuildInputs = [
-    libsForQt5.wrapQtAppsHook
-    cmake
-    pkg-config
-  ];
-
-  meta = {
-    homepage = "https://qtpfsgui.sourceforge.net/";
-    description = "Complete open source solution for HDR photography";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a3920ad4effa..556712e68f2e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1288,6 +1288,7 @@ mapAliases {
   lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30
   LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
+  luminanceHDR = throw "'luminanceHDR' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
   lunarvim = throw "'lunarvim' has been removed since it was abandoned upstream and relied on an older version of 'neovim' to work properly"; # Added 2026-02-05
   lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9b4e0066152..48c8e136c830 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9834,10 +9834,6 @@ with pkgs;
     withFonts = true;
   };
 
-  luminanceHDR = callPackage ../applications/graphics/luminance-hdr {
-    openexr = openexr_2;
-  };
-
   luddite = with python3Packages; toPythonApplication luddite;
 
   lyx = libsForQt5.callPackage ../applications/misc/lyx { };

From 7c9f14e288395089ff414d5cc62a13e74968f7dc Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 17 Apr 2026 10:43:37 +0200
Subject: [PATCH 101/107] kdeltachat: drop

---
 pkgs/by-name/kd/kdeltachat/package.nix | 81 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 pkgs/by-name/kd/kdeltachat/package.nix

diff --git a/pkgs/by-name/kd/kdeltachat/package.nix b/pkgs/by-name/kd/kdeltachat/package.nix
deleted file mode 100644
index 6308c12ddb0a..000000000000
--- a/pkgs/by-name/kd/kdeltachat/package.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchFromSourcehut,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  libdeltachat,
-  libsForQt5,
-  rustPlatform,
-  stdenv,
-}:
-
-let
-  libdeltachat' = libdeltachat.overrideAttrs rec {
-    version = "1.155.6";
-    src = fetchFromGitHub {
-      owner = "chatmail";
-      repo = "core";
-      tag = "v${version}";
-      hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y=";
-    };
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      pname = "deltachat-core-rust";
-      inherit version src;
-      hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs=";
-    };
-  };
-  inherit (libsForQt5)
-    kirigami2
-    qtbase
-    qtimageformats
-    qtmultimedia
-    qtwebengine
-    wrapQtAppsHook
-    ;
-in
-stdenv.mkDerivation {
-  pname = "kdeltachat";
-  version = "unstable-2024-01-14";
-
-  src = fetchFromSourcehut {
-    owner = "~link2xt";
-    repo = "kdeltachat";
-    rev = "d61a01c2d6d5bdcc9ca500b466ed42689b2bd5c6";
-    hash = "sha256-KmL3ODXPi1c8C5z2ySHg0vA5Vg/dZumDZTbpxkzf7A4=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    kirigami2
-    libdeltachat'
-    qtimageformats
-    qtmultimedia
-    qtwebengine
-  ];
-
-  env = {
-    # needed for qmlplugindump to work
-    QT_PLUGIN_PATH = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
-    QML2_IMPORT_PATH = lib.concatMapStringsSep ":" (lib: "${lib}/${qtbase.qtQmlPrefix}") [
-      kirigami2
-      qtmultimedia
-    ];
-  };
-
-  meta = {
-    description = "Delta Chat client using Kirigami framework";
-    mainProgram = "kdeltachat";
-    homepage = "https://git.sr.ht/~link2xt/kdeltachat";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ dotlambda ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 556712e68f2e..fc376a267ef4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1007,6 +1007,7 @@ mapAliases {
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kchmviewer = throw "'kchmviewer' has been removed as it was unmaintained upstream since 2022 and depended on qt5 webengine. Consider switching to 'uchmviewer', a fork of 'kchmviewer'."; # Added 2026-02-10
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+  kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
   keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
   keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08
   kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27

From 70e95a80f01feaad0755f0c2d7262c5444813091 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 25 Apr 2026 19:17:21 +0200
Subject: [PATCH 102/107] deltatouch: drop

---
 pkgs/by-name/de/deltatouch/package.nix | 73 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 pkgs/by-name/de/deltatouch/package.nix

diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix
deleted file mode 100644
index 8c2b289ed306..000000000000
--- a/pkgs/by-name/de/deltatouch/package.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromCodeberg,
-  fetchFromGitHub,
-  cmake,
-  intltool,
-  libdeltachat,
-  lomiri,
-  qt5,
-  quirc,
-  rustPlatform,
-}:
-
-let
-  libdeltachat' = libdeltachat.overrideAttrs rec {
-    version = "2.25.0";
-    src = fetchFromGitHub {
-      owner = "chatmail";
-      repo = "core";
-      tag = "v${version}";
-      hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8=";
-    };
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      pname = "chatmail-core";
-      inherit version src;
-      hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0=";
-    };
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "deltatouch";
-  version = "2.35.0";
-
-  src = fetchFromCodeberg {
-    owner = "lk108";
-    repo = "deltatouch";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-6jzGwOkO14P7rZSBGZ6/Mzda/PM6ZVQeUCb7yfQtbkQ=";
-  };
-
-  nativeBuildInputs = [
-    qt5.wrapQtAppsHook
-    intltool
-    cmake
-  ];
-
-  buildInputs = [
-    qt5.qtbase
-    qt5.qtwebengine
-    qt5.qtquickcontrols2
-    libdeltachat'
-    lomiri.lomiri-ui-toolkit
-    lomiri.lomiri-ui-extras
-    lomiri.lomiri-api
-    lomiri.qqc2-suru-style
-    quirc
-  ];
-
-  meta = {
-    changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.tag}/CHANGELOG";
-    description = "Messaging app for Ubuntu Touch, powered by Delta Chat core";
-    longDescription = ''
-      DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core.
-      Delta Chat works over email.
-    '';
-    homepage = "https://codeberg.org/lk108/deltatouch";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ link2xt ];
-    mainProgram = "deltatouch";
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fc376a267ef4..344b74f477e0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -600,6 +600,7 @@ mapAliases {
   defuddle-cli = warnAlias "defuddle-cli has been renamed to/replaced by 'defuddle'" defuddle; # Added 2026-04-16
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
   deltachat-cursed = throw "'deltachat-cursed' has been renamed to/replaced by 'arcanechat-tui'"; # Converted to throw 2025-10-27
+  deltatouch = throw "'deltatouch' has been removed as it depended on qt5 webengine which reached EOL"; # Added 2026-04-25
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
   discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29

From 6fdf9178917973e56b7f8a6e63a3536d2255c743 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 25 Apr 2026 19:23:59 +0200
Subject: [PATCH 103/107] nmapsi4: drop

An alpha for qt6 exists: https://github.com/nmapsi4/nmapsi4/releases/tag/v0.6-alpha1
However, this now uses polkit for elevation.
Packaging this new version likely requires expertise from someone actually using the package.
---
 pkgs/by-name/nm/nmapsi4/package.nix | 67 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 pkgs/by-name/nm/nmapsi4/package.nix

diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix
deleted file mode 100644
index 37287dcef021..000000000000
--- a/pkgs/by-name/nm/nmapsi4/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  dnsutils,
-  nmap,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nmapsi4";
-  version = "0.5-alpha2";
-
-  src = fetchFromGitHub {
-    owner = "nmapsi4";
-    repo = "nmapsi4";
-    rev = "v${version}";
-    hash = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = with libsForQt5; [
-    qtbase
-    qtscript
-    qtwebengine
-  ];
-
-  postPatch = ''
-    substituteInPlace src/platform/digmanager.cpp \
-      --replace '"dig"' '"${dnsutils}/bin/dig"'
-    substituteInPlace src/platform/discover.cpp \
-        --replace '"nping"' '"${nmap}/bin/nping"'
-    for f in \
-      src/platform/monitor/monitor.cpp \
-      src/platform/nsemanager.cpp ; do
-
-      substituteInPlace $f \
-        --replace '"nmap"'  '"${nmap}/bin/nmap"'
-    done
-  '';
-
-  postInstall = ''
-    mv $out/share/applications/kde4/*.desktop $out/share/applications
-    rmdir $out/share/applications/kde4
-
-    for f in $out/share/applications/* ; do
-      substituteInPlace $f \
-        --replace Qt4                   Qt5
-    done
-  '';
-
-  meta = {
-    description = "Qt frontend for nmap";
-    mainProgram = "nmapsi4";
-    changelog = "https://github.com/nmapsi4/nmapsi4/releases/tag/${src.rev}";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ peterhoeg ];
-    inherit (src.meta) homepage;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 344b74f477e0..756b05f7105c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1505,6 +1505,7 @@ mapAliases {
   nixosTest = throw "'nixosTest' has been renamed to/replaced by 'testers.nixosTest'"; # Converted to throw 2025-10-27
   nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
+  nmapsi4 = throw "'nmapsi4' has been removed as it depended on qt5 webengine, which is EOL"; # Added 2026-04-25
   node2nix = throw "node2nix has been removed because it was only used to maintain the now-removed nodePackages set. Use the newer builders in nixpkgs instead, such as buildNpmPackage"; # Added 2026-03-03
   nodePackages = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
   nodePackages_latest = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03

From 9bfcba60c90bed50fa448d6fbc713dacfd84ff7d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 25 Apr 2026 19:58:53 +0200
Subject: [PATCH 104/107] pentobi: drop

Qt6 versions exist, but the package is unmaintained and the update is not quite trivial.
---
 pkgs/by-name/pe/pentobi/package.nix | 59 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/pe/pentobi/package.nix

diff --git a/pkgs/by-name/pe/pentobi/package.nix b/pkgs/by-name/pe/pentobi/package.nix
deleted file mode 100644
index c7d84eb6d0aa..000000000000
--- a/pkgs/by-name/pe/pentobi/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  qt5,
-  appstream,
-  fetchFromGitHub,
-  cmake,
-  librsvg,
-  itstool,
-  docbook_xsl,
-}:
-
-stdenv.mkDerivation rec {
-  version = "20.0";
-  pname = "pentobi";
-
-  src = fetchFromGitHub {
-    owner = "enz";
-    repo = "pentobi";
-    rev = "v${version}";
-    sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    docbook_xsl
-    qt5.qttools
-    qt5.wrapQtAppsHook
-  ];
-  buildInputs = [
-    appstream
-    qt5.qtbase
-    qt5.qtsvg
-    qt5.qtquickcontrols2
-    qt5.qtwebview
-    itstool
-    librsvg
-  ];
-
-  patchPhase = ''
-    substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
-    substituteInPlace pentobi/unix/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
-    substituteInPlace pentobi/docbook/CMakeLists.txt --replace "/html" "/share/xml/docbook-xsl/html"
-  '';
-
-  cmakeFlags = [
-    "-DCMAKE_VERBOSE_MAKEFILE=1"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}"
-    "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
-  ];
-
-  meta = {
-    description = "Computer opponent for the board game Blokus";
-    homepage = "https://pentobi.sourceforge.io";
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 756b05f7105c..86f333934971 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1603,6 +1603,7 @@ mapAliases {
   peach = throw "'peach' has been renamed to/replaced by 'asouldocs'"; # Converted to throw 2025-10-27
   pell = throw "'pell' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
   pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
+  pentobi = throw "'pentobi' has been removed as it was unmaintained in nixpkgs and still depended on qt5 webengine"; # Added 2026-04-25
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   percona-server_8_0 = throw "'percona-server_8_0' reaches end of life on 2026-04-30 and has been removed. Use 'percona-server_8_4'"; # Added 2026-04-09
   percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27

From 6b1544fd6b9cfbc5debdd544df110664b4f06cdc Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 25 Apr 2026 21:30:27 +0200
Subject: [PATCH 105/107] teamspeak3: drop

---
 pkgs/by-name/te/teamspeak3/package.nix | 137 -------------------------
 pkgs/top-level/aliases.nix             |   1 +
 2 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100644 pkgs/by-name/te/teamspeak3/package.nix

diff --git a/pkgs/by-name/te/teamspeak3/package.nix b/pkgs/by-name/te/teamspeak3/package.nix
deleted file mode 100644
index f717bc297e86..000000000000
--- a/pkgs/by-name/te/teamspeak3/package.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchzip,
-  makeDesktopItem,
-  glib,
-  qt5,
-  libsForQt5,
-  perl,
-  libcxx,
-  autoPatchelfHook,
-  copyDesktopItems,
-}:
-
-let
-  pluginsdk = fetchzip {
-    url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip";
-    hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ=";
-  };
-in
-
-stdenv.mkDerivation rec {
-  pname = "teamspeak3";
-
-  version = "3.6.2";
-
-  src = fetchurl {
-    url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_amd64-${version}.run";
-    hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI=";
-  };
-
-  nativeBuildInputs = [
-    perl # Installer script needs `shasum`
-    qt5.wrapQtAppsHook
-    autoPatchelfHook
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    libsForQt5.quazip
-    glib
-    libcxx
-  ]
-  ++ (with qt5; [
-    qtbase
-    qtwebengine
-    qtwebchannel
-    qtwebsockets
-    qtsvg
-  ]);
-
-  # This runs the installer script. If it gets stuck, run it with -x.
-  # If it then gets stuck at something like:
-  #
-  # ++ exec
-  # + PAGER_PATH=
-  #
-  # it's looking for a dependency and didn't find it. Check the script and make
-  # sure the dep is in nativeBuildInputs.
-  unpackPhase = ''
-    runHook preUnpack
-
-    # Run the installer script non-interactively
-    echo -e '\ny' | PAGER=cat sh -e $src
-
-    cd TeamSpeak3-Client-linux_amd64
-
-    runHook postUnpack
-  '';
-
-  patchPhase = ''
-    runHook prePatch
-
-    # Delete unecessary libraries - these are provided by nixos.
-    find . -\( -name '*.so' -or -name '*.so.*' -\) -print0 | xargs -0 rm # I hate find.
-
-    rm QtWebEngineProcess
-    rm qt.conf
-
-    mv ts3client_linux_amd64 ts3client
-
-    # Our libquazip's so name has this suffix and there is no symlink
-    patchelf --replace-needed libquazip.so libquazip1-qt5.so ts3client error_report
-
-    runHook postPatch
-  '';
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "teamspeak";
-      exec = "ts3client";
-      icon = "teamspeak";
-      comment = "The TeamSpeak voice communication tool";
-      desktopName = "TeamSpeak";
-      genericName = "TeamSpeak";
-      categories = [ "Network" ];
-    })
-  ];
-
-  qtWrapperArgs = [
-    # wayland is currently broken, remove when TS3 fixes that
-    "--set QT_QPA_PLATFORM xcb"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/opt/teamspeak
-    mv * $out/opt/teamspeak/
-
-    # Grab the desktop icon from the plugin sdk
-    install ${pluginsdk}/doc/_static/logo.png -D $out/share/icons/hicolor/64x64/apps/teamspeak.png
-
-    mkdir -p $out/bin/
-    ln -s $out/opt/teamspeak/ts3client $out/bin/ts3client
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "TeamSpeak voice communication tool";
-    homepage = "https://teamspeak.com/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.teamspeak;
-    maintainers = with lib.maintainers; [
-      lhvwb
-      lukegb
-      atemu
-    ];
-    mainProgram = "ts3client";
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 86f333934971..d6bd3c2fe754 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1989,6 +1989,7 @@ mapAliases {
   tdfgo = throw "'tdfgo' has been removed because it was removed from upstream"; # Added 2025-12-18
   tdlib-purple = throw "'tdlib-purple' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   tdom = throw "'tdom' has been renamed to/replaced by 'tclPackages.tdom'"; # Converted to throw 2025-10-27
+  teamspeak3 = throw "'teamspeak3' has been removed as it depended on qt5 webengine which is EOL"; # Added 2026-04-25
   teamspeak5_client = throw "'teamspeak5_client' has been renamed to/replaced by 'teamspeak6-client'"; # Converted to throw 2025-10-27
   teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10

From ca8f12e883262954d92c19877c6360cf5c669473 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 21:33:34 +0200
Subject: [PATCH 106/107] cisco-packet-tracer_8: drop

---
 .../ci/cisco-packet-tracer_8/package.nix      | 203 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 2 files changed, 1 insertion(+), 203 deletions(-)
 delete mode 100644 pkgs/by-name/ci/cisco-packet-tracer_8/package.nix

diff --git a/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix b/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix
deleted file mode 100644
index 0690c18b8fcc..000000000000
--- a/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  requireFile,
-  autoPatchelfHook,
-  dpkg,
-  makeWrapper,
-  alsa-lib,
-  dbus,
-  expat,
-  fontconfig,
-  glib,
-  libdrm,
-  libglvnd,
-  libpulseaudio,
-  libudev0-shim,
-  libxkbcommon,
-  libxml2_13,
-  libxslt,
-  nspr,
-  nss,
-  wayland,
-  libxcb-wm,
-  libxcb-render-util,
-  libxcb-keysyms,
-  libxcb-image,
-  libxtst,
-  libxscrnsaver,
-  libxrender,
-  libxrandr,
-  libxi,
-  libxfixes,
-  libxext,
-  libxdamage,
-  libxcursor,
-  libxcomposite,
-  libx11,
-  libsm,
-  libice,
-  libxcb,
-  buildFHSEnv,
-  copyDesktopItems,
-  makeDesktopItem,
-  libsForQt5,
-  version ? "8.2.2",
-  packetTracerSource ? null,
-}:
-
-let
-  hashes = {
-    "8.2.0" = "sha256-GxmIXVn2Ew7lVBT7AuIRoXc0YGids4v9Gsfw1FEX7RY=";
-    "8.2.1" = "sha256-QoM4rDKkdNTJ6TBDPCAs+l17JLnspQFlly9B60hOB7o=";
-    "8.2.2" = "sha256-bNK4iR35LSyti2/cR0gPwIneCFxPP+leuA1UUKKn9y0=";
-  };
-  names = {
-    "8.2.0" = "CiscoPacketTracer_820_Ubuntu_64bit.deb";
-    "8.2.1" = "CiscoPacketTracer_821_Ubuntu_64bit.deb";
-    "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb";
-  };
-
-  unwrapped = stdenvNoCC.mkDerivation {
-    name = "cisco-packet-tracer-unwrapped";
-    inherit version;
-
-    src =
-      if (packetTracerSource != null) then
-        packetTracerSource
-      else
-        requireFile {
-          name = names.${version};
-          hash = hashes.${version};
-          url = "https://www.netacad.com";
-        };
-
-    nativeBuildInputs = [
-      autoPatchelfHook
-      dpkg
-      makeWrapper
-    ];
-
-    buildInputs = [
-      alsa-lib
-      dbus
-      expat
-      fontconfig
-      glib
-      libdrm
-      libglvnd
-      libpulseaudio
-      libudev0-shim
-      libxkbcommon
-      libxml2_13
-      libxslt
-      nspr
-      nss
-      wayland
-      libice
-      libsm
-      libx11
-      libxscrnsaver
-      libxcomposite
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxtst
-      libxcb
-      libxcb-image
-      libxcb-keysyms
-      libxcb-render-util
-      libxcb-wm
-    ];
-
-    unpackPhase = ''
-      runHook preUnpack
-
-      dpkg-deb -x $src $out
-      chmod 755 "$out"
-
-      runHook postUnpack
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \
-        --set QT_QPA_PLATFORM xcb \
-        --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
-
-      runHook postInstall
-    '';
-  };
-
-  fhs-env = buildFHSEnv {
-    pname = "cisco-packet-tracer-fhs-env";
-    inherit version;
-    runScript = lib.getExe' unwrapped "packettracer8";
-    targetPkgs = _: [ libudev0-shim ];
-  };
-in
-
-stdenvNoCC.mkDerivation {
-  pname = "cisco-packet-tracer";
-  inherit version;
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [
-    copyDesktopItems
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    ln -s ${fhs-env}/bin/${fhs-env.pname} $out/bin/packettracer8
-
-    mkdir -p $out/share/icons/hicolor/48x48/apps
-    ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-8.png
-    ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes
-    ln -s ${unwrapped}/usr/share/mime $out/share/mime
-
-    runHook postInstall
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "cisco-pt8.desktop";
-      desktopName = "Cisco Packet Tracer 8";
-      icon = "cisco-packet-tracer-8";
-      exec = "packettracer8 %f";
-      mimeTypes = [
-        "application/x-pkt"
-        "application/x-pka"
-        "application/x-pkz"
-        "application/x-pksz"
-        "application/x-pks"
-      ];
-    })
-  ];
-
-  meta = {
-    description = "Network simulation tool from Cisco";
-    homepage = "https://www.netacad.com/courses/packet-tracer";
-    license = lib.licenses.unfree;
-    mainProgram = "packettracer8";
-    maintainers = with lib.maintainers; [
-      gepbird
-    ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    knownVulnerabilities = [
-      ''
-        Cisco Packet Tracer 8 ships with qt5 qtwebengine.
-
-        ${lib.head libsForQt5.qtwebengine.meta.knownVulnerabilities}
-      ''
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d6bd3c2fe754..70edc1ca2c7f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -470,6 +470,7 @@ mapAliases {
   chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
+  cisco-packet-tracer_8 = throw "'cisco-packet-tracer_8' has been removed as it vendored qt5 webengine. Consider updating to 'cisco-packet-tracer_9' instead."; # Added 2026-04-26
   ciscoPacketTracer7 = throw "'ciscoPacketTracer7' has been removed in favor of 'cisco-packet-tracer_8' and 'cisco-packet-tracer_9'";
   ciscoPacketTracer8 = cisco-packet-tracer_8; # Added 2026-02-08
   ciscoPacketTracer9 = cisco-packet-tracer_9; # Added 2026-02-08

From 448531580f8771c40b0dffbfdcd24a18166cd346 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 31 Mar 2026 21:22:10 +0200
Subject: [PATCH 107/107] qt5.qtwebengine: drop

---
 .../libraries/qt-5/5.15/default.nix           |  28 -
 .../qt-5/5.15/qtwebengine-darwin-checks.patch |  29 -
 ...qtwebengine-darwin-no-platform-check.patch |  12 -
 .../5.15/qtwebengine-link-pulseaudio.patch    |   8 -
 ...webengine-mac-dont-set-dsymutil-path.patch |  12 -
 .../qt-5/5.15/qtwebengine-ninja-1.12.patch    |  11 -
 .../libraries/qt-5/modules/qtwebengine.nix    | 529 ------------------
 7 files changed, 629 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch
 delete mode 100644 pkgs/development/libraries/qt-5/modules/qtwebengine.nix

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 6bb41d3a21bd..12bfafad1df1 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -189,18 +189,6 @@ let
         hash = "sha256-B/z/+tai01RU/bAJSCp5a0/dGI8g36nwso8MiJv27YM=";
       })
     ];
-    qtwebengine = [
-      ./qtwebengine-link-pulseaudio.patch
-      # Fixes Chromium build failure with Ninja 1.12.
-      # See: https://bugreports.qt.io/browse/QTBUG-124375
-      # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09
-      ./qtwebengine-ninja-1.12.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./qtwebengine-darwin-no-platform-check.patch
-      ./qtwebengine-mac-dont-set-dsymutil-path.patch
-      ./qtwebengine-darwin-checks.patch
-    ];
     qtwebkit = [
       (fetchpatch {
         name = "qtwebkit-python39-json.patch";
@@ -315,22 +303,6 @@ let
       qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { };
       qtwayland = callPackage ../modules/qtwayland.nix { };
       qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
-      qtwebengine =
-        # Actually propagating stdenv change
-        let
-          # Won’t build with Clang 20, as `-Wenum-constexpr-conversion`
-          # was made a hard error.
-          # qt5webengine no longer maintained, FTBFS with GCC 15
-          stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv;
-          qtModule' = qtModuleWithStdenv stdenv';
-        in
-        callPackage ../modules/qtwebengine.nix {
-          inherit (srcs.qtwebengine) version;
-          inherit (darwin) bootstrap_cmds;
-          stdenv = stdenv';
-          qtModule = qtModule';
-          python = python3;
-        };
       qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { };
       qtwebkit = callPackage ../modules/qtwebkit.nix { };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix { };
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
deleted file mode 100644
index 213fb624dab1..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/configure.pri b/configure.pri
-index 3a33bdc82..c1460b8b5 100644
---- a/configure.pri
-+++ b/configure.pri
-@@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
- }
- 
- defineTest(qtwebengine_isMacOsPlatformSupported) {
--    !qtwebengine_isMinXcodeVersion(10, 0, 0) {
--        qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.")
--        return(false)
--    }
--    !clang|intel_icc {
--        qtwebengine_platformError("requires Clang.")
--        return(false)
--    }
--    # We require macOS 10.13 (darwin version 17.0.0) or newer.
--    darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
--    lessThan(darwin_major_version, 17) {
--        qtwebengine_platformError("requires macOS version 10.13 or newer.")
--        return(false)
--    }
--    !qtwebengine_isMinOSXSDKVersion(10, 13): {
--        qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
--        return(false)
--    }
-     CONFIG(debug, debug|release):isUniversal(){
-         qtwebengine_platformError("Universal builds can not be done with debug configuration due to large binary size.")
-         return(false)
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
deleted file mode 100644
index 86663ee80b57..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri
---- a/src/buildtools/config/mac_osx.pri
-+++ b/src/buildtools/config/mac_osx.pri
-@@ -5,8 +5,6 @@ load(functions)
- # otherwise query for it.
- QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
- isEmpty(QMAKE_MAC_SDK_VERSION) {
--     QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
--     isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
- }
- 
- # chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format.
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch
deleted file mode 100644
index 052ec89dbc17..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/core/config/common.pri
-+++ b/src/core/config/common.pri
-@@ -47,3 +47,5 @@
-
- !qtConfig(webengine-nodejs10): gn_args += use_rollup=false
- gn_args += enable_ipc_logging=false
-+
-+gn_args += link_pulseaudio=true
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch
deleted file mode 100644
index dcdf5f57ffdc..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
---- a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
-+++ b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
-@@ -184,8 +184,6 @@ template("mac_toolchain") {
-     # If dSYMs are enabled, this flag will be added to the link tools.
-     if (_enable_dsyms) {
-       dsym_switch = " -Wcrl,dsym,{{root_out_dir}} "
--      dsym_switch += "-Wcrl,dsymutilpath," +
--                     "${prefix}dsymutil" + " "
- 
-       dsym_output_dir =
-           "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM"
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch
deleted file mode 100644
index c70788516fd4..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/src/3rdparty/chromium/content/public/browser/BUILD.gn b/src/3rdparty/chromium/content/public/browser/BUILD.gn
---- a/src/3rdparty/chromium/content/public/browser/BUILD.gn	1969-12-31 19:00:01.000000000 -0500
-+++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn	2024-05-29 22:12:36.416136269 -0400
-@@ -469,6 +469,7 @@
-     "//build:chromeos_buildflags",
-     "//cc",
-     "//components/viz/host",
-+    "//components/spellcheck:buildflags",
-     "//content/browser",  # Must not be public_deps!
-     "//device/fido",
-     "//gpu",
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
deleted file mode 100644
index 72d34f9245db..000000000000
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ /dev/null
@@ -1,529 +0,0 @@
-{
-  qtModule,
-  qtdeclarative,
-  qtquickcontrols,
-  qtlocation,
-  qtwebchannel,
-  fetchpatch,
-  fetchpatch2,
-
-  bison,
-  flex,
-  gperf,
-  ninja,
-  pkg-config,
-  python,
-  which,
-  nodejs,
-  perl,
-  buildPackages,
-  pkgsBuildTarget,
-  pkgsBuildBuild,
-
-  expat,
-  libxdamage,
-  libxcomposite,
-  xrandr,
-  libxkbfile,
-  libpciaccess,
-  libxcursor,
-  libxscrnsaver,
-  libxrandr,
-  libxtst,
-  fontconfig,
-  freetype,
-  harfbuzz,
-  icu,
-  dbus,
-  libdrm,
-  zlib,
-  minizip,
-  libjpeg,
-  libpng,
-  libtiff,
-  libwebp,
-  libopus,
-  jsoncpp,
-  protobuf,
-  libvpx,
-  srtp,
-  snappy,
-  nss,
-  libevent,
-  alsa-lib,
-  pulseaudio,
-  libcap,
-  pciutils,
-  systemd,
-  enableProprietaryCodecs ? true,
-  gn,
-  cctools,
-  cups,
-  bootstrap_cmds,
-  xcbuild,
-  writeScriptBin,
-  ffmpeg_7 ? null,
-  lib,
-  stdenv,
-  version ? null,
-  qtCompatVersion,
-  pipewireSupport ? stdenv.hostPlatform.isLinux,
-  pipewire,
-  postPatch ? "",
-  nspr,
-  lndir,
-}:
-
-let
-  # qtwebengine expects to find an executable in $PATH which runs on
-  # the build platform yet knows about the host `.pc` files.  Most
-  # configury allows setting $PKG_CONFIG to point to an
-  # arbitrarily-named script which serves this purpose; however QT
-  # insists that it is named `pkg-config` with no target prefix.  So
-  # we re-wrap the host platform's pkg-config.
-  pkg-config-wrapped-without-prefix = stdenv.mkDerivation {
-    name = "pkg-config-wrapper-without-target-prefix";
-    dontUnpack = true;
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/bin
-      ln -s '${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' $out/bin/pkg-config
-    '';
-  };
-
-in
-
-qtModule (
-  {
-    pname = "qtwebengine";
-    nativeBuildInputs = [
-      bison
-      flex
-      gperf
-      ninja
-      pkg-config
-      (python.withPackages (ps: [ ps.html5lib ]))
-      which
-      gn
-      nodejs
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      perl
-      lndir
-      (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
-      pkgsBuildBuild.pkg-config
-      (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
-      pkg-config-wrapped-without-prefix
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      bootstrap_cmds
-      xcbuild
-    ];
-    doCheck = true;
-    outputs = [
-      "bin"
-      "dev"
-      "out"
-    ];
-
-    enableParallelBuilding = true;
-
-    # Don’t use the gn setup hook
-    dontUseGnConfigure = true;
-
-    # ninja builds some components with -Wno-format,
-    # which cannot be set at the same time as -Wformat-security
-    hardeningDisable = [ "format" ];
-
-    patches = [
-      # Support FFmpeg 5
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/14074e4d789167bd776939037fe6df8d4d7dc0b3/qt5-webengine-ffmpeg5.patch";
-        hash = "sha256-jTbJFXBPwRMzr8IeTxrv9dtS+/xDS/zR4dysV/bRg3I=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/";
-      })
-
-      # Support FFmpeg 7
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/e8fb4f86104243b90966b69cdfaa967273d834b6/qt5-webengine-ffmpeg7.patch";
-        hash = "sha256-YNeHmOVp0M5HB+b91AOxxJxl+ktBtLYVdHlq13F7xtY=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # Support PipeWire ≥ 0.3
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/c9db2cd9e144bd7a5e9246f5f7a01fe52fd089ba/qt5-webengine-pipewire-0.3.patch";
-        hash = "sha256-mGexRfVDF3yjNzSi9BjavhzPtsXI0BooSr/rZ1z/BDo=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/";
-      })
-
-      # Fix race condition exposed by missing dependency
-      # https://bugs.gentoo.org/933368
-      ./qtwebengine-fix_build_pdf_extension_util.patch
-
-      # The latest version of Clang changed what macros it predefines on Apple
-      # targets, causing errors about predefined macros in zlib.
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/2f39ac8d0a414dd65c0e1d5aae38c8f97aa06ae9.patch";
-        hash = "sha256-3kA2os0IntxIiJwzS5nPd7QWYlOWOpoLKYsOQFYv0Sk=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # The latest version of Clang changed what macros it predefines on Apple
-      # targets, causing errors about predefined macros in libpng.
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/66defc14abe47c0494da9faebebfa0a5b6efcf38.patch";
-        hash = "sha256-ErS5Eycls5+xQLGYKz1r/tQC6IcRJWb/WoGsUyzO9WY=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # https://trac.macports.org/ticket/71563
-      # src/3rdparty/chromium/third_party/freetype/src/src/gzip/ftzconf.h:228:12: error: unknown type name 'Byte'
-      (fetchpatch2 {
-        url = "https://github.com/macports/macports-ports/raw/f9a4136c48020b01ecc6dffa99b88333c360f056/aqua/qt5/files/patch-qtwebengine-chromium-freetype-gzip.diff";
-        hash = "sha256-NeLmMfYMo80u3h+5GTenMANWfWLPeS35cKg+h3vzW4g=";
-        extraPrefix = "";
-      })
-
-      # src/3rdparty/chromium/base/process/process_metrics_mac.cc:303:17: error: static assertion expression is not an integral constant expression
-      (fetchpatch2 {
-        url = "https://github.com/macports/macports-ports/raw/f9a4136c48020b01ecc6dffa99b88333c360f056/aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff";
-        hash = "sha256-8TFN5XU0SUvPJCFU6wvcKP5a8HCd0ygUnLT8BF4MZ/E=";
-        extraPrefix = "";
-      })
-
-      # Add "-target-feature +aes" to the arm crc32c build flags
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/9f43d823b6b4cdea62f0cc7563ff01f9239b8970.patch";
-        hash = "sha256-2WCx+ZOWA8ZyV2yiSQLx9uFZOoeWQHxLqwLEZsV41QU=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # Fix build with clang and libc++ 19
-      # https://github.com/freebsd/freebsd-ports/commit/0ddd6468fb3cb9ba390973520517cb1ca2cd690d
-      (fetchpatch2 {
-        url = "https://github.com/freebsd/freebsd-ports/raw/0ddd6468fb3cb9ba390973520517cb1ca2cd690d/www/qt5-webengine/files/patch-libc++19";
-        hash = "sha256-pSVPnuEpjFHW60dbId5sZ3zHP709EWG4LSWoS+TkgcQ=";
-        extraPrefix = "";
-      })
-      (fetchpatch2 {
-        url = "https://github.com/freebsd/freebsd-ports/raw/0ddd6468fb3cb9ba390973520517cb1ca2cd690d/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_hash__table.h";
-        hash = "sha256-+vyWC7Indd1oBhvL5fMTlIH4mM4INgISZFAbHsq32Lg=";
-        extraPrefix = "";
-      })
-      (fetchpatch2 {
-        url = "https://github.com/freebsd/freebsd-ports/raw/0ddd6468fb3cb9ba390973520517cb1ca2cd690d/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h";
-        hash = "sha256-DcAYOV9b30ogPCiedvQimEmiZpUJquk5j6WLjJxR54U=";
-        extraPrefix = "";
-      })
-
-      # Fix the build with gperf ≥ 3.2 and Clang 19.
-      ./qtwebengine-gperf-3.2.patch
-    ];
-
-    postPatch = ''
-      # Patch Chromium build tools
-      (
-        cd src/3rdparty/chromium;
-
-        patch -p1 < ${
-          (fetchpatch {
-            # support for building with python 3.12
-            name = "python312-six.patch";
-            url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/6b0c0e76e0934db2f84be40cb5978cee47266e78/python3.12-six.patch";
-            hash = "sha256-YgP9Sq5+zTC+U7+0hQjZokwb+fytk0UEIJztUXFhTkI=";
-          })
-        }
-
-        # Manually fix unsupported shebangs
-        substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
-          --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
-
-        # TODO: be more precise
-        patchShebangs .
-      )
-    ''
-    # Prevent Chromium build script from making the path to `clang` relative to
-    # the build directory.  `clang_base_path` is the value of `QMAKE_CLANG_DIR`
-    # from `src/core/config/mac_osx.pri`.
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \
-        --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"'
-    ''
-    # Patch library paths in Qt sources
-    + ''
-      sed -i \
-        -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
-        -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
-        -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
-        src/core/web_engine_library_info.cpp
-    ''
-    # Patch library paths in Chromium sources
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
-        src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
-
-      sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
-        src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/buildtools/config/mac_osx.pri \
-        --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
-
-      # Use system ffmpeg
-      echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri
-      echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri
-    ''
-    + postPatch;
-
-    env = {
-      NIX_CFLAGS_COMPILE = toString (
-        lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-          "-w "
-        ]
-        ++ lib.optionals stdenv.cc.isGNU [
-          # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
-          "-Wno-class-memaccess"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
-          # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
-          # TODO: investigate and fix properly
-          "-march=westmere"
-        ]
-        ++ lib.optionals stdenv.cc.isClang [
-          "-Wno-elaborated-enum-base"
-          # 5.15.17: need to silence these two warnings
-          # https://trac.macports.org/ticket/70850
-          "-Wno-enum-constexpr-conversion"
-          "-Wno-unused-but-set-variable"
-          # Clang 19
-          "-Wno-error=missing-template-arg-list-after-template-kw"
-        ]
-      );
-    }
-    // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-      NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
-      "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch";
-    };
-
-    preConfigure = ''
-      export NINJAFLAGS=-j$NIX_BUILD_CORES
-
-      if [ -d "$PWD/tools/qmake" ]; then
-          QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
-      fi
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      export QMAKE_CC=$CC
-      export QMAKE_CXX=$CXX
-      export QMAKE_LINK=$CXX
-      export QMAKE_AR=$AR
-    '';
-
-    qmakeFlags = [
-      "--"
-      "-system-ffmpeg"
-    ]
-    ++ lib.optionals (pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform) [
-      "-webengine-webrtc-pipewire"
-    ]
-    ++ lib.optionals enableProprietaryCodecs [
-      "-proprietary-codecs"
-    ];
-
-    propagatedBuildInputs = [
-      qtdeclarative
-      qtquickcontrols
-      qtlocation
-      qtwebchannel
-
-      # Image formats
-      libjpeg
-      libpng
-      libtiff
-      libwebp
-
-      # Video formats
-      srtp
-      libvpx
-
-      # Audio formats
-      libopus
-
-      # Text rendering
-      harfbuzz
-      icu
-
-      expat
-      libevent
-      ffmpeg_7
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      dbus
-      zlib
-      minizip
-      snappy
-      nss
-      protobuf
-      jsoncpp
-
-      # Audio formats
-      alsa-lib
-      pulseaudio
-
-      # Text rendering
-      fontconfig
-      freetype
-
-      libcap
-      pciutils
-
-      # X11 libs
-      xrandr
-      libxscrnsaver
-      libxcursor
-      libxrandr
-      libpciaccess
-      libxtst
-      libxcomposite
-      libxdamage
-      libdrm
-      libxkbfile
-
-    ]
-    ++ lib.optionals pipewireSupport [
-      # Pipewire
-      pipewire
-    ]
-
-    # FIXME These dependencies shouldn't be needed but can't find a way
-    # around it. Chromium pulls this in while bootstrapping GN.
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools.libtool
-    ];
-
-    buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-      cups
-
-      # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
-      # to get some information about the host platform.
-      (writeScriptBin "sw_vers" ''
-        #!${stdenv.shell}
-
-        while [ $# -gt 0 ]; do
-          case "$1" in
-            -buildVersion) echo "17E199";;
-          *) break ;;
-
-          esac
-          shift
-        done
-      '')
-    ];
-
-    dontUseNinjaBuild = true;
-    dontUseNinjaInstall = true;
-
-    postInstall =
-      lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-        mkdir -p $out/libexec
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        cat > $out/libexec/qt.conf <<EOF
-        [Paths]
-        Prefix = ..
-        EOF
-
-      ''
-      + ''
-        # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)
-        sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
-      '';
-
-    requiredSystemFeatures = [ "big-parallel" ];
-
-    meta = {
-      description = "Web engine based on the Chromium web browser";
-      mainProgram = "qwebengine_convert_dict";
-      maintainers = [ ];
-
-      # qtwebengine-5.15.8: "QtWebEngine can only be built for x86,
-      # x86-64, ARM, Aarch64, and MIPSel architectures."
-      platforms =
-        with lib.systems.inspect.patterns;
-        let
-          inherit (lib.systems.inspect) patternLogicalAnd;
-        in
-        lib.concatMap (patternLogicalAnd isUnix) (
-          lib.concatMap lib.toList [
-            isx86_32
-            isx86_64
-            isAarch32
-            isAarch64
-            (patternLogicalAnd isMips isLittleEndian)
-          ]
-        );
-
-      # This build takes a long time; particularly on slow architectures
-      timeout = 24 * 3600;
-
-      knownVulnerabilities = [
-        ''
-          qt5 qtwebengine is unmaintained upstream since april 2025.
-          It is based on chromium 87.0.4280.144, and supposedly patched up to 135.0.7049.95 which is outdated.
-
-          Security issues are frequently discovered in chromium.
-          The following list of CVEs was fixed in the life cycle of chromium 138 and likely also affects qtwebengine:
-          - CVE-2025-8879
-          - CVE-2025-8880
-          - CVE-2025-8901
-          - CVE-2025-8881
-          - CVE-2025-8882
-          - CVE-2025-8576
-          - CVE-2025-8577
-          - CVE-2025-8578
-          - CVE-2025-8579
-          - CVE-2025-8580
-          - CVE-2025-8581
-          - CVE-2025-8582
-          - CVE-2025-8583
-          - CVE-2025-8292
-          - CVE-2025-8010
-          - CVE-2025-8011
-          - CVE-2025-7656
-          - CVE-2025-6558 (known to be exploited in the wild)
-          - CVE-2025-7657
-          - CVE-2025-6554
-          - CVE-2025-6555
-          - CVE-2025-6556
-          - CVE-2025-6557
-
-          The actual list of CVEs affecting qtwebengine is likely much longer,
-          as this list is missing issues fixed in chromium 136/137 and even more
-          issues are continuously discovered and lack upstream fixes in qtwebengine.
-        ''
-      ];
-    };
-
-  }
-  // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-    configurePlatforms = [ ];
-    # to get progress output in `nix-build` and `nix build -L`
-    preBuild = ''
-      export TERM=dumb
-    '';
-    depsBuildBuild = [
-      pkgsBuildBuild.stdenv
-      zlib
-      nss
-      nspr
-    ];
-
-  }
-)