From 6380990d355092d073a64a2a3d83ed5e1ed0a48c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Jan 2026 12:24:04 +0000
Subject: [PATCH 001/112] stevia: 0.51.0 -> 0.52.0

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

diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix
index 1cd8ace2671c..a92afb1ce03b 100644
--- a/pkgs/by-name/st/stevia/package.nix
+++ b/pkgs/by-name/st/stevia/package.nix
@@ -25,14 +25,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "stevia";
-  version = "0.51.0";
+  version = "0.52.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World/Phosh";
     repo = "stevia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dRygDUHXpXjEuwNNfgVy742jfIhT9erN7IcmaMImuYw=";
+    hash = "sha256-LE2+1RkxD8Sj2H/3NFzcYXZktlVGoNzWrE0UO5sJCAM=";
   };
 
   mesonFlags = [

From 538b5743ce0b27814d805b719c42124d323c4dae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jan 2026 10:35:03 +0000
Subject: [PATCH 002/112] python3Packages.pypdfium2: 5.2.0 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix
index 4d3684d3e025..d75e17abb52d 100644
--- a/pkgs/development/python-modules/pypdfium2/default.nix
+++ b/pkgs/development/python-modules/pypdfium2/default.nix
@@ -36,14 +36,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pypdfium2";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypdfium2-team";
     repo = "pypdfium2";
     tag = version;
-    hash = "sha256-A/NNyEmGXk21r5eXOYqIx6LXceOKnj2jUQFhUJbl7nU=";
+    hash = "sha256-HXJv7GCb+r1rE9Jh0wHm/LCfr8eHJA7qtCk0YhbE+24=";
   };
 
   build-system = [

From 0a5c1899fb5a2d707ecf7a7626f167a39f498f87 Mon Sep 17 00:00:00 2001
From: Andy Zhang <1329212+zh4ngx@users.noreply.github.com>
Date: Thu, 8 Jan 2026 14:12:32 -0800
Subject: [PATCH 003/112] keychron-udev-rules: 23-10-2025 ->
 0-unstable-2026-01-07

---
 pkgs/by-name/ke/keychron-udev-rules/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/keychron-udev-rules/package.nix b/pkgs/by-name/ke/keychron-udev-rules/package.nix
index 7731eba47b37..f1bb1ec46e08 100644
--- a/pkgs/by-name/ke/keychron-udev-rules/package.nix
+++ b/pkgs/by-name/ke/keychron-udev-rules/package.nix
@@ -6,7 +6,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "keychron-udev-rules";
-  version = "23-10-2025";
+  version = "0-unstable-2026-01-07";
 
   nativeBuildInputs = [ udevCheckHook ];
 
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux";
+    description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux & permissions on Keychron Launcher";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ kruziikrel13 ];

From 3addac51a169ba54386d564297dde42d952d5a68 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Thu, 8 Jan 2026 00:36:41 +0800
Subject: [PATCH 004/112] jabref: 6.0-alpha.3 -> 6.0-alpha.4

---
 pkgs/by-name/ja/jabref/deps.json   | 1237 ++++++++++++----------------
 pkgs/by-name/ja/jabref/package.nix |   46 +-
 2 files changed, 550 insertions(+), 733 deletions(-)

diff --git a/pkgs/by-name/ja/jabref/deps.json b/pkgs/by-name/ja/jabref/deps.json
index 3cbe63ff7857..cf671cd8725e 100644
--- a/pkgs/by-name/ja/jabref/deps.json
+++ b/pkgs/by-name/ja/jabref/deps.json
@@ -6,30 +6,10 @@
    "jar": "sha256-lCG/tJqgorl3a7E7I0tU2uJ54twh5GW26r/l4SgUzwQ=",
    "pom": "sha256-wy8tTwK/IzXbLQH9Gwz/teUyhGO0lDZmvqwaH/ijpRs="
   },
-  "koppor#wiremock-slf4j-shim/main-4c871b2e09-1/SNAPSHOT": {
-   "jar": "sha256-hYimLyaTZemhJDtmEe7bXPgd6NyKqTlEmUNmppuGRMQ=",
-   "module": "sha256-0hRsMRKmvd7NpykFlfy09yR+mB1dRC1BJ9ZXJMHT3mg=",
-   "pom": "sha256-8zEeXekVsvcVpndak1CfKytwdn66tWZ1P/LMn7AghiM="
-  },
-  "koppor#wiremock-slf4j-spi-shim/main-baf2359720-1/SNAPSHOT": {
-   "jar": "sha256-pMFZcWqiV+eoEWvos2DcosgjcISVkIRJd/frIot7wtY=",
-   "module": "sha256-X/cJ7GFDbk5yxaoKRBL+2WNQaou3AtGjdJ3guAZ5e+I=",
-   "pom": "sha256-eN40hwyeJ7TzUBS5QkTROKe8dU47/PKV5MWGKFgV2pM="
-  },
   "koppor/jbang-gradle-plugin#build/8a85836163": {
    "jar": "sha256-EV18C7JMsORCV1SsIU0OAN0RGXwNSxVqHvUUagoFibM=",
    "pom": "sha256-/UAMODCKxj6CvtciTIXCQDvzZlYH4L3iPe+aI2csWMg="
   },
-  "koppor/wiremock-slf4j-shim/main-SNAPSHOT/maven-metadata": {
-   "xml": {
-    "groupId": "com.github.koppor"
-   }
-  },
-  "koppor/wiremock-slf4j-spi-shim/main-SNAPSHOT/maven-metadata": {
-   "xml": {
-    "groupId": "com.github.koppor"
-   }
-  },
   "sialcasa/mvvmFX#mvvmfx-parent/f195849ca9": {
    "pom": "sha256-5nTE66pGjgRswUpwK3guGpZb5iI4/2kmYy+wtGIsSz0="
   },
@@ -38,27 +18,6 @@
    "pom": "sha256-MplYnkdrZQ8ptd0PuUqUcWe6SwKaoM4VdOOV1KMAPvs="
   }
  },
- "https://maven-central.storage-download.googleapis.com": {
-  "repos/central/data/com/google/code/gson/gson/maven-metadata": {
-   "xml": {
-    "groupId": "com.google.code.gson",
-    "lastUpdated": "20191004190047",
-    "release": "2.8.6"
-   }
-  }
- },
- "https://oss.sonatype.org/content/groups/public/com/google/code": {
-  "gson#gson/2.13.1": {
-   "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo="
-  },
-  "gson/gson/maven-metadata": {
-   "xml": {
-    "groupId": "com.google.code.gson",
-    "lastUpdated": "20250424011321",
-    "release": "2.13.1"
-   }
-  }
- },
  "https://plugins.gradle.org/m2": {
   "aopalliance#aopalliance/1.0": {
    "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=",
@@ -79,10 +38,10 @@
    "module": "sha256-49Y3GBZP75e4crP94UvWCedF5nN3CRI5B2dD71Umino=",
    "pom": "sha256-/+1G4g7Y+U21B6Am4PcD3GYEiA9bDhwmq7flVq7mFSM="
   },
-  "com/autonomousapps#dependency-analysis-gradle-plugin/3.3.0": {
-   "jar": "sha256-czStTpOfjq99QgOYUgcKiCi80Vz5qTSvCRpIrosUb4g=",
-   "module": "sha256-a7FFF9qhCdcqgO9yeOE5+KaIBs6Ee6Ors7HfJ+pdoo4=",
-   "pom": "sha256-YKDf6jxhBxClvOTaQ/0llWWjwHSWdZBUfveZ36jOU+w="
+  "com/autonomousapps#dependency-analysis-gradle-plugin/3.5.1": {
+   "jar": "sha256-jlXMuCOCKMkeeSCCYjmrjsI38llXokViln2oeyQetFo=",
+   "module": "sha256-fQoho8g9jqe9+07AT77Dm4fZvEQgkY0oLcgfXvBU85k=",
+   "pom": "sha256-FTlnlpXM5EdIs9U1FumQktMkui9Zs/cFmWYzEBZ5oC8="
   },
   "com/autonomousapps#graph-support/0.9.0": {
    "jar": "sha256-1ec9azC/6AT3g1FWOusgRFBPGYTe+0lAE6d8kbxGkwA=",
@@ -106,9 +65,6 @@
   "com/fasterxml#oss-parent/55": {
    "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
   },
-  "com/fasterxml#oss-parent/58": {
-   "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
-  },
   "com/fasterxml#oss-parent/61": {
    "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
   },
@@ -118,26 +74,20 @@
   "com/fasterxml#oss-parent/70": {
    "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk="
   },
-  "com/fasterxml/jackson#jackson-base/2.17.1": {
-   "pom": "sha256-4K78YdOPzd2VX/7sAbt1EE8bv/+jpuy1jb50r7cV4yI="
+  "com/fasterxml#oss-parent/73": {
+   "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4="
   },
   "com/fasterxml/jackson#jackson-base/2.18.3": {
    "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0="
   },
-  "com/fasterxml/jackson#jackson-base/2.20.0": {
-   "pom": "sha256-/IgCjRnuqjftpZbmuY03SfIs/IrdGeoZdFq+g2iDzmY="
-  },
-  "com/fasterxml/jackson#jackson-bom/2.17.1": {
-   "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU="
+  "com/fasterxml/jackson#jackson-base/2.20.1": {
+   "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU="
   },
   "com/fasterxml/jackson#jackson-bom/2.18.3": {
    "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA="
   },
-  "com/fasterxml/jackson#jackson-bom/2.20.0": {
-   "pom": "sha256-9ig2R+cB/aHNMS3MIcsTKkD3mPGejkL6/D/jR8WlG7s="
-  },
-  "com/fasterxml/jackson#jackson-parent/2.17": {
-   "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+  "com/fasterxml/jackson#jackson-bom/2.20.1": {
+   "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ="
   },
   "com/fasterxml/jackson#jackson-parent/2.18.1": {
    "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
@@ -145,55 +95,40 @@
   "com/fasterxml/jackson#jackson-parent/2.20": {
    "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.17.1": {
-   "jar": "sha256-/MrYLhMXLA5DhNtxV3IZybhjHAgg9LGNqqVwFvtmHHY=",
-   "module": "sha256-VNTVHaATppa+CeH0gDH39At3cYB4qpNuZMAjpP2blZM=",
-   "pom": "sha256-c1XzdEX12vUPUMdfLrzXG6LE+86ktiVBSAWexjVkTnc="
-  },
   "com/fasterxml/jackson/core#jackson-annotations/2.20": {
    "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=",
    "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=",
    "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.17.1": {
-   "jar": "sha256-3bJsih8ahFNeghPEizWyUzcENOMoezzxV3eFb8TljOY=",
-   "module": "sha256-iowJZP38Js7bso2CXfRiGBf7jNIrnnpZ2cdKOl8b3R0=",
-   "pom": "sha256-2UiDEgmgTAE5G5Oq7nrTShyelIY/nnaFwvW2FJoqs50="
+  "com/fasterxml/jackson/core#jackson-core/2.20.1": {
+   "jar": "sha256-/6tNlX2qJ5bPJMtm0LeKcJDxvL4Xw6RXjwmv+q8TcIk=",
+   "module": "sha256-GalAQ0Ic2ahuFUkSnDjBjgs1exQUWuT3Ns2gL4Bch8k=",
+   "pom": "sha256-FuBJqySPgqpssEjwTVLvPuH1TIDaHSY68k++UM9ueX4="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.20.0": {
-   "jar": "sha256-vAz0YHWHcgH4QG7n3idBrn32wGb18EV72AYypxjAbnI=",
-   "module": "sha256-2oWNOW9/pritA4zVzLkDj7ORq3o2rmKWI+N6UyR537w=",
-   "pom": "sha256-XxZVisIjBzpvJHRA8wX1nwXv9QqvHurguq1BKAABb2g="
+  "com/fasterxml/jackson/core#jackson-databind/2.20.1": {
+   "jar": "sha256-NLvrRSb/9PhWWxIQa/haavy66FiWbUibVCFKxGsuJug=",
+   "module": "sha256-S1M7Mu5wZfVaSnsNbuTYn9WDdxSr83YUyJkRT7EhWHo=",
+   "pom": "sha256-vP3yeCUyMraDq1HeLcvI+Y8g9Hc4wRHs/SyFxBsTHOw="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.17.1": {
-   "jar": "sha256-tsovfVsaskXOxUlewzl3PS2QVUxIWSWQZz+xj0QAqUg=",
-   "module": "sha256-C6vGRqBi8NnTWEQCpQJxiE7cPhekGULB4x4OENcdvuY=",
-   "pom": "sha256-YKCKmGrDE60+MmiKTjJ6YSg6ioAa1vphV5+MS+bcj2w="
-  },
-  "com/fasterxml/jackson/core#jackson-databind/2.20.0": {
-   "jar": "sha256-pw4Uamvyy6T5zTZxaXh/UK3Pu1cSK8LpyDkM0LOXrDA=",
-   "module": "sha256-oSgvNhZKyQG66p7bULqYE3L/7hjCz7F75CW5s/dYeuI=",
-   "pom": "sha256-zv7+0B3SwNlqiOEBuz4GX8FQBjtJjjAak4xpCwK8884="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.20.0": {
-   "jar": "sha256-DU67TVg92pGAHTfHVl1GKiX+kp8NdsNHZ+xLgEExEMA=",
-   "module": "sha256-+Vo/xxi+i/IaLVkpokZpblRMLigfA9yPrPaQhiusUCI=",
-   "pom": "sha256-SSZxpqcwB8Xq7YZ9luLJfKVtGzfSpYx0Zx99V4Aav6w="
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.20.1": {
+   "jar": "sha256-GQrU66NdidujUX2ieeBpBoHEdFF0uUsJ6nj4HOrhQPA=",
+   "module": "sha256-hUEEQQ13F89ArnJvmWoK2aACxiaV23QHvjm+NlNJmW8=",
+   "pom": "sha256-QTj0W/qeyxDsefm/3JLfYos5yLpScTk2tq9eBioP9ck="
   },
   "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.3": {
    "module": "sha256-v2AjrStgVyCsbaJ6K16Y7bGjJs0L9jfDpAtiH+jgk80=",
    "pom": "sha256-a056nStXQq6hOMFcDJ3gRjLxotjebnYe3vizYJK0hko="
   },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.0": {
-   "jar": "sha256-zD3sn7i1ZXR5e/72JkEyVQjw5byWi9JoVoQCgY1Vuq4=",
-   "module": "sha256-ZA8QhiTO8o1t6jJ+KC6eyC9lEhVY5gkcqPuJlfkUpac=",
-   "pom": "sha256-rpwz0EFZBkwZsuq0FIiU+jHxVjW7/lMYzjIp+OFHCcU="
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.1": {
+   "jar": "sha256-Aw8dkfffJ46G4bo+Ep+1IIcawWzlMBfHNfcIgjvpcNs=",
+   "module": "sha256-At0WoElpdLY7sgrszAK2fpeuQ6Uc5H1JSbyAUiLHQxI=",
+   "pom": "sha256-JrotoAFsKiNbPccCc5xm3O6xjKBURirhVE2srfnguSU="
   },
   "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.3": {
    "pom": "sha256-VnParMboVZdt7O3rRtxjOVprGsmkg+Zy8IMc9G/gbiU="
   },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.0": {
-   "pom": "sha256-RH4cfT+o2Skn3L2DjSRGOAXohi9yPM7VENUNrrhPgLQ="
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.1": {
+   "pom": "sha256-bIZ3yvUcuerYfbYmiPNR3MxDrPkAqONHcuQQ0TOPaqs="
   },
   "com/fasterxml/woodstox#woodstox-core/7.1.1": {
    "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=",
@@ -204,10 +139,10 @@
    "module": "sha256-HJZopxNuP0KJnDB4Gj/BlEwmOt+JxD/9Wjq4CyLJWys=",
    "pom": "sha256-BWin12bwYR/dbcGzCa+cFTQdt60LwDDeymXm7OTeWQo="
   },
-  "com/github/ben-manes/caffeine#caffeine/3.2.2": {
-   "jar": "sha256-x0psciId+3brkvK7QBCOpWGn2i8xXcOx5kr6jwd/IQw=",
-   "module": "sha256-oD7s/Xs/XQSmZSw4yT1xFDCnSfx/+OwKpN7janRJwDE=",
-   "pom": "sha256-OQTfB3fF2aYILhfKOiaSseoGGtTpOjomkAIRbrGsq2I="
+  "com/github/ben-manes/caffeine#caffeine/3.2.3": {
+   "jar": "sha256-ynDJCl0c4VEYgM6ck9StIhCPYREdPa+R61J2K1cb0Xk=",
+   "module": "sha256-jZo7mA6b1wQS7jObJFYxNhezuK4uhon5s8vwZAzVjzw=",
+   "pom": "sha256-n3BPkIN5e099DB1chV00zSaNVEzwa0KD1c5CiKz8nuA="
   },
   "com/github/package-url#packageurl-java/1.5.0": {
    "jar": "sha256-5FVRcncHrMDFasYtVpZDMuoPE41sw2VtmIuTaRUPUkc=",
@@ -227,21 +162,21 @@
    "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
    "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
   },
-  "com/google/errorprone#error_prone_annotations/2.36.0": {
-   "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
   },
-  "com/google/errorprone#error_prone_annotations/2.40.0": {
-   "jar": "sha256-v6d+SSJum9KsesG8SjxwQwB48ubNMMjgYV1sJdiugY0=",
-   "pom": "sha256-GI+AyOrAS0CvdrRdA90dCjk5IOP6DEglL05u8YcojK4="
+  "com/google/errorprone#error_prone_annotations/2.43.0": {
+   "jar": "sha256-SCcudcFuH3vce9GVKcys1e4XBARwHX9aI0QbtYR5V/U=",
+   "pom": "sha256-T2uIia+o3r2+Hj/ipfjmbiIWygtWPya05UE4cw7s3IA="
   },
   "com/google/errorprone#error_prone_parent/2.27.0": {
    "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
   },
-  "com/google/errorprone#error_prone_parent/2.36.0": {
-   "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
   },
-  "com/google/errorprone#error_prone_parent/2.40.0": {
-   "pom": "sha256-HGt0MRxgFPj9aMjdHl9h3bVEz/LHQ8JyTbf4LXLd5Is="
+  "com/google/errorprone#error_prone_parent/2.43.0": {
+   "pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA="
   },
   "com/google/guava#failureaccess/1.0.3": {
    "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
@@ -256,11 +191,19 @@
   "com/google/guava#guava-parent/33.4.8-jre": {
    "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
   },
+  "com/google/guava#guava-parent/33.5.0-jre": {
+   "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
+  },
   "com/google/guava#guava/33.4.8-jre": {
    "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=",
    "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
    "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw="
   },
+  "com/google/guava#guava/33.5.0-jre": {
+   "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+   "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+   "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
+  },
   "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
    "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
@@ -274,13 +217,13 @@
   "com/google/inject#guice/5.1.0/classes": {
    "jar": "sha256-FCrUR14ZUk0v46yZWz98vJYvxyby7bnb3Mxh/qubK/k="
   },
-  "com/google/j2objc#j2objc-annotations/3.0.0": {
-   "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
-   "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+  "com/google/j2objc#j2objc-annotations/3.1": {
+   "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
+   "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
   },
-  "com/h2database#h2/2.2.224": {
-   "jar": "sha256-udjxk1itqCpPbrWxdMbP4yCjdbWpy1pP5FbWI+blVJc=",
-   "pom": "sha256-DUUDoBpMemL5GuGmJxM5z4BvKkYt7+C+/17/1aYR45g="
+  "com/h2database#h2/2.4.240": {
+   "jar": "sha256-KbcOQnzBxAzcN2KDrbsMxihTBzeXu1/ldh+B/nPVfOA=",
+   "pom": "sha256-J69LeAWFazFw1YfgoCyqyT1CH4dc/JSX2/X/1/Mkeko="
   },
   "com/networknt#json-schema-validator/1.5.9": {
    "jar": "sha256-4Li663j9G6AnRU7jl02KAvVER+qlENMFKCCn0hYNmuQ=",
@@ -310,59 +253,62 @@
    "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=",
    "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k="
   },
-  "com/squareup/okhttp3#okhttp-jvm/5.1.0": {
-   "jar": "sha256-pqrH8V08LDy9Kvfs9W+XQHFkpgSy24eVKZUOMc6mmbI=",
-   "module": "sha256-sulz7WEYTDMNpU5+YuW6STQLZkh1x8PiLfjvSWB8TXA=",
-   "pom": "sha256-aNCp1oSYz/jQM+gJUKihDamZiE6Y07RMiNDpsAUd4nA="
+  "com/squareup/okhttp3#okhttp/3.14.9": {
+   "jar": "sha256-JXD6tVUVy/iB16TO70n8UVSQvAJwV+Zmd2ooMkZa7KA=",
+   "pom": "sha256-Ye3zxHZOqV8SEsot+8bqXUEzxxxOjEC9JH7IPnxrfOc="
   },
-  "com/squareup/okhttp3#okhttp/5.1.0": {
-   "module": "sha256-9Lg+E7Rr8Q9cccDL82M54X4ttXZwDaNElfulX063g24=",
-   "pom": "sha256-hwO2W8qKgsj6H3DHt4FTtAx5FrKQUS/PmA5/IaZQpzc="
+  "com/squareup/okhttp3#parent/3.14.9": {
+   "pom": "sha256-tfEB3PLMfzLsPXtovcB4536sGXm7hmTo+H92IojD3OU="
   },
-  "com/squareup/okio#okio-bom/3.15.0": {
-   "module": "sha256-x3W4IzK61AlhIt5sVUqd2PlLgvJUxwr7Cnw9lkxN8GY=",
-   "pom": "sha256-d91HMYPYt/8tpJVLSsYCBj7mMnhk/nYpxYgwj18l4Eo="
+  "com/squareup/okio#okio-bom/3.16.4": {
+   "module": "sha256-dJ52meyyZXzaGsemojjaSsTbCBXPJL38gOXMnxB/jos=",
+   "pom": "sha256-Z1oFMqkhyPOLkw2SMOYhLFqtaNiDUED2ouLluudzbyE="
   },
-  "com/squareup/okio#okio-jvm/3.15.0": {
-   "jar": "sha256-SD3Dg7EEnSIIkjIqDWpDCEJfCbsFtIxD1Oqp/4KxzRY=",
-   "module": "sha256-mJRUqUrvvClwMoiPE1rNoUqf+0aWDn2EYDkl0mkkHuc=",
-   "pom": "sha256-B45C9oykYT/yWX+8VUHFzleM3MSIOdqJ2nynYFGL+3k="
+  "com/squareup/okio#okio-jvm/3.16.4": {
+   "jar": "sha256-IZa5k800272Rnn4B9XpHgbWL7oD4YQYWPih8IDQ6lqc=",
+   "module": "sha256-kAjVopVKBoxoSCdPbuvf9IsUpw28aT0zAuCMVwzKAy8=",
+   "pom": "sha256-ZnePTQWXvOY/kewADFdcwCmzIB990JLLgIh1FVs+hqE="
   },
   "com/squareup/okio#okio-jvm/3.7.0": {
    "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=",
    "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=",
    "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc="
   },
-  "com/squareup/okio#okio/3.15.0": {
-   "module": "sha256-EWgmBmzrTTM2p05xcqM3UWF+w0S8UKNPmbDSSVmko50=",
-   "pom": "sha256-LXN4VBFATurDLwRzouB6sVFrmFCpKAzGGgi0eXkMzPg="
+  "com/squareup/okio#okio/3.16.4": {
+   "module": "sha256-yEQahybbGk+dTzngaOu0LfalnWR+MqnGHBW1OQ7VklI=",
+   "pom": "sha256-CPvpfh4ugVoUyvFv9ayHCFEb713ec51gwHE5UYdtomM="
   },
   "com/squareup/okio#okio/3.7.0": {
    "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=",
    "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24="
   },
-  "com/squareup/retrofit2#converter-scalars/3.0.0": {
-   "jar": "sha256-uXzwaSmoDUm8Yy5E8hnPCnGF/Ezuhh7JCtHQ5IIIQCM=",
-   "module": "sha256-gECNEiZVQbMCRDuw++YUb0BqglP+fDdudWulhAujnKQ=",
-   "pom": "sha256-B42x+Kgsb48K0vzzn7ia4bfUf1XQIlGEksToSN1QL8c="
+  "com/squareup/retrofit2#converter-moshi/2.12.0": {
+   "jar": "sha256-GbejX6FkCTYH+aY+2BC0scH76cfUXjGWJ3wea+Exfy4=",
+   "module": "sha256-1FNRun8nTshOXqsvdrPOfGPduLpL+KzTHiix0D3Jmu0=",
+   "pom": "sha256-FHYD65pzlqUrotJq/brZw8i0kR9B1MKMV782mtDwYYU="
   },
-  "com/squareup/retrofit2#retrofit/3.0.0": {
-   "jar": "sha256-acai00UbbflUmpP6t0QJTr8HpLDOT0U9bI9XXvD+yaE=",
-   "module": "sha256-PeUoKbiYIVU06G7aJo2kSf/L+VsYcD2lKdmYgyd0hPc=",
-   "pom": "sha256-/BaPqJcZiIc331OurA9JgLP07z5hIeMww2YGHJlrBoA="
+  "com/squareup/retrofit2#converter-scalars/2.12.0": {
+   "jar": "sha256-EV60l+rtabOFSyeico6fDzAB/xU0DxXEackw/1lhDHM=",
+   "module": "sha256-vXPboF8M9vxG6Tbq205zOKpgDNs8UDW6k6NypSrk3Hs=",
+   "pom": "sha256-P0n83lXvfTADVn2UYOZ8yjtm3TlSdCbBuUROq4dQJOI="
   },
-  "com/vanniktech#central-portal/0.34.0": {
-   "jar": "sha256-9HyW3152+uQ1H46O8qAFTtTKvvfzNzJgwPVv7yY9ITY=",
-   "module": "sha256-ff8P01naUujxJk8f49eVPQD9LrwCSq+a6rvdfnULjj8=",
-   "pom": "sha256-BNzoESg1rimFmZ1hLZ0YfKfBqj0z1Noqx4KBnFie+ow="
+  "com/squareup/retrofit2#retrofit/2.12.0": {
+   "jar": "sha256-Oy37gruZzTPfldkq1vzXi6fxesgeZ5BOuZH+QEAV0dg=",
+   "module": "sha256-Og+cjvwUlYqFoThkgj+UBCc41gF72euPvGH3EXTM2B8=",
+   "pom": "sha256-pPj7y8g4IBNWfzPnDLCJ7wxl7TJ+DV4EIx99hDTQ8wA="
   },
-  "com/vanniktech#gradle-maven-publish-plugin/0.34.0": {
-   "jar": "sha256-GzBK4yfXA03hlRH3etInulnXNY6LUdGLCdp6JT/sTAU=",
-   "module": "sha256-3b3ll8lZPBTqNerTPKC1nMP9W50241Q1j/ZvYwSYHHE=",
-   "pom": "sha256-yBLl8DxlILOqJxkOEn8SXCubWDWVWLfPPf09daGQnYE="
+  "com/vanniktech#central-portal/0.35.0": {
+   "jar": "sha256-mJ3cc+/lNAB+Be/yx8MU3ru9OLEgfTOwdBoNmMrcoFA=",
+   "module": "sha256-3ICG1mWG0LrcSgP85vv0IMyZJnz0QZ/Wwwe++UIEvXM=",
+   "pom": "sha256-YVVZa2TixqHcpFMfJMBrqCzsrfF/HNG/iIg9DOYqYYw="
   },
-  "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.34.0": {
-   "pom": "sha256-yvlwLHCOE0teBeL1lb16yBsMYdEGC0Kat3Y5aLa5epY="
+  "com/vanniktech#gradle-maven-publish-plugin/0.35.0": {
+   "jar": "sha256-9TrJP++0RWm06G+XlW5ggFj9VSIrCuXUS82tFHThF+A=",
+   "module": "sha256-R6IkODDchPwQ9/ZWbb3+7zqpvDWgMIBGpBEFs/5sdp0=",
+   "pom": "sha256-Bqupfg8WGjoZN2P78jvEb/MYQ0ejYKtMqlcUPbyeFIM="
+  },
+  "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.35.0": {
+   "pom": "sha256-iAGpAS3B+PqnKUcEDWYVpQFg6ftXoHwA9JspwjQ1gZ4="
   },
   "commons-codec#commons-codec/1.16.0": {
    "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
@@ -371,17 +317,13 @@
    "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=",
    "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
   },
-  "commons-codec#commons-codec/1.18.0": {
-   "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=",
-   "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4="
-  },
   "commons-codec#commons-codec/1.19.0": {
    "jar": "sha256-XDiB5PVWhV6cUykn7gyd/elMxmdg1YBcAxpZiHBwr18=",
    "pom": "sha256-4PMmn6I94MgxMMVln1+VFMxUIsC830Xy6uAEp4ufyjQ="
   },
-  "commons-io#commons-io/2.18.0": {
-   "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=",
-   "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o="
+  "commons-codec#commons-codec/1.20.0": {
+   "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=",
+   "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys="
   },
   "commons-io#commons-io/2.19.0": {
    "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=",
@@ -391,6 +333,10 @@
    "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
    "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
   },
+  "commons-io#commons-io/2.21.0": {
+   "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
+   "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
+  },
   "dev/zacsweers/moshix#moshi-sealed-reflect/0.30.0": {
    "jar": "sha256-vP2qMkmcYojqi201i2ZknAXaif9mHENj1D0z1n5gp7k=",
    "module": "sha256-aZsM1QFQTeLsZSbovXgSLNXUf7K6Zj8h8QEnmoIQ3+A=",
@@ -474,9 +420,9 @@
    "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=",
    "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw="
   },
-  "org/apache/commons#commons-csv/1.14.0": {
-   "jar": "sha256-LzTWn4nclNYG4lDV6yYgWSPl28LDiR01dfhshJ9/hyY=",
-   "pom": "sha256-k7VTRtiuqBQAS5x8wq7ZWwidOLMTiTZkNCuOA2mRJWU="
+  "org/apache/commons#commons-csv/1.14.1": {
+   "jar": "sha256-Mr4OHnZnMJL10Sy3kL0qy2wqsExOpu/GnqXuF5EcJP4=",
+   "pom": "sha256-ld9zUwLAq5LOwForUeInB1jhXwpkGG3mVmLrFI69l/0="
   },
   "org/apache/commons#commons-lang3/3.16.0": {
    "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=",
@@ -502,12 +448,6 @@
   "org/apache/commons#commons-parent/72": {
    "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
   },
-  "org/apache/commons#commons-parent/78": {
-   "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4="
-  },
-  "org/apache/commons#commons-parent/79": {
-   "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo="
-  },
   "org/apache/commons#commons-parent/81": {
    "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ="
   },
@@ -517,6 +457,9 @@
   "org/apache/commons#commons-parent/88": {
    "pom": "sha256-i/cmFQ0dakO6CqkgYOVSkzyvKHOqGTlS2dSWRw+p+9g="
   },
+  "org/apache/commons#commons-parent/91": {
+   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
+  },
   "org/apache/maven#maven-artifact/3.8.8": {
    "jar": "sha256-gTIzqEhcuvl7H5osF873I7Bo9yYKQxnPSVjyIdBLmTc=",
    "pom": "sha256-PGKRS2E++Q+BwFaN7kCNIlVrTZmoHnqk1yqlxO4r96U="
@@ -672,17 +615,17 @@
    "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=",
    "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI="
   },
-  "org/cyclonedx#cyclonedx-core-java/11.0.0": {
-   "jar": "sha256-3oQazoSm6GTV0FaNgX7B5NEZcyWHKGr14aL9VmW5S4Y=",
-   "pom": "sha256-2GHp/nFKoPukYKNkp5tkKm8ZWrAdVuttzFf3pBEGT+8="
+  "org/cyclonedx#cyclonedx-core-java/11.0.1": {
+   "jar": "sha256-mJNIzG04VimjzLc11FCw8PAiFny3AsL8sObyvdmJ3ec=",
+   "pom": "sha256-7CoPqkYkAWvfNEvI4fItXgv793Q8DxWnUhMUBhLQw7E="
   },
-  "org/cyclonedx#cyclonedx-gradle-plugin/3.0.1": {
-   "jar": "sha256-NykXVNJpBdoPeyf5I107ir4WazI4wuzqTjIjjRvMjks=",
-   "module": "sha256-ERVsrays+tt40MWkgB7TwmImovG3uTiDJ7xPUra3Gj8=",
-   "pom": "sha256-ZUi5/PCURQCRtZnJ85fCbjm3ZFTBku0oDOxjYFDE+Rs="
+  "org/cyclonedx#cyclonedx-gradle-plugin/3.1.0": {
+   "jar": "sha256-OTJUHCikD2bqsO/zc0GFVsn1+cSeUx/FPq3p1omxUzs=",
+   "module": "sha256-cwK7mMFmJIdyH2JUWThMsSwY9sQlg2Lr+G+XqNTfcpI=",
+   "pom": "sha256-JxJ5LudnqlkYFEuKnzuZCig3v5h9oAZj1tmi8yWApns="
   },
-  "org/cyclonedx/bom#org.cyclonedx.bom.gradle.plugin/3.0.1": {
-   "pom": "sha256-M3mVlmdlvhj6qnYnIC23PibiYE7kBZAFEFsC5j2XBMo="
+  "org/cyclonedx/bom#org.cyclonedx.bom.gradle.plugin/3.1.0": {
+   "pom": "sha256-gS6ychNdCtFa6/ehS3ydwMYD+kxnLR+C62Mq/olOcvk="
   },
   "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.5": {
    "jar": "sha256-xZlAELzc4dK9YDpNUMRxkd29eHXRFXsjqqJtM8gv2hM=",
@@ -732,20 +675,20 @@
    "module": "sha256-fhNlSHgJgj3QsW1doKyZf9PmtrTephg58fHm8x/4D7A=",
    "pom": "sha256-N/yzpQhcQ/1cjVNvUU1LPju4WQtv0HNKcUL4i4NpWOA="
   },
-  "org/gradlex#java-module-packaging/1.1": {
-   "jar": "sha256-tG4desVuo/RmoviGeVclIuaFoV/mblWlKhSlDL1ZG/4=",
-   "module": "sha256-CilLazbgRJ4PllkhFCxED+ZW6OiWk0xdpYeDM3J0284=",
-   "pom": "sha256-NJEVgtmX9kIcxlBzUReESqL4SND5UPZCLscdp1Hg9Wo="
+  "org/gradlex#java-module-packaging/1.2": {
+   "jar": "sha256-OYhi3QQLcnd1LnptEgug8mHIG2gQ352+wiSQLsyJABs=",
+   "module": "sha256-shcObdBLh6Jc2FPHPbMUPknQWsTxsNwXj/AIc+1qfyo=",
+   "pom": "sha256-oIxyBX9Jmj68iOVJaCcC430yJZpcuQM8EbTrLebfr00="
   },
-  "org/gradlex#java-module-testing/1.7": {
-   "jar": "sha256-SuAfIlj54DFcfEqHVxpN73LUZHfDO/HnZwpnSGCgMMM=",
-   "module": "sha256-fF35H4l02PrGF8J5/V6SlaN/Xqq4RRc6F7PCFoqDuJo=",
-   "pom": "sha256-2xMRTEoSN6SknNX5a2N99tfDxQeIwc3F9rU+qWXfvuY="
+  "org/gradlex#java-module-testing/1.8": {
+   "jar": "sha256-VGnTdoQTLIykKPjhCa0cyuKFqRe+7VtIBqO7zyQxHh8=",
+   "module": "sha256-YzjMz5Q6yRPtywfwD6LBCmb/0dTjBFI9TK52iA3sUO4=",
+   "pom": "sha256-oQB1HIxCz13s7vaVQ/rNEY7eC3O/zf1kydIvPuJoPMA="
   },
-  "org/gradlex#jvm-dependency-conflict-resolution/2.4": {
-   "jar": "sha256-07ysXNC5ZGAo2eT4s1iP+r9UGwPmEzgAQQZ/g/QlRCY=",
-   "module": "sha256-9rh4lX2yRAgFK8q0lyZiVlznCC2hiD5C8fsU24GIlRo=",
-   "pom": "sha256-uacve85Giz5v2SwEXDdN6mMskIRE6tdzc0vfdDBMjnU="
+  "org/gradlex#jvm-dependency-conflict-resolution/2.5": {
+   "jar": "sha256-ZTyhRdbI9h4nbrIw3yr3htxWZaCqyXOi3tdd4gw6170=",
+   "module": "sha256-wbliVk8tJ7IJc4FOQbiw8FT9nJ02tDZRaEHjLGYQuog=",
+   "pom": "sha256-x/+x9Yt+AWImYiG5T75j1jb1NciBIO8QnjOMgWJ/0uA="
   },
   "org/itsallcode#openfasttrace-gradle/3.1.0": {
    "jar": "sha256-+HhFKm0fhNF7qz+Kw7tlqTcsICHWIqvFneXWLdSgtYM=",
@@ -1005,9 +948,9 @@
    "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=",
    "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs="
   },
-  "org/jooq#jool/0.9.14": {
-   "jar": "sha256-EO13VqAFaYQJsWqteXqnZgCaZhD29r7GZ7NbFwl7o0s=",
-   "pom": "sha256-L4ndA8dhMAqVuGSecX63t1j1SOz8q8hHkb0kVzslv/c="
+  "org/jooq#jool/0.9.15": {
+   "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=",
+   "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M="
   },
   "org/jspecify#jspecify/1.0.0": {
    "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
@@ -1030,10 +973,6 @@
    "module": "sha256-42L7gWcgLW8NSlsWcHxTJFEP0pA9U2SYiMRJasgcM34=",
    "pom": "sha256-xyEkqcmnmRDBhYdmtyw1Dho5JEy/tLB2NI+/4HgoGWU="
   },
-  "org/junit#junit-bom/5.11.2": {
-   "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=",
-   "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI="
-  },
   "org/junit#junit-bom/5.11.4": {
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
@@ -1072,16 +1011,16 @@
   "org/openjfx#javafx/25": {
    "pom": "sha256-55IzCPyt1/LGiwcgQfR9jnNVIj2EZVnutceA3EuivxM="
   },
-  "org/openrewrite#plugin/7.19.0": {
-   "jar": "sha256-0Q7hjPsBdtkJPK1XOudOT71gdrnRlLdUFx/Hz55svEQ=",
-   "module": "sha256-O34NiVkjs7Kkluv2/TjvNRLruzaUJ8aqWtH28zxoeW0=",
-   "pom": "sha256-ZoGHq63frzP4dlvYpmb2ZFWefpPS6+l2pGjLXAjIjoE="
+  "org/openrewrite#plugin/7.23.0": {
+   "jar": "sha256-FVTJaML4Qf/TyPQSYzueRB3hsIcUt1lKr7O6VsK3y8o=",
+   "module": "sha256-zMwRRR/4rKPfwRVYPfbUtN6n7hrOkMKL1BC/Uw18GRk=",
+   "pom": "sha256-1iJirMbYonNt/uYcEsdLRophOntSLZC1KZDT7INDCq8="
   },
-  "org/openrewrite#rewrite-bom/8.64.0": {
-   "pom": "sha256-TUbuSNSXKl011/ufBiQhwFVY0Z2+KtuoRso5rb45OWs="
+  "org/openrewrite#rewrite-bom/8.69.0": {
+   "pom": "sha256-qB0qP51WQTq/xDVb7rWgmX0HbsCiwktZqWNy6ZG1/YM="
   },
-  "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.19.0": {
-   "pom": "sha256-IhGb4mgJ1Ht6ijckmt2mm0q6kDJ/pgyKUuE24UAaHso="
+  "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.23.0": {
+   "pom": "sha256-DPyIx0N8YHljfQckzwRhwEorLJ2ouhBsbXBnvN4y2Z8="
   },
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
@@ -1094,42 +1033,26 @@
    "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=",
    "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc="
   },
-  "org/slf4j#slf4j-api/1.7.2": {
-   "jar": "sha256-O654m0ATM7Kh0WA7f6Vz4ZkIYoGRcHID9utwjN7iwFI=",
-   "pom": "sha256-LqynGv4KFRb0q9jp/5B4ONJo84yBw6VCzOjX87h8XUw="
-  },
   "org/slf4j#slf4j-api/1.7.36": {
+   "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
    "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
   },
-  "org/slf4j#slf4j-api/2.0.13": {
-   "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=",
-   "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE="
-  },
   "org/slf4j#slf4j-api/2.0.17": {
    "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
    "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
   },
-  "org/slf4j#slf4j-bom/2.0.13": {
-   "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo="
-  },
   "org/slf4j#slf4j-bom/2.0.17": {
    "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
   },
-  "org/slf4j#slf4j-parent/1.7.2": {
-   "pom": "sha256-HY4ISm8jhK3kJoUzK1Kg7OCQR4ZB3BTA+oxS4eKYRCU="
-  },
   "org/slf4j#slf4j-parent/1.7.36": {
    "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
   },
-  "org/slf4j#slf4j-parent/2.0.13": {
-   "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo="
-  },
   "org/slf4j#slf4j-parent/2.0.17": {
    "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
-  "org/slf4j#slf4j-simple/2.0.13": {
-   "jar": "sha256-MVP+HWic/7lPFTC1hHDDBmhbpohE3ohXEW47bruB2fc=",
-   "pom": "sha256-Sk1Lskz4q+LLh0qDb150PTSFt9sE/P9vwHFJUlO1z6g="
+  "org/slf4j#slf4j-simple/2.0.17": {
+   "jar": "sha256-3f6lmsB0xtPiSsLDhiLS2WOJXhf3CzjtS9rk14C+aWQ=",
+   "pom": "sha256-+zDo4vauotKYQnmGd+1FQbmyJVcVwVg1DKLF9ce4ZLA="
   },
   "org/sonatype/oss#oss-parent/7": {
    "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
@@ -1144,32 +1067,52 @@
   "org/zeroturnaround#zt-exec/1.12": {
    "jar": "sha256-9ROvOZj9QCT5k+iyWe/TazSgzxx5PpO0olrcNJjQEf0=",
    "pom": "sha256-aYxGAAk6FF9lEYVGJfSVKPBOFqLESAiFKP2Oi0JsTFQ="
+  },
+  "tools/jackson#jackson-base/3.0.3": {
+   "pom": "sha256-kvfF8WaH7WtSwOgm76sON5s3rkkYFc8tQ3ySPUJodbQ="
+  },
+  "tools/jackson#jackson-bom/3.0.3": {
+   "pom": "sha256-hOPOTqXFbXvqiGH+HEOayaGd1UqaPem4oIhL8LvHUPI="
+  },
+  "tools/jackson/core#jackson-core/3.0.3": {
+   "jar": "sha256-QUm7Kzu/+1M5CJF04m9FQIHmoBoQTSSyL3iha5SHmes=",
+   "module": "sha256-tJO1FTrvaKzJwyEsOa3fbYi7yDO4h1LhVjLgwoEAdjU=",
+   "pom": "sha256-Z4lSP9lndVN7lriKwAyQ5CQ+lkYVXLE1/OjzE6GiH9g="
+  },
+  "tools/jackson/core#jackson-databind/3.0.3": {
+   "jar": "sha256-37t5EwkQ3s8GMSXB5pOjnF7I+4tHjX85ZxkB1Hzn9qI=",
+   "module": "sha256-tpz6mbeuIssVcLSJ7RUprnUluaGrP57zXR9PPT5HGHs=",
+   "pom": "sha256-9EpMrUeqwuQkLk31NoJ7WP7fKCkFbJUX9E51raYHF2g="
   }
  },
  "https://repo.maven.apache.org/maven2": {
-  "ai/djl#api/0.34.0": {
-   "jar": "sha256-fTJPadhpvbRg0n0PegUu0LxVFNq4gBTYmk4BKa2ZYM4=",
-   "pom": "sha256-8aXphfBTdbhovv8377sA4eemn7LKjFff8QnXAGAkXCo="
+  "ai/djl#api/0.35.1": {
+   "jar": "sha256-EpXJunxbDil0pjiVPtEjFUvMCsoNvEEGkR3GyaXYzPU=",
+   "pom": "sha256-vuzCtZfq/v79VQOau6bjrKEhxvO6+kpO79hLn8DqrJc="
   },
-  "ai/djl#bom/0.34.0": {
-   "pom": "sha256-/mUHucQxaWENPHsxS9NBD8koaBn8iz/94fJpzBfqM3E="
+  "ai/djl#bom/0.35.1": {
+   "pom": "sha256-T8VC15hK8PPvGwIPd9+v3ZCYWDzGN7BVz8fznimOQHs="
   },
-  "ai/djl/huggingface#tokenizers/0.34.0": {
-   "jar": "sha256-zDVisUKNQIDqjEQ+xG844XjfYafvtr7c1coeM1CmflI=",
-   "pom": "sha256-ODxC90MPpmbgG932pPdt1d1XHGkDhOn24SqyH6xaWZs="
+  "ai/djl/huggingface#tokenizers/0.35.1": {
+   "jar": "sha256-7R2M9g8BhuQpO2wKVR6R+DSxjfeyNmoWuA6sJFWutUI=",
+   "pom": "sha256-ZA0rZaYZFnbWHvbk5WDojA583fl3sGsRNN5lGx9tVHA="
   },
-  "ai/djl/pytorch#pytorch-engine/0.34.0": {
-   "jar": "sha256-Y498d7lSd0TEbxz5IvdrviicSdM58B1LuTKcRen7ZsM=",
-   "pom": "sha256-JEGTooNdo/aI8pNl+qgxa5ra0TLFK/1bfA7h0PkuBqo="
+  "ai/djl/pytorch#pytorch-engine/0.35.1": {
+   "jar": "sha256-n4s4o4IPrLve8JtOaRkA2lhgu3178uBo2b4gXEca4C8=",
+   "pom": "sha256-KNmLmRj+KFMUVNstmg6x6gcFI5eVeWJokNWYGctykjc="
   },
-  "ai/djl/pytorch#pytorch-model-zoo/0.34.0": {
-   "jar": "sha256-gqb4Xdubnzgmj63lEM5G5YhPB57CzkN8ezur2+VhySg=",
-   "pom": "sha256-8bXJCIW2cS0Xnk3bQPIutJczhWJ59KcFI0UmzlwqCpI="
+  "ai/djl/pytorch#pytorch-model-zoo/0.35.1": {
+   "jar": "sha256-xF+2zouU+bT5gn80EkEe1oPWg3emv2KJEcd1SmMGato=",
+   "pom": "sha256-m6bKSOEbokXqHCGVrK1NlBjjCm+XjW3tfnusVo2PCn8="
   },
   "at/favre/lib#hkdf/1.1.0": {
    "jar": "sha256-gexMVudA1EC8lCb6YAyu5Ku26fTO/1dunOznw4F8WgY=",
    "pom": "sha256-HCRX381QzRlXEdO38sd7YLFf+8YukrOvxTujzKawfHg="
   },
+  "cc/jilt#jilt/1.9": {
+   "module": "sha256-gGgkCvNxRtdHYhuiKcHpl1Ac6+t5UrK58KMj1oglvKc=",
+   "pom": "sha256-bfLSAjd4+Rljn71PVxUEPFc9oiyzh6Wmf/jg49BZwDk="
+  },
   "com/dlsc#dlsc-maven-parent/1.0.0": {
    "pom": "sha256-6aQJT1Kt8lihN2bcHAh0Xk3D0hkL60SvIMalCLeg28w="
   },
@@ -1179,19 +1122,19 @@
   "com/dlsc#dlsc-maven-parent/1.6.0": {
    "pom": "sha256-4ZbQC5GiVEwBEy/ZZXg5MWci0OzPYKn7tqFQbBxr4lE="
   },
-  "com/dlsc/gemsfx#gemsfx/3.5.7": {
-   "jar": "sha256-Y+dETxXXBI8h/0esdUtXFR+Vk3fw7rIltmU6bZNQvRs=",
-   "pom": "sha256-4Cb6VQcdX6hIkxDVgRBgGr+NGjlTM8xNSatkkH0RNwI="
+  "com/dlsc/gemsfx#gemsfx/3.6.2": {
+   "jar": "sha256-1U/XOBMiFpDnyDiaAV5cpk45QAJzFxwyMmDQwA0GuxM=",
+   "pom": "sha256-unp6nKC/WVT/J8qtR2kUtwGEWr615SfKXweAFOL4DQk="
   },
-  "com/dlsc/gemsfx#parent/3.5.7": {
-   "pom": "sha256-ORawbydR4eGFsBL7XJkwe+OFRtlTI2/N515p01GIvH8="
+  "com/dlsc/gemsfx#parent/3.6.2": {
+   "pom": "sha256-cqDCKTd0AXAiLe4KquYeC0ZIzzeR3mMZHekt94KZR1Y="
   },
-  "com/dlsc/pdfviewfx#parent/3.3.2": {
-   "pom": "sha256-o6yhZ7+ceSphXd39Q4pr+OnTfM1WyARtsgfNCb6gVaQ="
+  "com/dlsc/pdfviewfx#parent/3.4.1": {
+   "pom": "sha256-x2WzdVKrEG81YjepLD+gldo/wPD4+casNMsBtFwgqHA="
   },
-  "com/dlsc/pdfviewfx#pdfviewfx/3.3.2": {
-   "jar": "sha256-HmWihBRyah4PHs4xE574h7ubCmi1xEs48BzIjpLEoA4=",
-   "pom": "sha256-DDn3/qcYMDIhxeoVoOrXcxJbmH+k/IF+V/1zlj+5kkI="
+  "com/dlsc/pdfviewfx#pdfviewfx/3.4.1": {
+   "jar": "sha256-0K6aX7Ej1rvwQR9nWJN28aaqBoPB9dJB5uX+4ouRE1g=",
+   "pom": "sha256-StvaJfplK4cTwkMRqKQVP7UvC1pf6SiJOSrefdcCshs="
   },
   "com/dlsc/pickerfx#parent/1.3.1": {
    "pom": "sha256-aUrDFyy6O9PUh4XN3UBHsi++Qk9Kd3G+bK9RwP2/3Wc="
@@ -1207,29 +1150,20 @@
    "jar": "sha256-Sxhrmeu47j3uesKeevLS+/dkeQQ8cj+q1Zaad+WhnBg=",
    "pom": "sha256-6v50YYv2uOH3NAVfC75ayZ7hfLkWxfW8AJppE0uCOb8="
   },
-  "com/ethlo/time#itu/1.10.3": {
-   "pom": "sha256-shihqWmXfQEerG6Ttzo6uwuIQGMK0aHxbr//JOWIbXQ="
+  "com/fasterxml#aalto-xml/1.3.4": {
+   "jar": "sha256-9Kxo2RGEootCBM72sSS4qvQ5sj0/E/WCG1znpnVPXyA=",
+   "pom": "sha256-klKG9TV8CCLMl5lWME+Ly8pvvTE7V3j+4m38BBmIL9c="
   },
-  "com/fasterxml#aalto-xml/1.3.3": {
-   "jar": "sha256-KIKe67NoY7BYEI+hubi1z7lMGHE0bkpPc+aeH+Cl8PY=",
-   "pom": "sha256-lXWPfdZUKR9D0cEJvBwm4lQYe61NyAAuhje/fiMUr9c="
-  },
-  "com/fasterxml#classmate/1.7.0": {
-   "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=",
-   "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE="
+  "com/fasterxml#classmate/1.7.1": {
+   "jar": "sha256-zDKZ5d9PwkGA5pR3yJDQfTjbed0t7MDvIOdKmGiXwKE=",
+   "pom": "sha256-z4m9p/hn2IUOK5Ma8VEcCXX2obhVB6oL/0F5ZQHHpkI="
   },
   "com/fasterxml#oss-parent/55": {
    "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
   },
-  "com/fasterxml#oss-parent/56": {
-   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
-  },
   "com/fasterxml#oss-parent/58": {
    "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
   },
-  "com/fasterxml#oss-parent/61": {
-   "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
-  },
   "com/fasterxml#oss-parent/68": {
    "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
   },
@@ -1239,36 +1173,27 @@
   "com/fasterxml#oss-parent/70": {
    "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk="
   },
+  "com/fasterxml#oss-parent/73": {
+   "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4="
+  },
   "com/fasterxml/jackson#jackson-base/2.17.2": {
    "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
   },
   "com/fasterxml/jackson#jackson-base/2.19.2": {
    "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM="
   },
-  "com/fasterxml/jackson#jackson-base/2.20.0": {
-   "pom": "sha256-/IgCjRnuqjftpZbmuY03SfIs/IrdGeoZdFq+g2iDzmY="
-  },
   "com/fasterxml/jackson#jackson-bom/2.17.2": {
    "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
   },
-  "com/fasterxml/jackson#jackson-bom/2.18.3": {
-   "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA="
-  },
   "com/fasterxml/jackson#jackson-bom/2.19.1": {
    "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
   },
   "com/fasterxml/jackson#jackson-bom/2.19.2": {
    "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM="
   },
-  "com/fasterxml/jackson#jackson-bom/2.20.0": {
-   "pom": "sha256-9ig2R+cB/aHNMS3MIcsTKkD3mPGejkL6/D/jR8WlG7s="
-  },
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
-  "com/fasterxml/jackson#jackson-parent/2.18.1": {
-   "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
-  },
   "com/fasterxml/jackson#jackson-parent/2.19.2": {
    "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
   },
@@ -1278,11 +1203,6 @@
   "com/fasterxml/jackson#jackson-parent/2.20": {
    "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.19.2": {
-   "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=",
-   "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=",
-   "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck="
-  },
   "com/fasterxml/jackson/core#jackson-annotations/2.20": {
    "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=",
    "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=",
@@ -1293,53 +1213,34 @@
    "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=",
    "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.20.0": {
-   "jar": "sha256-vAz0YHWHcgH4QG7n3idBrn32wGb18EV72AYypxjAbnI=",
-   "module": "sha256-2oWNOW9/pritA4zVzLkDj7ORq3o2rmKWI+N6UyR537w=",
-   "pom": "sha256-XxZVisIjBzpvJHRA8wX1nwXv9QqvHurguq1BKAABb2g="
+  "com/fasterxml/jackson/core#jackson-databind/2.17.2": {
+   "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=",
+   "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
   },
   "com/fasterxml/jackson/core#jackson-databind/2.19.2": {
    "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=",
    "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=",
    "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.20.0": {
-   "jar": "sha256-pw4Uamvyy6T5zTZxaXh/UK3Pu1cSK8LpyDkM0LOXrDA=",
-   "module": "sha256-oSgvNhZKyQG66p7bULqYE3L/7hjCz7F75CW5s/dYeuI=",
-   "pom": "sha256-zv7+0B3SwNlqiOEBuz4GX8FQBjtJjjAak4xpCwK8884="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.0": {
-   "jar": "sha256-zD3sn7i1ZXR5e/72JkEyVQjw5byWi9JoVoQCgY1Vuq4=",
-   "module": "sha256-ZA8QhiTO8o1t6jJ+KC6eyC9lEhVY5gkcqPuJlfkUpac=",
-   "pom": "sha256-rpwz0EFZBkwZsuq0FIiU+jHxVjW7/lMYzjIp+OFHCcU="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.0": {
-   "pom": "sha256-RH4cfT+o2Skn3L2DjSRGOAXohi9yPM7VENUNrrhPgLQ="
-  },
   "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.17.2": {
    "module": "sha256-eG+CJvp0Tkyw3/M7pt+MLv8kd2PixpwhkP1SesSrrmw=",
    "pom": "sha256-3fwpGHlF2jpkLCK4cP1keg30smJYIK/DXLeldGkWjsQ="
   },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.20.0": {
-   "jar": "sha256-Pq6dtKTruBwzBnq2aDobEpZzF5V/QzxdzsKoWSN8SHc=",
-   "module": "sha256-2gH0D0MTgHgHN4crpPKPY9nySFLjLWXg+kJPtY2KFgI=",
-   "pom": "sha256-n2YSsgn9bSeizmJPneGWtK/jQuakfx1OeXDG23fwmXk="
-  },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.0": {
-   "jar": "sha256-jDIVWXWpNbH3v9Z3ZHvVyM3uErFEuE5EkqRHteoulNU=",
-   "module": "sha256-GLsOOniabs0DmHNhBUEU3jf6hrB98wzeKuEO2L3LFgw=",
-   "pom": "sha256-DPgn58+QwbLF/C2PIXWgKO5ylG1rWN4YL7/ZDlTO1Zk="
+  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.2": {
+   "jar": "sha256-YFX+8QdW6L0bDogHqh2IEzjGPKldWSceHaSSK5oXWB4=",
+   "module": "sha256-cJMXXvltnjxoFL59n5uQeZzGsd/JDqi8ZUVP9byleEo=",
+   "pom": "sha256-u2kaYgtZPgNo7zrOifnc1dY3VtXlvAXdyay3ih/Ny+c="
   },
   "com/fasterxml/jackson/module#jackson-modules-java8/2.17.2": {
    "pom": "sha256-PznFUQn1GiKIF7SxheQ1G57wUBwJ/B4aMHWulUfMLQM="
   },
-  "com/fasterxml/jackson/module#jackson-modules-java8/2.20.0": {
-   "pom": "sha256-jhXY4aWgLsdHIj8j4OSkmv5vZVUERDysO47pkvqWxSU="
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": {
+   "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ="
   },
-  "com/github/ben-manes/caffeine#caffeine/3.0.5": {
-   "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=",
-   "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=",
-   "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg="
+  "com/github/ben-manes/caffeine#caffeine/3.2.3": {
+   "jar": "sha256-ynDJCl0c4VEYgM6ck9StIhCPYREdPa+R61J2K1cb0Xk=",
+   "module": "sha256-jZo7mA6b1wQS7jObJFYxNhezuK4uhon5s8vwZAzVjzw=",
+   "pom": "sha256-n3BPkIN5e099DB1chV00zSaNVEzwa0KD1c5CiKz8nuA="
   },
   "com/github/hypfvieh#dbus-java-core/4.2.1": {
    "jar": "sha256-Onuf1UOhvpTemQCcNqwYA/CNbRI1dwbI9QQIVTFUadE=",
@@ -1368,17 +1269,6 @@
   "com/github/javaparser#javaparser-symbol-solver-core/3.27.1": {
    "pom": "sha256-pc/rihPH9G7kilI87mX+9KJHrG2ivpnoFKC42ooovVg="
   },
-  "com/github/jknack#handlebars-helpers/4.3.1": {
-   "jar": "sha256-VvCtTe+0RLA4pwio4NADaS3xuRK5EhlzanZN6I/3hnw=",
-   "pom": "sha256-AYv9plPb9sQZG3sF/k7+2KPY1w495wp77RsYim3ibNI="
-  },
-  "com/github/jknack#handlebars.java/4.3.1": {
-   "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk="
-  },
-  "com/github/jknack#handlebars/4.3.1": {
-   "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=",
-   "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU="
-  },
   "com/github/kevinstern#software-and-algorithms/1.0": {
    "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=",
    "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g="
@@ -1413,23 +1303,9 @@
   "com/google/auto/value#auto-value-parent/1.9": {
    "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c="
   },
-  "com/google/code/gson#gson-parent/2.13.0": {
-   "pom": "sha256-bNRgu0Rf977gqbtmJwJkh0RXgCxUGJlFY4IYSvNNFqI="
-  },
-  "com/google/code/gson#gson-parent/2.13.1": {
-   "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY="
-  },
   "com/google/code/gson#gson-parent/2.13.2": {
    "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0="
   },
-  "com/google/code/gson#gson/2.13.0": {
-   "jar": "sha256-jGp0K3T4aaefOfXHjMCZmfmfO2r/YwT87db1Q+J++ng=",
-   "pom": "sha256-AuRJJF3rSlZG8BXOzxEk7lvTe1Ue7YHf0JAVG0Vu/0w="
-  },
-  "com/google/code/gson#gson/2.13.1": {
-   "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=",
-   "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo="
-  },
   "com/google/code/gson#gson/2.13.2": {
    "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=",
    "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y="
@@ -1441,13 +1317,9 @@
     "release": "2.13.2"
    }
   },
-  "com/google/errorprone#error_prone_annotation/2.42.0": {
-   "jar": "sha256-6O9uAxS9CrVZXkJ0t894lkxSVoWCeuX089D+/7TaXxE=",
-   "pom": "sha256-MEn5AqmV9qu6xJm5Q4wv0lS99A7QpzPSqvBEIh3agCA="
-  },
-  "com/google/errorprone#error_prone_annotations/2.37.0": {
-   "jar": "sha256-0ppiY7SNRtTHwotkcXptEFs+Kj5kJWCS+EXo53T8pro=",
-   "pom": "sha256-nBm0OV6yKL6yEJXdMdVa2V+bcnKYNpuShL0jMOi2LaI="
+  "com/google/errorprone#error_prone_annotation/2.44.0": {
+   "jar": "sha256-zWlNRVWHQMkFSQAs/z6PjP+q//Ai9TigS7jQook+EV8=",
+   "pom": "sha256-GPtw0vTOH/dgIV2HIXe4OvqaALTIYPCiMKaMVP55Y6g="
   },
   "com/google/errorprone#error_prone_annotations/2.38.0": {
    "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
@@ -1457,20 +1329,21 @@
    "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
    "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
   },
-  "com/google/errorprone#error_prone_annotations/2.42.0": {
-   "jar": "sha256-8oKmSIg4mGuAM71RiIkoz/alnBBQQmR2VT7SYiuJ5RA=",
-   "pom": "sha256-r9/wIhQuSJ7lRS6KSgiOLdPndkBWSyMj6e+EeHLwbP0="
+  "com/google/errorprone#error_prone_annotations/2.43.0": {
+   "jar": "sha256-SCcudcFuH3vce9GVKcys1e4XBARwHX9aI0QbtYR5V/U=",
+   "pom": "sha256-T2uIia+o3r2+Hj/ipfjmbiIWygtWPya05UE4cw7s3IA="
   },
-  "com/google/errorprone#error_prone_check_api/2.42.0": {
-   "jar": "sha256-d9z8e4mqHwlBREJ9Mw1SAo6Fc/V038kYHBOsmtjRqTU=",
-   "pom": "sha256-E4cgJOTwd9ZEAu6vuZk+auW9GGPDhDJ3MyLj3teUSX8="
+  "com/google/errorprone#error_prone_annotations/2.44.0": {
+   "jar": "sha256-vPc4pSXlRskmojPQoWnPfq/PcD/oGsnWmU9yRO2ikFI=",
+   "pom": "sha256-fmGVkFEuhKKOAjWK3qvn3kureQr2FOhAtAQTlRbeFlc="
   },
-  "com/google/errorprone#error_prone_core/2.42.0": {
-   "jar": "sha256-Ofv13fwqr88MnEfgZNS0MmqZU/PtGX/N1SD3e01k7TE=",
-   "pom": "sha256-B+TX1Nuy8gvyK+ZFOy/aVETo9RQaBTkj7rkcTlEN/rU="
+  "com/google/errorprone#error_prone_check_api/2.44.0": {
+   "jar": "sha256-rFRNsezoAFm1NJU93Ipa/PZUfCCrnBtQC5kHGQOQDL8=",
+   "pom": "sha256-Nl9VFHNSFSwr9syl+uNdspsxDqR4A/neWuRL/k1d+jo="
   },
-  "com/google/errorprone#error_prone_parent/2.37.0": {
-   "pom": "sha256-SmWUVg9cwGyJ2vzEn4spHxJ83bon1CYFliKhmrjWzkc="
+  "com/google/errorprone#error_prone_core/2.44.0": {
+   "jar": "sha256-3K8Higb7HPuj5dRkRIrTDwERB6OdaSQg2YetU8jlnew=",
+   "pom": "sha256-GSe9Wd9Xlv2pXW2z/4rT/y2ioGUmYSGtgLG0mjyS3+0="
   },
   "com/google/errorprone#error_prone_parent/2.38.0": {
    "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
@@ -1478,11 +1351,11 @@
   "com/google/errorprone#error_prone_parent/2.41.0": {
    "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
   },
-  "com/google/errorprone#error_prone_parent/2.42.0": {
-   "pom": "sha256-YolCpNYTZBj92nOUhBcOY4B250E/zJ6E9xutJUvWICA="
+  "com/google/errorprone#error_prone_parent/2.43.0": {
+   "pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA="
   },
-  "com/google/errorprone#error_prone_type_annotations/2.37.0": {
-   "pom": "sha256-69Fv9A5HxZg71f1iL0ym71cWPowYU+OilsOtKUYnUdY="
+  "com/google/errorprone#error_prone_parent/2.44.0": {
+   "pom": "sha256-9v3+0f+Ubr0B9HgCSux5CBz16XbMDY6MmL+GMXOxY10="
   },
   "com/google/googlejavaformat#google-java-format-parent/1.27.0": {
    "pom": "sha256-rOuKJTTBnTBcBY8iq0ffOaDhm3QIWx5MWwfTukXYQlA="
@@ -1532,25 +1405,21 @@
    "jar": "sha256-LIIlzXOyOUOCudABbZJ4oAKRViIkpZTu8AwApqxQvAQ=",
    "pom": "sha256-fqc4xbuppSWxP3KDW9aBOFPZgHMf9Kuiy4uo4OWA7Zg="
   },
-  "com/jayway/jsonpath#json-path/2.9.0": {
-   "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=",
-   "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8="
-  },
   "com/knuddels#jtokkit/1.1.0": {
    "jar": "sha256-FQHOAlmriXxnRsz6+h0gis1AT7F+GsYuFXFy8meLEYM=",
    "module": "sha256-QxxAPs80ROw72ZNJIvNpOf1vCClXmpolySdBmSzVjC8=",
    "pom": "sha256-cfjoMOMzqx9I5NAy7FSiu4J6Zk+crtGlo8h815W+8eA="
   },
-  "com/konghq#unirest-java-core/4.5.1": {
-   "jar": "sha256-hzS58uio16ATB/9TLutw7rPwRFvPimeY2u6fRSjF9uM=",
-   "pom": "sha256-G8IxK1eWPVaavo0VZdyYmXkvsWGaiahuLncZTfBegc0="
+  "com/konghq#unirest-java-core/4.7.0": {
+   "jar": "sha256-vrG2r47OzMOXs83OhvWcLIeSzQmO7mllaYY6bl10l8Q=",
+   "pom": "sha256-HMU/jIc5+Wgzi9DOQU++WbDGc6fB06JQfY+CQizHW+M="
   },
-  "com/konghq#unirest-java-parent/4.5.1": {
-   "pom": "sha256-Op85yzb/PrKGx4BNG2tAW9QdBTlA3mcL6LQuEPfLGIE="
+  "com/konghq#unirest-java-parent/4.7.0": {
+   "pom": "sha256-hflUAkAOOKwySYOxi/sQtwuZQt1V6SpONXiUx4tbw3s="
   },
-  "com/konghq#unirest-modules-gson/4.5.1": {
-   "jar": "sha256-vCLl5VY1vvywEjMmOCqao27fw5+Y2smBloskQ8Myy3E=",
-   "pom": "sha256-2oBvnNCenHShoeLh1IJ9qItegtH8BPzvS1VpU/6oHdE="
+  "com/konghq#unirest-modules-gson/4.7.0": {
+   "jar": "sha256-Vkqs1zMxmn0BtQ/Pg5cvAdhFCFU3JwzX91agvVpOpzY=",
+   "pom": "sha256-5Lh7puKpRzeyuJi+yk9RFgES7LyVRZpLzeXgH8BIzmM="
   },
   "com/lihaoyi#fastparse_2.13/2.3.3": {
    "jar": "sha256-dXipnwkfW7pdj+2IFhn8rZraeU0/N4dWBwrViUPxBVE=",
@@ -1564,9 +1433,6 @@
    "jar": "sha256-B5T8EGEH001xEB6tCzGyxIJzc32JGXu/mxusb/MqtXY=",
    "pom": "sha256-oiq0AqkyzobUAcU3A01FPzeuq1nlJMKIalwgeVB92jU="
   },
-  "com/networknt#json-schema-validator/1.5.6": {
-   "pom": "sha256-e/wlpTWWxa1g1qLRQ+BPC1weA9u2IGjnpl9q3YiCl5w="
-  },
   "com/pixelduke#fxthemes/1.6.0": {
    "jar": "sha256-Lw53pVtUPDjUlpYEFr40sRZzLeNYvG7mtg6ANY9MD9s=",
    "pom": "sha256-srTnPug05l3LuE0XByfksEyI7KemxjIibujuqt0i2vQ="
@@ -1589,10 +1455,10 @@
    "module": "sha256-9Lg+E7Rr8Q9cccDL82M54X4ttXZwDaNElfulX063g24=",
    "pom": "sha256-hwO2W8qKgsj6H3DHt4FTtAx5FrKQUS/PmA5/IaZQpzc="
   },
-  "com/squareup/okio#okio-jvm/3.16.0": {
-   "jar": "sha256-xzfANcpnUYe/EaZ925WBlUvw1cqfPgSOg4syZ88ytcM=",
-   "module": "sha256-h5N9uN2s/m54G1UOVcRgEvRtuvEggD2phbshf0eXWJA=",
-   "pom": "sha256-UZpRemxp4bmF6BsNm3XT3kWjg4aI46CUjnpTYeVHOPM="
+  "com/squareup/okio#okio-jvm/3.16.4": {
+   "jar": "sha256-IZa5k800272Rnn4B9XpHgbWL7oD4YQYWPih8IDQ6lqc=",
+   "module": "sha256-kAjVopVKBoxoSCdPbuvf9IsUpw28aT0zAuCMVwzKAy8=",
+   "pom": "sha256-ZnePTQWXvOY/kewADFdcwCmzIB990JLLgIh1FVs+hqE="
   },
   "com/squareup/okio#okio/3.15.0": {
    "module": "sha256-EWgmBmzrTTM2p05xcqM3UWF+w0S8UKNPmbDSSVmko50=",
@@ -1741,9 +1607,12 @@
    "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
   },
   "commons-codec#commons-codec/1.18.0": {
-   "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=",
    "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4="
   },
+  "commons-codec#commons-codec/1.20.0": {
+   "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=",
+   "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys="
+  },
   "commons-collections#commons-collections/3.2.2": {
    "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
    "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
@@ -1752,12 +1621,9 @@
    "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=",
    "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc="
   },
-  "commons-fileupload#commons-fileupload/1.5": {
-   "pom": "sha256-zHIPHgWDV52f5Tk8iE7kbQ10+Z0fm6AXsXKzHqGJ4rE="
-  },
-  "commons-io#commons-io/2.20.0": {
-   "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
-   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
+  "commons-io#commons-io/2.21.0": {
+   "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
+   "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
   },
   "commons-logging#commons-logging/1.3.5": {
    "jar": "sha256-bXp0TkAnZJ+7UIld+Ul9EJ+Yx2amNwYv6NLqu7MUC6Q=",
@@ -1857,81 +1723,85 @@
    "module": "sha256-hYXA4tg94OvQdHoIYgHVFkocGMac7CNkOzKInK+nplc=",
    "pom": "sha256-usoMboDZwvbgb1ZjNVPJL+gECIGhPJ1jCdOtCbHFQAI="
   },
-  "io/github/classgraph#classgraph/4.8.181": {
-   "pom": "sha256-kj4br0msZAeQ30WHuMz0AfYG8L/HBZZh9xhVG2Jw8Ug="
+  "io/github/classgraph#classgraph/4.8.184": {
+   "pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA="
   },
-  "io/github/darvil82#terminal-text-formatter/2.2.0": {
-   "jar": "sha256-MfiZaC/y+NgogMWn41JR2fxoLJ5ZDbJcJyD/U0sTz1Q=",
-   "module": "sha256-283Z1+Tg06hSf1y3YdrCOyoQsdyf9gjUVFSSW/t2mk4=",
-   "pom": "sha256-f0eR6KhW9qojX3wmNptBqcAqOQUWBmsc9jF+wqH6L1o="
+  "io/github/darvil82#terminal-text-formatter/2.3.0c": {
+   "jar": "sha256-fmV4AIRX4Ztj+ovcIdMX+KNjTawswCGqVWgYr/zWjqg=",
+   "module": "sha256-QQEFGQh1NP7lkfhnQsF9n68nrICcbAPTE8qC8vTsAy8=",
+   "pom": "sha256-CGo8cNJRD5xXify/nwO9t9VclCv54BfuLrbSp8d5Dnc="
   },
-  "io/github/darvil82#utils/0.7.1": {
-   "jar": "sha256-ifcK6Ss6PJLm27m+PJHCjJSfSjmhfEvmbMJmPMl2GHM=",
-   "module": "sha256-Xv+x8FagR3nDzKTzrDi+rGqugjUyK+IF5nE44j0ccsQ=",
-   "pom": "sha256-/fFozhF1Mtmmu/IbpLr6kUuCc3Yhs/ACfdsIrDrXPR0="
+  "io/github/darvil82#utils/0.8.0b": {
+   "jar": "sha256-fjFIIzSX3MQMq/r+/NbWS9OQQQTQ74PwfIXMZiqmJHA=",
+   "module": "sha256-yQ3Zxs48wjBo4u23xXMR2wEZMOn/kDWABuf5cXHBAzw=",
+   "pom": "sha256-6T3YGIOl4gLoGhBjyGTrUBVajl6tT6a295eorLSR7wg="
   },
   "io/github/eisop#dataflow-errorprone/3.41.0-eisop1": {
    "jar": "sha256-EENPuk5T9V+px2kEzeQUuRiTJUjJ38Ti1jSsBf96fRA=",
    "pom": "sha256-I/HN+kYTwAzG6lyfU2DhRxtEn4JjPxPPX/bNs0+jHr0="
   },
-  "io/github/java-diff-utils#java-diff-utils-parent/4.15": {
-   "pom": "sha256-CefUSnz6GbxrI8rRTsCkHzKuC1l/Dias6RkW/cK7XII="
+  "io/github/java-diff-utils#java-diff-utils-parent/4.16": {
+   "pom": "sha256-pDRNpY5TqOjFe+Gekjut8ksn3UKwfebURtKmWaRWUJo="
   },
-  "io/github/java-diff-utils#java-diff-utils/4.15": {
-   "jar": "sha256-lkxp46I6iS2yd4rmgGqh1C+BIwAyvY5JgtyGIFgu5rc=",
-   "pom": "sha256-Gt8qYOhitxqmlKPo5qiIqjU/r/UFlHfrv9yrzTo/+S4="
+  "io/github/java-diff-utils#java-diff-utils/4.16": {
+   "jar": "sha256-YgQDAw1nakon94CjrOx0ON7hsWUaHIBPprsRuwc5mm8=",
+   "pom": "sha256-Q01Zih4YExEThSNRYWJ6TE69YhNPcFRCjT4gKzLPOd4="
   },
   "io/github/stefanbratanov#jvm-openai/0.11.0": {
    "jar": "sha256-xPzxC/BQ198fJ6UNBE+H3nDEmbt7MTDJeoWkuhAPDy4=",
    "module": "sha256-ZGQms3XvHPIxNpJDGVsdgcBV5OKcG+BDMGjYAZ1RLAc=",
    "pom": "sha256-NU6HjGIom9LFsjtidmUGBJESMU+mFS7J+XpTuzOb1n0="
   },
-  "io/github/thibaultmeyer#cuid/2.0.3": {
-   "jar": "sha256-qk6RPsJ+ucuZkXcx/LeZ57WueMDcPz6QOPBwf1pasrY=",
-   "pom": "sha256-AF9eKRgpy68hc7p2BUcJWRMo4uhHGES+6oayyu8DDwI="
+  "io/github/thibaultmeyer#cuid/2.0.4": {
+   "jar": "sha256-ThsaAKO3aVlMjY9dp61WmqhnqBuHWo54b6wEqBnriAc=",
+   "pom": "sha256-PLCprpRMOMgu60mgVm+2lxpBWnmaOgjUKeACNxoAdH8="
   },
   "io/zonky/test#embedded-postgres/2.1.1": {
    "jar": "sha256-txrgUlEpZ+o6CuOJgIkvgFdza67C96nrhRaQrUlAzis=",
    "pom": "sha256-utspdh18ivb3Gkl0tpY9mgocG51daf3oFjfGsfZGjGs="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-bom/17.6.0": {
-   "pom": "sha256-n0HACqk5C+WZYlGnbZ9XwV5ZqY0ETc9XUNdjfm3105Q="
+  "io/zonky/test/postgres#embedded-postgres-binaries-bom/18.1.0": {
+   "pom": "sha256-rM8WPQuBWwALzewhj8l/OTN4RS+Xcyfwcr1BQ2CYmeE="
   },
   "io/zonky/test/postgres#embedded-postgres-binaries-darwin-amd64/14.19.0": {
    "pom": "sha256-FLhurgoE1tG4h5+5GjsmGGM7HiwfDBwapJq/RZijHX4="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-darwin-amd64/17.6.0": {
-   "jar": "sha256-8dbTmJbKSOZdbby0ktgJ3w1JUsZSmd6K9uCNIgjq4+A=",
-   "pom": "sha256-7gS39XfUDVoOTtm3sANATtRSX3TKCszZT7gRS5O4i5U="
+  "io/zonky/test/postgres#embedded-postgres-binaries-darwin-amd64/18.1.0": {
+   "jar": "sha256-O08W3PVyUNj5xeknCn38OSG2bWZTTQD482boJj6GLRE=",
+   "pom": "sha256-rBkS1B68++ESgiKFkkG7ELadGDhPfgBPaLTILr+mHxY="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-darwin-arm64v8/17.6.0": {
-   "jar": "sha256-6H7jZ2fe5PAPgp16UuSiFuL96+WTTFaDcwlAqr5XByE=",
-   "pom": "sha256-ATLl5guk2rgiPRTwMx81pCjI/w+iJCGUBCqtE55zpQE="
+  "io/zonky/test/postgres#embedded-postgres-binaries-darwin-arm64v8/18.1.0": {
+   "jar": "sha256-c5jGwZ0RWUqUTcDdx5/bthEWQxLh9QmoyGsJckAnQB4=",
+   "pom": "sha256-ser0IOUIpYaYvlHyg49iL9tTi/n8t1HAkFFbosX7K8s="
   },
   "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64-alpine/14.19.0": {
    "pom": "sha256-iljFNphFYXpVHn0f2erjjceSL6agTBunS7j7m2SafjM="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64-alpine/17.6.0": {
-   "jar": "sha256-hYS8angY6WNE0pFzNGCh/suY8TPf1766lfxX5LAvBGI=",
-   "pom": "sha256-O2TRvK6S2WwNHULK+x+GtpLPaHx6GTRQKzT3PJQAmG0="
+  "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64-alpine/18.1.0": {
+   "jar": "sha256-hF5IIlr+QE1RVhCCM/7qdGJTIy8cLiF/7RYoYmgCEgk=",
+   "pom": "sha256-ZQaVEGjghW12eNoDjSw3FTeUBSpqYH9mF9Yy6r3XINs="
   },
   "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64/14.19.0": {
    "pom": "sha256-JNywnlVuwoQ7x7bTR7U11r3Q80xqu8Rjq9fu9cIeJP0="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64/17.6.0": {
-   "jar": "sha256-I9paBEtPt6WggaRQCMlXSchzMFMo1z+Grv1Wkizh0p0=",
-   "pom": "sha256-DLyVzA+fPMGdkjprqaHcN9RKcRl4nzaeBlYdyb3K2dU="
+  "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64/18.1.0": {
+   "jar": "sha256-ZdByPgJ0rT7GIw3L3+A0r27glvzhWnew+bi+cdJwKTQ=",
+   "pom": "sha256-md4tr9pbBzQ5vbmv6tSUyGaFDBAsYNBxsmXsNJymCVk="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-linux-arm64v8/17.6.0": {
-   "jar": "sha256-hEJ+pUpSOCR5JO87D5QOfQJ+WHYPGdcyUkLlDSL6AUo=",
-   "pom": "sha256-pI2qmGIcvwgtc+61g0GRW73K8g/m92m1qzGo6QCsecc="
+  "io/zonky/test/postgres#embedded-postgres-binaries-linux-arm64v8/18.1.0": {
+   "jar": "sha256-6g8Wt1T8ChDZ2Jk7vUJsIPjHCbMYso5JtC2crByVi48=",
+   "pom": "sha256-5GI/jei/YOFy1FXK3cMcEeaCI/KAQWoctUCQoApBsJE="
   },
   "io/zonky/test/postgres#embedded-postgres-binaries-windows-amd64/14.19.0": {
    "pom": "sha256-MeCJzI5PDPreCd3t6paoqbUi1wuGudsEzs3iAy504To="
   },
-  "io/zonky/test/postgres#embedded-postgres-binaries-windows-amd64/17.6.0": {
-   "jar": "sha256-yR05ttuRz4gR47INlB50oDluJ3Nghzgh2qtHzbTBKCw=",
-   "pom": "sha256-rdf2XFadF1hvicGy2AbRpU0Ma0agSxWNEW+gvrpOirI="
+  "io/zonky/test/postgres#embedded-postgres-binaries-windows-amd64/18.1.0": {
+   "jar": "sha256-Cn6VFmDLvuPzgvi0Syw64mxKF4F8Opct7jN4yA/Jsjs=",
+   "pom": "sha256-3N1luh4SY3a714teD9HrmjETd0M32Xcm1R+xUHnABiA="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.3": {
+   "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=",
+   "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg="
   },
   "jakarta/activation#jakarta.activation-api/2.1.4": {
    "jar": "sha256-ydtSEAzmyKrJXMOQdflXINLlYbEfgFG4HBIa1O/9cAQ=",
@@ -1951,8 +1821,9 @@
   "jakarta/platform#jakartaee-api-parent/9.1.0": {
    "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
   },
-  "jakarta/servlet#jakarta.servlet-api/6.0.0": {
-   "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk="
+  "jakarta/servlet#jakarta.servlet-api/6.1.0": {
+   "jar": "sha256-ijH0ZfNZO/I1FTGlyVIBTrg52pamBbWCW5PdVHFMSMQ=",
+   "pom": "sha256-G6+Lb6bQIYAwINCXDqQ/sH32beZskNKZohZ3Dwsz5K4="
   },
   "jakarta/validation#jakarta.validation-api/3.1.1": {
    "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=",
@@ -1972,6 +1843,7 @@
    "pom": "sha256-T2Jvmnj4adPssUuUOjXlmas8psJZx1SxDwbfvKXWwGk="
   },
   "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": {
+   "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=",
    "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4="
   },
   "jakarta/xml/bind#jakarta.xml.bind-api/4.0.4": {
@@ -1997,22 +1869,19 @@
    "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
    "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
   },
-  "net/bytebuddy#byte-buddy-parent/1.17.6": {
-   "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0="
-  },
   "net/bytebuddy#byte-buddy-parent/1.17.7": {
    "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
   },
-  "net/bytebuddy#byte-buddy/1.17.6": {
-   "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4="
+  "net/bytebuddy#byte-buddy-parent/1.18.2": {
+   "pom": "sha256-1Ar3bB/A//KEcLWpG9FXIq0zBre6H525Z6ZfkEgBmXM="
   },
-  "net/bytebuddy#byte-buddy/1.17.7": {
-   "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
-   "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
+  "net/bytebuddy#byte-buddy/1.18.2": {
+   "jar": "sha256-9VsUX0yq2pspQ+SXYuoxcbAlmcTH4jD7qK/GakpRNd4=",
+   "pom": "sha256-jdLkoXMfilQMRQsvHpHMKJ3SDHL7BYvcI77Gk6i3Ao0="
   },
-  "net/harawata#appdirs/1.4.0": {
-   "jar": "sha256-5ImfxeiiZ9P4LUl+4BtIEKSxUCPnqBrwqlR5HFe8bBE=",
-   "pom": "sha256-CRqldjaf1HheU2S2BqFS3Mp4x/e3hMuMxwyWwzDk44s="
+  "net/harawata#appdirs/1.5.0": {
+   "jar": "sha256-Zf7OLgUQObfTnWpQmq3LE2qahtmH3YRHN5Eog7NXeOs=",
+   "pom": "sha256-2Yn1w5+5rAGUFVYdGkIIfHpeL3dY7gHm4S0YJ6FaRWk="
   },
   "net/java#jvnet-parent/4": {
    "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s="
@@ -2035,12 +1904,6 @@
    "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
    "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
   },
-  "net/javacrumbs/json-unit#json-unit-core/2.40.1": {
-   "pom": "sha256-fQRVja+97tYnCxaDBh2k+nj76qhlAgQ9IeRldagofhE="
-  },
-  "net/javacrumbs/json-unit#json-unit-parent/2.40.1": {
-   "pom": "sha256-GgCNCnykEDwm/lGk3ott86W5KGQZHNGLGfEBumF3yZQ="
-  },
   "net/jcip#jcip-annotations/1.0": {
    "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=",
    "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc="
@@ -2049,12 +1912,6 @@
    "jar": "sha256-7+iqots4OhUeMYgQQAgEw5kr3lQ+dKTXLeon7VR0yvo=",
    "pom": "sha256-HxvbdkwDDZ3Q3MGAxHfDKgtwRuK6GDmAsSJXVeLegZ8="
   },
-  "net/minidev#accessors-smart/2.5.0": {
-   "pom": "sha256-VJelxIYeWCxm5xyHzFppgtauiz4hSUersbl7l70+HAc="
-  },
-  "net/minidev#json-smart/2.5.0": {
-   "pom": "sha256-wyo2YQmypaNuoA4SGqolfa5W7jqbl9JEI+YzteIUVGY="
-  },
   "net/sf/jopt-simple#jopt-simple/5.0.4": {
    "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
   },
@@ -2106,9 +1963,6 @@
   "org/apache#apache/27": {
    "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
   },
-  "org/apache#apache/29": {
-   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
-  },
   "org/apache#apache/31": {
    "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
@@ -2157,9 +2011,6 @@
   "org/apache/commons#commons-parent/47": {
    "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
   },
-  "org/apache/commons#commons-parent/56": {
-   "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ="
-  },
   "org/apache/commons#commons-parent/65": {
    "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424="
   },
@@ -2184,6 +2035,9 @@
   "org/apache/commons#commons-parent/88": {
    "pom": "sha256-i/cmFQ0dakO6CqkgYOVSkzyvKHOqGTlS2dSWRw+p+9g="
   },
+  "org/apache/commons#commons-parent/91": {
+   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
+  },
   "org/apache/commons#commons-text/1.14.0": {
    "jar": "sha256-Eh/OIoKRDI8MO6eTpUNrMb63EEI8vi1XSj+3pzxQjpI=",
    "pom": "sha256-XIDoFE8iu0fay2QvZEYEGOslPwsboD6xQTwvNvChiAU="
@@ -2232,37 +2086,37 @@
   "org/apache/logging/log4j#log4j/2.25.2": {
    "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
   },
-  "org/apache/lucene#lucene-analysis-common/10.3.1": {
-   "jar": "sha256-NrXrYms/FsUG407H0UNjuEF9Jjm+XArrtZD7F1guihw=",
-   "pom": "sha256-hQC5/Dm/I3gfomccaDWh63wbz+cn4KsE68wVnExYDYY="
+  "org/apache/lucene#lucene-analysis-common/10.3.2": {
+   "jar": "sha256-FAPg3yA6kDdigBW82cpGz6iZQwvfuTk3TM7MNM3N9Gs=",
+   "pom": "sha256-RFxi6t+4yBF2WvOJW10AjOHEGV8A0k14fb5rBAmUXQI="
   },
-  "org/apache/lucene#lucene-core/10.3.1": {
-   "jar": "sha256-z2tig+D5vZL55NSapzr7cNvQd0L0U6lalk10XGtbJF8=",
-   "pom": "sha256-VTfn4AA0Bv+5TeeDrlPsm3tuMDrPL0uTrsR99zewnYE="
+  "org/apache/lucene#lucene-core/10.3.2": {
+   "jar": "sha256-yDWjzCfNVywsjZN3HFOt/pe8EeGrzDU7h6XSkPigGgg=",
+   "pom": "sha256-td+QeIHDN+zTDEne3DXsQKbhFB9vxXZj40xTZltRHC0="
   },
-  "org/apache/lucene#lucene-facet/10.3.1": {
-   "jar": "sha256-zzcjGJ04LUUVwh9XZAmLq9lz1gsOj1LTfUq7cUc+hlU=",
-   "pom": "sha256-n+hhDvAqWMllXfF2Ggpu2R5Ir2qr5aBr+WXEY3QGOsQ="
+  "org/apache/lucene#lucene-facet/10.3.2": {
+   "jar": "sha256-nOtAGQ517KUKJ9+AxdEG1/J/EfyfljMbGJO+AX0SPSA=",
+   "pom": "sha256-3cTnSs8dvN6VjuE2JpYmlPz5mp3sroB0hn+wDxgCQnc="
   },
-  "org/apache/lucene#lucene-highlighter/10.3.1": {
-   "jar": "sha256-vfimmf9u/v+uQ5OpmKw4swRCXQ2ADTCyUUXaeG7IyUs=",
-   "pom": "sha256-6SadgF00HhRa3ct7vehKeZanjdRAcsv/lQGhNpdCch0="
+  "org/apache/lucene#lucene-highlighter/10.3.2": {
+   "jar": "sha256-2cQ1TowJtGXl+eEbEF+ZvSdIHw2G7F4j4dMhS7KkPAk=",
+   "pom": "sha256-6ldRQrgiuKeH86mdBUt/LuGB1W/SnbkEU7xsfP95ee0="
   },
-  "org/apache/lucene#lucene-memory/10.3.1": {
-   "jar": "sha256-5D3dFNUJrAZGrRAzPoyKHz8FiBA+U02lL+B7tVS+1BQ=",
-   "pom": "sha256-b3eFyDk4wNjZZcr74rD2a7bzUDGNhFh2Bflk79JcLYQ="
+  "org/apache/lucene#lucene-memory/10.3.2": {
+   "jar": "sha256-Z9BTRXkdAS4dchiXM6dsl4hwKzVRBk4eqs5nU6olW6g=",
+   "pom": "sha256-9LnJkx+9O668bBANGZHnr4RG+CN5uxxpxYvZGZ9VW+M="
   },
-  "org/apache/lucene#lucene-queries/10.3.1": {
-   "jar": "sha256-K+r6yPjuQ7V2bc+tussZrS8UyKoqLgcq7RuaGCGcigc=",
-   "pom": "sha256-OYgGHbKmpAnKDF5tdOI20g4f0753G6nULyiym6K5ylg="
+  "org/apache/lucene#lucene-queries/10.3.2": {
+   "jar": "sha256-RfmJTSqj0UOnmpgPqUHXL3M7Tr1L5mwLGnnUKOag21c=",
+   "pom": "sha256-qzsGG2eHRGEvrp+NBv4Nkv8a82eQsxa6vnoZUkcwa8Y="
   },
-  "org/apache/lucene#lucene-queryparser/10.3.1": {
-   "jar": "sha256-YbJ79QsAqz8WvlKdEUIbgc/XxY1HVrHhMIxhpE0TynQ=",
-   "pom": "sha256-sNvV4DfnjLElQMV/LxlMZODm5yDb1bPRiVnHktCNVAc="
+  "org/apache/lucene#lucene-queryparser/10.3.2": {
+   "jar": "sha256-drlQ7T09TTlFYYoL5238XZ7pDiT483SK4Hdcjb3z1rg=",
+   "pom": "sha256-7ccAzTciiDsJdedvqmXEv15FmPG5xDUKbK7YEZrMKFA="
   },
-  "org/apache/lucene#lucene-sandbox/10.3.1": {
-   "jar": "sha256-CNvR32RMJaGoZ94GMQEKDV260bRyzTiRhNQ6diWF02E=",
-   "pom": "sha256-irB7zsHTwL9NfQU7yIS3+gupQPwqe8p+TqPuNNCMQ20="
+  "org/apache/lucene#lucene-sandbox/10.3.2": {
+   "jar": "sha256-ZwtxPSCWFemSBsQZ0Zu1pTMCXWf8tuQOJgBrKgnmIFE=",
+   "pom": "sha256-LCHL5A4z1/md9scSZepoqd+rO61+kjcxynggTmB+2xk="
   },
   "org/apache/opennlp#opennlp-tools/2.5.4": {
    "jar": "sha256-Xv7bJtDpflNweo0vDi4o8F/PZU/OKjP4v+EcLUwqT+k=",
@@ -2271,24 +2125,24 @@
   "org/apache/opennlp#opennlp/2.5.4": {
    "pom": "sha256-Qz0Ic+wnz+Gxog6mQ3c6LymkCh/eobtdGCiy81NQwps="
   },
-  "org/apache/pdfbox#fontbox/3.0.5": {
-   "jar": "sha256-6KYr4t8noNRBkbZmnAsY327+UnEjLbjcuHRdXZd0dVs=",
-   "pom": "sha256-I/bas9ldDvUDM8n3ZZp0ChCwYZ3eEXbqYtyLSTU4jr4="
+  "org/apache/pdfbox#fontbox/3.0.6": {
+   "jar": "sha256-egn8sMYw5HGsJrNHykWg2K71qWnMWa6/8cV/6SKT4rE=",
+   "pom": "sha256-RP18HBKL1r/1Kj9kvHiIcQD6zS5J8rJoGGMHfGdoFa4="
   },
-  "org/apache/pdfbox#pdfbox-io/3.0.5": {
-   "jar": "sha256-bfPztNtP1V71AoR+pOTrxY4okIgA6G6rAxNF7+IZtwU=",
-   "pom": "sha256-NVvL5DdA/CEouNwRUQsTutOrPcet1Cnjt0q72WA3iVc="
+  "org/apache/pdfbox#pdfbox-io/3.0.6": {
+   "jar": "sha256-GR6sY3Vv8NvIQeOX6Xz6DL39JRWXLWDvVjmgqohKfkc=",
+   "pom": "sha256-EClai3kj970whlODleHVo/XLQ/503tNMsHwy97P0X4U="
   },
-  "org/apache/pdfbox#pdfbox-parent/3.0.5": {
-   "pom": "sha256-HKnfIMk56uhgJQonn+oCoRzdK0DkJa2Q0M5Ma3d8gpY="
+  "org/apache/pdfbox#pdfbox-parent/3.0.6": {
+   "pom": "sha256-EdzNtSovFEpIui+89npGrcTaN5JZQ/xNkhLfiSMxqN4="
   },
-  "org/apache/pdfbox#pdfbox/3.0.5": {
-   "jar": "sha256-8OXToeVzxwfk+8wu6OQuqModUmG9yzoFoI0hGFU8Hlo=",
-   "pom": "sha256-oFmNxJdGm9W/HEjFubAmcqJlaQG435sfG6pJy3huZYM="
+  "org/apache/pdfbox#pdfbox/3.0.6": {
+   "jar": "sha256-h7kSK3j1If74PigG2Y5+SD4Enwh+piZ7ctMZ9nIBkQE=",
+   "pom": "sha256-PkOO4NLXVJ0IVPDy5LJnWK699Ocv1JMTSafHLzPI1S8="
   },
-  "org/apache/pdfbox#xmpbox/3.0.5": {
-   "jar": "sha256-AXiZsvtcKvcU0wxSzKks3o8SmZq/MUDU8NXxEzT2L90=",
-   "pom": "sha256-E6MTEo+lkzyjcj8gwYKO5oJUHRRqX7BK5JtXoqYFC4s="
+  "org/apache/pdfbox#xmpbox/3.0.6": {
+   "jar": "sha256-ATRBZTxgKBTu5Bo82DBeBlCHQN5/u/dRxTR/o8TSJ/g=",
+   "pom": "sha256-LwFS3KrhAotX9y88wYUreM/4KNMNEtwefwuh4cGi9XY="
   },
   "org/apache/velocity#velocity-engine-core/2.4.1": {
    "jar": "sha256-HBkVfRFx1WAIjkhb6XyTp6L36fVuUX8KMCc8XDnfYjE=",
@@ -2348,9 +2202,6 @@
    "jar": "sha256-pr01xTjPkP/5Qa1iWMQMCPygtcnD9TbGVxFPJ84FJ6c=",
    "pom": "sha256-NcnhYgmychJhNU6K6pcWJmSK2dQgHSIb2WkB2QA3LaA="
   },
-  "org/eclipse/ee4j#project/1.0.5": {
-   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
-  },
   "org/eclipse/ee4j#project/1.0.6": {
    "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
   },
@@ -2363,84 +2214,12 @@
   "org/eclipse/ee4j#project/1.0.9": {
    "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
   },
-  "org/eclipse/jetty#jetty-alpn-client/11.0.24": {
-   "pom": "sha256-4ChUPNXWBpMyzMepXiaeCUfgUWY62QK8CRmkbgxrfSk="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": {
+   "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4="
   },
-  "org/eclipse/jetty#jetty-alpn-java-client/11.0.24": {
-   "pom": "sha256-EXzXCLo3u6kMVwaD9v3LsY9IPiDkpOj0QhRT/JP47a0="
-  },
-  "org/eclipse/jetty#jetty-alpn-java-server/11.0.24": {
-   "pom": "sha256-jq2POCgEbXoevHVoT2OTaLdhQ51Ru19sgiCscdMJ33o="
-  },
-  "org/eclipse/jetty#jetty-alpn-parent/11.0.24": {
-   "pom": "sha256-OEfidTdZ+GkaIo2c8dddJPcwJG4J3FL/8b0r0PTbnVc="
-  },
-  "org/eclipse/jetty#jetty-alpn-server/11.0.24": {
-   "pom": "sha256-Kl+OKVd+qPdvkUmX9VOPjofcGYeJef4SC+UFRtsUoUg="
-  },
-  "org/eclipse/jetty#jetty-bom/11.0.24": {
-   "pom": "sha256-OzjVNA/7MaYiymePR8K2Bawg6lhVJZ84Xm0ujyfs1dk="
-  },
-  "org/eclipse/jetty#jetty-client/11.0.24": {
-   "pom": "sha256-u68OEXqGWPInb/qKEbdVywctM1NQWvsKPk7BpkzkbP4="
-  },
-  "org/eclipse/jetty#jetty-http/11.0.24": {
-   "pom": "sha256-/lve2cVDbsrkT438v4Rw0O96qj/U1nAe+oEuV4EOeP8="
-  },
-  "org/eclipse/jetty#jetty-io/11.0.24": {
-   "pom": "sha256-vTPGW6IaAznasQRHEZ9yPb23L7mSM0AHjtTT1ZVTkwc="
-  },
-  "org/eclipse/jetty#jetty-project/11.0.24": {
-   "pom": "sha256-9miJ0dIX26PbBfSwXOwksKIg1PHRbFLSA9m2+3HaYIY="
-  },
-  "org/eclipse/jetty#jetty-proxy/11.0.24": {
-   "pom": "sha256-NaAFoAOnCQTDSyp+GfgdI71U25KBjCEfYsTiInDyGys="
-  },
-  "org/eclipse/jetty#jetty-security/11.0.24": {
-   "pom": "sha256-NeCJ1jkTMrp34adpkgnU7j7zlq0pkmWDWt4tm/0Esp0="
-  },
-  "org/eclipse/jetty#jetty-server/11.0.24": {
-   "pom": "sha256-5yEko9Ho+3DaG1JY4VQrgB/+sDOqExYB2hH3lLQpj1Q="
-  },
-  "org/eclipse/jetty#jetty-servlet/11.0.24": {
-   "pom": "sha256-3uiUnisDmOn03P7p/2yS86l4qZd3aF1i6MheSx+7itg="
-  },
-  "org/eclipse/jetty#jetty-servlets/11.0.24": {
-   "pom": "sha256-gbRgsSDWSrntgs0oDfrdtb4om9P6V2M6D4/1e6R1HoQ="
-  },
-  "org/eclipse/jetty#jetty-util/11.0.24": {
-   "pom": "sha256-7ro8qZy7kyAEbuNm6V3wzr8vEQciaPRcouvj4iO2m8o="
-  },
-  "org/eclipse/jetty#jetty-webapp/11.0.24": {
-   "pom": "sha256-Y9pNCE6Eb9AtbJpCi8zGYK+hxb17wkfsIfFsN6cWaBs="
-  },
-  "org/eclipse/jetty#jetty-xml/11.0.24": {
-   "pom": "sha256-JXNlZfHw0Et42x+ZH449AZRmgAWbwqhXauRd7pJu8h8="
-  },
-  "org/eclipse/jetty/http2#http2-common/11.0.24": {
-   "pom": "sha256-aEwrliRzkYCfzaIEvCz/NqLyc7LgCLlDxs6QTrmkCsE="
-  },
-  "org/eclipse/jetty/http2#http2-hpack/11.0.24": {
-   "pom": "sha256-4N056ZrPI6FKjnFfmLf5Lxe6AgVMJuI4XOXEm85i4jU="
-  },
-  "org/eclipse/jetty/http2#http2-parent/11.0.24": {
-   "pom": "sha256-H/63MlEaizavZ8nPMV5XckiQjy/U8WLyxVezUjFsBis="
-  },
-  "org/eclipse/jetty/http2#http2-server/11.0.24": {
-   "pom": "sha256-e4PC3DueupOTnXmCIU9A++tU/iean6/NAb9Me0dVdE0="
-  },
-  "org/eclipse/jetty/toolchain#jetty-jakarta-servlet-api/5.0.2": {
-   "pom": "sha256-g+y5PmHWvZyMgfwlzcrUp3ONx7LAiCnRcihj7kaaSIo="
-  },
-  "org/eclipse/jetty/toolchain#jetty-toolchain/1.6": {
-   "pom": "sha256-RVY/EXXZhZwcBmoJgPvbn2u0xtPBLgXYlXm7F4P0e2w="
-  },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/7.3.0.202506031305-r": {
-   "pom": "sha256-EuCm1BYOBfIGFJVPhMPmemiCdBhQJTysHHTj+5nXmjQ="
-  },
-  "org/eclipse/jgit#org.eclipse.jgit/7.3.0.202506031305-r": {
-   "jar": "sha256-xMTho+sa/p3Gqck7HIkG6qq5panNtcld5MyA7/TKDcE=",
-   "pom": "sha256-vWj77cwn8P6jA6dOS4JFmyRaL8IR0DZDrda/XpxYVyg="
+  "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": {
+   "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=",
+   "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ="
   },
   "org/eclipse/lsp4j#org.eclipse.lsp4j.jsonrpc/0.24.0": {
    "jar": "sha256-dyFXLoSdTzWbRu3lXVYEuYL/SY0NkuvHDhgCn1mCPAg=",
@@ -2459,10 +2238,10 @@
    "module": "sha256-R0PuegFqASpt8zzShzaiKv7nhN6qOoO5X8YWqNg+VBw=",
    "pom": "sha256-b3He3vgo4AGrCr+l2+15Adgd9Uzo58ea0kQ8fqkZR0E="
   },
-  "org/fxmisc/richtext#richtextfx/0.11.6": {
-   "jar": "sha256-LRL3kNssLeNdILgJDljhhPjTD9R2GwCO7l7yWODuD78=",
-   "module": "sha256-+KGPzb69jD/3+NUqg7/TE/H0LZRl33kDUKQgfIx7tWc=",
-   "pom": "sha256-jVYX1QxejiqosXXT8HDenZxOWn7jgJkSI9dJVyE5p60="
+  "org/fxmisc/richtext#richtextfx/0.11.7": {
+   "jar": "sha256-wmNVhtS6mjWou/X6N79afaNfsQ3Ylq78Z+u/hGCLmMw=",
+   "module": "sha256-hAX8CTISsp0PWhnk5JnRdca9bGoaW2lQH5xWRiCPRxo=",
+   "pom": "sha256-1mQ2pXSpvod9H3jLPWa5TLKXLGBynj4tSONRk4LT4Og="
   },
   "org/fxmisc/undo#undofx/2.1.1": {
    "jar": "sha256-25cIxYqOLbRX+9Z/BRXkqVlVygsLj06no9y7/L0Z0tc=",
@@ -2484,6 +2263,7 @@
    "pom": "sha256-5o1kXUXO91e5efhO+z/BMupcwMrGjITyoLu7E2SDfQk="
   },
   "org/glassfish/grizzly#grizzly-http-servlet/4.0.2": {
+   "jar": "sha256-OCI5UYe3scXFk6WM7MrI6DG//zEnqefH13GY+DZ5NrE=",
    "pom": "sha256-uRIINv8LSwQN83kziX5780xw4vcBqdVGYvos4izeo2w="
   },
   "org/glassfish/grizzly#grizzly-http/4.0.2": {
@@ -2496,29 +2276,50 @@
   "org/glassfish/hk2#external/3.1.1": {
    "pom": "sha256-Q1ET1J40IK3AYKMJqt75EHphOYgdgpRHhj7WWYygF48="
   },
+  "org/glassfish/hk2#external/4.0.0-M3": {
+   "pom": "sha256-h4t5Hl6qPIcE76MFUNGl5XF9yA0xS+a8szPMBWgC3WM="
+  },
   "org/glassfish/hk2#hk2-api/3.1.1": {
-   "jar": "sha256-rBTZKRCsU5UFtMDHKrbF91eqEqQ7yI0TpbyfI7GHBis=",
    "pom": "sha256-cZcycKIuCVh3fXK8+0SqW7wcpsoiIHm9XxfLlyEfbpg="
   },
+  "org/glassfish/hk2#hk2-api/4.0.0-M3": {
+   "jar": "sha256-ZvhZkW5qfeNiKXOs9/ZyqJXJusgWIggN+7laybAhsfg=",
+   "pom": "sha256-2ldYwcrGDJCVjWfLuaP++EZVE7gyTvQ/9si2VeHjJtc="
+  },
+  "org/glassfish/hk2#hk2-extra-parent/3.0.0": {
+   "pom": "sha256-7QQT8DTUZlo32xhiyiquiq9NjKuJTSrKTna7zN+qgFk="
+  },
   "org/glassfish/hk2#hk2-locator/3.1.1": {
-   "jar": "sha256-qx6GX1mGgJI1tlA0tc0i4AeqgdT35dFLb7TiKDOQt4g=",
    "pom": "sha256-Jx4a0fedi3l+kDJ1/BdNXui8Lod0MjC283fHLwxNBsY="
   },
+  "org/glassfish/hk2#hk2-locator/4.0.0-M3": {
+   "jar": "sha256-KQAnOV2Vv8u19AyZI3am8hx1v2PJyNTfPPwDS6GoXe0=",
+   "pom": "sha256-UPXyftFr6i4tPdqL7CtLQIr6plzyi3ySP/KwK9cQkSY="
+  },
   "org/glassfish/hk2#hk2-parent/3.1.1": {
    "pom": "sha256-u/kqbG0phpvXT9TOo8g0bgvQORe6kf8Rc6M4E9tdSRQ="
   },
+  "org/glassfish/hk2#hk2-parent/4.0.0-M3": {
+   "pom": "sha256-r2nz6US27idzz1BnoGR+pbNkKj60iZUTT2lPQFaO4jo="
+  },
   "org/glassfish/hk2#hk2-utils/3.1.1": {
-   "jar": "sha256-b16l/vUHVbog+7iTeCssY/mupGPBg9Y6V9zJ+msRcTk=",
    "pom": "sha256-9jp0ovDWaukmsU7dbk9W28NvctqQxZo/D/YCvNP3neU="
   },
-  "org/glassfish/hk2#osgi-resource-locator/1.0.3": {
-   "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=",
-   "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo="
+  "org/glassfish/hk2#hk2-utils/4.0.0-M3": {
+   "jar": "sha256-unCHgn/omvPYJPwmVWyYXOmvoMww+qJOi2UUXKD+/PE=",
+   "pom": "sha256-YJoXFaqpUEu2K0tT6Ndf61iAfGtYdDrV88HYw9S4RIY="
+  },
+  "org/glassfish/hk2#osgi-resource-locator/3.0.0": {
+   "jar": "sha256-oYZsz92qKfGNpdOd9mKJSrLdmQKZSlAA52RPbMHjflU=",
+   "pom": "sha256-nxPzihfjMzJMF7uo68PDkvZq3rkVZAN3XN5V7HMe7Pw="
   },
   "org/glassfish/hk2/external#aopalliance-repackaged/3.1.1": {
-   "jar": "sha256-5AxkMBbUDdmsqjhCqYC5O3ltlFYh+CD8vYKyXJaWj6s=",
    "pom": "sha256-WEztva7OI/utMabFsHInu1xPx+NU0/fbGmBxJdZxcZo="
   },
+  "org/glassfish/hk2/external#aopalliance-repackaged/4.0.0-M3": {
+   "jar": "sha256-ZcCruUbSqzoSN8YQ8kvxXwRpYVHpyvvhr6bO5S++1e0=",
+   "pom": "sha256-V9aw+yZOT3V7k1nvKC2cmXhG74JSSlA3Kj6GN8WKYe0="
+  },
   "org/glassfish/jaxb#jaxb-bom/4.0.6": {
    "pom": "sha256-frfNg7krfC/QqK5mvLNQY1TxZqE/gtKmbB2WJZcy0qU="
   },
@@ -2534,102 +2335,81 @@
    "jar": "sha256-/MdJeFQS7zgG/eHOcPk+9aAGXcxH/kSbyHHbB5XLEa8=",
    "pom": "sha256-avFKkbP56eMX96WOgNy+/T308vIFRINZ/zocWQFic3Q="
   },
-  "org/glassfish/jersey#jersey-bom/3.1.10": {
-   "pom": "sha256-KYl09Itfm23mIvJFApLexNuZs5vjJF9WVqbJpEtd67Q="
+  "org/glassfish/jersey#jersey-bom/4.0.0": {
+   "pom": "sha256-xUcMOr8/QtNyHQo137qtS6NkMJy36M8vyBBX+R1LFhs="
   },
-  "org/glassfish/jersey#jersey-bom/3.1.11": {
-   "pom": "sha256-3DdcE5WY+5VgZlWat70vwxGHlvVcMMT19LW8O0dEIrQ="
+  "org/glassfish/jersey#project/4.0.0": {
+   "pom": "sha256-AxgU8a/mE6OUS5+K/ekHabew9cTHZ665fFopnV+mvxU="
   },
-  "org/glassfish/jersey#project/3.1.10": {
-   "pom": "sha256-HwCrKqQxlS9Eb7DXajOYoWstCgzmAP/L/g8iKp9aRSU="
+  "org/glassfish/jersey/containers#jersey-container-grizzly2-http/4.0.0": {
+   "jar": "sha256-hwJuwE1+udvbAAIg1Uypkw9MTQSB/RhkTroHovBAyVU=",
+   "pom": "sha256-uvsXcNbWMs3d7c/97C4Sqmb7x9YkoAGSsUpu8QIwIPU="
   },
-  "org/glassfish/jersey#project/3.1.11": {
-   "pom": "sha256-0sAaDDv9lcCHl+FhePUlAWzPEudYUo6uG901UXrVDfs="
+  "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/4.0.0": {
+   "jar": "sha256-8vgixexSs7jnKuwQVIxDJMOJWJ0sYtdLJA81DCAnEP8=",
+   "pom": "sha256-l050jqVCcVWuC30u8CUdDviskTblit47C+afCmBLeAE="
   },
-  "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.10": {
-   "pom": "sha256-hLP/zKuuOE8Vx/0IucMSoW/AhcKOcxG+PM1ZuyTkC+s="
+  "org/glassfish/jersey/containers#jersey-container-servlet/4.0.0": {
+   "jar": "sha256-ckfY37DUlQmRaQWAYGxa2TO5F8an/oW1JW8j8oeCTA8=",
+   "pom": "sha256-V1zTMUcq1HkWWuVDODpFUoCJ8RVba/yI/WsgDkAq6T8="
   },
-  "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.11": {
-   "jar": "sha256-/zn2epqi6OHHtZUkxt2Xc/YHocMHVpwmh8Hkg4WhUY4=",
-   "pom": "sha256-GzqUkEc3Xl7M4fmTVVjrj86h6d12TrsrJpA3myk0pfk="
+  "org/glassfish/jersey/containers#project/4.0.0": {
+   "pom": "sha256-P0Q/lOWOho6LjY/aaLcLiSTgSXEao9PMM12z2Q4MwsE="
   },
-  "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/3.1.11": {
-   "pom": "sha256-1LiQFi+vCLjfBGPSohCa+8Tu+vwCyE6egndv2kWZVSA="
+  "org/glassfish/jersey/core#jersey-client/4.0.0": {
+   "jar": "sha256-ng3FA4bcY/jqaNkW3OVeogSmSAl4W/k1dp38Ew9maaM=",
+   "pom": "sha256-Em+B58WqDE5cQyjIBW2aTIiYzaLG1c/7yYDj6B3OUPE="
   },
-  "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.11": {
-   "pom": "sha256-X55C8+DtJ16eEiSqgrpdrn08IJCCb5G818lt3LJtbNE="
+  "org/glassfish/jersey/core#jersey-common/4.0.0": {
+   "jar": "sha256-H5/ES2basv+CkfTHCSqn4LObs+/hu/UM5poy+gl5ZhY=",
+   "pom": "sha256-LmkrASQngfxhm6CxdtWE2VAw267AfEDG1//FVb6xr5U="
   },
-  "org/glassfish/jersey/containers#jersey-container-servlet/3.1.11": {
-   "pom": "sha256-A7QnrQbxZbhH+95azcqHtVuOPptUxE0n0wiqj3Lfj5o="
+  "org/glassfish/jersey/core#jersey-server/4.0.0": {
+   "jar": "sha256-ZPQgKGYxe+xYDCtl5C5/I3HBC/cIWvYTwwyLQQI0Abg=",
+   "pom": "sha256-HwcEUUOi9xKWboWKwuU6T7lTeqWOZAy7a+A3ONP228M="
   },
-  "org/glassfish/jersey/containers#project/3.1.10": {
-   "pom": "sha256-srKeL9s0eph5sEbHW+rV6E9O/C0gQp9KVCoMsxkYRSM="
+  "org/glassfish/jersey/inject#jersey-hk2/4.0.0": {
+   "jar": "sha256-cZdRkWdrvjicm6EUrhlGyXFBmMrJnL3vVq2+s9Yip0E=",
+   "pom": "sha256-4DauIN1e9qyVr3h1K9jXVNqIwcKlbQwHrC7k+bha3nc="
   },
-  "org/glassfish/jersey/containers#project/3.1.11": {
-   "pom": "sha256-ZJwIEcmQf12y85FoimBT7AGS8F5oMiD8mII2CYgz5BQ="
+  "org/glassfish/jersey/inject#project/4.0.0": {
+   "pom": "sha256-KxCS7+A0OpDAuAeAUVD8HabmyIfNmw0gUqs+vZhJYeE="
   },
-  "org/glassfish/jersey/core#jersey-client/3.1.11": {
-   "jar": "sha256-nw9TKmurtTD0x9b8T0UrmWqXqnw0JIvySe6oos5jl1g=",
-   "pom": "sha256-l065XrwW5iL+YL9j3SIbCWaaO9NqAEXTdtLDIv3i4XM="
+  "org/glassfish/jersey/media#jersey-media-jaxb/4.0.0": {
+   "jar": "sha256-tM615k4UTN85DX6GxzmtHtwKoy8fSLDIXvgw/Kz7SwY=",
+   "pom": "sha256-R5qbwqpPN0qjDDZaQSAwli7cQQYq+1WqaHu+TwtR0Vk="
   },
-  "org/glassfish/jersey/core#jersey-common/3.1.10": {
-   "pom": "sha256-37Tr4q/ZEifpSSJXnGk6Wx6+UOupnI9HDFwZZjgipBY="
+  "org/glassfish/jersey/media#project/4.0.0": {
+   "pom": "sha256-e4ZcegGG5BiqMEipkySzRMxhM+WptxAnGOLvSFIHrX4="
   },
-  "org/glassfish/jersey/core#jersey-common/3.1.11": {
-   "jar": "sha256-7FFtfC/c/NfrdznqzzzWkU4XoVlf1FgmszyHZZZZgbI=",
-   "pom": "sha256-/shJQsC+skBPjbOWRrqMMPqM/elJPYO7FGUKl/kbDYk="
+  "org/glassfish/jersey/test-framework#jersey-test-framework-core/4.0.0": {
+   "jar": "sha256-nAniDTwafpg/QeHneWfVVrmtDzwE5NYiHcqTIhflK2M=",
+   "pom": "sha256-HOYqBvbWnmF1v0EFGTdiZBO2knwmrCryp6qD52NZQfo="
   },
-  "org/glassfish/jersey/core#jersey-server/3.1.11": {
-   "jar": "sha256-fd4q32YA8+j3I+N6jJbDGDimgvjbhU/c/PTwBpXW+QM=",
-   "pom": "sha256-y+VJe4ExCM0BGlMEa0T5akNQ5ozlz0T+eiG32RxOzu4="
+  "org/glassfish/jersey/test-framework#project/4.0.0": {
+   "pom": "sha256-qljN8WaFhfXzlBBNCRdBvOODFsS3Smt5IZZ9o8bMP2U="
   },
-  "org/glassfish/jersey/inject#jersey-hk2/3.1.11": {
-   "jar": "sha256-+u7phdcLgiOp6yK6q/V52fhgFBcW78r3SwolKmOVn8M=",
-   "pom": "sha256-667WoeVDo3q08uqt1wqEz3P24YffKd2nZaQS5vMEY2M="
+  "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/4.0.0": {
+   "jar": "sha256-Zlu20Jxi44hLwWmVqkfVVqXPt/4pKzXip/nFqp8VTdU=",
+   "pom": "sha256-nqTMjn8SCGQ/qHPYpBk/tB6I7qlpVZSpHw0fkSE/iLY="
   },
-  "org/glassfish/jersey/inject#project/3.1.11": {
-   "pom": "sha256-2HawxNlN/CHWyem7mcxXmNmwT7MF/KPKIVXfn8A4Obg="
-  },
-  "org/glassfish/jersey/media#jersey-media-jaxb/3.1.11": {
-   "pom": "sha256-OJl3I+KYlhzoC1ThHpSKYGdDeV5BXJlbGpknliUiWTA="
-  },
-  "org/glassfish/jersey/media#project/3.1.11": {
-   "pom": "sha256-tQmzXrfR7wVA43bK+DvPUC949pI6yrNn7oXX0S6OM3w="
-  },
-  "org/glassfish/jersey/test-framework#jersey-test-framework-core/3.1.11": {
-   "pom": "sha256-KGnwIIig8xxsFCqbkudX/vCfxfrMADIHZP3p+4P0myE="
-  },
-  "org/glassfish/jersey/test-framework#project/3.1.11": {
-   "pom": "sha256-3OqcXyh28KciQ9MSMgrCfxLGwXElVMEkb7+h0aDs4Ag="
-  },
-  "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/3.1.11": {
-   "pom": "sha256-IQazyx8NVZXetuIfp0A8MdW4tO+WhflFzC9IF262FzM="
-  },
-  "org/glassfish/jersey/test-framework/providers#project/3.1.11": {
-   "pom": "sha256-+Gd6F5VqTZ8wjT1QTcn7JdS2if9ERQ+HUn26AcO/7gk="
+  "org/glassfish/jersey/test-framework/providers#project/4.0.0": {
+   "pom": "sha256-BPXWhR3CI7huGPYMpHp/Kd++wr2UJqsDMdqSmLBxsxw="
   },
   "org/hamcrest#hamcrest-core/1.3": {
    "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
   },
-  "org/hamcrest#hamcrest-core/2.2": {
-   "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590="
-  },
   "org/hamcrest#hamcrest-parent/1.3": {
    "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
   },
   "org/hamcrest#hamcrest/3.0": {
+   "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
    "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
    "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
   },
-  "org/hibernate/validator#hibernate-validator/9.0.1.Final": {
-   "jar": "sha256-JfQBGPpMUPhSLQkNJdUtWjiVOwzNElCDXwUue9MWTOA=",
-   "pom": "sha256-5w3BopQp/dTgh1E+tk70V1IMrwpRqxFFw7ilN8hC6gw="
-  },
-  "org/infinispan#infinispan-bom/11.0.19.Final": {
-   "pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE="
-  },
-  "org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": {
-   "pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno="
+  "org/hibernate/validator#hibernate-validator/9.1.0.Final": {
+   "jar": "sha256-Teogx4DRLorW4f59aVRgr3T4Zo3561iRCZGRkZRBIYg=",
+   "pom": "sha256-1XS291wE5USxv3YAcMLvuDnfufY0SNN19Z/dB+QM4JQ="
   },
   "org/jabref#afterburner.fx/2.0.0": {
    "jar": "sha256-PhxWSKv8xpaYIdi3BnPwxMV5qp8IBP/9/gwn1UTZDIM=",
@@ -2649,9 +2429,6 @@
    "jar": "sha256-sOqDZn2darH89q2EieF6pRsA18CGRUrsNQFuL7Ucm7U=",
    "pom": "sha256-ZMsdu8KSZgmcYTnVsq8NXKfUxgVV/gABoBePhGjfnCo="
   },
-  "org/jboss#jboss-parent/36": {
-   "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4="
-  },
   "org/jboss#jboss-parent/42": {
    "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs="
   },
@@ -2667,30 +2444,39 @@
    "module": "sha256-n+hq62S4YyPo5XlQOxGgOKFAaUwTtoBDQ/ik3Jo6RrE=",
    "pom": "sha256-mn4e3huQFzBSwebtck+w8OvMiP9oLQI/DJs0PhN3p/8="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.0": {
-   "jar": "sha256-DRC8DUK4YF8jYpo/MeonwZzbyp3N9PU/bSLNY2aDbRg=",
-   "pom": "sha256-lcIYnDXve/xIlRwyrXCEeyHzgJ0m9dCnbiNXCHmYjDA="
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.21": {
+   "jar": "sha256-t4WSLxHm2Rpt0ddcsK7xzje4P43g46ITkTnfuCO7iiw=",
+   "pom": "sha256-I3xPNRZpV77Mwm7J8WxNjdTJtSNZ98cdAdznfYqwdmI="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.0": {
-   "jar": "sha256-rcFmSNu881sNEOfsMBw110bRwv5GDGBqulnxKxF8+bA=",
-   "pom": "sha256-I00G/b3CncvAdEfijEomq6uVmdXD2qPZKjTmrt6iNqY="
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.21": {
+   "jar": "sha256-xiJ1xQ7lkcovgse6QmlreRYAwlhE9H6EvZRgMCoNUjg=",
+   "pom": "sha256-RN6GQYDP52PPB8EmjPJ5uYqVVaQjuyyBHe3bVawsyFk="
   },
   "org/jetbrains/kotlin#kotlin-stdlib/2.1.21": {
    "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=",
    "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg="
   },
   "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": {
-   "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=",
    "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=",
    "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": {
+   "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=",
+   "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=",
+   "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.21": {
+   "jar": "sha256-ZVij0jPaVqIJNLMhWfnbX4btWBbvCY94osIj3Gq7ed0=",
+   "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=",
+   "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI="
+  },
   "org/jooq#jool/0.9.15": {
    "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=",
    "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M="
   },
-  "org/jsoup#jsoup/1.20.1": {
-   "jar": "sha256-ybt7LA9JVfx4WlXAVKPWpbFzuQ6krIhm17GmFuOEkc0=",
-   "pom": "sha256-oeGYRMAjusOTjPx5zGLPovp1SonWyooyxL+anx1IhIU="
+  "org/jsoup#jsoup/1.21.2": {
+   "jar": "sha256-8FSW4lVzR1nw1LVjLaeyT4ExMUfHjGnpCtBF0JYZE0Q=",
+   "pom": "sha256-S74tJSipD5l8QK7ztitRn9NzxWBXtU/7CGzCvvAe9EY="
   },
   "org/jspecify#jspecify/1.0.0": {
    "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
@@ -2705,10 +2491,6 @@
    "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
    "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
   },
-  "org/junit#junit-bom/5.10.3": {
-   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
-   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
-  },
   "org/junit#junit-bom/5.10.5": {
    "module": "sha256-hXsWv6Q5P1aoQJN8Z01TbeTiPFxjRpYgp3m1BcCowak=",
    "pom": "sha256-g+QFzK2rN7rfIrfdZ6LS90vPLmgB+1W7LV1+eUI3Lho="
@@ -2748,64 +2530,60 @@
   "org/junit#junit-bom/5.5.1": {
    "pom": "sha256-eHThBkE5sx4sWkZrPcEClwk2IWK98B8PSqq3OKuTLTM="
   },
-  "org/junit#junit-bom/5.9.1": {
-   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
-   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
-  },
-  "org/junit#junit-bom/6.0.0": {
-   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
-   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
+  "org/junit#junit-bom/6.0.1": {
+   "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=",
+   "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg="
   },
   "org/junit/jupiter#junit-jupiter-api/5.12.2": {
    "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=",
    "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994="
   },
-  "org/junit/jupiter#junit-jupiter-api/6.0.0": {
-   "jar": "sha256-iNaQ0tNzzWYXB3DDF5dxls6eRl8jiJMPS8lmXohzhfY=",
-   "module": "sha256-ulAS9rG1AydsxsokGUPC2bJuJFkCXowg3VjsMeumcXU=",
-   "pom": "sha256-rNeSzwaDpEvqadPP/uujfRm5kAwdnogijjKfJsRBNQM="
+  "org/junit/jupiter#junit-jupiter-api/6.0.1": {
+   "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=",
+   "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=",
+   "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo="
   },
   "org/junit/jupiter#junit-jupiter-engine/5.12.2": {
    "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=",
    "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM="
   },
-  "org/junit/jupiter#junit-jupiter-engine/6.0.0": {
-   "jar": "sha256-j6HWw32ymm70cYO0mFHudnbwj9exwntozPOk5XzgL0g=",
-   "module": "sha256-/BOeA32ssQfRpQ6FVVg2h0+pwgKIwx17a86To9PoUEw=",
-   "pom": "sha256-qzyiIIkCJq8xuRVzeT+n8APHqBdSuskFZx3Krum5fXM="
+  "org/junit/jupiter#junit-jupiter-engine/6.0.1": {
+   "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=",
+   "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=",
+   "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY="
   },
   "org/junit/jupiter#junit-jupiter-params/5.12.2": {
    "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=",
    "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw="
   },
-  "org/junit/jupiter#junit-jupiter-params/6.0.0": {
-   "jar": "sha256-IIR+RcVT1R45JEbgM1UGnxOP4MUekdfvG9v/wNOvBFQ=",
-   "module": "sha256-VfWJwqiUZt40HEAL8AzdGihwp+bc1oUL2tcyLbONc7c=",
-   "pom": "sha256-91zeM8lEa0XsSlqaKC3LWyv7dj1KMKshv8+EgqZg5UI="
+  "org/junit/jupiter#junit-jupiter-params/6.0.1": {
+   "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=",
+   "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=",
+   "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM="
   },
   "org/junit/jupiter#junit-jupiter/5.12.2": {
    "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=",
    "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc="
   },
-  "org/junit/jupiter#junit-jupiter/6.0.0": {
-   "jar": "sha256-jb8LIX4usBPWU9kW/BBgkklrfMrI8IQyiYHlXjZzrnE=",
-   "module": "sha256-YdlnTuitkcdk2IbQzTFjO1up967ad6okIPglNaJVXOE=",
-   "pom": "sha256-9j4gTo0IDEzis05lnzGVzHHYpKZrcyqAW5pv0rjyVrs="
+  "org/junit/jupiter#junit-jupiter/6.0.1": {
+   "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=",
+   "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=",
+   "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM="
   },
-  "org/junit/platform#junit-platform-commons/6.0.0": {
-   "jar": "sha256-huj6+H8xUaPVRYUIUqDyzFXqiiQ07ungj4OIHFLVWZI=",
-   "module": "sha256-oNE82wfx2950q74HZmT/XcQEOtXRO/+UD3i55gTyElE=",
-   "pom": "sha256-lDFdk3FOzUB6kg2TOcj0S0DPCEBBMWMu1/m3dwzxCgU="
+  "org/junit/platform#junit-platform-commons/6.0.1": {
+   "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=",
+   "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=",
+   "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI="
   },
-  "org/junit/platform#junit-platform-engine/6.0.0": {
-   "jar": "sha256-b4GELpwT6ZfKxmtEYUUi82OUGeI4iuLQAMS8CmuS2T8=",
-   "module": "sha256-GcijGiINhY0hWr20mfYjuLxy/ig3jMBABI0ymTCliSE=",
-   "pom": "sha256-TD7A1PapQGLOgr3kLuvtHya5m7XLHWl24VmPzF+KSS0="
+  "org/junit/platform#junit-platform-engine/6.0.1": {
+   "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=",
+   "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=",
+   "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo="
   },
-  "org/junit/platform#junit-platform-launcher/6.0.0": {
-   "jar": "sha256-Xwl7AMZxS7cez7XexitZu0wveJdj+v0ezpbE7w5sKA8=",
-   "module": "sha256-/OwWMsXFlyf/nn6jCKmTh9ci/6iC2FzKUFKv7Iw47ug=",
-   "pom": "sha256-RwG8mhY9lbI1zhatdt4Z8qyFTFyjT689LsThAYsIzHQ="
+  "org/junit/platform#junit-platform-launcher/6.0.1": {
+   "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=",
+   "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=",
+   "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho="
   },
   "org/kordamp/ikonli#ikonli-bootstrapicons-pack/12.4.0": {
    "jar": "sha256-RbwgHLWfhluydZcOCI394XH01pxIwRYZS68xmSbFWAw=",
@@ -2842,9 +2620,9 @@
   "org/mockito#mockito-bom/4.11.0": {
    "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
   },
-  "org/mockito#mockito-core/5.20.0": {
-   "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
-   "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU="
+  "org/mockito#mockito-core/5.21.0": {
+   "jar": "sha256-A9sj3nQsvKQqo9YSf9rOVg+sN7A22TGHCAH4TCiL0oY=",
+   "pom": "sha256-AiGzH5bfAaFYxkU3Gq2BstP1vuD1icoNDC6qbo2gkvM="
   },
   "org/objenesis#objenesis-parent/3.3": {
    "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
@@ -2945,14 +2723,11 @@
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-bom/9.7": {
-   "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c="
+  "org/ow2/asm#asm-bom/9.9": {
+   "pom": "sha256-D6JzNvp7YpI8qb3GlSbr5xKjv7H37ov3bEoLP4XxnWI="
   },
-  "org/ow2/asm#asm-bom/9.8": {
-   "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA="
-  },
-  "org/ow2/asm#asm/9.8": {
-   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  "org/ow2/asm#asm/9.9": {
+   "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc="
   },
   "org/pcollections#pcollections/4.0.1": {
    "jar": "sha256-H4J2bXwyIZMIVAM76/9Qc+pGtD8nMmB0u+FdFIwYv7M=",
@@ -2985,6 +2760,10 @@
   "org/slf4j#slf4j-parent/2.0.17": {
    "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
+  "org/snakeyaml#snakeyaml-engine/2.10": {
+   "jar": "sha256-yZ2f1mx8JR2IGpzZUIm3yARMKaGwKYPXA2mBvUNU7Dc=",
+   "pom": "sha256-VhQsopiYjPZNplrivcGYNJIdc411qyN2Go+sS19YMUk="
+  },
   "org/sonatype/oss#oss-parent/5": {
    "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
   },
@@ -2998,9 +2777,6 @@
    "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
    "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/testcontainers#testcontainers-bom/1.20.1": {
-   "pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A="
-  },
   "org/testfx#testfx-core/4.0.18": {
    "pom": "sha256-+rVBhIAbFZm8WzBb8R0X3ACeT1lqUXwT3BxUb6jdOxo="
   },
@@ -3023,28 +2799,15 @@
    "jar": "sha256-lcY8GlWyLdZFOJCkGcwaZA95C799iugtseMK7++wiIg=",
    "pom": "sha256-72CLg8O7bI4+azvqo4hCuhWWO0ZJXkr5GwdGyLdQ87k="
   },
-  "org/wiremock#wiremock/3.13.0": {
-   "module": "sha256-6UqHsje9650nqsFtS6+ujcPjsXblK3tBQSOKrhEsZgs=",
-   "pom": "sha256-8DaGoIr4nd2qb8RQ2/havBO4oKS99AXlSZo2vLhLjZ4="
-  },
   "org/xmlunit#xmlunit-core/2.10.4": {
    "pom": "sha256-QMVRcQPPFS8IejttyqpTDs5h8D1/KUSR/4gtk2utBl8="
   },
-  "org/xmlunit#xmlunit-legacy/2.10.0": {
-   "pom": "sha256-B0sBekWQP79QoP3faxekM90lzFQDmMGvuG+tkOxxwmg="
-  },
   "org/xmlunit#xmlunit-matchers/2.10.4": {
    "pom": "sha256-JH4kA3uLcvdMy7TUXzVPlJ1VUQTeyL7U6K/dVleCvww="
   },
-  "org/xmlunit#xmlunit-parent/2.10.0": {
-   "pom": "sha256-XOnCkW1QdlQJ78IKgQf5jvF3BAzr4LG4VwSI4h0JYcc="
-  },
   "org/xmlunit#xmlunit-parent/2.10.4": {
    "pom": "sha256-g9gzkrJTxbwHpRKgjYt5RiPn1MW7u6DE25H0zjeAkeI="
   },
-  "org/xmlunit#xmlunit-placeholders/2.10.0": {
-   "pom": "sha256-41+qK1zuBc03FaViqCOoA4/PQyp97WWZny0lBaGMSes="
-  },
   "org/yaml#snakeyaml/2.5": {
    "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=",
    "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0="
@@ -3070,6 +2833,30 @@
   },
   "tech/uom/lib#uom-lib/2.2": {
    "pom": "sha256-EUCfWa/BJ74iyO5VCUNHZPSB5mX3FMBz5HGciB0oM8k="
+  },
+  "tools/jackson#jackson-base/3.0.2": {
+   "pom": "sha256-bNfjpxD7/9oYOZzlZe//tviCVICZC7Yxj4Ps8Z28k7I="
+  },
+  "tools/jackson#jackson-bom/3.0.2": {
+   "pom": "sha256-j/nmDa1VX3MadR8hSPVo36hhFpZPnofSOOK6m1fI0fQ="
+  },
+  "tools/jackson/core#jackson-core/3.0.2": {
+   "jar": "sha256-+nRRW6X8ASgs7Kt+WXD6EqD0/yO9bCBh6cd4MzjQtDY=",
+   "module": "sha256-ahqDE3aR5sMwIzIHsENnSsV+gohKRgT9erpnPsv4Dok=",
+   "pom": "sha256-M0PoYpgxJsUq1LGVhV/fKYlwcAFTRWHR5cH3DbrM5SM="
+  },
+  "tools/jackson/core#jackson-databind/3.0.2": {
+   "jar": "sha256-9U9pv8eAOAo/TeQvssPoKyLI702EupGM/4HSLGqhBp8=",
+   "module": "sha256-r8lO4gcAP1TxfepZ1em1DdSPSGl6aDD2XWKtwfJ35Lw=",
+   "pom": "sha256-Mk6hllrSTyPQU/zkQJ0lBaxZckJGcp1QLpct6f0fxIw="
+  },
+  "tools/jackson/dataformat#jackson-dataformat-yaml/3.0.2": {
+   "jar": "sha256-9Of2pLjGDePEiuIQe+eQo/1wUYg7P3tWfo2cAmG37sk=",
+   "module": "sha256-WhXr7vNPJ04OgA0ntENjjpEALsar8JhxUcjyxaLchBc=",
+   "pom": "sha256-WInJZdlIuikWXxpy2nGwVK3oL0RX3HREKwRvhcAUlTA="
+  },
+  "tools/jackson/dataformat#jackson-dataformats-text/3.0.2": {
+   "pom": "sha256-YV+jqbxqx0NoZZS1gJPmq8wW/zFypaxRErTrjzG6Too="
   }
  }
 }
diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix
index d8f0363e0390..2e31f41c8b30 100644
--- a/pkgs/by-name/ja/jabref/package.nix
+++ b/pkgs/by-name/ja/jabref/package.nix
@@ -13,6 +13,7 @@
   gtk3,
   jdk25,
   openjfx25,
+  jre25_minimal,
   gradle_9,
   python3,
   postgresql,
@@ -22,6 +23,31 @@
 let
   jdk = jdk25;
   openjfx = openjfx25;
+  jre = jre25_minimal.override {
+    modules = [
+      "java.base"
+      "java.compiler"
+      "java.datatransfer"
+      "java.desktop"
+      "java.logging"
+      "java.management"
+      "java.naming"
+      "java.net.http"
+      "java.prefs"
+      "java.scripting"
+      "java.sql"
+      "java.sql.rowset"
+      "java.xml"
+      "jdk.httpserver"
+      "jdk.incubator.vector"
+      "jdk.jsobject"
+      "jdk.net"
+      "jdk.security.auth"
+      "jdk.unsupported"
+      "jdk.unsupported.desktop"
+      "jdk.xml.dom"
+    ];
+  };
   gradle = gradle_9;
   ltwaUrl = "https://www.issn.org/wp-content/uploads/2021/07/ltwa_20210702.csv";
   ltwa = fetchurl {
@@ -30,14 +56,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "6.0-alpha.3";
+  version = "6.0-alpha.4";
   pname = "jabref";
 
   src = fetchFromGitHub {
     owner = "JabRef";
     repo = "jabref";
     tag = "v${version}";
-    hash = "sha256-ZX4LQe8xKZCDJqVh+L9BHkJK82Pz/qPhlaE8SrAin6o=";
+    hash = "sha256-ZhyWYZD8QT3dH6MwG2kMjTAjkxaVFIMR4C9aAvi3FJQ=";
     fetchSubmodules = true;
   };
 
@@ -62,10 +88,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -e '/vendor/d' -e '/JavaLanguageVersion/s/24/25/' build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
-    sed -i -e '/javafx-base/s/24.0.1/25/' build-support/src/main/java/*.java
-
-    substituteInPlace build-support/src/main/java/*.java \
-      --replace-fail 'JAVA 24' 'JAVA 25'
+    sed -i -e '/javafx-base/s/24.0.2/25/' build-support/src/main/java/*.java
+    sed -i -e 's/javafx = .*/javafx = "25"/' versions/build.gradle.kts
 
     sed -i -e '1a //REPOS file://${mitmCache}/https/repo.maven.apache.org/maven2,file://${mitmCache}/https/plugins.gradle.org/m2' build-support/src/main/java/*.java
 
@@ -135,9 +159,15 @@ stdenv.mkDerivation rec {
       tar xf $tarball -C $out --strip-components=1
     done
 
+    # Replace .so files with the ones from nixpkgs
+    cp ${openjfx}/modules_libs/javafx.graphics/*.so $out/lib
     # Temp fix: openjfx doesn't build with webkit
     unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/
 
+    zip -d $out/lib/javafx-media-*-*.jar "*.so"
+    zip -d $out/lib/javafx-graphics-*-*.jar "*.so"
+    zip -d $out/lib/javafx-web-*-*.jar "*.so"
+
     # Use postgresql from nixpkgs since the bundled binary doesn't work on NixOS
     ARCH1=${if stdenv.isAarch64 then "arm64v8" else "amd64"}
     ARCH2=${if stdenv.isAarch64 then "arm_64" else "x86_64"}
@@ -169,7 +199,7 @@ stdenv.mkDerivation rec {
       rm $out/bin/$bin*
 
       # put this in postFixup because some gappsWrapperArgs are generated in gappsWrapperArgsHook in preFixup
-      makeWrapper ${jdk}/bin/java $out/bin/$bin \
+      makeWrapper ${jre}/bin/java $out/bin/$bin \
         "''${gappsWrapperArgs[@]}" \
         --suffix PATH : ${
           lib.makeBinPath [
@@ -178,7 +208,7 @@ stdenv.mkDerivation rec {
           ]
         } \
         --add-flags "$DEFAULT_JVM_OPTS \
-          -Djava.library.path=$out/lib/:${openjfx}/modules_libs/javafx.graphics:${openjfx}/modules_libs/javafx.media \
+          -Djava.library.path=$out/lib/ \
           --module-path $MODULE_PATH \
           --module $MODULE"
     done

From aa7f5743860caa33c3b781e38a74d5b8fdac55d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 22:10:53 +0100
Subject: [PATCH 005/112] maintainers: drop manveru

Did not react to maintainer pings since 2024. Dropping according to
maintainer guidelines.
---
 maintainers/maintainer-list.nix                         | 7 -------
 maintainers/team-list.nix                               | 1 -
 pkgs/by-name/am/amazon-ssm-agent/package.nix            | 1 -
 pkgs/by-name/bu/bundix/package.nix                      | 1 -
 pkgs/by-name/ca/calamares/package.nix                   | 1 -
 pkgs/by-name/cb/cbonsai/package.nix                     | 1 -
 pkgs/by-name/cr/crystal2nix/package.nix                 | 1 -
 pkgs/by-name/cu/cucumber/package.nix                    | 1 -
 pkgs/by-name/db/dbmate/package.nix                      | 1 -
 pkgs/by-name/di/di/package.nix                          | 1 -
 pkgs/by-name/ej/ejson/package.nix                       | 1 -
 pkgs/by-name/en/enter-tex/package.nix                   | 1 -
 pkgs/by-name/go/google-fonts/package.nix                | 1 -
 pkgs/by-name/hu/hue-cli/package.nix                     | 1 -
 pkgs/by-name/le/ledger-web/package.nix                  | 1 -
 pkgs/by-name/li/libgedit-amtk/package.nix               | 1 -
 pkgs/by-name/li/libgedit-tepl/package.nix               | 1 -
 pkgs/by-name/lo/lolcat/package.nix                      | 1 -
 pkgs/by-name/ma/marathonctl/package.nix                 | 1 -
 pkgs/by-name/ma/matter-compiler/package.nix             | 1 -
 pkgs/by-name/md/mdl/package.nix                         | 1 -
 pkgs/by-name/mi/mint/package.nix                        | 1 -
 pkgs/by-name/mp/mpdcron/package.nix                     | 1 -
 pkgs/by-name/pr/procodile/package.nix                   | 1 -
 pkgs/by-name/pt/pt/package.nix                          | 1 -
 pkgs/by-name/r1/r10k/package.nix                        | 1 -
 pkgs/by-name/ra/rake/package.nix                        | 1 -
 pkgs/by-name/re/redis-dump/package.nix                  | 1 -
 pkgs/by-name/ri/riemann-dash/package.nix                | 1 -
 pkgs/by-name/ri/riemann-tools/package.nix               | 1 -
 pkgs/by-name/sa/sass/package.nix                        | 1 -
 pkgs/by-name/t/t/package.nix                            | 1 -
 pkgs/by-name/ta/taskjuggler/package.nix                 | 1 -
 pkgs/by-name/te/terraform-landscape/package.nix         | 1 -
 pkgs/by-name/ti/timetrap/package.nix                    | 1 -
 pkgs/by-name/wa/wayback_machine_downloader/package.nix  | 1 -
 pkgs/by-name/wp/wpscan/package.nix                      | 1 -
 pkgs/development/compilers/crystal/default.nix          | 1 -
 pkgs/development/interpreters/ruby/default.nix          | 1 -
 pkgs/development/libraries/gecode/3.nix                 | 1 -
 pkgs/development/tools/build-managers/drake/default.nix | 1 -
 pkgs/development/tools/compass/default.nix              | 1 -
 pkgs/development/tools/haskell/vaultenv/default.nix     | 1 -
 pkgs/tools/package-management/fpm/default.nix           | 1 -
 44 files changed, 50 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 29df4d5cdc6d..273ef1dd7cfb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16058,13 +16058,6 @@
     githubId = 7802795;
     name = "Manoj Karthick";
   };
-  manveru = {
-    email = "m.fellinger@gmail.com";
-    matrix = "@manveru:matrix.org";
-    github = "manveru";
-    githubId = 3507;
-    name = "Michael Fellinger";
-  };
   maolonglong = {
     email = "shaolong.chen@outlook.it";
     github = "maolonglong";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..c1c1f1b4b39f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -503,7 +503,6 @@ with lib.maintainers;
     members = [
       cleverca22
       disassembler
-      manveru
     ];
     scope = "Input-Output Global employees, which maintain critical software";
     shortName = "Input-Output Global employees";
diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
index ff6861a29cdc..98c81a4ddbc1 100644
--- a/pkgs/by-name/am/amazon-ssm-agent/package.nix
+++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -174,7 +174,6 @@ buildGoModule rec {
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      manveru
       anthonyroussel
       arianvp
     ];
diff --git a/pkgs/by-name/bu/bundix/package.nix b/pkgs/by-name/bu/bundix/package.nix
index 5be47b5a0fb0..f313b40e899c 100644
--- a/pkgs/by-name/bu/bundix/package.nix
+++ b/pkgs/by-name/bu/bundix/package.nix
@@ -48,7 +48,6 @@ buildRubyGem rec {
     homepage = "https://github.com/nix-community/bundix";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       zimbatm
     ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ca/calamares/package.nix b/pkgs/by-name/ca/calamares/package.nix
index c1f63380483a..7c55735d5acb 100644
--- a/pkgs/by-name/ca/calamares/package.nix
+++ b/pkgs/by-name/ca/calamares/package.nix
@@ -126,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
       cc0
     ];
     maintainers = with lib.maintainers; [
-      manveru
       vlinkz
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix
index 5d53d43de2f0..15a527cf33a2 100644
--- a/pkgs/by-name/cb/cbonsai/package.nix
+++ b/pkgs/by-name/cb/cbonsai/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     mainProgram = "cbonsai";
     homepage = "https://gitlab.com/jallbrit/cbonsai";
     license = with lib.licenses; [ gpl3Only ];
-    maintainers = with lib.maintainers; [ manveru ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/cr/crystal2nix/package.nix b/pkgs/by-name/cr/crystal2nix/package.nix
index 99db99cd5259..18c23623e85e 100644
--- a/pkgs/by-name/cr/crystal2nix/package.nix
+++ b/pkgs/by-name/cr/crystal2nix/package.nix
@@ -40,7 +40,6 @@ crystal.buildCrystalPackage rec {
     mainProgram = "crystal2nix";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       peterhoeg
     ];
   };
diff --git a/pkgs/by-name/cu/cucumber/package.nix b/pkgs/by-name/cu/cucumber/package.nix
index 1e7c84e49c10..40f0fa8eb029 100644
--- a/pkgs/by-name/cu/cucumber/package.nix
+++ b/pkgs/by-name/cu/cucumber/package.nix
@@ -18,7 +18,6 @@ bundlerApp {
     license = lib.licenses.mit;
     mainProgram = "cucumber";
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
       anthonyroussel
     ];
diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix
index e1768599cfc0..bf1f125f3e39 100644
--- a/pkgs/by-name/db/dbmate/package.nix
+++ b/pkgs/by-name/db/dbmate/package.nix
@@ -25,6 +25,5 @@ buildGoModule rec {
     homepage = "https://github.com/amacneil/dbmate";
     changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ manveru ];
   };
 }
diff --git a/pkgs/by-name/di/di/package.nix b/pkgs/by-name/di/di/package.nix
index bded009283a0..0e37012325dd 100644
--- a/pkgs/by-name/di/di/package.nix
+++ b/pkgs/by-name/di/di/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
     description = "Disk information utility; displays everything 'df' does and more";
     homepage = "https://diskinfo-di.sourceforge.io/";
     license = lib.licenses.zlib;
-    maintainers = with lib.maintainers; [ manveru ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ej/ejson/package.nix b/pkgs/by-name/ej/ejson/package.nix
index 9c5179dee2e1..29907e535b92 100644
--- a/pkgs/by-name/ej/ejson/package.nix
+++ b/pkgs/by-name/ej/ejson/package.nix
@@ -27,6 +27,5 @@ buildGoModule rec {
     mainProgram = "ejson";
     license = lib.licenses.mit;
     homepage = "https://github.com/Shopify/ejson";
-    maintainers = [ lib.maintainers.manveru ];
   };
 }
diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix
index 21dddbf74cf0..6f1e211e5e04 100644
--- a/pkgs/by-name/en/enter-tex/package.nix
+++ b/pkgs/by-name/en/enter-tex/package.nix
@@ -76,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.gnome.org/World/gedit/enter-tex";
     description = "LaTeX editor for the GNOME desktop";
     maintainers = with lib.maintainers; [
-      manveru
       bobby285271
     ];
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/by-name/go/google-fonts/package.nix b/pkgs/by-name/go/google-fonts/package.nix
index 7d84384f2b7c..b5c10f794636 100644
--- a/pkgs/by-name/go/google-fonts/package.nix
+++ b/pkgs/by-name/go/google-fonts/package.nix
@@ -78,7 +78,6 @@ stdenvNoCC.mkDerivation {
     ];
     platforms = lib.platforms.all;
     hydraPlatforms = [ ];
-    maintainers = with lib.maintainers; [ manveru ];
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
   };
 }
diff --git a/pkgs/by-name/hu/hue-cli/package.nix b/pkgs/by-name/hu/hue-cli/package.nix
index 20c24f6178d6..d3c41878d401 100644
--- a/pkgs/by-name/hu/hue-cli/package.nix
+++ b/pkgs/by-name/hu/hue-cli/package.nix
@@ -17,7 +17,6 @@ bundlerApp {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     mainProgram = "hue";
diff --git a/pkgs/by-name/le/ledger-web/package.nix b/pkgs/by-name/le/ledger-web/package.nix
index 061b93a92feb..e16fc4265a6c 100644
--- a/pkgs/by-name/le/ledger-web/package.nix
+++ b/pkgs/by-name/le/ledger-web/package.nix
@@ -26,7 +26,6 @@ bundlerApp {
     homepage = "https://github.com/peterkeen/ledger-web";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix
index 047abb5d73d2..80838b14f74b 100644
--- a/pkgs/by-name/li/libgedit-amtk/package.nix
+++ b/pkgs/by-name/li/libgedit-amtk/package.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
     changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${version}/NEWS?ref_type=tags";
     description = "Actions, Menus and Toolbars Kit for GTK applications";
     maintainers = with lib.maintainers; [
-      manveru
       bobby285271
     ];
     license = lib.licenses.lgpl21Plus;
diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix
index aaf520fb4722..ab6b99865d92 100644
--- a/pkgs/by-name/li/libgedit-tepl/package.nix
+++ b/pkgs/by-name/li/libgedit-tepl/package.nix
@@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl";
     description = "Text editor product line";
     maintainers = with lib.maintainers; [
-      manveru
       bobby285271
     ];
     license = lib.licenses.lgpl3Plus;
diff --git a/pkgs/by-name/lo/lolcat/package.nix b/pkgs/by-name/lo/lolcat/package.nix
index 5578e542faca..8301ca611771 100644
--- a/pkgs/by-name/lo/lolcat/package.nix
+++ b/pkgs/by-name/lo/lolcat/package.nix
@@ -18,7 +18,6 @@
     license = lib.licenses.bsd3;
     maintainers = [
       lib.maintainers.StillerHarpo
-      lib.maintainers.manveru
       lib.maintainers.nicknovitski
     ];
     mainProgram = "lolcat";
diff --git a/pkgs/by-name/ma/marathonctl/package.nix b/pkgs/by-name/ma/marathonctl/package.nix
index 4741bdcce0e6..3bbe104f76f5 100644
--- a/pkgs/by-name/ma/marathonctl/package.nix
+++ b/pkgs/by-name/ma/marathonctl/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
     homepage = "https://github.com/shoenig/marathonctl";
     description = "CLI tool for Marathon";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ manveru ];
     mainProgram = "marathonctl";
   };
 }
diff --git a/pkgs/by-name/ma/matter-compiler/package.nix b/pkgs/by-name/ma/matter-compiler/package.nix
index 5d28606c00e2..5d17568e92be 100644
--- a/pkgs/by-name/ma/matter-compiler/package.nix
+++ b/pkgs/by-name/ma/matter-compiler/package.nix
@@ -20,7 +20,6 @@ bundlerApp {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       rvlander
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/md/mdl/package.nix b/pkgs/by-name/md/mdl/package.nix
index 4f0305056051..d235c29688df 100644
--- a/pkgs/by-name/md/mdl/package.nix
+++ b/pkgs/by-name/md/mdl/package.nix
@@ -17,7 +17,6 @@ bundlerApp {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       gerschtli
-      manveru
       nicknovitski
       totoroot
     ];
diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix
index 4f0f65ea4487..763640599e22 100644
--- a/pkgs/by-name/mi/mint/package.nix
+++ b/pkgs/by-name/mi/mint/package.nix
@@ -40,6 +40,5 @@ crystal.buildCrystalPackage rec {
     mainProgram = "mint";
     homepage = "https://www.mint-lang.com/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ manveru ];
   };
 }
diff --git a/pkgs/by-name/mp/mpdcron/package.nix b/pkgs/by-name/mp/mpdcron/package.nix
index 91a535aec1f1..8b74a4eb86a8 100644
--- a/pkgs/by-name/mp/mpdcron/package.nix
+++ b/pkgs/by-name/mp/mpdcron/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       lovek323
-      manveru
     ];
   };
 }
diff --git a/pkgs/by-name/pr/procodile/package.nix b/pkgs/by-name/pr/procodile/package.nix
index 3524d743a8de..5fdc97bb899b 100644
--- a/pkgs/by-name/pr/procodile/package.nix
+++ b/pkgs/by-name/pr/procodile/package.nix
@@ -16,7 +16,6 @@ bundlerApp {
     homepage = "https://github.com/adamcooke/procodile";
     license = with lib.licenses; mit;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pt/pt/package.nix b/pkgs/by-name/pt/pt/package.nix
index b9e70ca9a935..c6b69c7670d6 100644
--- a/pkgs/by-name/pt/pt/package.nix
+++ b/pkgs/by-name/pt/pt/package.nix
@@ -16,7 +16,6 @@ bundlerApp {
     homepage = "http://www.github.com/raul/pt";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/r1/r10k/package.nix b/pkgs/by-name/r1/r10k/package.nix
index 5973b9cb5365..fc94da7d29b7 100644
--- a/pkgs/by-name/r1/r10k/package.nix
+++ b/pkgs/by-name/r1/r10k/package.nix
@@ -42,7 +42,6 @@ bundlerApp rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       zimbatm
-      manveru
       nicknovitski
       anthonyroussel
     ];
diff --git a/pkgs/by-name/ra/rake/package.nix b/pkgs/by-name/ra/rake/package.nix
index 56037ee6555b..30a9d44aff7d 100644
--- a/pkgs/by-name/ra/rake/package.nix
+++ b/pkgs/by-name/ra/rake/package.nix
@@ -16,7 +16,6 @@ bundlerApp {
     homepage = "https://github.com/ruby/rake";
     license = with lib.licenses; mit;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/re/redis-dump/package.nix b/pkgs/by-name/re/redis-dump/package.nix
index 0e29ae1c00a9..269813ff0541 100644
--- a/pkgs/by-name/re/redis-dump/package.nix
+++ b/pkgs/by-name/re/redis-dump/package.nix
@@ -20,7 +20,6 @@ bundlerApp {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       offline
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ri/riemann-dash/package.nix b/pkgs/by-name/ri/riemann-dash/package.nix
index b61da9ca97b7..c6b260937bcf 100644
--- a/pkgs/by-name/ri/riemann-dash/package.nix
+++ b/pkgs/by-name/ri/riemann-dash/package.nix
@@ -16,7 +16,6 @@ bundlerApp {
     homepage = "https://github.com/riemann/riemann-dash";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ri/riemann-tools/package.nix b/pkgs/by-name/ri/riemann-tools/package.nix
index 2a0d47172b78..edf6c527443e 100644
--- a/pkgs/by-name/ri/riemann-tools/package.nix
+++ b/pkgs/by-name/ri/riemann-tools/package.nix
@@ -36,7 +36,6 @@ bundlerApp {
     description = "Tools to submit data to Riemann";
     homepage = "https://riemann.io";
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/sa/sass/package.nix b/pkgs/by-name/sa/sass/package.nix
index 1b2e3d58992f..df9b30b290ea 100644
--- a/pkgs/by-name/sa/sass/package.nix
+++ b/pkgs/by-name/sa/sass/package.nix
@@ -21,7 +21,6 @@ bundlerApp {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       romildo
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/t/t/package.nix b/pkgs/by-name/t/t/package.nix
index ca029d36effe..f642ff0f2317 100644
--- a/pkgs/by-name/t/t/package.nix
+++ b/pkgs/by-name/t/t/package.nix
@@ -17,7 +17,6 @@ bundlerApp {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       offline
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ta/taskjuggler/package.nix b/pkgs/by-name/ta/taskjuggler/package.nix
index abddd388f617..76577e5097dc 100644
--- a/pkgs/by-name/ta/taskjuggler/package.nix
+++ b/pkgs/by-name/ta/taskjuggler/package.nix
@@ -29,7 +29,6 @@ bundlerApp {
     license = lib.licenses.gpl2;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
   };
diff --git a/pkgs/by-name/te/terraform-landscape/package.nix b/pkgs/by-name/te/terraform-landscape/package.nix
index 87313745ff82..e2011a59fa9d 100644
--- a/pkgs/by-name/te/terraform-landscape/package.nix
+++ b/pkgs/by-name/te/terraform-landscape/package.nix
@@ -18,7 +18,6 @@ bundlerApp {
     license = with lib.licenses; asl20;
     maintainers = with lib.maintainers; [
       mbode
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ti/timetrap/package.nix b/pkgs/by-name/ti/timetrap/package.nix
index 89c858219778..683a156579e6 100644
--- a/pkgs/by-name/ti/timetrap/package.nix
+++ b/pkgs/by-name/ti/timetrap/package.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       jerith666
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wa/wayback_machine_downloader/package.nix b/pkgs/by-name/wa/wayback_machine_downloader/package.nix
index 31b8c481e41f..c1b54b83c8d9 100644
--- a/pkgs/by-name/wa/wayback_machine_downloader/package.nix
+++ b/pkgs/by-name/wa/wayback_machine_downloader/package.nix
@@ -14,7 +14,6 @@ bundlerApp {
     description = "Download websites from the Internet Archive Wayback Machine";
     homepage = "https://github.com/hartator/wayback-machine-downloader";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.manveru ];
     platforms = lib.platforms.all;
     mainProgram = "wayback_machine_downloader";
   };
diff --git a/pkgs/by-name/wp/wpscan/package.nix b/pkgs/by-name/wp/wpscan/package.nix
index 591d97e753ca..a8e20cb03249 100644
--- a/pkgs/by-name/wp/wpscan/package.nix
+++ b/pkgs/by-name/wp/wpscan/package.nix
@@ -26,7 +26,6 @@ bundlerApp {
     license = lib.licenses.unfreeRedistributable;
     maintainers = with lib.maintainers; [
       nyanloutre
-      manveru
     ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index b7fe92c4597d..d89d7fa66851 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -275,7 +275,6 @@ let
         license = lib.licenses.asl20;
         maintainers = with lib.maintainers; [
           david50407
-          manveru
           peterhoeg
           donovanglover
         ];
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 363397c70dca..1f8fdfb3598f 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -350,7 +350,6 @@ let
             description = "Object-oriented language for quick and easy programming";
             homepage = "https://www.ruby-lang.org/";
             license = lib.licenses.ruby;
-            maintainers = with lib.maintainers; [ manveru ];
             platforms = lib.platforms.all;
             mainProgram = "ruby";
             knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/.";
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix
index 0f0f79584f60..134c17fa37c0 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/pkgs/development/libraries/gecode/3.nix
@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     homepage = "https://www.gecode.org";
     description = "Toolkit for developing constraint-based systems";
     platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.manveru ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix
index a96c917ea3b9..7c6b88ae334b 100644
--- a/pkgs/development/tools/build-managers/drake/default.nix
+++ b/pkgs/development/tools/build-managers/drake/default.nix
@@ -16,7 +16,6 @@ bundlerApp {
     homepage = "http://quix.github.io/rake/";
     maintainers = with lib.maintainers; [
       romildo
-      manveru
       nicknovitski
     ];
     license = lib.licenses.mit;
diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
index f30e4bce5aea..696547325b94 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -20,7 +20,6 @@ bundlerEnv {
     license = with lib.licenses; mit;
     maintainers = with lib.maintainers; [
       offline
-      manveru
       nicknovitski
     ];
     mainProgram = "compass";
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index ad645ef016ec..edfc0afe2f22 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -88,6 +88,5 @@ mkDerivation rec {
   license = lib.licenses.bsd3;
   maintainers = with lib.maintainers; [
     lnl7
-    manveru
   ];
 }
diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix
index 640eba252bea..a855b9f4b044 100644
--- a/pkgs/tools/package-management/fpm/default.nix
+++ b/pkgs/tools/package-management/fpm/default.nix
@@ -16,7 +16,6 @@ bundlerApp {
     homepage = "https://github.com/jordansissel/fpm";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
     ];
     platforms = lib.platforms.unix;

From 64c2a338d1547cb5865d5b2beaef777bb8c36a92 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 22:15:19 +0100
Subject: [PATCH 006/112] maintainers: drop disassembler

Inactive since 2022, except for a single approval in 2024. Dropping
according to maintainer guidelines.
---
 maintainers/maintainer-list.nix                            | 6 ------
 maintainers/team-list.nix                                  | 1 -
 pkgs/by-name/ad/adms/package.nix                           | 1 -
 pkgs/by-name/ai/airsonic/package.nix                       | 1 -
 pkgs/by-name/gr/grafana-reporter/package.nix               | 1 -
 pkgs/by-name/ik/iksemel/package.nix                        | 1 -
 pkgs/by-name/li/lifelines/package.nix                      | 1 -
 pkgs/by-name/ma/mailhog/package.nix                        | 1 -
 pkgs/by-name/pd/pdns/package.nix                           | 1 -
 pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix  | 1 -
 pkgs/development/python-modules/cccolutils/default.nix     | 1 -
 pkgs/development/python-modules/openidc-client/default.nix | 1 -
 pkgs/development/python-modules/rpmfluff/default.nix       | 1 -
 13 files changed, 18 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 273ef1dd7cfb..fc085d9f04b8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6737,12 +6737,6 @@
     githubId = 392583;
     name = "Dirk-Willem van Gulik";
   };
-  disassembler = {
-    email = "disasm@gmail.com";
-    github = "disassembler";
-    githubId = 651205;
-    name = "Samuel Leathers";
-  };
   disserman = {
     email = "disserman@gmail.com";
     github = "divi255";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index c1c1f1b4b39f..77beb26f3339 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -502,7 +502,6 @@ with lib.maintainers;
   iog = {
     members = [
       cleverca22
-      disassembler
     ];
     scope = "Input-Output Global employees, which maintain critical software";
     shortName = "Input-Output Global employees";
diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix
index 5119f16e97a8..405c1f510d82 100644
--- a/pkgs/by-name/ad/adms/package.nix
+++ b/pkgs/by-name/ad/adms/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
     description = "Automatic device model synthesizer";
     homepage = "https://github.com/Qucs/adms";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ disassembler ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/ai/airsonic/package.nix b/pkgs/by-name/ai/airsonic/package.nix
index 1fc5177be36d..d34667a32f9c 100644
--- a/pkgs/by-name/ai/airsonic/package.nix
+++ b/pkgs/by-name/ai/airsonic/package.nix
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.gpl3;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ disassembler ];
   };
 }
diff --git a/pkgs/by-name/gr/grafana-reporter/package.nix b/pkgs/by-name/gr/grafana-reporter/package.nix
index 04a740d1bddb..25e16107600c 100644
--- a/pkgs/by-name/gr/grafana-reporter/package.nix
+++ b/pkgs/by-name/gr/grafana-reporter/package.nix
@@ -39,6 +39,5 @@ buildGoModule rec {
     mainProgram = "grafana-reporter";
     homepage = "https://github.com/IzakMarais/reporter";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.disassembler ];
   };
 }
diff --git a/pkgs/by-name/ik/iksemel/package.nix b/pkgs/by-name/ik/iksemel/package.nix
index fe124d3f729d..3fc9bf9e1794 100644
--- a/pkgs/by-name/ik/iksemel/package.nix
+++ b/pkgs/by-name/ik/iksemel/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
 
     homepage = "https://github.com/timothytylee/iksemel-1.4";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ disassembler ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/lifelines/package.nix b/pkgs/by-name/li/lifelines/package.nix
index 4f45e30442c3..8d123c865b2a 100644
--- a/pkgs/by-name/li/lifelines/package.nix
+++ b/pkgs/by-name/li/lifelines/package.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
     description = "Genealogy tool with ncurses interface";
     homepage = "https://lifelines.github.io/lifelines/";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.disassembler ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix
index ddfc7a54753d..bac7fee18371 100644
--- a/pkgs/by-name/ma/mailhog/package.nix
+++ b/pkgs/by-name/ma/mailhog/package.nix
@@ -40,7 +40,6 @@ buildGoModule rec {
     homepage = "https://github.com/mailhog/MailHog";
     changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}";
     maintainers = with lib.maintainers; [
-      disassembler
       jojosch
     ];
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix
index 9a0ea3f37d70..e691e76e963b 100644
--- a/pkgs/by-name/pd/pdns/package.nix
+++ b/pkgs/by-name/pd/pdns/package.nix
@@ -108,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       mic92
-      disassembler
       nickcao
     ];
   };
diff --git a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
index d2bf5f120bc3..aa990aa2b125 100644
--- a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
@@ -29,7 +29,6 @@ buildGoModule rec {
     mainProgram = "surfboard_exporter";
     homepage = "https://github.com/ipstatic/surfboard_exporter";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ disassembler ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
index ff973885feb4..78b1b3d468e3 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -39,6 +39,5 @@ buildPythonPackage rec {
     description = "Python Kerberos 5 Credential Cache Collection Utilities";
     homepage = "https://pagure.io/cccolutils";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ disassembler ];
   };
 }
diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix
index ee7b57a9c807..b5d05ab5b894 100644
--- a/pkgs/development/python-modules/openidc-client/default.nix
+++ b/pkgs/development/python-modules/openidc-client/default.nix
@@ -22,6 +22,5 @@ buildPythonPackage rec {
     description = "CLI python OpenID Connect client with token caching and management";
     homepage = "https://github.com/puiterwijk";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ disassembler ];
   };
 }
diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix
index 8c5f88e89df1..920b153b5577 100644
--- a/pkgs/development/python-modules/rpmfluff/default.nix
+++ b/pkgs/development/python-modules/rpmfluff/default.nix
@@ -22,6 +22,5 @@ buildPythonPackage rec {
     description = "Lightweight way of building RPMs, and sabotaging them";
     homepage = "https://pagure.io/rpmfluff";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ disassembler ];
   };
 }

From 01b4dafd088ee8ea9e4da9a6f9eaea5a5f9540ba Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 22:15:33 +0100
Subject: [PATCH 007/112] teams/iog: drop

---
 maintainers/team-list.nix                | 8 --------
 pkgs/by-name/bo/book-summary/package.nix | 1 -
 pkgs/by-name/da/damon/package.nix        | 1 -
 3 files changed, 10 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 77beb26f3339..e99bd8d07139 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -499,14 +499,6 @@ with lib.maintainers;
     shortName = "Infisical";
   };
 
-  iog = {
-    members = [
-      cleverca22
-    ];
-    scope = "Input-Output Global employees, which maintain critical software";
-    shortName = "Input-Output Global employees";
-  };
-
   java = {
     github = "java";
     enableFeatureFreezePing = true;
diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix
index 4d21bcc3e673..af508d86bee9 100644
--- a/pkgs/by-name/bo/book-summary/package.nix
+++ b/pkgs/by-name/bo/book-summary/package.nix
@@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "book-summary";
     homepage = "https://github.com/dvogt23/book-summary";
     license = lib.licenses.mit;
-    teams = with lib.teams; [ iog ];
   };
 }
diff --git a/pkgs/by-name/da/damon/package.nix b/pkgs/by-name/da/damon/package.nix
index 1b3eddea5e89..2e59ca9977e0 100644
--- a/pkgs/by-name/da/damon/package.nix
+++ b/pkgs/by-name/da/damon/package.nix
@@ -21,7 +21,6 @@ buildGoModule {
     homepage = "https://github.com/hashicorp/damon";
     license = lib.licenses.mpl20;
     description = "Terminal UI (TUI) for HashiCorp Nomad";
-    teams = [ lib.teams.iog ];
     mainProgram = "damon";
   };
 }

From 73743b2b7a52e9669c265ef0d4f5fc3f20e27075 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 10 Jan 2026 13:52:28 -0800
Subject: [PATCH 008/112] python3Packages.langchain-mongodb: apply finalAttrs
 fix

---
 .../python-modules/langchain-mongodb/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index e47503549425..36b83a96122b 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -33,7 +33,7 @@
   gitUpdater,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "langchain-mongodb";
   version = "0.9.0";
   pyproject = true;
@@ -41,11 +41,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-mongodb";
-    tag = "libs/langchain-mongodb/v${version}";
+    tag = "libs/langchain-mongodb/v${finalAttrs.version}";
     hash = "sha256-g2FEowzGvP7a/zx/qn8EUxj5s6j/miMlzkRJEE64G0k=";
   };
 
-  sourceRoot = "${src.name}/libs/langchain-mongodb";
+  sourceRoot = "${finalAttrs.src.name}/libs/langchain-mongodb";
 
   build-system = [ hatchling ];
 
@@ -104,7 +104,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/langchain-ai/langchain-mongodb/releases/tag/${src.tag}";
+    changelog = "https://github.com/langchain-ai/langchain-mongodb/releases/tag/${finalAttrs.src.tag}";
     description = "Integration package connecting MongoDB and LangChain";
     homepage = "https://github.com/langchain-ai/langchain-mongodb";
     license = lib.licenses.mit;
@@ -113,4 +113,4 @@ buildPythonPackage rec {
       sarahec
     ];
   };
-}
+})

From 3d4df2fc15c06eaeb18dabc28bb342bb7cbc474c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 10 Jan 2026 13:37:59 -0800
Subject: [PATCH 009/112] python3Packages.langchain-mongodb: 0.9.0 -> 0.10.0

Fixes build issues under Python 3.14

CHANGELOG: https://github.com/langchain-ai/langchain-mongodb/releases/tag/libs%2Flangchain-mongodb%2Fv0.10.0
DIFF: https://github.com/langchain-ai/langchain-mongodb/compare/libs/langchain-mongodb/v0.9.0...libs/langchain-mongodb/v0.10.0
---
 pkgs/development/python-modules/langchain-mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 36b83a96122b..88bf6a9556d5 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-mongodb";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-mongodb";
     tag = "libs/langchain-mongodb/v${finalAttrs.version}";
-    hash = "sha256-g2FEowzGvP7a/zx/qn8EUxj5s6j/miMlzkRJEE64G0k=";
+    hash = "sha256-MRvj6RJ6N+u1wA+zkyWhe4tnGaC4FduPl+k7AhBIwLI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/langchain-mongodb";

From 25ee55d3c726be56b31728adc10262e9db774e82 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:04:52 +0100
Subject: [PATCH 010/112] maintainers: drop victormeriqui

Inactive forever - was added in 2023, but never participated. Dropping
according to maintainer guidelines.
---
 maintainers/maintainer-list.nix | 6 ------
 maintainers/team-list.nix       | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 29df4d5cdc6d..4ac9eadae6d6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27706,12 +27706,6 @@
     githubId = 116078858;
     keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754  4B05 0104 BC05 F41B 77B8"; } ];
   };
-  victormeriqui = {
-    name = "Victor Meriqui";
-    email = "victor.meriqui@ororatech.com";
-    github = "victormeriqui";
-    githubId = 1396008;
-  };
   videl = {
     email = "thibaut.smith@mailbox.org";
     github = "videl";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..eedee5e7157b 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -798,7 +798,6 @@ with lib.maintainers;
     # Edits to this list should only be done by an already existing member.
     members = [
       kip93
-      victormeriqui
     ];
   };
 

From 5e7544107e880d12c5ce35fab1abceac9f8ab40a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:05:08 +0100
Subject: [PATCH 011/112] teams/ororatech: drop

---
 maintainers/team-list.nix                             | 10 ----------
 pkgs/development/python-modules/cobs/default.nix      |  1 -
 pkgs/development/python-modules/dronecan/default.nix  |  1 -
 pkgs/development/python-modules/libpcap/default.nix   |  1 -
 pkgs/development/python-modules/pkg-about/default.nix |  1 -
 pkgs/development/python-modules/pycyphal/default.nix  |  1 -
 pkgs/development/tools/misc/yakut/default.nix         |  1 -
 7 files changed, 16 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index eedee5e7157b..f9321be37297 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -791,16 +791,6 @@ with lib.maintainers;
     shortName = "OpenStack";
   };
 
-  ororatech = {
-    # email: nixdevs@ororatech.com
-    shortName = "OroraTech GmbH. employees";
-    scope = "Team for packages maintained by employees of OroraTech GmbH.";
-    # Edits to this list should only be done by an already existing member.
-    members = [
-      kip93
-    ];
-  };
-
   pantheon = {
     github = "pantheon";
     enableFeatureFreezePing = true;
diff --git a/pkgs/development/python-modules/cobs/default.nix b/pkgs/development/python-modules/cobs/default.nix
index d6dfdba88d88..e5c073766d7c 100644
--- a/pkgs/development/python-modules/cobs/default.nix
+++ b/pkgs/development/python-modules/cobs/default.nix
@@ -39,6 +39,5 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/cmcqueen/cobs-python/";
     license = lib.licenses.mit;
-    teams = [ lib.teams.ororatech ];
   };
 }
diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix
index ce8184a4014e..19cd14017d5f 100644
--- a/pkgs/development/python-modules/dronecan/default.nix
+++ b/pkgs/development/python-modules/dronecan/default.nix
@@ -27,6 +27,5 @@ buildPythonPackage rec {
     '';
     homepage = "https://dronecan.github.io/";
     license = lib.licenses.mit;
-    teams = [ lib.teams.ororatech ];
   };
 }
diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix
index e9c8e7b73ea0..15130c9ff5f0 100644
--- a/pkgs/development/python-modules/libpcap/default.nix
+++ b/pkgs/development/python-modules/libpcap/default.nix
@@ -65,6 +65,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/karpierz/libpcap/";
     changelog = "https://github.com/karpierz/libpcap/blob/${version}/CHANGES.rst";
     license = lib.licenses.bsd3;
-    teams = [ lib.teams.ororatech ];
   };
 }
diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index 14122e60969b..25dea6cce199 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -52,6 +52,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/karpierz/pkg_about/";
     changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst";
     license = lib.licenses.zlib;
-    teams = [ lib.teams.ororatech ];
   };
 }
diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index c2c4cb48ff79..2fe0735a56f4 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -101,6 +101,5 @@ buildPythonPackage rec {
     homepage = "https://opencyphal.org/";
     changelog = "https://github.com/OpenCyphal/pycyphal/blob/${version}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    teams = [ lib.teams.ororatech ];
   };
 }
diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix
index 3c9900c24196..b4dcd5ef7dd5 100644
--- a/pkgs/development/tools/misc/yakut/default.nix
+++ b/pkgs/development/tools/misc/yakut/default.nix
@@ -55,6 +55,5 @@ buildPythonApplication rec {
     '';
     homepage = "https://github.com/OpenCyphal/yakut/";
     license = lib.licenses.mit;
-    teams = [ lib.teams.ororatech ];
   };
 }

From 9664e08e4b19d76cd6f7bbebfd5044c966fe3282 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:55:44 +0100
Subject: [PATCH 012/112] maintainers: drop wr0belj

Was added in 2021, but never had any activity in Nixpkgs. Dropping
according to the maintainer guidelines.
---
 maintainers/maintainer-list.nix | 6 ------
 maintainers/team-list.nix       | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 29df4d5cdc6d..463aec5cc7d8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28532,12 +28532,6 @@
     github = "wrrrzr";
     githubId = 161970349;
   };
-  wr0belj = {
-    name = "Jakub Wróbel";
-    email = "wrobel.jakub@protonmail.com";
-    github = "wr0belj";
-    githubId = 40501814;
-  };
   wr7 = {
     name = "wr7";
     email = "d-wr7@outlook.com";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..7adf797dd7cb 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -861,7 +861,6 @@ with lib.maintainers;
   redcodelabs = {
     members = [
       unrooted
-      wr0belj
       wintrmvte
     ];
     scope = "Maintain Red Code Labs related packages and modules.";

From 81e9157d043fb959306c076416f5143b98d2e58b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:56:12 +0100
Subject: [PATCH 013/112] maintainers: drop wintrmvte

Was added in 2021, but never had any activity in Nixpkgs. Dropping
according to the maintainer guidelines.
---
 maintainers/maintainer-list.nix | 6 ------
 maintainers/team-list.nix       | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 463aec5cc7d8..ec25489d2dd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28387,12 +28387,6 @@
     githubId = 78392041;
     name = "Winter";
   };
-  wintrmvte = {
-    name = "Jakub Lutczyn";
-    email = "kubalutczyn@gmail.com";
-    github = "wintrmvte";
-    githubId = 41823252;
-  };
   wirew0rm = {
     email = "alex@wirew0rm.de";
     github = "wirew0rm";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7adf797dd7cb..eefd601a8c1d 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -861,7 +861,6 @@ with lib.maintainers;
   redcodelabs = {
     members = [
       unrooted
-      wintrmvte
     ];
     scope = "Maintain Red Code Labs related packages and modules.";
     shortName = "Red Code Labs";

From 3f0e1cf7ac818300ffb4ba82341c896047c10b3b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:58:36 +0100
Subject: [PATCH 014/112] teams/redcodelabs: drop

---
 maintainers/team-list.nix             | 8 --------
 pkgs/by-name/go/godspeed/package.nix  | 1 -
 pkgs/by-name/go/gosh/package.nix      | 1 -
 pkgs/by-name/sa/sammler/package.nix   | 1 -
 pkgs/by-name/sn/snowcrash/package.nix | 1 -
 5 files changed, 12 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index eefd601a8c1d..cc33c3de3349 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -858,14 +858,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  redcodelabs = {
-    members = [
-      unrooted
-    ];
-    scope = "Maintain Red Code Labs related packages and modules.";
-    shortName = "Red Code Labs";
-  };
-
   rocm = {
     github = "rocm";
   };
diff --git a/pkgs/by-name/go/godspeed/package.nix b/pkgs/by-name/go/godspeed/package.nix
index f07e8209dcd7..a56c0ca52524 100644
--- a/pkgs/by-name/go/godspeed/package.nix
+++ b/pkgs/by-name/go/godspeed/package.nix
@@ -31,7 +31,6 @@ buildGoModule rec {
     changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
-    teams = [ lib.teams.redcodelabs ];
     mainProgram = "godspeed";
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/go/gosh/package.nix b/pkgs/by-name/go/gosh/package.nix
index fe30e145947e..047eae776bf7 100644
--- a/pkgs/by-name/go/gosh/package.nix
+++ b/pkgs/by-name/go/gosh/package.nix
@@ -24,7 +24,6 @@ buildGoModule rec {
     homepage = "https://github.com/redcode-labs/GoSH";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
-    teams = [ lib.teams.redcodelabs ];
     mainProgram = "GoSH";
   };
 }
diff --git a/pkgs/by-name/sa/sammler/package.nix b/pkgs/by-name/sa/sammler/package.nix
index 80d9cfc1c93a..7d6866807892 100644
--- a/pkgs/by-name/sa/sammler/package.nix
+++ b/pkgs/by-name/sa/sammler/package.nix
@@ -26,6 +26,5 @@ buildGoModule rec {
     homepage = "https://github.com/redcode-labs/Sammler";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
-    teams = [ lib.teams.redcodelabs ];
   };
 }
diff --git a/pkgs/by-name/sn/snowcrash/package.nix b/pkgs/by-name/sn/snowcrash/package.nix
index 2a2de3416d7a..253c059d057f 100644
--- a/pkgs/by-name/sn/snowcrash/package.nix
+++ b/pkgs/by-name/sn/snowcrash/package.nix
@@ -29,7 +29,6 @@ buildGoModule rec {
     homepage = "https://github.com/redcode-labs/SNOWCRASH";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
-    teams = [ lib.teams.redcodelabs ];
     mainProgram = "SNOWCRASH";
   };
 }

From e73bed973b4da0f244f1b886ab7c380c1c3ea39a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 Jan 2026 13:16:44 +0000
Subject: [PATCH 015/112] python3Packages.netbox-routing: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/development/python-modules/netbox-routing/default.nix
index 0849c0946b9f..ffccac2914cd 100644
--- a/pkgs/development/python-modules/netbox-routing/default.nix
+++ b/pkgs/development/python-modules/netbox-routing/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-routing";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DanSheps";
     repo = "netbox-routing";
     tag = "v${version}";
-    hash = "sha256-qtGzZDRo80pdmt3CbM+HG/S7uLvLS7V6lHNB8sM6bcA=";
+    hash = "sha256-HB07q6VO/PjbLLzKmHPMK91ZnppFtm9woQwdJIOFs5s=";
   };
 
   build-system = [ setuptools ];

From a9214f54e791529ac6434c09af917fc33b5cb8f3 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sun, 11 Jan 2026 15:44:40 +0100
Subject: [PATCH 016/112] neovim/{utils,wrapper}.nix: fix typos

---
 pkgs/applications/editors/neovim/utils.nix   | 8 ++++----
 pkgs/applications/editors/neovim/wrapper.nix | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index cc40709d5b9e..650a307f5639 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -60,7 +60,7 @@ let
     };
 
   /**
-    * Builds a vim package (see ':h packages') with additionnal info:
+    * Builds a vim package (see ':h packages') with additional info:
     - the user lua configuration (specified by user)
     - the advised and advised by nixpkgs in passthru.initLua)
     - runtime dependencies (specified in plugins' "runtimeDeps")
@@ -110,7 +110,7 @@ let
       # viml config set by the user along with the plugin
       inherit userPluginViml;
 
-      # recommanded configuration set in vim plugins ".passthru.initLua"
+      # recommended configuration set in vim plugins ".passthru.initLua"
       inherit pluginAdvisedLua;
 
       # A Vim "package", see ':h packages'
@@ -135,8 +135,8 @@ let
     arguments (["-u" writeText "init.vim" GENERATEDRC)]).
     This makes it possible to write the config anywhere: on a per-project basis
     .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects.
-    Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded
-    anymore, $MYVIMRC wont be set etc
+    Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc won't be loaded
+    anymore, $MYVIMRC won't be set etc
   */
   makeNeovimConfig =
     {
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index c1c7fa4cdeba..0d8a0a94d4df 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -338,8 +338,7 @@ let
           unwrapped = neovim-unwrapped;
           initRc = neovimRcContent';
 
-          tests = callPackage ./tests {
-          };
+          tests = callPackage ./tests { };
         };
 
         meta = {

From 22e215d6ebe427171e781e42b8e6ffef75cc4b24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 Jan 2026 15:23:05 +0000
Subject: [PATCH 017/112] python3Packages.garth: 0.5.20 -> 0.5.21

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

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index 6d1dbe25da26..e23cfb04cbec 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "garth";
-  version = "0.5.20";
+  version = "0.5.21";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dqn/SeLQMT+6XOr65hlavZf1zdHnICKm9VCFh9DMLpk=";
+    hash = "sha256-jZeVldHU6iOhtGarSmCVXRObcfiG9GSQvhQPzuWE2rQ=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];

From ea17f27c985c844affcfaaa73884d90d3fc6943c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 11 Jan 2026 15:23:42 +0000
Subject: [PATCH 018/112] maintainers/README: update guidelines around closed
 teams

---
 maintainers/README.md | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/maintainers/README.md b/maintainers/README.md
index dee6bde1fae9..5a4009055aa6 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -145,18 +145,11 @@ When adding users to [`maintainer-list.nix`](./maintainer-list.nix), the followi
 Feel free to create a new maintainer team in [`team-list.nix`](./team-list.nix) when a group is collectively responsible for a collection of packages.
 Use taste and personal judgment when deciding if a team is warranted.
 
-Teams are allowed to define their own rules about membership.
+Teams should be organised around areas of maintenance interest and expertise, rather than employer or participation in another project or organization.
+For example, a team dedicated to maintaining support for a desktop environment or programming language in Nixpkgs makes sense, as does a team to maintain packaging of software from a given vendor, but a team exclusive to employees of a company or maintainers of another project does not.
 
-For example, some teams will represent a business or other group which wants to carefully track its members.
-Other teams may be very open about who can join, and allow anybody to participate.
-
-When reviewing changes to a team, read the team's scope and the context around the member list for indications about the team's membership policy.
-
-In any case, request reviews from the existing team members.
-If the team lists no specific membership policy, feel free to merge changes to the team after giving the existing members a few days to respond.
-
-> [!IMPORTANT]
-> If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
+When reviewing changes to a team, request reviews from the existing team members.
+Feel free to merge changes to the team if the existing members are unresponsive.
 
 #### Synced GitHub teams
 

From 215cc5fffb93fce0df16f95fbbec23dd4c398780 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 Jan 2026 18:55:54 +0100
Subject: [PATCH 019/112] python313Packages.garth: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index e23cfb04cbec..39e4fd0030b9 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -10,13 +10,13 @@
   requests-oauthlib,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "garth";
   version = "0.5.21";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-jZeVldHU6iOhtGarSmCVXRObcfiG9GSQvhQPzuWE2rQ=";
   };
 
@@ -55,8 +55,8 @@ buildPythonPackage rec {
   meta = {
     description = "Garmin SSO auth and connect client";
     homepage = "https://github.com/matin/garth";
-    changelog = "https://github.com/matin/garth/releases/tag/${version}";
+    changelog = "https://github.com/matin/garth/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 2a212c7c4e1274b7fcef96b3c40454b4a42d8446 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 11 Jan 2026 22:55:01 +0100
Subject: [PATCH 020/112] maintainers: drop elitak

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 maintainers/maintainer-list.nix                     | 6 ------
 pkgs/applications/misc/opentx/default.nix           | 1 -
 pkgs/by-name/di/dislocker/package.nix               | 1 -
 pkgs/by-name/ed/edgetx/package.nix                  | 1 -
 pkgs/by-name/fa/factorio/package.nix                | 1 -
 pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix | 1 -
 pkgs/by-name/li/livepeer/package.nix                | 1 -
 pkgs/by-name/st/stm32flash/package.nix              | 2 +-
 pkgs/by-name/su/sunxi-tools/package.nix             | 2 +-
 pkgs/by-name/vc/vcs/package.nix                     | 2 +-
 pkgs/by-name/wr/wraith/package.nix                  | 2 +-
 pkgs/development/python-modules/vncdo/default.nix   | 2 +-
 12 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a658758084db..1e1389f21a0e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7674,12 +7674,6 @@
     githubId = 161958668;
     name = "Élise Souche";
   };
-  elitak = {
-    email = "elitak@gmail.com";
-    github = "elitak";
-    githubId = 769073;
-    name = "Eric Litak";
-  };
   elizagamedev = {
     email = "eliza@eliza.sh";
     github = "elizagamedev";
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 3e9d0e569275..0abe97282fad 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -84,7 +84,6 @@ mkDerivation rec {
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [
-      elitak
       lopsided98
     ];
   };
diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix
index a0f844006471..5b69c53d45ae 100644
--- a/pkgs/by-name/di/dislocker/package.nix
+++ b/pkgs/by-name/di/dislocker/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      elitak
       yuannan
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 02d6fd045f38..9be1dbd82716 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [
-      elitak
       lopsided98
       wucke13
       xokdvium
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index b0d5072db3a8..3de81b7191f8 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -224,7 +224,6 @@ let
       license = lib.licenses.unfree;
       maintainers = with lib.maintainers; [
         Baughn
-        elitak
         priegger
         lukegb
       ];
diff --git a/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix b/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix
index 4734a263459e..209306c68d05 100644
--- a/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix
+++ b/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix
@@ -29,7 +29,6 @@ buildGoModule rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       Luflosi
-      elitak
     ];
     mainProgram = "fs-repo-migrations";
   };
diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix
index f64ce89481af..3b3e14643886 100644
--- a/pkgs/by-name/li/livepeer/package.nix
+++ b/pkgs/by-name/li/livepeer/package.nix
@@ -44,7 +44,6 @@ buildGoModule rec {
     homepage = "https://livepeer.org";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      elitak
       bot-wxt1221
     ];
     mainProgram = "livepeer";
diff --git a/pkgs/by-name/st/stm32flash/package.nix b/pkgs/by-name/st/stm32flash/package.nix
index 04bd951034aa..40824675e4c9 100644
--- a/pkgs/by-name/st/stm32flash/package.nix
+++ b/pkgs/by-name/st/stm32flash/package.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/stm32flash/";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.all; # Should work on all platforms
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/su/sunxi-tools/package.nix b/pkgs/by-name/su/sunxi-tools/package.nix
index b20be9e00960..8d1f3a567580 100644
--- a/pkgs/by-name/su/sunxi-tools/package.nix
+++ b/pkgs/by-name/su/sunxi-tools/package.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation {
     homepage = "http://linux-sunxi.org/";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.elitak ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/vc/vcs/package.nix b/pkgs/by-name/vc/vcs/package.nix
index 28a27164dbe2..f9819bbf4f9f 100644
--- a/pkgs/by-name/vc/vcs/package.nix
+++ b/pkgs/by-name/vc/vcs/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     description = "Generates contact sheets from video files";
     homepage = "http://p.outlyer.net/vcs";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
     mainProgram = "vcs";
   };
diff --git a/pkgs/by-name/wr/wraith/package.nix b/pkgs/by-name/wr/wraith/package.nix
index 4a352652a438..30f5d63e7a58 100644
--- a/pkgs/by-name/wr/wraith/package.nix
+++ b/pkgs/by-name/wr/wraith/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://wraith.botpack.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix
index 575c428595b0..697c7618f0c7 100644
--- a/pkgs/development/python-modules/vncdo/default.nix
+++ b/pkgs/development/python-modules/vncdo/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/sibson/vncdotool";
     changelog = "https://github.com/sibson/vncdotool/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = [ ];
     mainProgram = "vncdo";
     platforms = with lib.platforms; linux ++ darwin;
   };

From dce1a64b856700f4d6c8fdb0e878df2e98584a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Neumann?= <necoro@necoro.eu>
Date: Mon, 12 Jan 2026 01:43:41 +0100
Subject: [PATCH 021/112] maintainers: drop sargon

---
 maintainers/maintainer-list.nix          | 6 ------
 pkgs/by-name/ra/radsecproxy/package.nix  | 2 +-
 pkgs/by-name/ss/sshguard/package.nix     | 2 +-
 pkgs/servers/mail/nullmailer/default.nix | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2824b32dccf9..18003a822bb6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23440,12 +23440,6 @@
     githubId = 30531572;
     name = "Robert James Hernandez";
   };
-  sargon = {
-    email = "danielehlers@mindeye.net";
-    github = "sargon";
-    githubId = 178904;
-    name = "Daniel Ehlers";
-  };
   sarunint = {
     email = "nixpkgs@sarunint.com";
     github = "sarunint";
diff --git a/pkgs/by-name/ra/radsecproxy/package.nix b/pkgs/by-name/ra/radsecproxy/package.nix
index 737cb9891a53..5b32115c3fc5 100644
--- a/pkgs/by-name/ra/radsecproxy/package.nix
+++ b/pkgs/by-name/ra/radsecproxy/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     homepage = "https://radsecproxy.github.io/";
     description = "Generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ sargon ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/by-name/ss/sshguard/package.nix b/pkgs/by-name/ss/sshguard/package.nix
index 8c0a62b123d2..bb8f4a7a3f03 100644
--- a/pkgs/by-name/ss/sshguard/package.nix
+++ b/pkgs/by-name/ss/sshguard/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://sshguard.net";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ sargon ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd;
   };
 }
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index 6276035dc3e0..bd5a7ae90918 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ sargon ];
+    maintainers = [ ];
   };
 }

From 3263c13a8bf8bd568ebbb9a6ace399d95027c821 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Mon, 12 Jan 2026 15:04:08 +0100
Subject: [PATCH 022/112] libxsmm: ensure gcc15 compatibility

---
 pkgs/by-name/li/libxsmm/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libxsmm/package.nix b/pkgs/by-name/li/libxsmm/package.nix
index ebcdfb6ee79b..6382c5fda724 100644
--- a/pkgs/by-name/li/libxsmm/package.nix
+++ b/pkgs/by-name/li/libxsmm/package.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
       "STATIC=${static}"
     ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -std=gnu17";
+
   postInstall = ''
     mkdir -p $dev/lib/pkgconfig
     mv $out/lib/*.pc $dev/lib/pkgconfig

From 211d38fd01b00021a2e30a8458a1a64fdac065dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Jan 2026 16:03:36 +0000
Subject: [PATCH 023/112] hl-log-viewer: 0.34.1 -> 0.35.1

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

diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix
index 91d44c50b048..6577bf30f363 100644
--- a/pkgs/by-name/hl/hl-log-viewer/package.nix
+++ b/pkgs/by-name/hl/hl-log-viewer/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hl-log-viewer";
-  version = "0.34.1";
+  version = "0.35.1";
 
   src = fetchFromGitHub {
     owner = "pamburus";
     repo = "hl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WUapXgmgshoziNviaKMGs+uKw6E8/sWCIJkleygfACk=";
+    hash = "sha256-gkUZHepuPOzFi0oWFBzqXPFfWaxlKr5+VCkZwawz+/Q=";
   };
 
-  cargoHash = "sha256-DtYGGe0ot54q2A/W3sUigNoYwf2LiDwxj+AI5VovOTE=";
+  cargoHash = "sha256-jon7nDdK2bYDIh/zqJV7em87se9XBXV6+c2HlMBzJnA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a05074f4a66585e06295e85ada180ad823751b58 Mon Sep 17 00:00:00 2001
From: Michael Farber Brodsky <misha@farbebrodsky.com>
Date: Mon, 12 Jan 2026 19:36:51 +0200
Subject: [PATCH 024/112] gruvbox-plus-icons: add light theme

---
 pkgs/by-name/gr/gruvbox-plus-icons/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
index b0b8591bca1b..8dcf786dc094 100644
--- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
+++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
@@ -36,9 +36,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     mkdir -p $out/share/icons
     cp -r Gruvbox-Plus-Dark $out/share/icons/
+    cp -r Gruvbox-Plus-Light $out/share/icons/
     patchShebangs scripts/folders-color-chooser
     ./scripts/folders-color-chooser -c ${folder-color}
     gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark
+    gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Light
 
     runHook postInstall
   '';

From 3b3875c7003aaedbc41d97e949fa84148c4055f2 Mon Sep 17 00:00:00 2001
From: Val Packett <val@invisiblethingslab.com>
Date: Tue, 13 Jan 2026 00:56:13 -0300
Subject: [PATCH 025/112] maintainers: add valpackett

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 03688a1175f6..64164801577a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27541,6 +27541,13 @@
     githubId = 27813;
     name = "Vincent Breitmoser";
   };
+  valpackett = {
+    email = "val@invisiblethingslab.com";
+    github = "valpackett";
+    githubId = 208340;
+    matrix = "@valpackett:mozilla.org";
+    name = "Val Packett";
+  };
   vamega = {
     email = "github@madiathv.com";
     github = "vamega";

From 133f4cd7dad37e6f53e5466401b6afa06ce58ba7 Mon Sep 17 00:00:00 2001
From: Val Packett <val@invisiblethingslab.com>
Date: Fri, 28 Nov 2025 05:08:37 -0300
Subject: [PATCH 026/112] nixos/userborn: introduce
 config.services.userborn.static mode

For embedded appliance-style applications, we would like to avoid the
~100ms boot time hit that comes from running userborn or sysusers by
pre-baking the final password files directly into the system closure.

Turns out, userborn is trivial to run at build time instead of boot time,
so let's introduce a new "baked" static mode that directly places the files
into an immutable /etc.
---
 nixos/modules/services/system/userborn.nix | 77 ++++++++++++++++------
 nixos/tests/all-tests.nix                  |  1 +
 nixos/tests/userborn-static.nix            | 57 ++++++++++++++++
 3 files changed, 116 insertions(+), 19 deletions(-)
 create mode 100644 nixos/tests/userborn-static.nix

diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix
index 73b7581bd2b7..f9595fe72654 100644
--- a/nixos/modules/services/system/userborn.nix
+++ b/nixos/modules/services/system/userborn.nix
@@ -35,6 +35,9 @@ let
   };
 
   userbornConfigJson = pkgs.writeText "userborn.json" (builtins.toJSON userbornConfig);
+  userbornStaticFiles =
+    pkgs.runCommand "static-userborn" { }
+      "mkdir -p $out; ${lib.getExe cfg.package} ${userbornConfigJson} $out";
 
   immutableEtc = config.system.etc.overlay.enable && !config.system.etc.overlay.mutable;
   # The filenames created by userborn.
@@ -51,12 +54,29 @@ in
 
     enable = lib.mkEnableOption "userborn";
 
+    static = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to generate the password files at build time and store them directly
+        in the system closure, without requiring any services at boot time.
+
+        This is STRICTLY intended for embedded appliance images that only have system
+        users with manually managed static user IDs, and CANNOT be used with generation
+        updates.
+
+        WARNING: In this mode, you MUST statically manage user IDs yourself, carefully.
+        Beware, UID reuse is a serious security issue and it's your responsibility
+        to avoid it over the entire lifetime of the system.
+      '';
+    };
+
     package = lib.mkPackageOption pkgs "userborn" { };
 
     passwordFilesLocation = lib.mkOption {
       type = lib.types.str;
-      default = if immutableEtc then "/var/lib/nixos" else "/etc";
-      defaultText = lib.literalExpression ''if immutableEtc then "/var/lib/nixos" else "/etc"'';
+      default = if immutableEtc && !cfg.static then "/var/lib/nixos" else "/etc";
+      defaultText = lib.literalExpression ''if immutableEtc && !config.services.userborn.static then "/var/lib/nixos" else "/etc"'';
       description = ''
         The location of the original password files.
 
@@ -83,8 +103,12 @@ in
         message = "system.activationScripts.users has to be empty to use userborn";
       }
       {
-        assertion = immutableEtc -> (cfg.passwordFilesLocation != "/etc");
-        message = "When `system.etc.overlay.mutable = false`, `services.userborn.passwordFilesLocation` cannot be set to `/etc`";
+        assertion = (immutableEtc && !cfg.static) -> (cfg.passwordFilesLocation != "/etc");
+        message = "When `system.etc.overlay.mutable = false` and `services.userborn.static = false`, `services.userborn.passwordFilesLocation` cannot be set to `/etc`";
+      }
+      {
+        assertion = !(cfg.static && config.system.switch.enable);
+        message = "You cannot use `services.userborn.static = true` with switchable configurations, it is ONLY indended for appliance images with fully static user IDs";
       }
     ];
 
@@ -110,7 +134,7 @@ in
             ) userCfg.users
           );
 
-      services.userborn = {
+      services.userborn = lib.mkIf (!cfg.static) {
         wantedBy = [ "sysinit.target" ];
         requiredBy = [ "sysinit-reactivation.target" ];
         after = [
@@ -166,20 +190,35 @@ in
       };
     };
 
-    # Statically create the symlinks to passwordFilesLocation when they're not
-    # inside /etc because we will not be able to do it at runtime in case of an
-    # immutable /etc!
-    environment.etc = lib.mkIf (cfg.passwordFilesLocation != "/etc") (
-      lib.listToAttrs (
-        lib.map (
-          file:
-          lib.nameValuePair file {
-            source = "${cfg.passwordFilesLocation}/${file}";
-            mode = "direct-symlink";
-          }
-        ) passwordFiles
-      )
-    );
+    environment.etc = lib.mkMerge [
+      (lib.mkIf cfg.static (
+        # In static mode, statically drop the files into an immutable /etc.
+        lib.listToAttrs (
+          lib.map (
+            file:
+            lib.nameValuePair file {
+              source = "${userbornStaticFiles}/${file}";
+              mode = if file == "shadow" then "0000" else "0644";
+            }
+          ) passwordFiles
+        )
+      ))
+
+      (lib.mkIf (!cfg.static && cfg.passwordFilesLocation != "/etc") (
+        # Statically create the symlinks to passwordFilesLocation when they're not
+        # inside /etc because we will not be able to do it at runtime in case of a
+        # (non-static) immutable /etc!
+        lib.listToAttrs (
+          lib.map (
+            file:
+            lib.nameValuePair file {
+              source = "${cfg.passwordFilesLocation}/${file}";
+              mode = "direct-symlink";
+            }
+          ) passwordFiles
+        )
+      ))
+    ];
   };
 
   meta.maintainers = with lib.maintainers; [ nikstur ];
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ddd09ceb28d2..e845597fa3ef 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1647,6 +1647,7 @@ in
   userborn-immutable-users = runTest ./userborn-immutable-users.nix;
   userborn-mutable-etc = runTest ./userborn-mutable-etc.nix;
   userborn-mutable-users = runTest ./userborn-mutable-users.nix;
+  userborn-static = runTest ./userborn-static.nix;
   ustreamer = runTest ./ustreamer.nix;
   uwsgi = runTest ./uwsgi.nix;
   v2ray = runTest ./v2ray.nix;
diff --git a/nixos/tests/userborn-static.nix b/nixos/tests/userborn-static.nix
new file mode 100644
index 000000000000..e1d5cf259a7d
--- /dev/null
+++ b/nixos/tests/userborn-static.nix
@@ -0,0 +1,57 @@
+{ lib, ... }:
+
+let
+  sysuserPassword = "$y$j9T$3aiOV/8CADAK22OK2QT3/0$67OKd50Z4qTaZ8c/eRWHLIM.o3ujtC1.n9ysmJfv639";
+
+  common = {
+    services.userborn = {
+      enable = true;
+      static = true;
+    };
+    boot.initrd.systemd.enable = true;
+    networking.useNetworkd = true;
+    system.etc.overlay = {
+      enable = true;
+      mutable = false;
+    };
+  };
+in
+
+{
+
+  name = "userborn-static";
+
+  meta.maintainers = with lib.maintainers; [
+    mic92
+    valpackett
+  ];
+
+  nodes.machine =
+    { ... }:
+    {
+      imports = [ common ];
+
+      users.users.sysuser = {
+        uid = 1337;
+        isSystemUser = true;
+        group = "wheel";
+        home = "/var/empty";
+        initialHashedPassword = sysuserPassword;
+      };
+    };
+
+  testScript = ''
+    with subtest("Correct mode on the password files"):
+      assert machine.succeed("stat -c '%a' /etc/passwd") == "644\n"
+      assert machine.succeed("stat -c '%a' /etc/group") == "644\n"
+      assert machine.succeed("stat -c '%a' /etc/shadow") == "0\n"
+
+    with subtest("Check files"):
+      print(machine.succeed("grpck -r"))
+      print(machine.succeed("pwck -r"))
+
+    with subtest("sysuser user is created"):
+      print(machine.succeed("getent passwd sysuser"))
+      assert "${sysuserPassword}" in machine.succeed("getent shadow sysuser"), "sysuser user password is not correct"
+  '';
+}

From fba0e5e96c4f80528767204007cd84ef5a995718 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 13 Jan 2026 11:31:50 +0000
Subject: [PATCH 027/112] python3Packages.iterable-io: modernize

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

diff --git a/pkgs/development/python-modules/iterable-io/default.nix b/pkgs/development/python-modules/iterable-io/default.nix
index 02d25109df51..276a3c4ca951 100644
--- a/pkgs/development/python-modules/iterable-io/default.nix
+++ b/pkgs/development/python-modules/iterable-io/default.nix
@@ -6,7 +6,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "iterable-io";
   version = "1.0.0";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pR0Ps";
     repo = "iterable-io";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA=";
   };
 
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library to adapt iterables to a file-like interface";
     homepage = "https://github.com/pR0Ps/iterable-io";
-    changelog = "https://github.com/pR0Ps/iterable-io/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/pR0Ps/iterable-io/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.lgpl3Only;
     maintainers = [ lib.maintainers.mjoerg ];
   };
-}
+})

From 27367015b7eba0bd0204ee2f7313b39ff3d56585 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 13 Jan 2026 11:31:50 +0000
Subject: [PATCH 028/112] python3Packages.iterable-io: 1.0.0 -> 1.0.1

https://github.com/pR0Ps/iterable-io/compare/refs/tags/v1.0.0...refs/tags/v1.0.1
https://github.com/pR0Ps/iterable-io/blob/refs/tags/v1.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/iterable-io/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iterable-io/default.nix b/pkgs/development/python-modules/iterable-io/default.nix
index 276a3c4ca951..dd07c69333f4 100644
--- a/pkgs/development/python-modules/iterable-io/default.nix
+++ b/pkgs/development/python-modules/iterable-io/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iterable-io";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pR0Ps";
     repo = "iterable-io";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA=";
+    hash = "sha256-mS8x3M0DNnwW6Ov3TG8b2J702rjOnZT9r38fsIUXkro=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 4c3528ada3a85098a26681c3f360297501ccd7cd Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 14 Jan 2026 02:17:12 +0100
Subject: [PATCH 029/112] gnu-cim: fix build with CFLAG

---
 pkgs/by-name/gn/gnu-cim/package.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/gn/gnu-cim/package.nix b/pkgs/by-name/gn/gnu-cim/package.nix
index cdf0583d5bf6..fe2339f27a1a 100644
--- a/pkgs/by-name/gn/gnu-cim/package.nix
+++ b/pkgs/by-name/gn/gnu-cim/package.nix
@@ -29,13 +29,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  # lib.escapeShellArgs does not work
-  env.CFLAGS = lib.concatStringsSep " " [
-    "-Wno-error=implicit-function-declaration"
-    "-Wno-error=implicit-int"
-    "-Wno-error=return-mismatch"
-    "-Wno-error=incompatible-pointer-types"
-  ];
+  env.CFLAGS = "-std=gnu89";
 
   doCheck = true;
 

From dd3aba90a41d2498eafaae4636ff057f35904f4a Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:26 +0000
Subject: [PATCH 030/112] cosmic-applibrary: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 3d5f4b731a1a..cef431b4a68d 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-BNOHYciE+/HGNJRvRK6imB4mx4B4Vqz9kVEqWP/DXvE=";
+    hash = "sha256-uQaTSt0sgUQYopEFVmaeDCnejSc1gyGLHeHM2bGzStQ=";
   };
 
-  cargoHash = "sha256-M3zyBsNFUQ5dwzJRlaC8m6o5U4teIgwl6jTDYSqW8qw=";
+  cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A=";
 
   nativeBuildInputs = [
     just

From 0da963def8a39537394033d719de0f642d8a6875 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:38:36 +0000
Subject: [PATCH 031/112] cosmic-applets: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index 0ae09c3f6e20..bfc8bc235283 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-GhH3bM/mj1fx6cxxtZXZvODJZoSszkBCE8lcq42sZbA=";
+    hash = "sha256-o64sXCWuEIRV1KCRvKeN6iZBZfUyDYtft5yeag4jBNc=";
   };
 
-  cargoHash = "sha256-Eq0RSA8TYHKNRx5mg010iyrONigKR0GgGZ3fXnWOmG8=";
+  cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY=";
 
   nativeBuildInputs = [
     just

From a0b9d58eb982df979388bc20e52d5b81ff7f3e91 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:41:06 +0000
Subject: [PATCH 032/112] cosmic-bg: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-bg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 8cc258500684..e2731285a3e8 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 597fcf05311d700cdd51dbe37c70a93d8d48a990 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:44:30 +0000
Subject: [PATCH 033/112] cosmic-comp: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 469e1cbb82c8..b7e4cf54972b 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xvvaRuYbUDNORCoBQ9FKIpGROoDoyg3k5CdUl2gjd0s=";
+    hash = "sha256-PBobAoXi3p1xUbs4XmmPkQ93QlMsULEYUoTDqOlJozg=";
   };
 
-  cargoHash = "sha256-1j99crcOUGocmdCsKCN0gKRUd4s0YOJyHskiR/SqA7A=";
+  cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w=";
 
   separateDebugInfo = true;
 

From 182a18def49c520c883f2fc13f6edc5be0041e9e Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:47 +0000
Subject: [PATCH 034/112] cosmic-edit: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index d03122633487..1ba7ac72a79d 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-TWFTHbkYlZh4yPBnTbVgB9Ld05mVbUTF6yIN3HJbhdo=";
+    hash = "sha256-ZqyaCryXNljJ00qD3ZksfKszANke3HqYgHoGNCHOUqI=";
   };
 
   cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8=";

From 638919526c725803c111fcb911406d2dbcc2edd3 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:47 +0000
Subject: [PATCH 035/112] cosmic-files: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index 40317ee61bc6..c96b17ccd1a1 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gGURDSKOIroYGeZJrKayNMCC8GzB8OstkDl2jz/rm5A=";
+    hash = "sha256-ZX7eRSrQXgc4oitjugvRicng87zVK41ecSUE80tl0Y0=";
   };
 
   cargoHash = "sha256-CGFBvOWu9ZA8kYDYDBVur5uWW8Cs7fT5T96UnKMkvEo=";

From 543d3567c31242a4e1b3585a108e9a6a18a9fd4a Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:40:10 +0000
Subject: [PATCH 036/112] cosmic-greeter: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index af13ac9e2a1d..afc0b6f32bf9 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,7 +19,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
 
   env = {
-    VERGEN_GIT_COMMIT_DATE = "2025-12-31";
+    VERGEN_GIT_COMMIT_DATE = "2026-01-14";
     VERGEN_GIT_SHA = finalAttrs.src.tag;
   };
 

From def1ac0d37c48c1ca81a9793f3b0641f94aba3a1 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:36:40 +0000
Subject: [PATCH 037/112] cosmic-icons: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-icons/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 164ed907c55e..b570a9335547 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From e207a018882989509dc82dadf0c94351780f5b0c Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:16 +0000
Subject: [PATCH 038/112] cosmic-idle: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-idle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 0520f43486b0..04f8881af359 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 43c70309ea8f9364ca39cdc51a8189739217f33e Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:19 +0000
Subject: [PATCH 039/112] cosmic-initial-setup: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index c30773c00ae4..7808c5e82634 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,17 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-VO8r2r7zzFZU5gYBTxUpS/829QQvlVGsG798XfqqXR0=";
+    hash = "sha256-g1FJiJSyPZTJ1G8cW8A0sxbIUeG3JcjJYo6qHp639d4=";
   };
 
-  cargoHash = "sha256-fjcYPA+kuhD9JLjoZkzAziJK8qF/a/gdSafmckLD8n0=";
+  cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8=";
 
   buildFeatures = [ "nixos" ];
 

From e3033eafc971ac47178dbe87646a74ff75bb2c17 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:27 +0000
Subject: [PATCH 040/112] cosmic-launcher: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-launcher/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index e8ac09949b00..fc3f0112c9ef 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 38799707f51f378c820af3b13c3b0389d5905530 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:14 +0000
Subject: [PATCH 041/112] cosmic-notifications: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index cb9ef98aa6e6..309c2b9b3fb1 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-8wYX3KCWXHwTb7NHg0wXxmxtVG+jOFU3EidIomPYY0s=";
+    hash = "sha256-lvqqeY/FPv+LFTmZoBUuKWCjAGZozGj/yUCphlFuk/g=";
   };
 
   cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";

From 136431af185fe6ba3424abac4592949f3250b7cd Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:38:13 +0000
Subject: [PATCH 042/112] cosmic-osd: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index e77bf17b629d..445992943b8b 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-pcuTKKXt4qrs48hKfA4Pzjgx+4wNHgggbWW+yZ/1Sck=";
+    hash = "sha256-PNFwlxAdbQpFFIe54AEteWG2YRHGRgjDDUpgDwCxXns=";
   };
 
   cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";

From 4fdffc302b41d62a09612134673a3be8df8fa43c Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:58 +0000
Subject: [PATCH 043/112] cosmic-panel: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-panel/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index 8dab461b53d7..946990275f93 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 0dd5e2d6490a82c07aa2ac52741a5b661ac7d230 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:42:09 +0000
Subject: [PATCH 044/112] cosmic-player: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-player/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index e77d40e95762..69ae94316b23 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,7 +18,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From e49d68c49a8e751d0966a978452000d056ba7149 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:32 +0000
Subject: [PATCH 045/112] cosmic-randr: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-randr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 9d0cbfc390f0..299d3404bdb0 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 668f8938fccf635514786fc73d33ff770ff06e6f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:37:10 +0000
Subject: [PATCH 046/112] cosmic-screenshot: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index f6578bdf555f..6b2c0c45713e 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 74305eb87db2039f7fb0e2136460475a3de5c320 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:41:09 +0000
Subject: [PATCH 047/112] cosmic-session: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index c4a0d4569ef0..79ab5c4c3851 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-6pGMk0p3Ry97z8NLtECpFgY2GHecj+6A4bcR3AMSV88=";
+    hash = "sha256-JlRGK3uac94r81MBaOZZ4hRcKD4fh/vgJBxic0BSWnY=";
   };
 
   cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4=";

From e219345809fa3d3d86d9b1f112aa47ee24db5a1d Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:41:43 +0000
Subject: [PATCH 048/112] cosmic-settings: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 2304caf3a862..e0e32d1f8669 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gn8Nxo5pwJciva34pSsSz2iSVT8ieS54MVPdC1kbrvs=";
+    hash = "sha256-IYuQlXkdakAbchOH2vje02eWCJMBEp7ONtls4Hm/iCo=";
   };
 
-  cargoHash = "sha256-xsVQyb9tki/bNV9wMavx8PYIimB7ZoOtwKL3gNPGuIM=";
+  cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo=";
 
   nativeBuildInputs = [
     cmake

From fffe796424eb21b53f840dc422066d57f0bb6f7e Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:40:38 +0000
Subject: [PATCH 049/112] cosmic-settings-daemon: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 46bce01259d9..eda52dd48000 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-eDpwJRRX6RjOEtSOCGYpeJQldnwZ9gsqfkycHrP5w6c=";
+    hash = "sha256-4BXsjcAzu4twwIGqHQ4jvewO5oUns6yqY1n26KbIygQ=";
   };
 
   postPatch = ''

From e0df004bd8bc8dbdd775b0ec64ff78fb6b7e7223 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:39:54 +0000
Subject: [PATCH 050/112] cosmic-store: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-store/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 4abd60446ee6..45836f850eda 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 95ac6b27ff35fbf19ea4b13c8f9d453d1c47e025 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:42:46 +0000
Subject: [PATCH 051/112] cosmic-term: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 5fa535e855cf..400b632aaa07 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-7Iebf/AffJPeIJYVhaGW5GpgUGbkWDTz7A31Y0EPGqc=";
+    hash = "sha256-SmwXRgYgFelVQhx03GaIRWHCm7x/9eXMdVxH06TLxLE=";
   };
 
   cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA=";

From c044634bdc230b65e26588ae5d03923ab28c1e09 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:38:09 +0000
Subject: [PATCH 052/112] cosmic-wallpapers: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index dcc044b5f2c9..0a99261a8d49 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From d5bf0304ce116533a90c49221d1e138e284c176e Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:40:14 +0000
Subject: [PATCH 053/112] cosmic-workspaces-epoch: 1.0.1 -> 1.0.2

---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index e00566e094eb..44225233d0d3 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 58c8c667c8db1866fdf4f684edc442194394251f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 14 Jan 2026 03:40:32 +0000
Subject: [PATCH 054/112] xdg-desktop-portal-cosmic: 1.0.1 -> 1.0.2

---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index ab1c7d8b6ec2..f6f3d4ab7a9b 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -17,14 +17,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-f1I+2aYQtfE4EYzgx46pxyWEV8w1TVNFVcEui7xOOyo=";
+    hash = "sha256-Bx+tobtsevaBFB6Dqpj49Y3VUOmfEVNQJ5ll2bLk+VU=";
   };
 
   cargoHash = "sha256-99MGWfZrDOav77SRI7c5V21JTfkq7ejC7x+ZiQ5J0Yw=";

From 550ed2936325cf6634f71f1dec65b26d884365be Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 22:03:14 +0100
Subject: [PATCH 055/112] teams/helsinki-systems: drop

---
 maintainers/team-list.nix                             | 11 -----------
 .../services/web-apps/icingaweb2/icingaweb2.nix       |  5 ++++-
 nixos/tests/icingaweb2.nix                            |  7 ++++---
 nixos/tests/iscsi-root.nix                            | 10 +++++++---
 nixos/tests/lvm2/systemd-stage-1.nix                  |  5 ++++-
 nixos/tests/lvm2/thinpool.nix                         |  5 ++++-
 nixos/tests/mysql/mariadb-galera.nix                  |  9 ++++++---
 nixos/tests/mysql/mysql-replication.nix               |  8 +++++---
 nixos/tests/mysql/mysql.nix                           |  8 +++++---
 nixos/tests/redis.nix                                 |  5 +++--
 pkgs/by-name/do/dovecot/package.nix                   |  3 ++-
 pkgs/by-name/do/dovecot_pigeonhole/package.nix        |  6 ++++--
 pkgs/by-name/ex/exim/package.nix                      |  7 +++++--
 pkgs/by-name/fl/flexoptix-app/package.nix             |  5 ++++-
 pkgs/by-name/ge/geoipupdate/package.nix               |  5 ++++-
 pkgs/by-name/hy/hydra/package.nix                     |  8 ++++++--
 pkgs/by-name/li/libmaxminddb/package.nix              |  5 ++++-
 pkgs/by-name/li/libspf2/package.nix                   |  7 +++++--
 pkgs/by-name/ma/mariadb-galera/package.nix            |  8 ++++++--
 pkgs/by-name/op/opendmarc/package.nix                 |  5 ++++-
 pkgs/by-name/op/openldap/package.nix                  |  6 +++++-
 pkgs/by-name/ru/rustdesk-flutter/package.nix          |  5 ++++-
 pkgs/by-name/un/unifi-protect-backup/package.nix      |  5 ++++-
 pkgs/by-name/wi/wimboot/package.nix                   |  5 ++++-
 pkgs/development/php-packages/maxminddb/default.nix   |  5 ++++-
 .../python-modules/bitvector-for-humans/default.nix   |  5 ++++-
 .../python-modules/busylight-for-humans/default.nix   |  5 ++++-
 pkgs/development/python-modules/paramiko/default.nix  |  1 -
 pkgs/servers/http/nginx/generic.nix                   |  5 ++---
 pkgs/servers/icingaweb2/default.nix                   |  5 ++++-
 pkgs/servers/icingaweb2/ipl.nix                       |  5 ++++-
 pkgs/servers/icingaweb2/thirdparty.nix                |  5 ++++-
 pkgs/servers/monitoring/icinga2/default.nix           |  5 ++++-
 pkgs/servers/nextcloud/notify_push.nix                |  5 ++++-
 pkgs/servers/sql/mariadb/default.nix                  |  8 ++++++--
 pkgs/tools/networking/openssh/default.nix             |  5 +++--
 pkgs/tools/text/diffutils/default.nix                 |  5 ++++-
 pkgs/tools/text/gawk/default.nix                      |  5 ++++-
 38 files changed, 154 insertions(+), 68 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 28a2189c5d2b..068bf48733b9 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -386,17 +386,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  helsinki-systems = {
-    # Verify additions to this team with at least one already existing member of the team.
-    members = [
-      das_j
-      conni2461
-      helsinki-Jo
-    ];
-    scope = "Group registration for packages maintained by Helsinki Systems";
-    shortName = "Helsinki Systems employees";
-  };
-
   home-assistant = {
     members = [
       dotlambda
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 880ae5f55994..597d4951a0db 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -17,7 +17,10 @@ let
   };
 in
 {
-  meta.maintainers = teams.helsinki-systems.members;
+  meta.maintainers = with lib.maintainers; [
+    das_j
+    helsinki-Jo
+  ];
 
   options.services.icingaweb2 = with types; {
     enable = mkEnableOption "the icingaweb2 web interface";
diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix
index 08fc4f262c08..0103c14bbe2b 100644
--- a/nixos/tests/icingaweb2.nix
+++ b/nixos/tests/icingaweb2.nix
@@ -1,9 +1,10 @@
 { pkgs, ... }:
 {
   name = "icingaweb2";
-  meta = {
-    maintainers = pkgs.lib.teams.helsinki-systems.members;
-  };
+  meta.maintainers = with pkgs.lib.maintainers; [
+    das_j
+    helsinki-Jo
+  ];
 
   nodes = {
     icingaweb2 =
diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix
index c279a0d7e49e..d48dc55465d0 100644
--- a/nixos/tests/iscsi-root.nix
+++ b/nixos/tests/iscsi-root.nix
@@ -5,9 +5,13 @@ let
 in
 {
   name = "iscsi";
-  meta = {
-    maintainers = lib.teams.deshaw.members ++ lib.teams.helsinki-systems.members;
-  };
+  meta.maintainers =
+    with lib.maintainers;
+    [
+      das_j
+      helsinki-Jo
+    ]
+    ++ lib.teams.deshaw.members;
 
   nodes = {
     target =
diff --git a/nixos/tests/lvm2/systemd-stage-1.nix b/nixos/tests/lvm2/systemd-stage-1.nix
index 9eb7a6797e38..c6c68ae64c1c 100644
--- a/nixos/tests/lvm2/systemd-stage-1.nix
+++ b/nixos/tests/lvm2/systemd-stage-1.nix
@@ -70,7 +70,10 @@ import ../make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "lvm2-${flavour}-systemd-stage-1";
-    meta.maintainers = lib.teams.helsinki-systems.members;
+    meta.maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
 
     nodes.machine =
       { pkgs, lib, ... }:
diff --git a/nixos/tests/lvm2/thinpool.nix b/nixos/tests/lvm2/thinpool.nix
index bf9b7160abc2..8c7471d46f28 100644
--- a/nixos/tests/lvm2/thinpool.nix
+++ b/nixos/tests/lvm2/thinpool.nix
@@ -6,7 +6,10 @@ import ../make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "lvm2-thinpool";
-    meta.maintainers = lib.teams.helsinki-systems.members;
+    meta.maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
 
     nodes.machine =
       { pkgs, lib, ... }:
diff --git a/nixos/tests/mysql/mariadb-galera.nix b/nixos/tests/mysql/mariadb-galera.nix
index 1f08eb697504..b659f4647472 100644
--- a/nixos/tests/mysql/mariadb-galera.nix
+++ b/nixos/tests/mysql/mariadb-galera.nix
@@ -19,9 +19,12 @@ let
     }:
     makeTest {
       name = "${name}-galera-mariabackup";
-      meta = {
-        maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members;
-      };
+      meta.maintainers = with lib.maintainers; [
+        conni2461
+        das_j
+        helsinki-Jo
+        izorkin
+      ];
 
       # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node,
       # and checking the table's presence on the other node.
diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix
index d1ccb7c8c924..2cc541093a5b 100644
--- a/nixos/tests/mysql/mysql-replication.nix
+++ b/nixos/tests/mysql/mysql-replication.nix
@@ -20,9 +20,11 @@ let
     }:
     makeTest {
       name = "${name}-replication";
-      meta = {
-        maintainers = lib.teams.helsinki-systems.members;
-      };
+      meta.maintainers = with lib.maintainers; [
+        conni2461
+        das_j
+        helsinki-Jo
+      ];
 
       nodes = {
         primary = {
diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix
index 67ef87e99481..9175ef95f6fb 100644
--- a/nixos/tests/mysql/mysql.nix
+++ b/nixos/tests/mysql/mysql.nix
@@ -25,9 +25,11 @@ let
     }:
     makeTest {
       inherit name;
-      meta = {
-        maintainers = lib.teams.helsinki-systems.members;
-      };
+      meta.maintainers = with lib.maintainers; [
+        conni2461
+        das_j
+        helsinki-Jo
+      ];
 
       nodes = {
         ${name} =
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
index cf3cd6c5b552..f878509bce35 100644
--- a/nixos/tests/redis.nix
+++ b/nixos/tests/redis.nix
@@ -20,9 +20,10 @@ let
     makeTest {
       inherit name;
       meta.maintainers = [
+        lib.maintainers.das_j
         lib.maintainers.flokli
-      ]
-      ++ lib.teams.helsinki-systems.members;
+        lib.maintainers.helsinki-Jo
+      ];
 
       nodes = {
         machine =
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index 92757140467b..27aa80c349c9 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -192,9 +192,10 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "dovecot";
     maintainers = with lib.maintainers; [
+      das_j
       fpletz
+      helsinki-Jo
     ];
-    teams = [ lib.teams.helsinki-systems ];
     platforms = lib.platforms.unix;
   };
   passthru.tests = {
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
index d28c342e8614..9c8f2387f0ad 100644
--- a/pkgs/by-name/do/dovecot_pigeonhole/package.nix
+++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
@@ -43,8 +43,10 @@ stdenv.mkDerivation rec {
     homepage = "https://pigeonhole.dovecot.org/";
     description = "Sieve plugin for the Dovecot IMAP server";
     license = lib.licenses.lgpl21Only;
-    maintainers = [ ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index b7774c1925a9..e42b1a480b74 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -200,8 +200,11 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "exim";
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ tv ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+      tv
+    ];
     changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog";
   };
 }
diff --git a/pkgs/by-name/fl/flexoptix-app/package.nix b/pkgs/by-name/fl/flexoptix-app/package.nix
index 9c400dde9797..d14d40f5d6fd 100644
--- a/pkgs/by-name/fl/flexoptix-app/package.nix
+++ b/pkgs/by-name/fl/flexoptix-app/package.nix
@@ -70,7 +70,10 @@ appimageTools.wrapAppImage {
     homepage = "https://www.flexoptix.net";
     changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog";
     license = lib.licenses.unfree;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix
index 79411ae7efc6..af7e5d1d715f 100644
--- a/pkgs/by-name/ge/geoipupdate/package.nix
+++ b/pkgs/by-name/ge/geoipupdate/package.nix
@@ -25,7 +25,10 @@ buildGoModule rec {
     description = "Automatic GeoIP database updater";
     homepage = "https://github.com/maxmind/geoipupdate";
     license = with lib.licenses; [ asl20 ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "geoipupdate";
   };
 }
diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 0732c6deff0a..7856f5f43204 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -264,7 +264,11 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://nixos.org/hydra";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ mindavi ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      conni2461
+      das_j
+      helsinki-Jo
+      mindavi
+    ];
   };
 })
diff --git a/pkgs/by-name/li/libmaxminddb/package.nix b/pkgs/by-name/li/libmaxminddb/package.nix
index cf591a7f1adb..93428fbea46a 100644
--- a/pkgs/by-name/li/libmaxminddb/package.nix
+++ b/pkgs/by-name/li/libmaxminddb/package.nix
@@ -17,8 +17,11 @@ stdenv.mkDerivation rec {
     description = "C library for working with MaxMind geolocation DB files";
     homepage = "https://github.com/maxmind/libmaxminddb";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.helsinki-systems ];
     mainProgram = "mmdblookup";
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix
index fc6516722fcd..c87fa3910f70 100644
--- a/pkgs/by-name/li/libspf2/package.nix
+++ b/pkgs/by-name/li/libspf2/package.nix
@@ -40,8 +40,11 @@ stdenv.mkDerivation rec {
       lgpl21Plus
       bsd2
     ];
-    maintainers = with lib.maintainers; [ euxane ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      euxane
+      helsinki-Jo
+    ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix
index c2002555c61b..5d71dfcd944b 100644
--- a/pkgs/by-name/ma/mariadb-galera/package.nix
+++ b/pkgs/by-name/ma/mariadb-galera/package.nix
@@ -52,8 +52,12 @@ stdenv.mkDerivation rec {
     mainProgram = "garbd";
     homepage = "https://galeracluster.com/";
     license = lib.licenses.lgpl2Only;
-    maintainers = with lib.maintainers; [ izorkin ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      conni2461
+      das_j
+      helsinki-Jo
+      izorkin
+    ];
     platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/op/opendmarc/package.nix b/pkgs/by-name/op/opendmarc/package.nix
index 34bafbc67d8b..3630c4f126c6 100644
--- a/pkgs/by-name/op/opendmarc/package.nix
+++ b/pkgs/by-name/op/opendmarc/package.nix
@@ -70,6 +70,9 @@ stdenv.mkDerivation rec {
       bsd3
       sendmail
     ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix
index d45b2b1ede92..18f22935befa 100644
--- a/pkgs/by-name/op/openldap/package.nix
+++ b/pkgs/by-name/op/openldap/package.nix
@@ -159,7 +159,11 @@ stdenv.mkDerivation rec {
     homepage = "https://www.openldap.org/";
     description = "Open source implementation of the Lightweight Directory Access Protocol";
     license = lib.licenses.openldap;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      conni2461
+      das_j
+      helsinki-Jo
+    ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index df6437fe863f..8a4c00874b38 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -248,7 +248,10 @@ flutter329.buildFlutterApplication rec {
     homepage = "https://rustdesk.com";
     changelog = "https://github.com/rustdesk/rustdesk/releases/${version}";
     license = lib.licenses.agpl3Only;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "rustdesk";
     platforms = lib.platforms.linux; # should work on darwin as well but I have no machine to test with
   };
diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix
index 3cd927b62176..1f9a73c652ff 100644
--- a/pkgs/by-name/un/unifi-protect-backup/package.nix
+++ b/pkgs/by-name/un/unifi-protect-backup/package.nix
@@ -55,7 +55,10 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/ep1cman/unifi-protect-backup";
     changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "unifi-protect-backup";
   };
 }
diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix
index bb87666ae9c3..9ea5e4529067 100644
--- a/pkgs/by-name/wi/wimboot/package.nix
+++ b/pkgs/by-name/wi/wimboot/package.nix
@@ -41,7 +41,10 @@ stdenv.mkDerivation rec {
     homepage = "https://ipxe.org/wimboot";
     description = "Windows Imaging Format bootloader";
     license = lib.licenses.gpl2Plus;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index d5c3eb8cf290..53fb02ff372d 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -28,8 +28,11 @@ buildPecl {
     description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
     license = with lib.licenses; [ asl20 ];
     homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php";
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     teams = [
-      lib.teams.helsinki-systems
       lib.teams.php
     ];
   };
diff --git a/pkgs/development/python-modules/bitvector-for-humans/default.nix b/pkgs/development/python-modules/bitvector-for-humans/default.nix
index b8ad10e587a0..725fd141fa4f 100644
--- a/pkgs/development/python-modules/bitvector-for-humans/default.nix
+++ b/pkgs/development/python-modules/bitvector-for-humans/default.nix
@@ -36,6 +36,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/JnyJny/bitvector";
     description = "This simple bit vector implementation aims to make addressing single bits a little less fiddly";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix
index 904978dc90f8..0ff201b1e4e7 100644
--- a/pkgs/development/python-modules/busylight-for-humans/default.nix
+++ b/pkgs/development/python-modules/busylight-for-humans/default.nix
@@ -71,7 +71,10 @@ buildPythonPackage rec {
     homepage = "https://github.com/JnyJny/busylight";
     changelog = "https://github.com/JnyJny/busylight/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "busylight";
   };
 }
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index 1c96cda8a4da..156fae9d96d0 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -65,6 +65,5 @@ buildPythonPackage rec {
       between python scripts. All major ciphers and hash methods are
       supported. SFTP client and server mode are both supported too.
     '';
-    teams = [ lib.teams.helsinki-systems ];
   };
 }
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 75745d5b9365..cffe00f39527 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -314,11 +314,10 @@ stdenv.mkDerivation {
         broken = lib.any (m: m.meta.broken or false) modules;
         platforms = lib.platforms.all;
         maintainers = with lib.maintainers; [
+          das_j
           fpletz
+          helsinki-Jo
           raitobezarius
         ];
-        teams = with lib.teams; [
-          helsinki-systems
-        ];
       };
 }
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 06666e5884df..56f11a325080 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -38,7 +38,10 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://www.icinga.com/products/icinga-web-2/";
     license = lib.licenses.gpl2Plus;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "icingacli";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix
index 7b29f0ee3ef3..e068d379e3e7 100644
--- a/pkgs/servers/icingaweb2/ipl.nix
+++ b/pkgs/servers/icingaweb2/ipl.nix
@@ -28,6 +28,9 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/Icinga/icinga-php-library";
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix
index 0e1a61a7e50a..b3321039b135 100644
--- a/pkgs/servers/icingaweb2/thirdparty.nix
+++ b/pkgs/servers/icingaweb2/thirdparty.nix
@@ -28,6 +28,9 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/Icinga/icinga-php-thirdparty";
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix
index e73d178f88a0..21b39213e5ea 100644
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/servers/monitoring/icinga2/default.nix
@@ -128,6 +128,9 @@ stdenv.mkDerivation rec {
     homepage = "https://www.icinga.com";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index cff3a1f469bf..30349d77d741 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -63,6 +63,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nextcloud/notify_push";
     license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.linux;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 9c26ce8bb6e5..6a37823626de 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -220,8 +220,12 @@ let
           description = "Enhanced, drop-in replacement for MySQL";
           homepage = "https://mariadb.org/";
           license = lib.licenses.gpl2Plus;
-          maintainers = with lib.maintainers; [ thoughtpolice ];
-          teams = [ lib.teams.helsinki-systems ];
+          maintainers = with lib.maintainers; [
+            conni2461
+            das_j
+            helsinki-Jo
+            thoughtpolice
+          ];
           platforms = lib.platforms.all;
         };
       };
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6e95321b3de1..29bdb80eebf1 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -30,10 +30,11 @@ in
     ];
     extraMeta = {
       maintainers = with lib.maintainers; [
-        philiptaron
+        das_j
+        helsinki-Jo
         numinit
+        philiptaron
       ];
-      teams = [ lib.teams.helsinki-systems ];
     };
   };
 
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 3a39749b5a1c..ecbd00ec0094 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -83,6 +83,9 @@ stdenv.mkDerivation rec {
     description = "Commands for showing the differences between files (diff, cmp, etc.)";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.unix;
-    maintainers = lib.teams.helsinki-systems.members;
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
   };
 }
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 015b2409e115..bf9b9b3fba52 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -112,7 +112,10 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix ++ lib.platforms.windows;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "gawk";
   };
 }

From ef27241f6f60319bd209b582f7363535e677ac07 Mon Sep 17 00:00:00 2001
From: Vikingnope <aidsch0605@outlook.com>
Date: Wed, 14 Jan 2026 13:50:06 +0100
Subject: [PATCH 056/112] antigravity: 1.13.3 -> 1.14.2

---
 pkgs/by-name/an/antigravity/information.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json
index c812d387d292..b2c0be116043 100644
--- a/pkgs/by-name/an/antigravity/information.json
+++ b/pkgs/by-name/an/antigravity/information.json
@@ -1,22 +1,22 @@
 {
-  "version": "1.13.3",
+  "version": "1.14.2",
   "vscodeVersion": "1.104.0",
   "sources": {
     "x86_64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-x64/Antigravity.tar.gz",
-      "sha256": "084dfbedf1049b363aa3ad7ba679eec8b80feaf29585accb90b5910ebb270048"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/linux-x64/Antigravity.tar.gz",
+      "sha256": "dffb040c1efc67a1f6952c24dd71cffefa16094ceb35b3a7a4d0131e518ea449"
     },
     "aarch64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-arm/Antigravity.tar.gz",
-      "sha256": "0f71bce4d81fc02271e2bcaf2b57820e20762b149ef791720406817c6d189184"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/linux-arm/Antigravity.tar.gz",
+      "sha256": "7911d56c9e3525256dbf92f661f03f272b4bce73dfcc3f053113d5dae46fac53"
     },
     "x86_64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-x64/Antigravity.zip",
-      "sha256": "8e6ba418883dccd8a4a70fd5d6882f8a919630d3166d83327180165ff7b4eb55"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/darwin-x64/Antigravity.zip",
+      "sha256": "f516b8ea7d3566140d70dd6825cd5a07b0c899370c08acfdc9b133c6d0ef5ded"
     },
     "aarch64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-arm/Antigravity.zip",
-      "sha256": "ed95de92e852cac9ef1b264a0a304cf755a803129b54c1618682ec7bae1893dc"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/darwin-arm/Antigravity.zip",
+      "sha256": "014f5eeb231bf5e00837abbc45c47be5d68b542dad3cd969444becbd0bf12860"
     }
   }
 }

From e8a4f5229c721ccc19e14a4330d7c0ff1081921a Mon Sep 17 00:00:00 2001
From: Dustin Krysak <dustin@bashfulrobot.com>
Date: Wed, 14 Jan 2026 11:07:08 -0800
Subject: [PATCH 057/112] insomnia: 11.6.0 -> 12.2.0

Release notes: https://github.com/Kong/insomnia/releases/tag/core@12.2.0
---
 pkgs/by-name/in/insomnia/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix
index 53cae238c982..3b2eea97dcf5 100644
--- a/pkgs/by-name/in/insomnia/package.nix
+++ b/pkgs/by-name/in/insomnia/package.nix
@@ -7,22 +7,22 @@
 }:
 let
   pname = "insomnia";
-  version = "11.6.0";
+  version = "12.2.0";
 
   src =
     fetchurl
       {
         aarch64-darwin = {
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
-          hash = "sha256-9/Xkwgwyi/CqqmrroxhJ9IhvVK83qKROfCEF5IS5r+w=";
+          hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg=";
         };
         x86_64-darwin = {
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
-          hash = "sha256-9/Xkwgwyi/CqqmrroxhJ9IhvVK83qKROfCEF5IS5r+w=";
+          hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg=";
         };
         x86_64-linux = {
           url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage";
-          hash = "sha256-xHqRCR6D1ahqTyWA9icVK5oykABMp5qcgk35w1jzB2s=";
+          hash = "sha256-/0fJmbXhjrcVVSFvxd847mSKrzrZRK3Sqi6rjyaBOUw=";
         };
       }
       .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");

From fb1e5dffbca65a17fc4c80ce8f89a814c5e6b486 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Jan 2026 11:45:37 +0000
Subject: [PATCH 058/112] python3Packages.translate-toolkit: 3.17.5 -> 3.18.0

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

diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix
index 3031c3843208..61aef0c3ec6d 100644
--- a/pkgs/development/python-modules/translate-toolkit/default.nix
+++ b/pkgs/development/python-modules/translate-toolkit/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "translate-toolkit";
-  version = "3.17.5";
+  version = "3.18.0";
 
   pyproject = true;
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "translate";
     repo = "translate";
     tag = version;
-    hash = "sha256-I0HpVL/bH78oFGDWkXyRvZejXzjDHXFfdPu/+iMgAQw=";
+    hash = "sha256-wc8bSXdFHVSzm4CWZ9b27zEYNH0rbEXf0i947VNTg/8=";
   };
 
   build-system = [ setuptools-scm ];

From d228e7cae7fd86e0f6940c837dfedb152882805d Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 14 Jan 2026 21:03:56 +0100
Subject: [PATCH 059/112] python3Packages.weblate-language-data: 2025.10 ->
 2026.1

Changelog: https://github.com/WeblateOrg/language-data/releases/tag/2026.1
---
 .../python-modules/weblate-language-data/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix
index eb59391a7dc6..8d87dd524416 100644
--- a/pkgs/development/python-modules/weblate-language-data/default.nix
+++ b/pkgs/development/python-modules/weblate-language-data/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "weblate-language-data";
-  version = "2025.10";
+  version = "2026.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_language_data";
     inherit version;
-    hash = "sha256-pSMeuIDUGYbAetXugmahtTeGIIXxPPPiYt2Jb80vxoQ=";
+    hash = "sha256-qImbiZzsNk3oSljSwdsK+uk/1ZUygwltTCkGNKxBeN4=";
   };
 
   build-system = [ setuptools ];

From 4172593eafeaf02b0e20bf6a5e05bc66095a7a1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 Jan 2026 15:22:49 +0000
Subject: [PATCH 060/112] python3Packages.django-otp: 1.6.3 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix
index b4159f72f899..ff17b98a130a 100644
--- a/pkgs/development/python-modules/django-otp/default.nix
+++ b/pkgs/development/python-modules/django-otp/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-otp";
-  version = "1.6.3";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-otp";
     repo = "django-otp";
     tag = "v${version}";
-    hash = "sha256-sYwt41YWQQN6nKXGmrrZ75t/i1XNVjIgRKVElVaCGRc=";
+    hash = "sha256-Tqi6FHXJToOJsGETgIRl8rOUTfkn3kBkG5/bI8CxT24=";
   };
 
   build-system = [ hatchling ];

From cd522a0e6c687eb90e7253d17fa33f97c6b805e3 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 30 Dec 2025 14:50:04 +0100
Subject: [PATCH 061/112] weblate: 5.15.1 -> 5.15.2

Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.15.2
---
 pkgs/by-name/we/weblate/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index dc6ba744b26c..91231da9b554 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -24,7 +24,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.15.1";
+  version = "5.15.2";
 
   pyproject = true;
 
@@ -37,7 +37,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-9k6H9/XW7vbXix+zadxHCNl9UJ3yE1ONa/+VRvIGk28=";
+    hash = "sha256-qNv3aaPyQ/bOrPbK7u9vtq8R1MFqXLJzvLUZfVgjMK0=";
   };
 
   build-system = with python.pkgs; [ setuptools ];
@@ -65,10 +65,7 @@ python.pkgs.buildPythonApplication rec {
     '';
 
   pythonRelaxDeps = [
-    "celery"
     "certifi"
-    "cyrtranslit"
-    "django-appconf"
     "urllib3"
   ];
 
@@ -142,6 +139,7 @@ python.pkgs.buildPythonApplication rec {
       translate-toolkit
       translation-finder
       unidecode
+      urllib3
       user-agents
       weblate-language-data
       weblate-schemas

From 581c4d99066cedf28535dc2b85b98bccdd494b76 Mon Sep 17 00:00:00 2001
From: Jasi <jawsi@posteo.net>
Date: Fri, 2 Jan 2026 19:59:23 -0500
Subject: [PATCH 062/112] bazaar: 0.6.3 -> 0.7.3

---
 pkgs/by-name/ba/bazaar/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index e54eee945a52..40acc0d0b8a0 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -22,18 +22,20 @@
   libxmlb,
   libyaml,
   md4c,
+  webkitgtk_6_0,
+  libsecret,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bazaar";
-  version = "0.6.3";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "kolunmi";
     repo = "bazaar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fiSCRBbS6vNyLWRnaeyQE48NO/LYCk5OdAX8f85H2YM=";
+    hash = "sha256-T0HQ1bjH2nd9+BJAvhSNcpYp25Jt0sNZxKeTY7EfsSw=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxmlb
     libyaml
     md4c
+    webkitgtk_6_0
+    libsecret
   ];
 
   preFixup = ''

From ea415ea7994c4a03e95c24805301fd50dbebd4bd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 15 Jan 2026 13:15:43 +0200
Subject: [PATCH 063/112] volk: remove gcc wrapper

---
 pkgs/by-name/vo/volk/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix
index ec9c48351f4a..747bcd322a66 100644
--- a/pkgs/by-name/vo/volk/package.nix
+++ b/pkgs/by-name/vo/volk/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   python3,
+  removeReferencesTo,
   enableModTool ? true,
 }:
 
@@ -25,8 +26,17 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     python3
     python3.pkgs.mako
+    removeReferencesTo
   ];
 
+  # Don't embed the path to stdenv.cc in the output, see:
+  #
+  # - https://github.com/gnuradio/volk/blob/v3.2.0/lib/constants.c.in#L37-L41
+  # - https://github.com/gnuradio/volk/blob/v3.2.0/lib/CMakeLists.txt#L403-L405
+  postInstall = ''
+    remove-references-to -t ${stdenv.cc} $(readlink -f "''${!outputLib}"/lib/libvolk${stdenv.hostPlatform.extensions.sharedLibrary})
+  '';
+
   doCheck = true;
 
   meta = {

From c89c90dfa137316f3cf662783b4795d8b9897237 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 18 Jul 2025 09:23:17 +0200
Subject: [PATCH 064/112] .github/PULL_REQUEST_TEMPLATE: remove +1 footer

The footer has the following problems:
- It's not consistently added in all PRs, for example backports or those
where the template is not used. Inconsistency in a voting skews the
results.
- It's arguably not effective, because people use reactions naturally to
interact with PRs anyway. As long as there are multiple different
reaction types, what does it mean that one PR has 20 :+1:, but another
has 22 :tada:? The latter won't show up in the ranking for :+1:, so at
the minimum confusing. Same for :heart:.
- It's not useful to determine priority as in "higher number of votes
should be merged". A PR's quality should be determined independently of
votes - when it's good, it will be merged. The currently most upvoted PR
has serious issues, so this invites drive-by questions like "Why isn't
this merged, given the number of upvotes?".
---
 .github/PULL_REQUEST_TEMPLATE.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 85561029c86a..45a55eb45dce 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -38,10 +38,3 @@ For new packages please briefly describe the package or provide a link to its ho
 [nixos/tests]: https://github.com/NixOS/nixpkgs/blob/master/nixos/tests
 [pkgs/README.md]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md
 [pkgs/test]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/test
-
----
-
-Add a :+1: [reaction] to [pull requests you find important].
-
-[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
-[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc

From a9af82e31263af46a9e95bc82378d93bc9cd3e3f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Fri, 16 Jan 2026 12:57:33 +0530
Subject: [PATCH 065/112] cosmic-greeter: remove VERGEN_GIT_COMMIT_DATE because
 libcosmicAppHook sets it automatically

---
 pkgs/by-name/co/cosmic-greeter/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index afc0b6f32bf9..2dd5577ffbc8 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -31,10 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
 
-  env = {
-    VERGEN_GIT_COMMIT_DATE = "2026-01-14";
-    VERGEN_GIT_SHA = finalAttrs.src.tag;
-  };
+  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
   cargoBuildFlags = [ "--all" ];
 

From 241ac71227742bc4d58d473d3f90247e7d2b34bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Jan 2026 19:09:04 +0000
Subject: [PATCH 066/112] raspberrypi-eeprom: 2025.12.08-2712 ->
 2026.01.09-2711

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

diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index 7e4299c5fc90..4f09232a1548 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raspberrypi-eeprom";
-  version = "2025.12.08-2712";
+  version = "2026.01.09-2711";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-eeprom";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6zlq6BibjPWSGQPl13vFNCPVzjnROfYowVYPttQ9jZQ=";
+    hash = "sha256-grJc7wvnYIYouybJhAE6uRb28JGJ12YP6eHIt/xrPPs=";
   };
 
   buildInputs = [ python3 ];

From d0f58c54f2c7084740d453b3df74f527c27218c0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 19 Aug 2025 15:40:04 +0200
Subject: [PATCH 067/112] tests: migrate home-assistant-component-tests from
 all-packages

---
 pkgs/test/default.nix           | 2 ++
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index be7ee98212b3..283e96ec9690 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -254,4 +254,6 @@ in
   prefer-remote-fetch = recurseIntoAttrs (
     callPackages ../build-support/prefer-remote-fetch/tests.nix { }
   );
+
+  home-assistant-component-tests = recurseIntoAttrs pkgs.home-assistant.tests.components;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 566cb5480b7c..445b5e695a8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8788,8 +8788,6 @@ with pkgs;
 
   home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { };
 
-  home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components;
-
   icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { };
   icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { };
   icingaweb2 = callPackage ../servers/icingaweb2 { };

From 9e568d613d1a6deb1150a88ce70ec2f715f4d8a4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 19 Aug 2025 15:43:07 +0200
Subject: [PATCH 068/112] tests.stdenv: migrate tests-stdenv-gcc-stageCompare
 from all-packages

---
 nixos/release-small.nix          | 8 ++++++--
 pkgs/test/stdenv/default.nix     | 2 ++
 pkgs/top-level/all-packages.nix  | 2 --
 pkgs/top-level/release-small.nix | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 58f5d413feb7..4a28503e149b 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -110,8 +110,12 @@ rec {
       subversion
       tarball
       vim
-      tests-stdenv-gcc-stageCompare
       ;
+    tests.stdenv = {
+      inherit (nixpkgs'.tests.stdenv)
+        tests-stdenv-gcc-stageCompare
+        ;
+    };
   };
 
   tested =
@@ -163,7 +167,7 @@ rec {
           "nixos.tests.proxy"
           "nixos.tests.simple"
           "nixpkgs.jdk"
-          "nixpkgs.tests-stdenv-gcc-stageCompare"
+          "nixpkgs.tetsts.stdenv.tests-stdenv-gcc-stageCompare"
           "nixpkgs.opensshTest"
         ])
       ];
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 6a8297fea01f..6e628997f0f8 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -452,6 +452,8 @@ in
     stdenv' = bootStdenv;
   };
 
+  tests-stdenv-gcc-stageCompare = pkgs.callPackage ./gcc-stageCompare.nix { };
+
   ensure-no-execve-in-setup-sh =
     derivation {
       name = "ensure-no-execve-in-setup-sh";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 445b5e695a8e..aa23847bf909 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11825,8 +11825,6 @@ with pkgs;
 
   twmn = libsForQt5.callPackage ../applications/misc/twmn { };
 
-  tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };
-
   twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
 
   linphonePackages = recurseIntoAttrs (
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 5370cc028964..e7b89beed282 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -175,5 +175,5 @@ in
   xfsprogs = linux;
   xkeyboard_config = linux;
   zip = all;
-  tests-stdenv-gcc-stageCompare = linux;
+  tests.stdenv.tests-stdenv-gcc-stageCompare = linux;
 })

From a0dca31d2420191d9ffdea429edc9f084f48c501 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 16 Jan 2026 23:30:40 +0100
Subject: [PATCH 069/112] varnish{60,77}Packages: eval in ci

These package sets have already failed evaluation multiple times.
Let's just test them in CI so that it does not happen again.
---
 pkgs/servers/varnish/packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 3e307a566b17..2ba8bc689fcd 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -3,9 +3,10 @@
   callPackage,
   varnish60,
   varnish77,
+  lib,
 }:
 {
-  varnish60Packages = rec {
+  varnish60Packages = lib.recurseIntoAttrs rec {
     varnish = varnish60;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
     digest = callPackage ./digest.nix {
@@ -19,7 +20,7 @@
       sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
     };
   };
-  varnish77Packages = rec {
+  varnish77Packages = lib.recurseIntoAttrs rec {
     varnish = varnish77;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
   };

From fbc062fd43f17bb60e0155d57f64e7e2f84d2847 Mon Sep 17 00:00:00 2001
From: Jasi <jawsi@posteo.net>
Date: Sat, 17 Jan 2026 01:39:28 -0500
Subject: [PATCH 070/112] maintainers: remove normalcea

---
 maintainers/maintainer-list.nix                      | 12 ------------
 .../manual-packages/elpaca/default.nix               |  1 -
 pkgs/by-name/ad/adw-gtk3/package.nix                 |  1 -
 pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix      |  2 +-
 pkgs/by-name/as/asahi-audio/package.nix              |  2 +-
 pkgs/by-name/as/asahi-fwextract/package.nix          |  2 +-
 pkgs/by-name/ba/bankstown-lv2/package.nix            |  1 -
 pkgs/by-name/ba/bazaar/package.nix                   |  1 -
 pkgs/by-name/c-/c-intro-and-ref/package.nix          |  1 -
 pkgs/by-name/du/duckstation/package.nix              |  1 -
 pkgs/by-name/em/embellish/package.nix                |  2 +-
 pkgs/by-name/ga/gaphor/package.nix                   |  2 +-
 pkgs/by-name/ha/haunt/package.nix                    |  2 +-
 pkgs/by-name/li/libglycin/package.nix                |  2 +-
 pkgs/by-name/li/libmaddy-markdown/package.nix        |  2 +-
 pkgs/by-name/li/libnick/package.nix                  |  2 +-
 pkgs/by-name/li/libxmlxx5/package.nix                |  2 +-
 pkgs/by-name/m1/m1n1/package.nix                     |  2 +-
 pkgs/by-name/nm/nmh/package.nix                      |  2 +-
 pkgs/by-name/pa/parabolic/package.nix                |  1 -
 pkgs/by-name/pe/perfect_dark/package.nix             |  1 -
 pkgs/by-name/pi/pipeline/package.nix                 |  1 -
 pkgs/by-name/po/pop-wallpapers/package.nix           |  1 -
 pkgs/by-name/ql/qlementine-icons/package.nix         |  2 +-
 pkgs/by-name/ql/qlementine/package.nix               |  2 +-
 pkgs/by-name/qt/qtappinstancemanager/package.nix     |  2 +-
 pkgs/by-name/ru/ruffle/package.nix                   |  1 -
 pkgs/by-name/sp/speakersafetyd/package.nix           |  1 -
 pkgs/by-name/tr/triforce-lv2/package.nix             |  1 -
 pkgs/by-name/vi/virglrenderer/package.nix            |  4 +---
 pkgs/by-name/y-/y-cruncher/package.nix               |  2 +-
 31 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ef50ebc387ae..ca19eaf53a8c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19142,18 +19142,6 @@
     githubId = 3521180;
     name = "Tom Sydney Kerckhove";
   };
-  normalcea = {
-    name = "normalcea";
-    email = "normalc@posteo.net";
-    github = "normalcea";
-    githubId = 190049873;
-    keys = [
-      {
-        fingerprint = "6057 1155 7BA4 B922 66D6 2064 3DE3 BCB2 142A 8C71";
-      }
-    ];
-    matrix = "@normalcea:matrix.org";
-  };
   norpol = {
     name = "Syd Lightyear";
     email = "norpol+nixpkgs@exaple.org";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix
index 6c7883418d78..10d1bf24f45b 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix
@@ -66,7 +66,6 @@ melpaBuild rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       abhisheksingh0x558
-      normalcea
     ];
   };
 }
diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
index 0f1c8ff30d4e..9f98e43f17a6 100644
--- a/pkgs/by-name/ad/adw-gtk3/package.nix
+++ b/pkgs/by-name/ad/adw-gtk3/package.nix
@@ -35,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ciferkey
       Gliczy
-      normalcea
     ];
   };
 })
diff --git a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix
index 416ce1b568f9..ba4df31df4ea 100644
--- a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix
@@ -35,7 +35,7 @@ let
       homepage = "https://github.com/AsahiLinux/alsa-ucm-conf-asahi";
       changelog = "https://github.com/AsahiLinux/alsa-ucm-conf-asahi/releases/tag/${finalAttrs.src.tag}";
       license = lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [ normalcea ];
+      maintainers = [ ];
       platforms = [ "aarch64-linux" ];
     };
   });
diff --git a/pkgs/by-name/as/asahi-audio/package.nix b/pkgs/by-name/as/asahi-audio/package.nix
index 88b923dba3b1..edfe3364b1ba 100644
--- a/pkgs/by-name/as/asahi-audio/package.nix
+++ b/pkgs/by-name/as/asahi-audio/package.nix
@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/AsahiLinux/asahi-audio";
     changelog = "https://github.com/AsahiLinux/asahi-audio/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     platforms = [ "aarch64-linux" ];
   };
 })
diff --git a/pkgs/by-name/as/asahi-fwextract/package.nix b/pkgs/by-name/as/asahi-fwextract/package.nix
index 0db932bcaf0c..9276c5e12684 100644
--- a/pkgs/by-name/as/asahi-fwextract/package.nix
+++ b/pkgs/by-name/as/asahi-fwextract/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Asahi firmware extraction script";
     homepage = "https://github.com/AsahiLinux/asahi-installer";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     mainProgram = "asahi-fwextract";
     platforms = [ "aarch64-linux" ];
   };
diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix
index d3b86fd70a30..91326d39e635 100644
--- a/pkgs/by-name/ba/bankstown-lv2/package.nix
+++ b/pkgs/by-name/ba/bankstown-lv2/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Lightweight psychoacoustic bass enhancement plugin";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      normalcea
       yuka
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index e54eee945a52..71b9319d7844 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       dtomvan
-      normalcea
     ];
     mainProgram = "bazaar";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix
index 184bf3caa5c4..a0ecd2f9fb8a 100644
--- a/pkgs/by-name/c-/c-intro-and-ref/package.nix
+++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.gnu.org/software/c-intro-and-ref/";
     license = lib.licenses.fdl13Plus;
     maintainers = with lib.maintainers; [
-      normalcea
       rc-zb
     ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 78bcb84cbf50..0944f6591a3b 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -52,7 +52,6 @@ let
     homepage = "https://duckstation.org";
     license = lib.licenses.cc-by-nc-nd-40;
     maintainers = with lib.maintainers; [
-      normalcea
       matteopacini
     ];
   };
diff --git a/pkgs/by-name/em/embellish/package.nix b/pkgs/by-name/em/embellish/package.nix
index 6911f0fb0595..127a7613f9d0 100644
--- a/pkgs/by-name/em/embellish/package.nix
+++ b/pkgs/by-name/em/embellish/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/getnf/embellish";
     changelog = "https://github.com/getnf/embellish/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     mainProgram = "io.github.getnf.embellish";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index 22db18b93e29..3c3ddf4afd66 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -137,7 +137,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://gaphor.org/";
     changelog = "https://github.com/gaphor/gaphor/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     teams = [ lib.teams.gnome-circle ];
     mainProgram = "gaphor";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 01a956b279c1..65b745a957e8 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
       to do things that aren't provided out-of-the-box.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     inherit (guile.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix
index 324c6ff988d2..ff497becdea5 100644
--- a/pkgs/by-name/li/libglycin/package.nix
+++ b/pkgs/by-name/li/libglycin/package.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
       mpl20 # or
       lgpl21Plus
     ];
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix
index 621c7d857094..c218f2392eda 100644
--- a/pkgs/by-name/li/libmaddy-markdown/package.nix
+++ b/pkgs/by-name/li/libmaddy-markdown/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C++ Markdown to HTML header-only parser library";
     homepage = "https://github.com/progsource/maddy";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.normalcea ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix
index f583c3fc9b86..96aebceb55ef 100644
--- a/pkgs/by-name/li/libnick/package.nix
+++ b/pkgs/by-name/li/libnick/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Cross-platform development base for native Nickvision applications";
     homepage = "https://github.com/NickvisionApps/libnick";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.normalcea ];
+    maintainers = [ ];
     platforms = lib.platforms.unix ++ lib.platforms.windows;
     pkgConfigModules = [ "libnick" ];
   };
diff --git a/pkgs/by-name/li/libxmlxx5/package.nix b/pkgs/by-name/li/libxmlxx5/package.nix
index dbc2533f802c..980f534ce75c 100644
--- a/pkgs/by-name/li/libxmlxx5/package.nix
+++ b/pkgs/by-name/li/libxmlxx5/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "C++ wrapper for the libxml2 XML parser library";
     homepage = "https://libxmlplusplus.sourceforge.net/";
     license = lib.licenses.lgpl2Plus;
-    maintainers = [ lib.maintainers.normalcea ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index a0d89aec4ea6..0e2d9009da07 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
       bsd3
       asl20
     ];
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     platforms = lib.platforms.aarch64;
   };
 })
diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 4b92436f02d7..49c9f935a20f 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
       claws-mail's mail folders.  Most other mail clients have migrated to
       maildir.
     '';
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
   };
 
 })
diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix
index 254c884f0d88..eab8c6ab9392 100644
--- a/pkgs/by-name/pa/parabolic/package.nix
+++ b/pkgs/by-name/pa/parabolic/package.nix
@@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/NickvisionApps/Parabolic";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      normalcea
       getchoo
     ];
     mainProgram = "org.nickvision.tubeconverter";
diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix
index c37418334bb3..5fb2a595f136 100644
--- a/pkgs/by-name/pe/perfect_dark/package.nix
+++ b/pkgs/by-name/pe/perfect_dark/package.nix
@@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [
       PaulGrandperrin
-      normalcea
       sigmasquadron
     ];
     mainProgram = "io.github.fgsfdsfgs.perfect_dark";
diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix
index 53e4c5898a60..9141227d681e 100644
--- a/pkgs/by-name/pi/pipeline/package.nix
+++ b/pkgs/by-name/pi/pipeline/package.nix
@@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       chuangzhu
-      normalcea
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix
index 350d569f99dc..4595f981222c 100644
--- a/pkgs/by-name/po/pop-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-wallpapers/package.nix
@@ -85,7 +85,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       publicDomain
     ];
     maintainers = with lib.maintainers; [
-      normalcea
       pandapip1
     ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ql/qlementine-icons/package.nix b/pkgs/by-name/ql/qlementine-icons/package.nix
index 582b494787bd..9839f9c3bdc7 100644
--- a/pkgs/by-name/ql/qlementine-icons/package.nix
+++ b/pkgs/by-name/ql/qlementine-icons/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/oclero/qlementine-icons";
     changelog = "https://github.com/oclero/qlementine-icons/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ql/qlementine/package.nix b/pkgs/by-name/ql/qlementine/package.nix
index 16dc46ee4c15..683162e95beb 100644
--- a/pkgs/by-name/ql/qlementine/package.nix
+++ b/pkgs/by-name/ql/qlementine/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://oclero.github.io/qlementine/";
     changelog = "https://github.com/oclero/qlementine/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/qt/qtappinstancemanager/package.nix b/pkgs/by-name/qt/qtappinstancemanager/package.nix
index 050d1345602f..ce0dc211c62c 100644
--- a/pkgs/by-name/qt/qtappinstancemanager/package.nix
+++ b/pkgs/by-name/qt/qtappinstancemanager/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/oclero/qtappinstancemanager";
     changelog = "https://github.com/oclero/qtappinstancemanager/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     mainProgram = "qtappinstancemanager";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 6de2426703e0..69737b07249a 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -150,7 +150,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${lib.strings.removePrefix "0.2.0-" finalAttrs.version}";
     maintainers = [
       lib.maintainers.jchw
-      lib.maintainers.normalcea
     ];
     mainProgram = "ruffle";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix
index bd845006d12c..eab22ba075df 100644
--- a/pkgs/by-name/sp/speakersafetyd/package.nix
+++ b/pkgs/by-name/sp/speakersafetyd/package.nix
@@ -65,7 +65,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "speakersafetyd";
     homepage = "https://github.com/AsahiLinux/speakersafetyd";
     maintainers = with lib.maintainers; [
-      normalcea
       flokli
       yuka
     ];
diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix
index e52a62ef43c5..c3c8f3da2bc6 100644
--- a/pkgs/by-name/tr/triforce-lv2/package.nix
+++ b/pkgs/by-name/tr/triforce-lv2/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      normalcea
       yuka
     ];
     platforms = [ "aarch64-linux" ];
diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix
index 6b63b76552e8..d66545cf1488 100644
--- a/pkgs/by-name/vi/virglrenderer/package.nix
+++ b/pkgs/by-name/vi/virglrenderer/package.nix
@@ -82,9 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Virtual 3D GPU for use inside QEMU virtual machines";
     homepage = "https://docs.mesa3d.org/drivers/virgl";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      normalcea
-    ];
+    maintainers = [ ];
     mainProgram = "virgl_test_server";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/y-/y-cruncher/package.nix b/pkgs/by-name/y-/y-cruncher/package.nix
index 15bc83601618..57e4d45c8140 100644
--- a/pkgs/by-name/y-/y-cruncher/package.nix
+++ b/pkgs/by-name/y-/y-cruncher/package.nix
@@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       bsd3 # Intel Cilk Run-Time Library
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     mainProgram = "y-cruncher";
     platforms = lib.platforms.linux;
   };

From 7a3cbfadf53723b14cea5747768b32a3a2630425 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Jan 2026 13:54:06 +0100
Subject: [PATCH 071/112] Revert "python3Packages.pymicro-vad: drop"

This reverts commit b2a8824b475a91c988075fe4760c56139b0a4c45.

Was reintroduced due to regressions caused by silero vad.
---
 .../python-modules/pymicro-vad/default.nix    | 42 +++++++++++++++++++
 pkgs/top-level/python-aliases.nix             |  1 -
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pymicro-vad/default.nix

diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix
new file mode 100644
index 000000000000..8c796390bf15
--- /dev/null
+++ b/pkgs/development/python-modules/pymicro-vad/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  pybind11,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pymicro-vad";
+  version = "1.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rhasspy";
+    repo = "pymicro-vad";
+    tag = version;
+    hash = "sha256-yKy/oD6nl2qZW64+aAHZRAEFextCXT6RpMfPThB8DXE=";
+  };
+
+  build-system = [
+    pybind11
+    setuptools
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "pymicro_vad" ];
+
+  meta = {
+    changelog = "https://github.com/rhasspy/pymicro-vad/releases/tag/${version}";
+    description = "Self-contained voice activity detector";
+    homepage = "https://github.com/rhasspy/pymicro-vad";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index bbecf82f65b8..3f7b49eee77f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -351,7 +351,6 @@ mapAliases {
   pylit = throw "'pylit' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-29
   pymc3 = throw "'pymc3' has been renamed to/replaced by 'pymc'"; # Converted to throw 2025-10-29
   pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29
-  pymicro-vad = throw "'pymicro-vad' was removed because Home Assistant switched to 'pysilero-vad'"; # added 2026-01-08
   PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29
   pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29
   pyobject = throw "'pyobject' has been removed because it was only supporting python 2"; # Added 2026-01-24
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb96a9c85bfc..303ec2e43109 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13943,6 +13943,8 @@ self: super: with self; {
 
   pymfy = callPackage ../development/python-modules/pymfy { };
 
+  pymicro-vad = callPackage ../development/python-modules/pymicro-vad { };
+
   pymicrobot = callPackage ../development/python-modules/pymicrobot { };
 
   pymiele = callPackage ../development/python-modules/pymiele { };

From b10bef949eb34e5ac81a254cbf6cbcbfb84b702e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 16 Jan 2026 20:59:56 +0100
Subject: [PATCH 072/112] python313Packages.aiomealie: 1.1.1 -> 1.2.0

Diff: https://github.com/joostlek/python-mealie/compare/v1.1.1...v1.2.0

Changelog: https://github.com/joostlek/python-mealie/releases/tag/v1.2.0
---
 pkgs/development/python-modules/aiomealie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index e3edcf10aaad..7cf20cd20bb3 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "aiomealie";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-mealie";
     tag = "v${version}";
-    hash = "sha256-qiLynV/nJkejUVyS3p12bcAR3+Oj+XKp7Z/zVpxb84I=";
+    hash = "sha256-Q+8EZHZqbv5IEqhwCKhRPgr1Cfs/zVhLiwFgCZnNcW4=";
   };
 
   build-system = [ poetry-core ];

From 04e8c74b64406e68f0f4ef1ea7f94ee4c1d8cfc3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 16 Jan 2026 21:05:47 +0100
Subject: [PATCH 073/112] python313Packages.aiomealie: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index 7cf20cd20bb3..b892f151da65 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -15,7 +15,7 @@
   yarl,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aiomealie";
   version = "1.2.0";
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-mealie";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Q+8EZHZqbv5IEqhwCKhRPgr1Cfs/zVhLiwFgCZnNcW4=";
   };
 
@@ -50,8 +50,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to interact with Mealie";
     homepage = "https://github.com/joostlek/python-mealie";
-    changelog = "https://github.com/joostlek/python-mealie/releases/tag/${src.tag}";
+    changelog = "https://github.com/joostlek/python-mealie/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From c8ecaf761fac01671d550b25e4febdd996cdd150 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Jan 2026 14:01:39 +0100
Subject: [PATCH 074/112] python3Packages.knx-frontend: 2025.12.30.151231 ->
 2026.1.15.112308

https://github.com/XKNX/knx-frontend/releases/tag/2026.1.15.112308
---
 pkgs/development/python-modules/knx-frontend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index 9855ac6f65fa..06c7f3043833 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.12.30.151231";
+  version = "2026.1.15.112308";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-3KRufDLB1p+k2pmY9Mivvd2DmxWCZHZSIPhUZImKZIY=";
+    hash = "sha256-Q+9BUS0A/e0hIBq8J2hRZi/L7LKhf7vSEIFkPI0RMj0=";
   };
 
   build-system = [ setuptools ];

From 7305fdacf258c20611be2b1291e022bbce8c791f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Jan 2026 14:03:17 +0100
Subject: [PATCH 075/112] home-assistant: 2026.1.1 -> 2026.1.2

https://github.com/home-assistant/core/releases/tag/2026.1.2
---
 .../home-assistant/component-packages.nix     | 156 +++++++++---------
 pkgs/servers/home-assistant/default.nix       |   6 +-
 pkgs/servers/home-assistant/frontend.nix      |   4 +-
 3 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 20e2f7121b94..b35dccf0ef82 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.1.1";
+  version = "2026.1.2";
   components = {
     "3_day_blinds" =
       ps: with ps; [
@@ -33,8 +33,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -157,8 +157,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -298,7 +298,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
       ];
     "anwb_energie" =
@@ -386,8 +386,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -428,7 +428,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
       ];
     "assist_satellite" =
@@ -437,7 +437,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
       ];
     "asuswrt" =
@@ -469,7 +469,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -658,8 +658,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -705,8 +705,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -731,8 +731,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -832,8 +832,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -889,7 +889,7 @@
         plexauth
         plexwebsocket
         pychromecast
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -952,7 +952,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -1153,9 +1153,9 @@
         numpy
         pillow
         psutil-home-assistant
+        pymicro-vad
         pynacl
         pyserial
-        pysilero-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -1313,8 +1313,8 @@
         ifaddr
         mutagen
         py-dormakaba-dkey
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -1605,8 +1605,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -1636,8 +1636,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -1675,8 +1675,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -1824,8 +1824,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2013,8 +2013,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2153,7 +2153,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
       ];
     "google_mail" =
@@ -2217,8 +2217,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2478,9 +2478,9 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyroute2
         pyserial
-        pysilero-vad
         pyspeex-noise
         python-otbr-api
         zeroconf
@@ -2551,8 +2551,8 @@
         hueble
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2597,8 +2597,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2653,8 +2653,8 @@
         ibeacon-ble
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2684,8 +2684,8 @@
         idasen-ha
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2763,8 +2763,8 @@
         ifaddr
         mutagen
         py-improv-ble-client
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2808,8 +2808,8 @@
         ifaddr
         inkbird-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -2922,9 +2922,9 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pynecil
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3052,8 +3052,8 @@
         ifaddr
         kegtron-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3086,9 +3086,9 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pymicrobot
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3166,8 +3166,8 @@
         ifaddr
         mutagen
         pykulersky
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3208,8 +3208,8 @@
         ifaddr
         mutagen
         pylamarzocco
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3269,8 +3269,8 @@
         ifaddr
         ld2410-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3296,8 +3296,8 @@
         ifaddr
         leaone-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3323,8 +3323,8 @@
         ifaddr
         led-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3481,7 +3481,7 @@
         home-assistant-intents
         loqedapi
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -3621,8 +3621,8 @@
         ifaddr
         medcom-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3673,8 +3673,8 @@
         ifaddr
         melnor-bluetooth
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3795,8 +3795,8 @@
         ifaddr
         moat-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3810,8 +3810,8 @@
         home-assistant-intents
         mutagen
         pillow
+        pymicro-vad
         pynacl
-        pysilero-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -3882,8 +3882,8 @@
         ifaddr
         mopeka-iot-ble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -3914,8 +3914,8 @@
         ifaddr
         motionblindsble
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -4056,7 +4056,7 @@
         home-assistant-intents
         mutagen
         pyatmo
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -4270,7 +4270,7 @@
         home-assistant-intents
         mutagen
         ollama
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
       ];
     "ombi" =
@@ -4301,7 +4301,7 @@
         home-assistant-intents
         mutagen
         onedrive-personal-sdk
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -4333,7 +4333,7 @@
         home-assistant-intents
         mutagen
         openai
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-open-router
       ];
@@ -4344,7 +4344,7 @@
         home-assistant-intents
         mutagen
         openai
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
       ];
     "openalpr_cloud" =
@@ -4434,8 +4434,8 @@
         ifaddr
         mutagen
         oralb-ble
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -4494,7 +4494,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         python-overseerr
@@ -4515,8 +4515,8 @@
         home-assistant-intents
         mutagen
         paho-mqtt
+        pymicro-vad
         pynacl
-        pysilero-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -4639,8 +4639,8 @@
         hassil
         home-assistant-intents
         mutagen
+        pymicro-vad
         pyplaato
-        pysilero-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -4722,8 +4722,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -4748,9 +4748,9 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyprobeplus
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ];
@@ -4885,8 +4885,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         qingping-ble
         zeroconf
@@ -4938,7 +4938,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -5005,8 +5005,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         rapt-ble
         zeroconf
@@ -5047,7 +5047,7 @@
         home-assistant-frontend
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -5251,8 +5251,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         ruuvitag-ble
         zeroconf
@@ -5378,8 +5378,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         sensirion-ble
         zeroconf
@@ -5414,8 +5414,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         sensorpro-ble
         zeroconf
@@ -5441,8 +5441,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         sensorpush-ble
         zeroconf
@@ -5702,8 +5702,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pysnooz
         pyspeex-noise
         zeroconf
@@ -5944,8 +5944,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         pyswitchbot
         zeroconf
@@ -6139,8 +6139,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         thermobeacon-ble
         zeroconf
@@ -6169,8 +6169,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         thermopro-ble
         zeroconf
@@ -6236,8 +6236,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         tilt-ble
         zeroconf
@@ -6302,7 +6302,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -6630,8 +6630,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         zeroconf
       ]; # missing inputs: victron-ble-ha-parser
@@ -6673,7 +6673,7 @@
         home-assistant-intents
         ifaddr
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         voip-utils
       ];
@@ -6731,7 +6731,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -6822,7 +6822,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -6872,7 +6872,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         wyoming
       ];
@@ -6916,8 +6916,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         xiaomi-ble
         zeroconf
@@ -6950,7 +6950,7 @@
         hassil
         home-assistant-intents
         mutagen
-        pysilero-vad
+        pymicro-vad
         pyspeex-noise
         python-matter-server
         pyturbojpeg
@@ -6983,8 +6983,8 @@
         home-assistant-intents
         ifaddr
         mutagen
+        pymicro-vad
         pyserial
-        pysilero-vad
         pyspeex-noise
         yalexs-ble
         zeroconf
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1f20086586b9..c41d1d010d3b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -293,7 +293,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.1.1";
+  hassVersion = "2026.1.2";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -314,13 +314,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-l2/mi/WfZ3PbuB7LEhpWkubsY1xMyUjeolxPDHYEXWU=";
+    hash = "sha256-+H+ujcJ7uYLNFfm05V7FBdogGGUSkC1b6PaWJ5Zu24k=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ll1wwcdkH/A2N8M1ZuE1RvjNFRu6ipEyuy4Th34s/Uo=";
+    hash = "sha256-uWcSCmarOtfYIVYPz8wAgO8tx15MJcEP1Wv3h8YT0xI=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index c2c7980c05ed..eab45abb9f81 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20260107.1";
+  version = "20260107.2";
   format = "wheel";
 
   src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-P/7ZKtNwZZN7klPNISxOjfsdbk2KzFzGbTM5H44we7I=";
+    hash = "sha256-NPgtoNS4HgCBhRfHHJ835I5IvOCAggCnR81ieH/ItI0=";
   };
 
   # there is nothing to strip in this package

From feb5559ca5c498bfc3b980f6b5cf3500b0b2a473 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Jan 2026 14:29:19 +0100
Subject: [PATCH 076/112] python3Packages.homeassistant-stubs: 2026.1.1 ->
 2026.1.2

https://github.com/KapJI/homeassistant-stubs/releases/tag/2026.1.2
---
 .../home-assistant/pytest-homeassistant-custom-component.nix  | 4 ++--
 pkgs/servers/home-assistant/stubs.nix                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index d62af48af2f1..226ab2f0217e 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.306";
+  version = "0.13.307";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     tag = version;
-    hash = "sha256-RcUI15/+0nu453mcrRzMo2VvJAn3Up336LiuJygJaM0=";
+    hash = "sha256-E3kZEwyEmUxeRzwXQgI769mikyL1FkazmZXQFaknvlA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 64f559dbf1c4..9f11580de57e 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2026.1.1";
+  version = "2026.1.2";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-owl8Twq1FtRtWm9QZlhx/ZgsaOVaPX3W+oxiP0ZCPQg=";
+    hash = "sha256-f1decOoOyavabUC2KnScB+bnuernkyKMnKwnilViuRQ=";
   };
 
   build-system = [

From bc148507b7c349f7feeabff9041d9d5e9850ce08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Jan 2026 16:26:17 +0100
Subject: [PATCH 077/112] 
 home-assistant-custom-lovelace-modules.atomic-calendar-revive: 10.0.0 ->
 10.2.0

https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v10.1.0
https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v10.2.0
---
 .../atomic-calendar-revive/package.nix        | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
index 8f71dcce88bf..e1abe02afce2 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
@@ -1,36 +1,50 @@
 {
   lib,
   stdenv,
-  fetchYarnDeps,
   fetchFromGitHub,
-  yarnBuildHook,
-  yarnConfigHook,
+  fetchPnpmDeps,
   nodejs,
+  pnpm_9,
+  pnpmConfigHook,
   nix-update-script,
 }:
 
+let
+  pnpm = pnpm_9;
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "atomic-calendar-revive";
-  version = "10.0.0";
+  version = "10.2.0";
 
   src = fetchFromGitHub {
     owner = "totaldebug";
     repo = "atomic-calendar-revive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU=";
+    hash = "sha256-cqtXhBSFuEuh8IH/6S0qZN3+SrdCt0WXrBJlBcDUujY=";
   };
 
-  offlineCache = fetchYarnDeps {
-    inherit (finalAttrs) src;
-    hash = "sha256-d3lk3mwgaWMPFl/EDUWH/tUlAC7OfhNycOLbi1GzkfM=";
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-fhi1ysI2ygMfPTSiu40tt713fA/dy7r28Xyk0HxSvXE=";
   };
 
   nativeBuildInputs = [
-    yarnConfigHook
-    yarnBuildHook
+    pnpmConfigHook
+    pnpm
     nodejs
   ];
 
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run build
+
+    runHook postBuild
+  '';
+
   installPhase = ''
     runHook preInstall
 

From 30c13f801d0155b93545be7abe27dbb25b36a6db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Jan 2026 23:44:36 +0000
Subject: [PATCH 078/112] qownnotes: 26.1.6 -> 26.1.8

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 638603ba712e..e2944016f110 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "26.1.6";
+  version = "26.1.8";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qytiwlnuQvGljhgzLm7WpyA3E8VMpbhcKT7n5TcL2P0=";
+    hash = "sha256-pJBVkmXHDm5s3o5TxiJEdRhxQ3AUGw8bD/HTBXXDpIE=";
   };
 
   nativeBuildInputs = [

From 7777c0348fcc14736f39557054cde3d74d5b5159 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 01:37:16 +0000
Subject: [PATCH 079/112] libretro.beetle-saturn: 0-unstable-2025-07-01 ->
 0-unstable-2026-01-12

---
 .../applications/emulators/libretro/cores/beetle-saturn.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix
index 8c63c7922519..614fc85fa385 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-saturn";
-  version = "0-unstable-2025-07-01";
+  version = "0-unstable-2026-01-12";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-saturn-libretro";
-    rev = "ccba5265f60f8e64a1984c9d14d383606193ea6a";
-    hash = "sha256-Ixjduv67sPJmf0BH8GaJyyTdpDV/e1UCWCeOb7vLggo=";
+    rev = "b4df47a9f0f30d09eb95b07a4435d0f435a2e95d";
+    hash = "sha256-IIjJdw7u/AaqnKCp6LXc4U0GehwrvEukTC54odCFYkU=";
   };
 
   makefile = "Makefile";

From 2b83a9d1488c331bdfa32e9952de9f8637953e57 Mon Sep 17 00:00:00 2001
From: Asa Paparo <asapaparo@gmail.com>
Date: Sat, 17 Jan 2026 21:48:02 -0500
Subject: [PATCH 080/112] libwacom: add bin output

PR #372392 added runtime dependencies on the libevdev and pyudev python
packages, which are necessary to run several scripts contained in the
libwacom project. Since the project used a split derivation containing
`"out"` and `"dev"` outputs, this changed introduced python3 to the
closure of libwacom and all dependent packages.

By adding an additional `"bin"` output, the scripts will be contained
only in the `libwacom-bin` and `libwacom-out` closures. The `libwacom`
derivation does not depend on python.

```
$ nix-store -qR $(nix-build -A libwacom.out)
/nix/store/6h39qxzrm4i1fhl538knvyjapcdyasfx-xgcc-15.2.0-libgcc
/nix/store/hlcdbvwjlzjd2x86fxghzj1gpzplccqw-libunistring-1.4.1
/nix/store/kywwgk85nl83mpf10av3bvm2khdlq5ib-libidn2-2.3.8
/nix/store/j193mfi0f921y0kfs8vjc1znnr45ispv-glibc-2.40-66
/nix/store/1z031fwbsc8jhmm7i39r6z6m1xn7rbza-libffi-3.5.2
/nix/store/5qzr2w5n5gcgh8gp3mi8sdfh6ryypfqj-libxcrypt-4.5.2
/nix/store/jggxi5a991sx5si6sv47y0l2y1nqlh0g-pcre2-10.46
/nix/store/9862zy8hnb7xhygn1dbs9i316ldvbjyx-libselinux-3.8.1
/nix/store/c2qsgf2832zi4n29gfkqgkjpvmbmxam6-zlib-1.3.1
/nix/store/xbydf9b2lx6jziwi6z85g0bny5331dim-util-linux-minimal-2.41.2-lib
/nix/store/f7rcazhd826xlcz43il4vafv28888cgj-glib-2.86.3
/nix/store/dj62xc7d90axna889yzxd4r192vib8gj-util-linux-minimal-2.41.2-login
/nix/store/mm6518pcn7aggvsqzlag9awqacd88lm9-libcap-2.77-lib
/nix/store/n234iswy40dzhd7aw6ak0wfrbyjpvbw4-systemd-minimal-libs-258.2
/nix/store/n5zsk9wihymdwi7zss8d8my2m3njz1mp-libgudev-238
/nix/store/w3vy3bpndpj0b6ja5bgc7ll3kf5mv0qd-libevdev-1.13.4
/nix/store/cwdn4md7x08y7hjvlhz508zhnaxxsf1p-libwacom-2.17.0
```
---
 pkgs/by-name/li/libwacom/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index 0f6833c92b42..bf5f8c08193f 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.17.0";
 
   outputs = [
+    "bin"
     "out"
     "dev"
   ];

From e6ae9e5ff080b7ee186e73c2ddc357e034e72aac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 03:58:16 +0000
Subject: [PATCH 081/112] llama-cpp: 7704 -> 7767

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index dc4cdb36702f..3fe9e30521d3 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -74,13 +74,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "7704";
+  version = "7767";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-yFHrboXmJ2WK6QPvUqTz6qM2o2PVQF0co5opxFdARUs=";
+    hash = "sha256-k6Q1fUci0SkEB8vH5G3oG/evG7aUYBSqo+iXYG6x/dE=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 5104dd9d0fa4a32ce0cb0a4156969b52b72b7645 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 07:43:17 +0000
Subject: [PATCH 082/112] mosdns: 5.3.3 -> 5.3.4

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

diff --git a/pkgs/by-name/mo/mosdns/package.nix b/pkgs/by-name/mo/mosdns/package.nix
index 826b7f6d7390..a647d28374aa 100644
--- a/pkgs/by-name/mo/mosdns/package.nix
+++ b/pkgs/by-name/mo/mosdns/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "mosdns";
-  version = "5.3.3";
+  version = "5.3.4";
 
   src = fetchFromGitHub {
     owner = "IrineSistiana";
     repo = "mosdns";
     tag = "v${version}";
-    hash = "sha256-nSqSfbpi91W28DaLjCsWlPiLe1gLVHeZnstktc/CLag=";
+    hash = "sha256-N0JY0brs9IXx3L+sz66JniRaBzY0bGD8PawJ1WA3tkw=";
   };
 
-  vendorHash = "sha256-RpvWkIDhHSNbdkpBCcXYbbvbmGiG15qyB5aEJRmg9s4=";
+  vendorHash = "sha256-FfCA5204MP+m5nkzj/jLDh5NzpD1EtrL7owmcvZhOBU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 6a275fdd4e1debf356eb58377fcc0b954848d424 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 08:34:25 +0000
Subject: [PATCH 083/112] vacuum-tube: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index 3f13265bb8bd..5965f2decbf9 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-OHjTccQNrZZoXf26ABn9sIOVzTsVmBKdcRLsXUvnS6k=";
+    hash = "sha256-b5OnDoMejnupeK4sWoXQo7vpFFD/y1p4vxMZTMMO25g=";
   };
 
-  npmDepsHash = "sha256-1RfCyV0GSaI8UAnlPvepBU4LN2CkbvYt+JCtQy4B8LY=";
+  npmDepsHash = "sha256-NBsLgcYFHnj+hVELTKMreLsrJAu3S+RuhBcOTeIhQew=";
   makeCacheWritable = true;
 
   env = {

From 3a6f91205beebf808da321d758af6e346700ece7 Mon Sep 17 00:00:00 2001
From: Misaka13514 <Misaka13514@gmail.com>
Date: Sun, 18 Jan 2026 17:56:53 +0800
Subject: [PATCH 084/112] charles: fix desktop icons and mime integration

This addresses icon and mimetype issues for different versions:

- For Charles 5+:
  - Update desktop entry to use 'charles-proxy5'.
  - Install the upstream provided shared-mime-info XML. This correctly
    maps mime types to the upstream icon names (e.g. charles-proxy5-har).
- For Charles 4: Install the upstream provided shared-mime-info XML.
- For Charles 3: Fix icon installation paths (upstream tarball has
  non-standard layout). No mime icons are available for this version.
---
 .../networking/charles/default.nix            | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 20b7886b74d5..39d066451db5 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -31,7 +31,7 @@ let
         desktopName = "Charles";
         exec = "charles %F";
         genericName = "Web Debugging Proxy";
-        icon = "charles-proxy";
+        icon = "charles-proxy" + lib.optionalString (lib.versionAtLeast version "5.0") "5";
         mimeTypes = [
           "application/x-charles-savedsession"
           "application/x-charles-savedsession+xml"
@@ -73,8 +73,24 @@ let
         mkdir -p $out/share/applications
         ln -s ${desktopItem}/share/applications/* $out/share/applications/
 
-        mkdir -p $out/share/icons
-        cp -r icon $out/share/icons/hicolor
+        ${
+          if lib.versionOlder version "4.0" then
+            ''
+              for size in 16 32 48 64 128 256 512; do
+                install -Dm644 icon/charles_icon$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/charles-proxy.png
+              done
+              install -Dm644 icon/charles_icon.svg $out/share/icons/hicolor/scalable/apps/charles-proxy.svg
+            ''
+          else
+            ''
+              mkdir -p $out/share/icons
+              cp -r icon $out/share/icons/hicolor
+              if [ -d "etc/mime" ]; then
+                mkdir -p $out/share/mime/packages
+                cp etc/mime/*.xml $out/share/mime/packages/
+              fi
+            ''
+        }
 
         runHook postInstall
       '';

From 437eb4911d09437303af1c646c49fc9310b07983 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 09:59:23 +0000
Subject: [PATCH 085/112] libretro.ppsspp: 0-unstable-2026-01-10 ->
 0-unstable-2026-01-18

---
 pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index a0eb9af8c041..c0b389a35945 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2026-01-10";
+  version = "0-unstable-2026-01-18";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "3f3b353350aae4f9584070c793bf19983886d910";
-    hash = "sha256-VFAs6bmMWRn737nfRd98vcFJkVQ6Z580COUmgl2aOY0=";
+    rev = "3c3de9ce6b93dc718ad7487ee249dea560a791ed";
+    hash = "sha256-ZzOrK0ccYew91bZLMp5B4r5wC/4e6N5SaDled0fskcI=";
     fetchSubmodules = true;
   };
 

From 20aa01b8a30718fc1b44bc21431712a1325a9080 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 10:20:07 +0000
Subject: [PATCH 086/112] python3Packages.python-pooldose: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix
index 14fadd6d424b..568e140c7a56 100644
--- a/pkgs/development/python-modules/python-pooldose/default.nix
+++ b/pkgs/development/python-modules/python-pooldose/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-pooldose";
-  version = "0.8.1";
+  version = "0.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lmaertin";
     repo = "python-pooldose";
     tag = version;
-    hash = "sha256-NhUl9wFUuMhkarswVSM4I98rkCFV/iPYoq49Hl59i00=";
+    hash = "sha256-zhEUsbHIe31PQt4p0VhrZN3Y2ifE94br/D2ksRSh6Pg=";
   };
 
   build-system = [ setuptools ];

From e9a3c00592e4d7cb9b743e190699b2c347a52994 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 11:00:55 +0000
Subject: [PATCH 087/112] rsop: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix
index c09ce45d476a..6ff92c7fe5ba 100644
--- a/pkgs/by-name/rs/rsop/package.nix
+++ b/pkgs/by-name/rs/rsop/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsop";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "heiko";
     repo = "rsop";
     rev = "rsop/v${version}";
-    hash = "sha256-rjlkXiG96TbAt7JLbEC/ExKAOfMpGbTc/ZXjLSXN3lw=";
+    hash = "sha256-eP3jh5TIhMHDWnttnYvBre/tfzxajLNGtInWNiFAPiw=";
   };
 
-  cargoHash = "sha256-6o/JF25KJIKYtdeC9/ezAdwLk2GOGCu2r2FSLGxGzeY=";
+  cargoHash = "sha256-vmxqpOABd7S/htX8bbThyvfOSBY9f1CjX0gY9NQVHss=";
 
   nativeBuildInputs = [ pkg-config ];
 

From d688045edd56000a8a96ad73c29f6a343501fc52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 11:25:52 +0000
Subject: [PATCH 088/112] python3Packages.ffmpeg-progress-yield: 1.0.5 -> 1.1.1

---
 .../python-modules/ffmpeg-progress-yield/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
index 9524059c7784..79037bcbb491 100644
--- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
+++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ffmpeg-progress-yield";
-  version = "1.0.5";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "slhck";
     repo = "ffmpeg-progress-yield";
     tag = "v${version}";
-    hash = "sha256-L3q0Tyh0e1qBV13NRlFxjS/39uKfJWVeN/AGXH+Jss8=";
+    hash = "sha256-lAnTDA8YAqT7ZtRyxTtEZ8vK/OSz6mhpFXy6LURsU3E=";
   };
 
   build-system = [ uv-build ];

From 9f7fbb4b4e4427f48c1a83f838e3be6d8d6ced3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 11:26:13 +0000
Subject: [PATCH 089/112] nixbit: 0.6.3 -> 0.7.1

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

diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix
index 533f5196db13..816a77745722 100644
--- a/pkgs/by-name/ni/nixbit/package.nix
+++ b/pkgs/by-name/ni/nixbit/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nixbit";
-  version = "0.6.3";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "pbek";
     repo = "nixbit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wh7pXUinqjlNA2gGbxY/48f4yScqWqQTWF9SIPOz3/w=";
+    hash = "sha256-VBstZEs1ptLWjqiat5vLdrduUDTBj2Lm9CwpMt1puyM=";
   };
 
   nativeBuildInputs = [

From dbc30780b27e0f83f1740db9c26cc514c0a25073 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 11:35:59 +0000
Subject: [PATCH 090/112] home-assistant-custom-components.adaptive_lighting:
 1.30.0 -> 1.30.1

---
 .../custom-components/adaptive_lighting/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix
index 96799442e2d5..17d5ee5b79e6 100644
--- a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "basnijholt";
   domain = "adaptive_lighting";
-  version = "1.30.0";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "basnijholt";
     repo = "adaptive-lighting";
     tag = "v${version}";
-    hash = "sha256-rKqn6HnSrI0YWCxSIMqI4kQbpxeYwRNTPOi0xfU3CzU=";
+    hash = "sha256-pmI0jZxIjSiA9P5+0hRCujHE53WprvkAo6jp/IOpJ88=";
   };
 
   dependencies = [

From 3ec2c7692b489075ada1791b1e0c7d8324be7d20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 11:43:27 +0000
Subject: [PATCH 091/112] dgop: 0.1.12 -> 0.1.13

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

diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix
index edd9051e24bd..c1afaeaee9f3 100644
--- a/pkgs/by-name/dg/dgop/package.nix
+++ b/pkgs/by-name/dg/dgop/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dgop";
-  version = "0.1.12";
+  version = "0.1.13";
 
   src = fetchFromGitHub {
     owner = "AvengeMedia";
     repo = "dgop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ei6JMAai5azTy4iYLGp6vDd+ADMej+ysrZhlRv491g4=";
+    hash = "sha256-Frp1/AE5jznFWS52FgN9daI6Kgi0yPx7bZVoFuEIylw=";
   };
 
-  vendorHash = "sha256-MssJTtlKWzn+toNmE+QkXvLXtR7pR21cknXj89CSbwI=";
+  vendorHash = "sha256-NycCRxav1S/DW4fRlcLG5r5NsQQHbAE4zoOiF6Ut/bE=";
 
   ldflags = [
     "-w"

From b3c8b09200689c30726f40a93854ecf64d602d21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 11:44:14 +0000
Subject: [PATCH 092/112] dms-shell: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix
index a919c04c453a..d47a14fadd38 100644
--- a/pkgs/by-name/dm/dms-shell/package.nix
+++ b/pkgs/by-name/dm/dms-shell/package.nix
@@ -26,13 +26,13 @@ buildGoModule (
   in
   {
     pname = "dms-shell";
-    version = "1.2.2";
+    version = "1.2.3";
 
     src = fetchFromGitHub {
       owner = "AvengeMedia";
       repo = "DankMaterialShell";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-OUduJ6EcH91C8A5Jt2ZHgJiZg9k5ZKipKPbuHzbQGaI=";
+      hash = "sha256-P//moH3z9r4PXirTzXVsccQINsK5AIlF9RWOBwK3vLc=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/core";

From 7ad89da3bdaa05b84e2238c3de5287bdb4c4c81a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 12:10:50 +0000
Subject: [PATCH 093/112] terraform-providers.digitalocean_digitalocean: 2.72.0
 -> 2.73.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 1ea102300e95..9dd56249dc19 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -310,11 +310,11 @@
     "vendorHash": null
   },
   "digitalocean_digitalocean": {
-    "hash": "sha256-A6LxX2zMZAd/Db1VdAVqMplCW2qZx4MNyIpLwTBXkxU=",
+    "hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.72.0",
+    "rev": "v2.73.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From acb15533b3da1dadb79e19d0e3c3e20f00351a64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 12:14:24 +0000
Subject: [PATCH 094/112] home-assistant-custom-components.lednetwf_ble: 1.0.0
 -> 2.0.0

---
 .../home-assistant/custom-components/lednetwf_ble/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix
index 08d40442471e..1a28b2f0ce19 100644
--- a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "1.0.0";
+  version = "2.0.0";
 in
 buildHomeAssistantComponent {
   owner = "8none1";
@@ -19,7 +19,7 @@ buildHomeAssistantComponent {
     owner = "8none1";
     repo = "lednetwf_ble";
     tag = "v${version}";
-    hash = "sha256-YASoOuB2LvceE/DphmXb9nEGTd+pVP52/HOpV+6dCjM=";
+    hash = "sha256-Keb2Eph2DvS0zsg7wa30LrfqkmmccLl9okfdd0OTpqc=";
   };
 
   dependencies = [

From 9f6dc305e5577989981b51eefe5922b040e47467 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 18 Jan 2026 12:57:09 +0000
Subject: [PATCH 095/112] par-lang: 0-unstable-2025-12-04 ->
 0-unstable-2026-01-18

Diff: https://github.com/faiface/par-lang/compare/9056718048a5c8d1ff32c60f9fc5db5af36a0259...e10c1e4be92162fefdb515f321a2699c73726005
---
 pkgs/by-name/pa/par-lang/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix
index d3ccb069dcd9..7c81a11d3f35 100644
--- a/pkgs/by-name/pa/par-lang/package.nix
+++ b/pkgs/by-name/pa/par-lang/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "par-lang";
-  version = "0-unstable-2025-12-04";
+  version = "0-unstable-2026-01-18";
 
   src = fetchFromGitHub {
     owner = "faiface";
     repo = "par-lang";
-    rev = "9056718048a5c8d1ff32c60f9fc5db5af36a0259";
-    hash = "sha256-uerYlhUqwpt3BbYiN6+CubhZAcMRXTFKqKSqyqh5WYY=";
+    rev = "e10c1e4be92162fefdb515f321a2699c73726005";
+    hash = "sha256-/Rz0D7zAxjJgm/61/M3iGZ6XwHEHGT6tTmispUjSbW4=";
   };
 
   cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo=";

From 39e04fa1d5f5a2b234a49533949869e8eba752d2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 18 Jan 2026 16:40:17 +0300
Subject: [PATCH 096/112] nixos/services/continuwuity: actually use sd-notify

---
 nixos/modules/services/matrix/continuwuity.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/matrix/continuwuity.nix b/nixos/modules/services/matrix/continuwuity.nix
index b1aaae05cc39..7651080c91d1 100644
--- a/nixos/modules/services/matrix/continuwuity.nix
+++ b/nixos/modules/services/matrix/continuwuity.nix
@@ -216,6 +216,8 @@ in
       startLimitBurst = 5;
       startLimitIntervalSec = 60;
       serviceConfig = {
+        Type = "notify";
+
         DynamicUser = true;
         User = cfg.user;
         Group = cfg.group;

From fc1517ff7c8a676a9fd2563a1aafa6d89ac5017c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 14 Jan 2026 09:29:20 +0100
Subject: [PATCH 097/112] hdapsd: 20141203 -> 20250908

Update to the latest upstream release, which includes the fix for building
with modern GCC that treats implicit function declarations as errors.

Changes:
- Updated version from 20141203 to 20250908
- Switched source URL from evgeni/hdapsd to linux-thinkpad/hdapsd (repo moved)
- Removed fix-usage-call.patch (fix included upstream)
- Added pkg-config to nativeBuildInputs (now required)
- Updated homepage to new GitHub repository
---
 pkgs/by-name/hd/hdapsd/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/hd/hdapsd/package.nix b/pkgs/by-name/hd/hdapsd/package.nix
index cb4f82bd6d34..7239e9b3d5d1 100644
--- a/pkgs/by-name/hd/hdapsd/package.nix
+++ b/pkgs/by-name/hd/hdapsd/package.nix
@@ -2,19 +2,21 @@
   lib,
   stdenv,
   fetchurl,
+  pkg-config,
   udevCheckHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "hdapsd";
-  version = "20141203";
+  version = "20250908";
 
   src = fetchurl {
-    url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";
-    sha256 = "0ppgrfabd0ivx9hyny3c3rv4rphjyxcdsd5svx5pgfai49mxnl36";
+    url = "https://github.com/linux-thinkpad/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";
+    hash = "sha256-qENcOFJ9x5CkN72ZkTx/OL+gpwAYJlJomKvAjTklDYQ=";
   };
 
   nativeBuildInputs = [
+    pkg-config
     udevCheckHook
   ];
 
@@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Hard Drive Active Protection System Daemon";
     mainProgram = "hdapsd";
-    homepage = "http://hdaps.sf.net/";
+    homepage = "https://github.com/linux-thinkpad/hdapsd";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };

From 85787ade151d850d8582cb7a5f00ab5499b904b4 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 18 Jan 2026 14:49:46 +0100
Subject: [PATCH 098/112] userborn: add static test to passthru

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

diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 61f4580b7d65..331b44575634 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
         userborn-mutable-etc
         userborn-immutable-users
         userborn-immutable-etc
+        userborn-static
         ;
     };
   };

From 1fa522b9db7323d75fef82d0de806725ba4baf22 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 20:24:45 +0100
Subject: [PATCH 099/112] maintainers: drop dudymas

Inactive for half a year. Dropping according to maintainer guidelines.
---
 maintainers/maintainer-list.nix | 6 ------
 maintainers/team-list.nix       | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 25280bec5ac5..0a578c2882d7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7188,12 +7188,6 @@
     name = "Louis Orleans";
     keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ];
   };
-  dudymas = {
-    email = "jeremy.white@cloudposse.com";
-    github = "dudymas";
-    githubId = 928448;
-    name = "Jeremy White";
-  };
   dukc = {
     email = "ajieskola@gmail.com";
     github = "dukc";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index fe37f175fff7..3a369e577c42 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -142,7 +142,6 @@ with lib.maintainers;
   };
 
   cloudposse = {
-    members = [ dudymas ];
     scope = "Maintain atmos and applications made by the Cloud Posse team.";
     shortName = "CloudPosse";
     enableFeatureFreezePing = true;

From 4e52c4ed306f414b11579081432fc6dd3ae713d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 20:25:07 +0100
Subject: [PATCH 100/112] teams/cloudposse: drop

Empty team without members after removal of inactive maintainer.
---
 maintainers/team-list.nix         | 6 ------
 pkgs/by-name/at/atmos/package.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 3a369e577c42..e73ebcc14441 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -141,12 +141,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  cloudposse = {
-    scope = "Maintain atmos and applications made by the Cloud Posse team.";
-    shortName = "CloudPosse";
-    enableFeatureFreezePing = true;
-  };
-
   coq = {
     members = [
       cohencyril
diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index b63eeef11134..78e6c6c27e68 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -54,6 +54,5 @@ buildGoModule (finalAttrs: {
     description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)";
     mainProgram = "atmos";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.cloudposse ];
   };
 })

From 97fe4a07cba3a6383e662165b816eaad2899632b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:48:31 +0100
Subject: [PATCH 101/112] teams/mercury: drop

---
 maintainers/team-list.nix                      | 12 ------------
 pkgs/by-name/ho/honeycomb-refinery/package.nix |  5 ++++-
 pkgs/by-name/py/pyroscope/package.nix          |  5 ++++-
 pkgs/by-name/tc/tcld/package.nix               |  4 +++-
 pkgs/test/haskell/incremental/default.nix      |  8 ++++++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..04e7acf560ab 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -670,18 +670,6 @@ with lib.maintainers;
     shortName = "Matrix";
   };
 
-  mercury = {
-    members = [
-      _9999years
-      Gabriella439
-      curran
-      lf-
-      jkachmar
-    ];
-    scope = "Group registry for packages maintained by Mercury";
-    shortName = "Mercury Employees";
-  };
-
   minimal-bootstrap = {
     members = [
       alejandrosame
diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index 596b7fbc8c4a..b6c806815f0c 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -52,6 +52,9 @@ buildGoModule (finalAttrs: {
     description = "Tail-sampling proxy for OpenTelemetry";
     mainProgram = "refinery";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.mercury ];
+    maintainers = with lib.maintainers; [
+      jkachmar
+      lf-
+    ];
   };
 })
diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix
index 98dcb16a7d04..14299eb73584 100644
--- a/pkgs/by-name/py/pyroscope/package.nix
+++ b/pkgs/by-name/py/pyroscope/package.nix
@@ -55,7 +55,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/grafana/pyroscope";
     changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    teams = [ lib.teams.mercury ];
+    maintainers = with lib.maintainers; [
+      jkachmar
+      lf-
+    ];
     mainProgram = "pyroscope";
   };
 })
diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix
index 00f2f57b38c1..82107b84653a 100644
--- a/pkgs/by-name/tc/tcld/package.nix
+++ b/pkgs/by-name/tc/tcld/package.nix
@@ -69,7 +69,9 @@ buildGoModule (finalAttrs: {
     homepage = "https://www.github.com/temporalio/tcld";
     changelog = "https://github.com/temporalio/tcld/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    teams = [ lib.teams.mercury ];
+    maintainers = with lib.maintainers; [
+      jkachmar
+    ];
     mainProgram = "tcld";
   };
 })
diff --git a/pkgs/test/haskell/incremental/default.nix b/pkgs/test/haskell/incremental/default.nix
index c9ade36deb2a..329346d9ce83 100644
--- a/pkgs/test/haskell/incremental/default.nix
+++ b/pkgs/test/haskell/incremental/default.nix
@@ -33,7 +33,11 @@ let
   }) temporary;
 in
 temporary-incremental-build.overrideAttrs (old: {
-  meta = {
-    teams = [ lib.teams.mercury ];
+  meta = old.meta // {
+    maintainers = old.meta.maintainers or [ ] ++ [
+      lib.maintainers._9999years
+      lib.maintainers.Gabriella439
+      lib.maintainers.lf-
+    ];
   };
 })

From b55153ba563a392380a5aee44637be8149138827 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 14:21:32 +0000
Subject: [PATCH 102/112] cursor-cli: 0-unstable-2026-01-09 ->
 0-unstable-2026-01-17

---
 pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 45d0652c2974..abe3e2a3cc3c 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-FT4dPRYXWVLnl02KevhiMuh6F3P9Bu+YJXiWrQtH2vo=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-gZPjmxJxppni1tBL+4KNzP7It8vN0qG0e+xG42Cu/tM=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-23P7GxKzb66HNYasW87wgSFvL7PseXrZJ29Gewqx1O0=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-+ZTHbrRzte79MPrgCBb+Yj8GZaPCcDjc0v9vLI8wmoI=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-kYXTaddjTkuz+tzWJHU4Bk80jABTbQdVKLjEKvSBgX8=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-6LNXzVh7hpAFZWCZUECJKIv9RzuWih3G/+9cFjof2zM=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-wOPvhIOkg8NQch5GLe5JbK2Xl2vTboVCPPMa+aMV+MI=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-mUjH/9ADFgsCdCvUmSUMbepJUHA/4bz7I01c51tlAM8=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2026-01-09";
+  version = "0-unstable-2026-01-17";
 
   src = sources.${hostPlatform.system};
 

From abd6ddeea6e4283ad134841952acd311be63fbdb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:42:20 +0100
Subject: [PATCH 103/112] maintainers: drop invokes-su

Inactive since 2024. Dropping according to maintainer guidelines.
---
 maintainers/maintainer-list.nix | 6 ------
 maintainers/team-list.nix       | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 34306201bac1..0939d2543903 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11273,12 +11273,6 @@
     name = "Antoine Labarussias";
     keys = [ { fingerprint = "5CB5 9AA0 D180 1997 2FB3  E0EC 943A 1DE9 372E BE4E"; } ];
   };
-  invokes-su = {
-    email = "nixpkgs-commits@deshaw.com";
-    github = "invokes-su";
-    githubId = 88038050;
-    name = "Souvik Sen";
-  };
   io12 = {
     github = "io12";
     githubId = 7348004;
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index e30102efbf5e..995239662b5f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -193,7 +193,6 @@ with lib.maintainers;
     members = [
       de11n
       despsyched
-      invokes-su
     ];
     scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
     shortName = "D. E. Shaw employees";

From 6e85417bfe63b053cbba14029379d2d51116f23e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 23:44:07 +0100
Subject: [PATCH 104/112] teams/deshaw: drop

---
 maintainers/team-list.nix                     | 10 ---
 nixos/tests/iscsi-multipath-root.nix          |  3 -
 nixos/tests/iscsi-root.nix                    | 11 +--
 pkgs/by-name/dc/dcgm/package.nix              |  5 +-
 pkgs/by-name/ja/javacc/package.nix            |  1 -
 .../by-name/me/memcached-exporter/package.nix |  5 +-
 pkgs/by-name/ms/mscp/package.nix              |  1 -
 pkgs/by-name/pa/patroni/package.nix           |  5 +-
 pkgs/by-name/pr/procfd/package.nix            |  5 +-
 .../pr/prometheus-dcgm-exporter/package.nix   |  5 +-
 .../package.nix                               |  5 +-
 pkgs/by-name/re/remctl/package.nix            |  5 +-
 pkgs/development/libraries/tclap/1.4.nix      |  1 -
 .../python-modules/datefinder/default.nix     |  5 +-
 .../python-modules/jenkinsapi/default.nix     |  7 +-
 .../python-modules/krb5/default.nix           |  5 +-
 .../opentelemetry-api/default.nix             |  1 -
 .../opentelemetry-instrumentation/default.nix |  1 -
 .../python-modules/pytest-grpc/default.nix    |  1 -
 .../python-modules/ydiff/default.nix          |  5 +-
 pkgs/servers/http/nginx/modules.nix           |  5 +-
 .../monitoring/prometheus/fastly-exporter.nix |  1 -
 pkgs/top-level/perl-packages.nix              | 77 ++++++++++++++-----
 23 files changed, 110 insertions(+), 60 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 995239662b5f..f12ce735d58a 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -188,16 +188,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  deshaw = {
-    # Verify additions to this team with at least one already existing member of the team.
-    members = [
-      de11n
-      despsyched
-    ];
-    scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
-    shortName = "D. E. Shaw employees";
-  };
-
   dhall = {
     members = [
       Gabriella439
diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix
index 860faa0a32c1..ba17ac64058e 100644
--- a/nixos/tests/iscsi-multipath-root.nix
+++ b/nixos/tests/iscsi-multipath-root.nix
@@ -5,9 +5,6 @@ let
 in
 {
   name = "iscsi";
-  meta = {
-    maintainers = pkgs.lib.teams.deshaw.members;
-  };
 
   nodes = {
     target =
diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix
index d48dc55465d0..e8c98a39931c 100644
--- a/nixos/tests/iscsi-root.nix
+++ b/nixos/tests/iscsi-root.nix
@@ -5,13 +5,10 @@ let
 in
 {
   name = "iscsi";
-  meta.maintainers =
-    with lib.maintainers;
-    [
-      das_j
-      helsinki-Jo
-    ]
-    ++ lib.teams.deshaw.members;
+  meta.maintainers = with lib.maintainers; [
+    das_j
+    helsinki-Jo
+  ];
 
   nodes = {
     target =
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 7fd5dde85ccf..de95cb179d48 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -170,7 +170,10 @@ stdenv.mkDerivation {
     description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs";
     homepage = "https://developer.nvidia.com/dcgm";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
     mainProgram = "dcgmi";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ja/javacc/package.nix b/pkgs/by-name/ja/javacc/package.nix
index 7f78beec439c..50e4579a55d5 100644
--- a/pkgs/by-name/ja/javacc/package.nix
+++ b/pkgs/by-name/ja/javacc/package.nix
@@ -65,6 +65,5 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://javacc.github.io/javacc";
     license = lib.licenses.bsd2;
     mainProgram = "javacc";
-    teams = [ lib.teams.deshaw ];
   };
 })
diff --git a/pkgs/by-name/me/memcached-exporter/package.nix b/pkgs/by-name/me/memcached-exporter/package.nix
index d5ba29db7a7c..508f40801b3f 100644
--- a/pkgs/by-name/me/memcached-exporter/package.nix
+++ b/pkgs/by-name/me/memcached-exporter/package.nix
@@ -26,6 +26,9 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/prometheus/memcached_exporter";
     license = lib.licenses.asl20;
     mainProgram = "memcached_exporter";
-    teams = with lib.teams; [ deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 })
diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix
index 975002979981..45cc26a8e241 100644
--- a/pkgs/by-name/ms/mscp/package.nix
+++ b/pkgs/by-name/ms/mscp/package.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/upa/mscp";
     mainProgram = "mscp";
     license = lib.licenses.gpl3Only;
-    teams = [ lib.teams.deshaw ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix
index bfc0ef13296d..003004ec46a8 100644
--- a/pkgs/by-name/pa/patroni/package.nix
+++ b/pkgs/by-name/pa/patroni/package.nix
@@ -65,6 +65,9 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/patroni/patroni/blob/v${version}/docs/releases.rst";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 }
diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix
index baf6d9131422..07984c82b89e 100644
--- a/pkgs/by-name/pr/procfd/package.nix
+++ b/pkgs/by-name/pr/procfd/package.nix
@@ -29,6 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.bsd3;
     mainProgram = "procfd";
     platforms = lib.platforms.linux;
-    teams = with lib.teams; [ deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 })
diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
index 03be768cb83c..5016e1ae3b7e 100644
--- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
@@ -46,7 +46,10 @@ buildGoModule rec {
     description = "NVIDIA GPU metrics exporter for Prometheus leveraging DCGM";
     homepage = "https://github.com/NVIDIA/dcgm-exporter";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
     mainProgram = "dcgm-exporter";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
index 79f8dca869b6..04a7d3696659 100644
--- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
@@ -21,6 +21,9 @@ buildGoModule rec {
     mainProgram = "elasticsearch_exporter";
     homepage = "https://github.com/prometheus-community/elasticsearch_exporter";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 }
diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix
index de7ba2db61a4..f15acaef0905 100644
--- a/pkgs/by-name/re/remctl/package.nix
+++ b/pkgs/by-name/re/remctl/package.nix
@@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.eyrie.org/~eagle/software/remctl";
     mainProgram = "remctl";
     license = lib.licenses.mit;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 })
diff --git a/pkgs/development/libraries/tclap/1.4.nix b/pkgs/development/libraries/tclap/1.4.nix
index d15356041523..60fbe1901849 100644
--- a/pkgs/development/libraries/tclap/1.4.nix
+++ b/pkgs/development/libraries/tclap/1.4.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation {
     description = "Templatized C++ Command Line Parser Library (v1.4)";
     homepage = "https://tclap.sourceforge.net/";
     license = lib.licenses.mit;
-    teams = [ lib.teams.deshaw ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix
index ddb583767de7..953bd24bb409 100644
--- a/pkgs/development/python-modules/datefinder/default.nix
+++ b/pkgs/development/python-modules/datefinder/default.nix
@@ -34,6 +34,9 @@ buildPythonPackage rec {
     description = "Extract datetime objects from strings";
     homepage = "https://github.com/akoumjian/datefinder";
     license = lib.licenses.mit;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix
index f3a545f9b7b8..5ae93e9731f5 100644
--- a/pkgs/development/python-modules/jenkinsapi/default.nix
+++ b/pkgs/development/python-modules/jenkinsapi/default.nix
@@ -55,8 +55,11 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for accessing resources on a Jenkins continuous-integration server";
     homepage = "https://github.com/salimfadhley/jenkinsapi";
-    maintainers = with lib.maintainers; [ drets ];
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+      drets
+    ];
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix
index 0ade85e05e84..0d8cd32055a9 100644
--- a/pkgs/development/python-modules/krb5/default.nix
+++ b/pkgs/development/python-modules/krb5/default.nix
@@ -39,7 +39,10 @@ buildPythonPackage rec {
     description = "Kerberos API bindings for Python";
     homepage = "https://github.com/jborean93/pykrb5";
     license = lib.licenses.mit;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
     broken = stdenv.hostPlatform.isDarwin; # TODO: figure out how to build on Darwin
   };
 }
diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix
index 72776449fafb..eb4afad2436f 100644
--- a/pkgs/development/python-modules/opentelemetry-api/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-api/default.nix
@@ -65,7 +65,6 @@ let
       changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${src.tag}";
       license = lib.licenses.asl20;
       maintainers = [ lib.maintainers.natsukium ];
-      teams = [ lib.teams.deshaw ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
index e178836f6fc0..80c5e8536de1 100644
--- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
@@ -56,6 +56,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.natsukium ];
-    teams = [ lib.teams.deshaw ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-grpc/default.nix b/pkgs/development/python-modules/pytest-grpc/default.nix
index ccb040464e93..7e0589c7a835 100644
--- a/pkgs/development/python-modules/pytest-grpc/default.nix
+++ b/pkgs/development/python-modules/pytest-grpc/default.nix
@@ -24,6 +24,5 @@ buildPythonPackage rec {
     description = "Pytest plugin for grpc";
     homepage = "https://github.com/MobileDynasty/pytest-env";
     license = lib.licenses.mit;
-    teams = [ lib.teams.deshaw ];
   };
 }
diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix
index 34a9a80e670a..3e5fc98c2614 100644
--- a/pkgs/development/python-modules/ydiff/default.nix
+++ b/pkgs/development/python-modules/ydiff/default.nix
@@ -55,6 +55,9 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/ymattw/ydiff";
     license = lib.licenses.bsd3;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
   };
 }
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 584f2793cceb..87d9c905ee51 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -800,7 +800,10 @@ let
         description = "SPNEGO HTTP Authentication Module";
         homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module";
         license = with lib.licenses; [ bsd2 ];
-        teams = [ lib.teams.deshaw ];
+        maintainers = with lib.maintainers; [
+          de11n
+          despsyched
+        ];
       };
     };
 
diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
index 7ce2f93e0660..fee7411e6dff 100644
--- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
     description = "Prometheus exporter for the Fastly Real-time Analytics API";
     homepage = "https://github.com/fastly/fastly-exporter";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.deshaw ];
     mainProgram = "fastly-exporter";
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e15319aa85d9..112db2c2d0be 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2724,7 +2724,10 @@ with self;
     meta = {
       description = "BSD process resource limit and priority functions";
       license = with lib.licenses; [ artistic2 ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -4967,7 +4970,6 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
     };
   };
 
@@ -5982,7 +5984,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -13427,7 +13432,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -13458,7 +13466,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -13773,7 +13784,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -14018,7 +14032,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -14036,7 +14053,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -14742,7 +14762,10 @@ with self;
     meta = {
       description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git";
       license = with lib.licenses; [ gpl2Plus ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -15271,7 +15294,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -18917,7 +18943,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -20409,7 +20438,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -26712,8 +26744,11 @@ with self;
       description = "Perl extension for Apache ZooKeeper";
       homepage = "https://github.com/mark-5/p5-net-zookeeper";
       license = with lib.licenses; [ asl20 ];
-      maintainers = [ maintainers.ztzg ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+        ztzg
+      ];
     };
   };
 
@@ -27084,7 +27119,6 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
     };
   };
 
@@ -27272,7 +27306,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -27964,7 +28001,6 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
     };
   };
 
@@ -28037,7 +28073,6 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
       mainProgram = "ppkg-config";
     };
   };
@@ -28457,7 +28492,10 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
+      maintainers = with lib.maintainers; [
+        de11n
+        despsyched
+      ];
     };
   };
 
@@ -28475,7 +28513,6 @@ with self;
         artistic1
         gpl1Plus
       ];
-      teams = [ teams.deshaw ];
       mainProgram = "poe-gen-tests";
     };
   };

From 74a7a49aa684f6619616b3e903da7397441fa17b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 18 Jan 2026 16:33:38 +0200
Subject: [PATCH 105/112] ocrfeeder: add missing imghdr module

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

diff --git a/pkgs/by-name/oc/ocrfeeder/package.nix b/pkgs/by-name/oc/ocrfeeder/package.nix
index 5dc36c45b4ca..3554e3867424 100644
--- a/pkgs/by-name/oc/ocrfeeder/package.nix
+++ b/pkgs/by-name/oc/ocrfeeder/package.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
         reportlab
         odfpy
         pygobject3
+        standard-imghdr
       ]
     ))
   ];

From ae56d4b371573256052c6890aaa1c86f0c149792 Mon Sep 17 00:00:00 2001
From: tuhana <tuhana.cat+git@gmail.com>
Date: Sun, 18 Jan 2026 15:28:18 +0300
Subject: [PATCH 106/112] rygel: 45.0 -> 45.1

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

diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index f854150b842f..786575107ba7 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -38,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rygel";
-  version = "45.0";
+  version = "45.1";
 
   # TODO: split out lib
   outputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-gmZ7kC/AZy5kz5HrcnpwE3qP3+ej2aTBWLD0sfxwCII=";
+    hash = "sha256-zzhuKA2Or5tmd6L0i6eEhMcqCVVNXFjFHNh/pZRWF8g=";
   };
 
   patches = [

From 7ccc119785788ac308e36fab461cbbd3e6341d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Sun, 18 Jan 2026 16:12:00 +0100
Subject: [PATCH 107/112] firejail: Set meta.mainProgram

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

diff --git a/pkgs/by-name/fi/firejail/package.nix b/pkgs/by-name/fi/firejail/package.nix
index 4fdde82d3778..1975d2a676e0 100644
--- a/pkgs/by-name/fi/firejail/package.nix
+++ b/pkgs/by-name/fi/firejail/package.nix
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
     homepage = "https://firejail.wordpress.com/";
+    mainProgram = "firejail";
   };
 }

From d620fb79c66a7b5223e583397930d84fbeb0a02e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 Jan 2026 16:14:42 +0100
Subject: [PATCH 108/112] release-small: fix typo

---
 nixos/release-small.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 4a28503e149b..461afb49d4db 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -167,7 +167,7 @@ rec {
           "nixos.tests.proxy"
           "nixos.tests.simple"
           "nixpkgs.jdk"
-          "nixpkgs.tetsts.stdenv.tests-stdenv-gcc-stageCompare"
+          "nixpkgs.tests.stdenv.tests-stdenv-gcc-stageCompare"
           "nixpkgs.opensshTest"
         ])
       ];

From 058fad713502066eaf29849d95229e9685c4d51d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 Jan 2026 16:15:07 +0100
Subject: [PATCH 109/112] rocm-modules/release-attrPaths-gen.nix: fix import

This seems to have been moved to a different folder, so that the
relative path wasn't correct anymore.
---
 pkgs/development/rocm-modules/release-attrPaths-gen.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/rocm-modules/release-attrPaths-gen.nix b/pkgs/development/rocm-modules/release-attrPaths-gen.nix
index 0c6bcb43d19d..074cf2fe4c9d 100644
--- a/pkgs/development/rocm-modules/release-attrPaths-gen.nix
+++ b/pkgs/development/rocm-modules/release-attrPaths-gen.nix
@@ -2,7 +2,7 @@
   variant,
 }:
 let
-  pkgs = import ../../../../. { config.allowAliases = false; };
+  pkgs = import ../../../. { config.allowAliases = false; };
   lib = pkgs.lib;
   optionalsWithSuccess =
     toTry: next:

From 2858434827e2daf52abcf25be661180d99c42b0f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 Jan 2026 16:20:50 +0100
Subject: [PATCH 110/112] rocm-modules: generate attrpaths

Regenerate attrpaths after home-automation-tests have been moved to
tests.*.
---
 .../rocm-modules/release-attrPaths.json       | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/rocm-modules/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json
index 286734db1920..ba0e760fa06a 100644
--- a/pkgs/development/rocm-modules/release-attrPaths.json
+++ b/pkgs/development/rocm-modules/release-attrPaths.json
@@ -1,5 +1,5 @@
 {
-  "__generatedBy": "pkgs/development/rocm-modules/6/release-attrPaths-gen.sh",
+  "__generatedBy": "pkgs/development/rocm-modules/release-attrPaths-gen.sh",
   "attrPaths": [
     "adaptivecpp",
     "adios2",
@@ -16,13 +16,16 @@
     "appcsxcad",
     "arpack-mpi",
     "audiobookshelf",
+    "auto-editor",
     "babeldoc",
     "backgroundremover",
     "blender",
+    "blendfarm",
     "btop",
     "btop-cuda",
     "c3d",
     "calibre",
+    "calibre-no-speech",
     "catalyst",
     "chatd",
     "cloudcompare",
@@ -79,7 +82,6 @@
     "hdf5-mpi",
     "hieroglyphic",
     "highfive-mpi",
-    "home-assistant-component-tests.tami4",
     "hp2p",
     "hpcg",
     "hpl",
@@ -129,6 +131,7 @@
     "mpvScripts.autosubsync-mpv",
     "mrtrix",
     "mumps-mpi",
+    "mvapich",
     "nest-mpi",
     "netcdf-mpi",
     "netgen",
@@ -142,6 +145,7 @@
     "onnxruntime",
     "openai-whisper",
     "openems",
+    "openllm",
     "openmpi",
     "openseeface",
     "opensplat",
@@ -165,6 +169,7 @@
     "piper-tts",
     "pnetcdf",
     "pnfft",
+    "pocket-tts",
     "precice",
     "printrun",
     "python3Packages.accelerate",
@@ -178,11 +183,14 @@
     "python3Packages.argos-translate-files",
     "python3Packages.argostranslate",
     "python3Packages.array-api-compat",
+    "python3Packages.arviz",
+    "python3Packages.arviz-plots",
     "python3Packages.asteroid-filterbanks",
     "python3Packages.attacut",
     "python3Packages.auditok",
     "python3Packages.augmax",
     "python3Packages.ax-platform",
+    "python3Packages.bambi",
     "python3Packages.baselines",
     "python3Packages.bitsandbytes",
     "python3Packages.blackjax",
@@ -191,6 +199,7 @@
     "python3Packages.brax",
     "python3Packages.captum",
     "python3Packages.catalyst",
+    "python3Packages.causal-conv1d",
     "python3Packages.chromadb",
     "python3Packages.clean-fid",
     "python3Packages.cleanvision",
@@ -203,6 +212,7 @@
     "python3Packages.compressai",
     "python3Packages.compressed-tensors",
     "python3Packages.conduit-mpi",
+    "python3Packages.corner",
     "python3Packages.crewai",
     "python3Packages.ctranslate2",
     "python3Packages.curated-transformers",
@@ -215,10 +225,10 @@
     "python3Packages.deepface",
     "python3Packages.deepsearch-toolkit",
     "python3Packages.deepwave",
-    "python3Packages.depyf",
     "python3Packages.detectron2",
     "python3Packages.dicom2nifti",
     "python3Packages.diffusers",
+    "python3Packages.distrax",
     "python3Packages.dm-sonnet",
     "python3Packages.docling-core",
     "python3Packages.docling-ibm-models",
@@ -231,7 +241,6 @@
     "python3Packages.evosax",
     "python3Packages.executorch",
     "python3Packages.experiment-utilities",
-    "python3Packages.ezyrb",
     "python3Packages.f3d",
     "python3Packages.facenet-pytorch",
     "python3Packages.fairscale",
@@ -246,6 +255,7 @@
     "python3Packages.firedrake",
     "python3Packages.flammkuchen",
     "python3Packages.flax",
+    "python3Packages.flowjax",
     "python3Packages.flyingsquid",
     "python3Packages.funsor",
     "python3Packages.fvcore",
@@ -261,7 +271,6 @@
     "python3Packages.gradio",
     "python3Packages.gradio-client",
     "python3Packages.gradio-pdf",
-    "python3Packages.graphrag",
     "python3Packages.graphtage",
     "python3Packages.gruut",
     "python3Packages.gstools",
@@ -308,7 +317,6 @@
     "python3Packages.llama-index-embeddings-huggingface",
     "python3Packages.llama-index-embeddings-ollama",
     "python3Packages.llama-index-embeddings-openai",
-    "python3Packages.llama-index-graph-stores-nebula",
     "python3Packages.llama-index-graph-stores-neo4j",
     "python3Packages.llama-index-graph-stores-neptune",
     "python3Packages.llama-index-indices-managed-llama-cloud",
@@ -352,6 +360,7 @@
     "python3Packages.minari",
     "python3Packages.mlcroissant",
     "python3Packages.mlflow",
+    "python3Packages.mlx-lm",
     "python3Packages.mmcv",
     "python3Packages.mmengine",
     "python3Packages.mne",
@@ -365,10 +374,12 @@
     "python3Packages.napari-nifti",
     "python3Packages.nest",
     "python3Packages.netgen-mesher",
-    "python3Packages.neuronpy",
     "python3Packages.nianet",
     "python3Packages.nifty8",
     "python3Packages.noisereduce",
+    "python3Packages.numpyro",
+    "python3Packages.nutpie",
+    "python3Packages.nvdlfw-inspect",
     "python3Packages.onnxruntime",
     "python3Packages.open-clip-torch",
     "python3Packages.openai-whisper",
@@ -381,6 +392,7 @@
     "python3Packages.osqp",
     "python3Packages.outlines",
     "python3Packages.outlines-core",
+    "python3Packages.paddlepaddle",
     "python3Packages.pandantic",
     "python3Packages.pandas-stubs",
     "python3Packages.pandera",
@@ -394,16 +406,16 @@
     "python3Packages.pgmpy",
     "python3Packages.piano-transcription-inference",
     "python3Packages.piper-phonemize",
+    "python3Packages.pocket-tts",
     "python3Packages.pomegranate",
     "python3Packages.pyannote-audio",
     "python3Packages.pyannote-pipeline",
-    "python3Packages.pydmd",
     "python3Packages.pydub",
     "python3Packages.pyglet",
     "python3Packages.pykrige",
     "python3Packages.pylance",
     "python3Packages.pymanopt",
-    "python3Packages.pymatgen",
+    "python3Packages.pymc",
     "python3Packages.pymedio",
     "python3Packages.pymoo",
     "python3Packages.pyotb",
@@ -413,9 +425,8 @@
     "python3Packages.pyrender",
     "python3Packages.pyro-ppl",
     "python3Packages.pyseries",
-    "python3Packages.pysilero-vad",
+    "python3Packages.pytensor",
     "python3Packages.python-csxcad",
-    "python3Packages.python-openems",
     "python3Packages.pytmx",
     "python3Packages.pytorch-bench",
     "python3Packages.pytorch-lightning",
@@ -436,6 +447,7 @@
     "python3Packages.rerun-sdk",
     "python3Packages.resize-right",
     "python3Packages.retinaface",
+    "python3Packages.rlax",
     "python3Packages.rlcard",
     "python3Packages.roma",
     "python3Packages.rotary-embedding-torch",
@@ -446,12 +458,10 @@
     "python3Packages.scikit-bio",
     "python3Packages.scikit-survival",
     "python3Packages.sentence-transformers",
-    "python3Packages.sfepy",
     "python3Packages.shap",
     "python3Packages.shimmy",
     "python3Packages.simpleitk",
     "python3Packages.sirius",
-    "python3Packages.skorch",
     "python3Packages.skrl",
     "python3Packages.slepc4py",
     "python3Packages.slicer",
@@ -468,14 +478,13 @@
     "python3Packages.stanza",
     "python3Packages.staticvectors",
     "python3Packages.stytra",
-    "python3Packages.sumo",
     "python3Packages.syne-tune",
     "python3Packages.tables",
     "python3Packages.tami4edgeapi",
     "python3Packages.tensorboardx",
     "python3Packages.tensordict",
     "python3Packages.tensorflow-datasets",
-    "python3Packages.test-tube",
+    "python3Packages.tensorflow-probability",
     "python3Packages.textacy",
     "python3Packages.textnets",
     "python3Packages.tf2onnx",
@@ -560,6 +569,7 @@
     "stable-diffusion-cpp-vulkan",
     "superlu_dist",
     "tabby",
+    "tests.home-assistant-component-tests.tami4",
     "tests.pkg-config.defaultPkgConfigPackages.ompi",
     "tests.pkg-config.defaultPkgConfigPackages.ompi-c",
     "tests.pkg-config.defaultPkgConfigPackages.ompi-cxx",
@@ -586,6 +596,7 @@
     "ucx",
     "unbook",
     "unstructured-api",
+    "vcmi",
     "vectorcode",
     "vimPlugins.aider-nvim",
     "vimPlugins.vectorcode-nvim",

From 8f256b816e8e5c0d7b7d7b2a79c830eee2911f8a Mon Sep 17 00:00:00 2001
From: Elias Probst <mail@eliasprobst.eu>
Date: Fri, 24 Oct 2025 08:46:30 +0200
Subject: [PATCH 111/112] kcl-language-server: bump to 68b4062 to fix build
 with Rust 1.89

See also:
https://github.com/kcl-lang/kcl/issues/1986
---
 pkgs/by-name/kc/kcl-language-server/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/kc/kcl-language-server/package.nix b/pkgs/by-name/kc/kcl-language-server/package.nix
index 36586717f0ff..213b14e0b27d 100644
--- a/pkgs/by-name/kc/kcl-language-server/package.nix
+++ b/pkgs/by-name/kc/kcl-language-server/package.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kcl-language-server";
-  version = "0.11.2";
+  version = "0.11.2-unstable-2025-10-26";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
-    rev = "v${version}";
-    hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno=";
+    rev = "68b4062e1f6b818b2fc64cfc69ef0a692b35943d";
+    hash = "sha256-5yX9TYmn0nGlSI8jiAwxuYpBXq9ie+yVDHwcC1FLcBk=";
   };
 
   sourceRoot = "${src.name}/kclvm";
 
-  cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE=";
+  cargoHash = "sha256-FulW9qNVVZtOoRfm+NPwQENJU9Ib1GBzcjHxk5QS70g=";
 
   PROTOC = "${protobuf}/bin/protoc";
   PROTOC_INCLUDE = "${protobuf}/include";

From eadca93f21c3e52443a5b339db9fb084f8adcdfa Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sun, 11 Jan 2026 15:46:05 +0100
Subject: [PATCH 112/112] wrapNeovim: symlink treesitter grammars in the
 wrapper

---
 pkgs/applications/editors/neovim/utils.nix    |  4 +++-
 .../vim/plugins/nvim-treesitter/overrides.nix | 12 +++++-------
 .../editors/vim/plugins/utils/vim-utils.nix   | 19 +++++++++++++++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 650a307f5639..98e2d60f8cb8 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -343,7 +343,9 @@ let
 
           nativeBuildInputs = [ toNvimTreesitterGrammar ];
 
-          passthru = grammar.passthru or { };
+          passthru = grammar.passthru or { } // {
+            isTreesitterGrammar = true;
+          };
 
           meta = {
             platforms = lib.platforms.all;
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index bc2fdb75a2fd..9786265ec6de 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -21,7 +21,10 @@ let
     vimUtils.toVimPlugin (
       runCommand "nvim-treesitter-queries-${language}"
         {
-          passthru = { inherit language; };
+          passthru = {
+            inherit language;
+            isTreesitterQuery = true;
+          };
           meta.description = "Queries for ${language} from nvim-treesitter";
         }
         ''
@@ -94,12 +97,7 @@ let
       ];
     in
     self.nvim-treesitter.overrideAttrs {
-      passthru.dependencies = [
-        (symlinkJoin {
-          name = "nvim-treesitter-grammars";
-          paths = grammarPlugins ++ queryPlugins;
-        })
-      ];
+      passthru.dependencies = grammarPlugins ++ queryPlugins;
     };
 
   withAllGrammars = withPlugins (_: allGrammars);
diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
index 4d9f11b9b937..8679128e28a3 100644
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@@ -5,6 +5,7 @@
   vim,
   vimPlugins,
   buildEnv,
+  symlinkJoin,
   writeText,
   runCommand,
   makeWrapper,
@@ -200,12 +201,26 @@ let
           # and can simply pass `null`.
           depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt);
           startWithDeps = findDependenciesRecursively start;
-          allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
+          allPluginsAndGrammars = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
+
           allPython3Dependencies =
             ps: lib.flatten (map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins);
           python3Env = python3.withPackages allPython3Dependencies;
 
-          packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins;
+          partitionGrammars = lib.partition (
+            p: p.isTreesitterGrammar or false || p.isTreesitterQuery or false
+          );
+          allPluginsAndGrammarsPartitioned = partitionGrammars allPluginsAndGrammars;
+          allPlugins = allPluginsAndGrammarsPartitioned.wrong;
+          allGrammars = allPluginsAndGrammarsPartitioned.right;
+          allGrammarsSymlinked = symlinkJoin {
+            name = "nvim-treesitter-grammars";
+            paths = allGrammars;
+          };
+
+          packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" (
+            if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins
+          );
           packdirOpt = vimFarm "pack/${packageName}/opt" "packdir-opt" opt;
           # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection
           # for each plugin.