From 13d71c3e328869c5f19da2e5590aa36951a1007d Mon Sep 17 00:00:00 2001
From: Yiheng He <yiheng.he@proton.me>
Date: Mon, 20 Apr 2026 19:05:33 +0800
Subject: [PATCH 01/56] nixos/espanso: add extraPackages option

---
 nixos/modules/services/desktops/espanso.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
index a58d886cfe7f..048dd343202e 100644
--- a/nixos/modules/services/desktops/espanso.nix
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -21,6 +21,12 @@ in
       package = lib.mkPackageOption pkgs "espanso" {
         example = "pkgs.espanso-wayland";
       };
+      extraPackages = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
+        default = [ ];
+        example = lib.literalExpression "with pkgs; [ bash curl python3 ];";
+        description = "Extra packages to be added to Espanso service path.";
+      };
     };
   };
 
@@ -43,6 +49,7 @@ in
         Restart = "on-failure";
       };
       wantedBy = [ "graphical-session.target" ];
+      path = cfg.extraPackages;
     };
 
     environment.systemPackages = [ cfg.package ];

From ede6728ec56c3a1b81b8f1d6a4f7ddbe5fab09f4 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Tue, 28 Apr 2026 20:13:35 +0000
Subject: [PATCH 02/56] undercut-f1: 3.4.32 -> 4.0.73

---
 pkgs/by-name/un/undercut-f1/deps.json   | 387 +++++++++++-------------
 pkgs/by-name/un/undercut-f1/package.nix |  18 +-
 2 files changed, 188 insertions(+), 217 deletions(-)

diff --git a/pkgs/by-name/un/undercut-f1/deps.json b/pkgs/by-name/un/undercut-f1/deps.json
index fa71707557b2..1219ccc815b8 100644
--- a/pkgs/by-name/un/undercut-f1/deps.json
+++ b/pkgs/by-name/un/undercut-f1/deps.json
@@ -1,14 +1,4 @@
 [
-  {
-    "pname": "AutoMapper",
-    "version": "14.0.0",
-    "hash": "sha256-gaq2pLkiuki7Pmlb6Ld3+x/hrnoue1zGVw8oGOpSsrw="
-  },
-  {
-    "pname": "AutoMapper.Collection",
-    "version": "11.0.0",
-    "hash": "sha256-zOXvQz0kcrc7PwiAUkYD3HtefETvsbaBzVzrbO/5fqo="
-  },
   {
     "pname": "FFMpegCore",
     "version": "5.4.0",
@@ -21,8 +11,8 @@
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "8.3.1.2",
-    "hash": "sha256-rIU0GPkXzUQGKZbtVhlDBvdxIIECCJO/YdjEJSWWbV8="
+    "version": "8.3.1.3",
+    "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
@@ -61,38 +51,48 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Connections.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-w2tDobldb+kxZpJf2SwLYkvkgysgyo8jnZRzhAyW2FY="
+    "version": "10.0.3",
+    "hash": "sha256-NCYzcWz5lY05pXkFJKerraBa/F66zM228blumKekTBI="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Client",
-    "version": "9.0.10",
-    "hash": "sha256-E1RBf/lG+vJY2kMXb1rCFy2/7SUi8c6J/xn6nnZ7buk="
+    "version": "10.0.3",
+    "hash": "sha256-lbNYFIaISLYB3cw7rG9NV0zpNjEQH5rWtLaraCD67D4="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Common",
-    "version": "9.0.10",
-    "hash": "sha256-nWdTQRfznzjPeHZ3hQhJr1TSkcEr9Aenvj0PCe4DJ9k="
+    "version": "10.0.3",
+    "hash": "sha256-rUb8Qk37THyMXe7SvPAt9VP3EHAAbxbaj+8ZGpEkvJ0="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.OpenApi",
+    "version": "10.0.3",
+    "hash": "sha256-j7lAYuz2585j/j24XkptImH7WHx9rBp+tY8ZXqpC77k="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Client",
-    "version": "9.0.10",
-    "hash": "sha256-/HhDVi1MhSZCFEpA2AFCotl3/uba4O/rwX0o4XO6KIs="
+    "version": "10.0.3",
+    "hash": "sha256-KqMQ2eqp63oIzeklBH9E6G2HPoeM4FaGssMxqtaBxM4="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Client.Core",
-    "version": "9.0.10",
-    "hash": "sha256-QtoZ/C1xj1Q1moxhwzqjbMGkWIZ6Eegm1y5TCUWSOJk="
+    "version": "10.0.3",
+    "hash": "sha256-IihBiDIBVZmnkEQgZcDfPdLZR1prImAm6FaoyhlPUmk="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Common",
-    "version": "9.0.10",
-    "hash": "sha256-s/YrLu1SwZvMG1ep9Sriz/nlhKkiAaVdsDc4Li8VVaY="
+    "version": "10.0.3",
+    "hash": "sha256-S35lmcItmPf4of+THjgMketuiyLLNhAT11985oowp8Q="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
-    "version": "9.0.10",
-    "hash": "sha256-ERiXEu/r9FSOU93Qd9er/63avF6nEbAiowQ9Msbqk58="
+    "version": "10.0.3",
+    "hash": "sha256-byobnhiAbqruuzwqLtR9Bg4R+IWJ6WWzCjowggTEMZc="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -100,144 +100,114 @@
     "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
   },
   {
-    "pname": "Microsoft.CSharp",
-    "version": "4.7.0",
-    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "5.0.0",
+    "hash": "sha256-g4ALvBSNyHEmSb1l5TFtWW7zEkiRmhqLx4XWZu9sr2U="
   },
   {
-    "pname": "Microsoft.Extensions.ApiDescription.Server",
-    "version": "6.0.5",
-    "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "5.0.0",
+    "hash": "sha256-ctBCkQGFpH/xT5rRE3xibu9YxPD108RuC4a4Z25koG8="
+  },
+  {
+    "pname": "Microsoft.Extensions.AI.Abstractions",
+    "version": "10.0.0",
+    "hash": "sha256-hEvvw5jQCOvUOCqLC//TGTDVTdSCgAXmqTMmxG5QoWo="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.10",
-    "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
+    "version": "10.0.3",
+    "hash": "sha256-Qeh/7eMiP/RHekoK3LoIRYHEP7vPKWn/i3cTZiRQlIM="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
+    "version": "10.0.3",
+    "hash": "sha256-OfcPeDv7RJvvv7ns+wCMAQCdG/He2KtxV6MRlwvp35I="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "2.2.0",
-    "hash": "sha256-cigv0t9SntPWjJyRWMy3Q5KnuF17HoDyeKq26meTHoM="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "9.0.0",
-    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "9.0.10",
-    "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
+    "version": "10.0.3",
+    "hash": "sha256-XBHZjXmKz8W55kdqZSx1Ylxr1bQtekVPt6bcxRO1u3k="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.CommandLine",
-    "version": "9.0.10",
-    "hash": "sha256-lgBXA1ovyeEqH9xmLNxxMB2/OLILt7AW6BXf+yc8wqs="
+    "version": "10.0.3",
+    "hash": "sha256-UCEXti7QysYfJZP7uIXrIdC9j6+9qwiDmrzxNoMUAIE="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "9.0.10",
-    "hash": "sha256-D4Myt5rp8jxOvuQ4zwo/1bfNfLDZHrBYx7+UDOnhWgA="
+    "version": "10.0.3",
+    "hash": "sha256-ZBrmq65zpyrDyO3x/GvtWnJgHUQQr2ivO9SwOS9r1Mg="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "9.0.10",
-    "hash": "sha256-I8ywPAfg7GPQgOuA5TPXuseurWKk7BmXsnaowF80XEQ="
+    "version": "10.0.3",
+    "hash": "sha256-7XMVpjx9+61FoMQ1X/V4OvgRj8LIYpTK2z+DOWPs+c4="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "9.0.10",
-    "hash": "sha256-ykcnGdvnx19q3dpwZ9A09k+6iIGNurVebe4nUaOBtng="
+    "version": "10.0.3",
+    "hash": "sha256-0Mvfbr7/NhnbUElKFf6JaRliGVIHs7pOZgnfqwYOFHE="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.UserSecrets",
-    "version": "9.0.10",
-    "hash": "sha256-t4ssmlaX/lVemYekfubS841MStq00+C2h2HY1HyZQvQ="
+    "version": "10.0.3",
+    "hash": "sha256-LT6EY7GuiDb0hOA+t8pGUoRrMb722S12PTTk63cPnWo="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.10",
-    "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk="
+    "version": "10.0.3",
+    "hash": "sha256-h/wiSaVtRCIGdkv6/soA41Dhdlmu2I9hjv/swP8OjDk="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "7.0.0",
-    "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
+    "version": "10.0.3",
+    "hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "9.0.0",
-    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
+    "version": "10.0.0",
+    "hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "9.0.10",
-    "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog="
+    "version": "10.0.3",
+    "hash": "sha256-bTzYc76SUeDINYSgvmA3UrGTBOKy7Ndli5aay4YMRLQ="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0="
+    "version": "10.0.3",
+    "hash": "sha256-JglKtC6+jfiggRUU5AXC6mR0cW1t3M33wR7WXKyJjBs="
   },
   {
     "pname": "Microsoft.Extensions.Features",
-    "version": "9.0.10",
-    "hash": "sha256-SVtG0MpqgdSRU4hLOe7uDY/MYo8o/70ZCEhCTjwMDCs="
+    "version": "10.0.3",
+    "hash": "sha256-MIJYP+rVash9XKwed0DDskuvd8+ryVu8oAlnzWWgR+k="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo="
+    "version": "10.0.3",
+    "hash": "sha256-uWAZh/RdMEiwTM2311KlDKK2LBo81tIYXPTUzJXbceA="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "9.0.10",
-    "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0="
+    "version": "10.0.3",
+    "hash": "sha256-YzhgA21JbLYK++4cV/vl4beUYPWxEzsGbdUGNQOxHXw="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "9.0.10",
-    "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ="
+    "version": "10.0.3",
+    "hash": "sha256-rqOx0soU/fJraVEzAr+FMIPqLJZnsJx5JPvycLM55ZY="
   },
   {
     "pname": "Microsoft.Extensions.Hosting",
-    "version": "9.0.10",
-    "hash": "sha256-SImJyuK5D7uR0AjWFz6JwqvPZ5VVHPVK79T7vqTUs0g="
+    "version": "10.0.3",
+    "hash": "sha256-sW99TcPCQ1NXOM+Bv9L7Fdf7qC8YYTXuhUS0oHNoWtA="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
-  },
-  {
-    "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ="
+    "version": "10.0.3",
+    "hash": "sha256-d8zXyTfgVdok+Cgg5EC04DH4iPQtLxlU9CsGy5+dr6s="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Systemd",
@@ -246,99 +216,79 @@
   },
   {
     "pname": "Microsoft.Extensions.Http",
-    "version": "9.0.10",
-    "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA="
+    "version": "10.0.3",
+    "hash": "sha256-K64IcsNAP6Vc3e60MCE43KB4oj0XFA4OhaIfJCpKmFg="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "2.2.0",
-    "hash": "sha256-lY9axb6/MyPAhE+N8VtfCIpD80AFCtxUnnGxvb2koy8="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.0",
-    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.10",
-    "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
+    "version": "10.0.3",
+    "hash": "sha256-UmpmoOaxBJlm4FL6pGtRXKK+8YYj5hE/59ox2vGZl+A="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
+    "version": "10.0.3",
+    "hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "9.0.10",
-    "hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI="
+    "version": "10.0.3",
+    "hash": "sha256-aWROg7QQ+U8lOEqwqlph8/myeDe9bwaKKLTFoEMcq3A="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "9.0.10",
-    "hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E="
+    "version": "10.0.3",
+    "hash": "sha256-q+0WzmR9/V+2K+C/OPP7f8abIc/kWCrbhi+cYAC9GFw="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Debug",
-    "version": "9.0.10",
-    "hash": "sha256-x3B8uLpMuIUru3LxEg1ZMYkE5QkcfFe9fMCSUO1kakM="
+    "version": "10.0.3",
+    "hash": "sha256-62z1naLjBQpqHWCA9TKZWBtBQbK3bOZDWdEuURnqxLs="
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventLog",
-    "version": "9.0.10",
-    "hash": "sha256-TzOq62cH8KolfIvXnWapvPdmCdDxiKF7tg5ICE6iwEk="
+    "version": "10.0.3",
+    "hash": "sha256-IVCsxVf6JvyEj+lHqEY+bs1KH7Oxx7vEKaxldpWWXp0="
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventSource",
-    "version": "9.0.10",
-    "hash": "sha256-GGxnzocUi1se0kkysvkZ5QpN3p/N1VbrLkpeVPS18Ks="
+    "version": "10.0.3",
+    "hash": "sha256-u7XMB4b+jvdJZT55YcEy1SNWWI3CkzFmFdLtKD0v09A="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.0",
-    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.10",
-    "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
+    "version": "10.0.3",
+    "hash": "sha256-KDYaVBSdNEuhs3U164RV0n20cjwrpi7uI71B0j/UFsA="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "9.0.10",
-    "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
+    "version": "10.0.3",
+    "hash": "sha256-Wia7KiEYjMilkXSDmsY7edXvtvUFw7kppv/J/cYMPXo="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "10.0.3",
+    "hash": "sha256-w0G+IW9kz70ug1BEuJTeS1N7werQhms3gQl6ODzNIpQ="
   },
   {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.10",
-    "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w="
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.OpenApi",
-    "version": "1.2.3",
-    "hash": "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="
+    "version": "2.0.0",
+    "hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k="
   },
   {
     "pname": "Nerdbank.GitVersioning",
     "version": "3.9.50",
     "hash": "sha256-BiBfXwr8ob2HTaFk2L5TwAgtvd/EPoqudSI9nhAjQPI="
   },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
   {
     "pname": "Serilog",
     "version": "4.3.0",
@@ -346,18 +296,18 @@
   },
   {
     "pname": "Serilog.AspNetCore",
-    "version": "9.0.0",
-    "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ="
+    "version": "10.0.0",
+    "hash": "sha256-z7dY6pY2Kkns20mpzZN2GOfV172gDWpamKDXHyLhEJs="
   },
   {
     "pname": "Serilog.Extensions.Hosting",
-    "version": "9.0.0",
-    "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw="
+    "version": "10.0.0",
+    "hash": "sha256-zFQMZkAPqg+j2ZI0oBN07hO+9MFiyy5YECRbz7msxeU="
   },
   {
     "pname": "Serilog.Extensions.Logging",
-    "version": "9.0.0",
-    "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw="
+    "version": "10.0.0",
+    "hash": "sha256-MgfWK/SJWUPxPzrnCUnxn6Sy+SBVmP3dYd60uy80NdE="
   },
   {
     "pname": "Serilog.Formatting.Compact",
@@ -366,13 +316,13 @@
   },
   {
     "pname": "Serilog.Settings.Configuration",
-    "version": "9.0.0",
-    "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
+    "version": "10.0.0",
+    "hash": "sha256-WJK+wR7XPGAtD+vO+pjF5mn4qy8tO5uWIqHhovL0lAs="
   },
   {
     "pname": "Serilog.Sinks.Console",
-    "version": "6.0.0",
-    "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
+    "version": "6.1.1",
+    "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY="
   },
   {
     "pname": "Serilog.Sinks.Debug",
@@ -385,9 +335,9 @@
     "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
   },
   {
-    "pname": "SharpWebview",
-    "version": "0.11.3",
-    "hash": "sha256-HLZw90EOVXFGL/pnPHeaAmRQLCxZHSsHvFO6c7RlRIw="
+    "pname": "SharpWebview.Aot",
+    "version": "0.13.0",
+    "hash": "sha256-aAqk0VTGFy3eRNC8lsUkaxaCtjUrCldNaqZZab1JaA4="
   },
   {
     "pname": "SkiaSharp",
@@ -416,43 +366,33 @@
   },
   {
     "pname": "Spectre.Console",
-    "version": "0.48.0",
-    "hash": "sha256-hr7BkVJ5v+NOPytlINjo+yoJetRUKmBhZbTMVKOMf2w="
-  },
-  {
-    "pname": "Swashbuckle.AspNetCore",
-    "version": "6.5.0",
-    "hash": "sha256-thAX5M8OihCU5Pmht5FzQPR7K+gbia580KnI8i9kwUw="
-  },
-  {
-    "pname": "Swashbuckle.AspNetCore.Swagger",
-    "version": "6.5.0",
-    "hash": "sha256-bKJG6fhLBB5rKoVm0nc4PfecBtDg/r2G1hrZ6Izryug="
-  },
-  {
-    "pname": "Swashbuckle.AspNetCore.SwaggerGen",
-    "version": "6.5.0",
-    "hash": "sha256-A+n8r9bM8UU0ZpzS5pHqa/JOX+cY0jTbfTH7XfwbCUM="
+    "version": "0.54.0",
+    "hash": "sha256-qlZQkT5KzACqJ1bLgBOylq9qO0L7XCh/RY8L8PnkpcU="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerUI",
-    "version": "6.5.0",
-    "hash": "sha256-BxYBRvabFUIRkZ67YbUY6djxbLPtmPlAfREeFNg8HZ4="
+    "version": "10.1.0",
+    "hash": "sha256-qxIhoxk9dfzRo4lX5I5J5WWFagVYqgjbjY4Q/yJr6dA="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
   },
   {
     "pname": "System.CommandLine",
-    "version": "2.0.0-beta6.25358.103",
-    "hash": "sha256-bBd8zRElNoxv793V1bpRbc6etWvLq3I9AKR0/gmhmBY="
+    "version": "2.0.2",
+    "hash": "sha256-PK3wKHjY8FHkPV75Z4ouxKU67WcuVSiMFjAkBs+iSAo="
   },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "9.0.10",
-    "hash": "sha256-Nl5DqIAwczE10eWNlVz1UpAVO668eNdhyWq+Rfw+QI0="
-  },
-  {
-    "pname": "System.IO.Pipelines",
-    "version": "8.0.0",
-    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+    "version": "10.0.3",
+    "hash": "sha256-yT3XjTyXEsmn4ptBShNAPUpKIvCEj0H9Gopd5H6MkrQ="
   },
   {
     "pname": "System.Memory",
@@ -460,19 +400,39 @@
     "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
   },
   {
-    "pname": "System.Net.ServerSentEvents",
-    "version": "9.0.10",
-    "hash": "sha256-CbvTNiqbAvtR/zEHdRvfVM+6a/pX7S+8gFX+Yda4b1I="
+    "pname": "System.Memory",
+    "version": "4.6.0",
+    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
   },
   {
-    "pname": "System.Text.Json",
-    "version": "9.0.10",
-    "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w="
+    "pname": "System.Numerics.Vectors",
+    "version": "4.6.0",
+    "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU="
   },
   {
-    "pname": "System.Threading.Channels",
-    "version": "9.0.10",
-    "hash": "sha256-1SSATu8rInAryjFE98mInmAfrPQ48KixeqqAjn4xp64="
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.1.0",
+    "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "8.0.0",
+    "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.6.0",
+    "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY="
   },
   {
     "pname": "TextCopy",
@@ -501,12 +461,17 @@
   },
   {
     "pname": "Whisper.net",
-    "version": "1.8.1",
-    "hash": "sha256-h1iUHXwaf641TgMKkW4sBQS3UoRNJBIIm6ioydFC9qQ="
+    "version": "1.9.0",
+    "hash": "sha256-E6EFB6hVxkEouD4j7bY/lvd6jrkxHYh8Vo8ds44O6k8="
   },
   {
     "pname": "Whisper.net.Runtime",
-    "version": "1.8.1",
-    "hash": "sha256-zoOe2wL174lnYjY0tln43v76VZxuksZ6GzCPWvCjOCE="
+    "version": "1.9.0",
+    "hash": "sha256-TFOc4QVx+EqQEsJ8zQUBfdiakp7M9EwmiO7V0NhKlBI="
+  },
+  {
+    "pname": "Whisper.net.Runtime.Metal",
+    "version": "1.9.0",
+    "hash": "sha256-W9Nz5s8qyzG/l53xyGinanFmZBYXre5xxN7QpcRn/TU="
   }
 ]
diff --git a/pkgs/by-name/un/undercut-f1/package.nix b/pkgs/by-name/un/undercut-f1/package.nix
index 284bfccf24e9..fe54d39b556a 100644
--- a/pkgs/by-name/un/undercut-f1/package.nix
+++ b/pkgs/by-name/un/undercut-f1/package.nix
@@ -19,20 +19,20 @@
 }:
 buildDotnetModule rec {
   pname = "undercut-f1";
-  version = "3.4.32";
+  version = "4.0.73";
   src = fetchFromGitHub {
     owner = "JustAman62";
     repo = "undercut-f1";
     tag = "v${version}";
-    hash = "sha256-A4IZNiVhUZNSBlFvIqAEJGf48uVrjIhe2w5YabtCPEc=";
+    hash = "sha256-EZnJDkgQK5je/xrw3+hDK3jqzKDaRbSmNPIVIL5F/8I=";
   };
 
   projectFile = "UndercutF1.Console/UndercutF1.Console.csproj";
 
   executables = [ "undercutf1" ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_9_0;
-  dotnet-runtime = dotnetCorePackages.sdk_9_0;
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.sdk_10_0;
 
   nugetDeps = ./deps.json;
 
@@ -52,7 +52,11 @@ buildDotnetModule rec {
   ];
 
   postPatch = ''
-    rm -f .config/dotnet-tools.json
+      rm -f .config/dotnet-tools.json
+      substituteInPlace UndercutF1.Console/UndercutF1.Console.csproj --replace-fail \
+        "<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>" \
+        "<EnableCompressionInSingleFile>false</EnableCompressionInSingleFile><DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>"
   '';
 
   postFixup = ''
@@ -66,9 +70,11 @@ buildDotnetModule rec {
   '';
 
   dotnetBuildFlags = [
-    "-p:PublishSingleFile=true"
+    "-p:DebugType=None"
     "-p:IncludeNativeLibrariesForSelfExtract=true"
+    "-p:IncludeAllContentForSelfExtract=true"
     "-p:OverridePackageVersion=${version}"
+    "-p:PublicRelease=true"
   ];
 
   dotnetPublishFlags = [

From a8e71cb4121cbd79f1e26b1b1f345ef924a43eb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 May 2026 19:06:12 +0000
Subject: [PATCH 03/56] vscode-extensions.wgsl-analyzer.wgsl-analyzer: 0.11.262
 -> 0.11.318

---
 .../vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix
index 2d42cb2c2528..4fad9491f77b 100644
--- a/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "wgsl-analyzer";
     publisher = "wgsl-analyzer";
-    version = "0.11.262";
-    hash = "sha256-a2TVwTmxP9wBt0tMkQcVCyzM0RoihGag56ITd+xjtl8=";
+    version = "0.11.318";
+    hash = "sha256-px6lKME6aapi9L9Owb3zhbEMoKmA9GpBQrHtb8Kg0XI=";
   };
 
   nativeBuildInputs = [

From f01108c715dad46eb6c57675860aa7ce2503fd95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 May 2026 19:57:07 +0000
Subject: [PATCH 04/56] python3Packages.ossapi: 5.3.4 -> 5.3.5

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

diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix
index aaacaad29164..5f9246e723c4 100644
--- a/pkgs/development/python-modules/ossapi/default.nix
+++ b/pkgs/development/python-modules/ossapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ossapi";
-  version = "5.3.4";
+  version = "5.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Liam-DeVoe";
     repo = "ossapi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Favez9YcEHgAPNxJg9L4J8BpEUYIx9IFhSeNToT7sv4=";
+    hash = "sha256-gkees4d12vCfx5KGNKm9NjW5XmRw+xJy2RISMOKzG+s=";
   };
 
   build-system = [ setuptools ];

From 8f1ac3b3a04add6310cfbfaa26560f32dd44c7c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 May 2026 02:00:24 +0000
Subject: [PATCH 05/56] morse_cli: 1.16.4 -> 1.17.8

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

diff --git a/pkgs/by-name/mo/morse_cli/package.nix b/pkgs/by-name/mo/morse_cli/package.nix
index 3d980ed565fc..3b697e72a353 100644
--- a/pkgs/by-name/mo/morse_cli/package.nix
+++ b/pkgs/by-name/mo/morse_cli/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "morse-cli";
-  version = "1.16.4";
+  version = "1.17.8";
 
   src = fetchFromGitHub {
     owner = "MorseMicro";
     repo = "morse_cli";
     tag = finalAttrs.version;
-    hash = "sha256-EhrKMMbWJ6gweAt2EudyO7vHZ9ITjRYagE4k+QuUnOo=";
+    hash = "sha256-K0J6iqUsEo1zuXnlPLxGUDipsMSRu2w4vW5lna/HJyU=";
   };
 
   buildInputs = [

From 0f7a408c7f3fec3e070012cb64cc6777fc991894 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 May 2026 08:27:55 +0000
Subject: [PATCH 06/56] python3Packages.devpi-web: 5.0.2 -> 5.1.0

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

diff --git a/pkgs/development/python-modules/devpi-web/default.nix b/pkgs/development/python-modules/devpi-web/default.nix
index ac54b3525e73..d05780e39178 100644
--- a/pkgs/development/python-modules/devpi-web/default.nix
+++ b/pkgs/development/python-modules/devpi-web/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "devpi-web";
-  version = "5.0.2";
+  version = "5.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "devpi";
     repo = "devpi";
     tag = "web-${finalAttrs.version}";
-    hash = "sha256-rAku3oHcmzFNA/MP/64382gCTgqopwjjy4S4HTEFZiY=";
+    hash = "sha256-7uYHkrACVRaSqhCflbN3TrGtAnw7ifdkiiLnuGd8bnw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/web";

From cca19383435dc863fbde0add50b539992628d1b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 12:32:23 +0000
Subject: [PATCH 07/56] flink: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/fl/flink/package.nix b/pkgs/by-name/fl/flink/package.nix
index a837b051d18c..32cd4d90dd35 100644
--- a/pkgs/by-name/fl/flink/package.nix
+++ b/pkgs/by-name/fl/flink/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "flink";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
-    sha256 = "sha256-tmx9xuGVNyCd3DlDDWvn54XUjcB41rLSaapgFQlbSF8=";
+    sha256 = "sha256-WxL4DN/UbOIcUc7K+yNtzyCtN4D884qmEMa+hk/3EQs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 64a6456f520d39e8439f9a1ef613e9040ec4bb5e Mon Sep 17 00:00:00 2001
From: Colin Hooper <chopper2000uk@gmail.com>
Date: Fri, 22 May 2026 16:20:20 +0100
Subject: [PATCH 08/56] nixos/foot: fix zsh prompt marker precmd function being
 overwritten by the end pipe marker precmd function

---
 nixos/modules/programs/foot/zshrc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/programs/foot/zshrc b/nixos/modules/programs/foot/zshrc
index 043db42e2838..186f21c987e5 100644
--- a/nixos/modules/programs/foot/zshrc
+++ b/nixos/modules/programs/foot/zshrc
@@ -9,14 +9,11 @@ function chpwd-osc7-pwd() {
     (( ZSH_SUBSHELL )) || osc7-pwd
 }
 
-precmd() {
-    print -Pn "\e]133;A\e\\"
-}
-
 function precmd {
     if ! builtin zle; then
         print -n "\e]133;D\e\\"
     fi
+    print -Pn "\e]133;A\e\\"
 }
 
 function preexec {

From 691ddc98741b348e1eddf4d4aa07d4aa59467431 Mon Sep 17 00:00:00 2001
From: azban <me@azban.net>
Date: Sun, 22 Mar 2026 23:33:17 -0600
Subject: [PATCH 09/56] swayimg: 4.7 -> 5.2

---
 pkgs/by-name/sw/swayimg/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix
index d47ddd2bf399..979df8fbdbce 100644
--- a/pkgs/by-name/sw/swayimg/package.nix
+++ b/pkgs/by-name/sw/swayimg/package.nix
@@ -10,6 +10,7 @@
   wayland-protocols,
   json_c,
   libxkbcommon,
+  exiv2,
   fontconfig,
   giflib,
   libheif,
@@ -19,11 +20,11 @@
   librsvg,
   libpng,
   libjxl,
-  libexif,
   libavif,
   libsixel,
   libraw,
   libdrm,
+  luajit,
   openexr,
   bash-completion,
   testers,
@@ -32,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swayimg";
-  version = "4.7";
+  version = "5.2";
 
   src = fetchFromGitHub {
     owner = "artemsen";
     repo = "swayimg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1dJf339lM8ETcYyjtWCJEyNmwmoxt72+rXdTH/48s6Q=";
+    hash = "sha256-aDZ7Ka8uKVLzEwxS2CT5fRFNDf9z/LO3bB0dCMz1Mf0=";
   };
 
   strictDeps = true;
@@ -64,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     json_c
     libxkbcommon
+    exiv2
     fontconfig
     giflib
     libheif
@@ -73,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     libpng
     libjxl
-    libexif
     libavif
     libsixel
     libraw
     libdrm
+    luajit
     openexr
   ];
 

From f439e787f961f70e075cb18ebf24de6cc84c6de5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 May 2026 12:02:13 +0200
Subject: [PATCH 10/56] grub2: migrate to fuse3

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

diff --git a/pkgs/by-name/gr/grub2/package.nix b/pkgs/by-name/gr/grub2/package.nix
index 35acf233f794..0fba3264c7c8 100644
--- a/pkgs/by-name/gr/grub2/package.nix
+++ b/pkgs/by-name/gr/grub2/package.nix
@@ -22,7 +22,7 @@
   fetchpatch,
   buildPackages,
   nixosTests,
-  fuse, # only needed for grub-mount
+  fuse3, # only needed for grub-mount
   runtimeShell,
   zfs ? null,
   efiSupport ? false,
@@ -616,7 +616,7 @@ stdenv.mkDerivation rec {
     libusb-compat-0_1
     freetype
     lvm2
-    fuse
+    fuse3
     libtool
     bash
   ]

From d0ddb3fdb5c5677e05a6615b36f44f04a82cd70a Mon Sep 17 00:00:00 2001
From: "PAEPCKE, Michael" <git@paepcke.de>
Date: Wed, 3 Jun 2026 06:22:15 +0200
Subject: [PATCH 11/56] bttf: init at 0.1.4

Signed-off-by: PAEPCKE, Michael <git@paepcke.de>
---
 pkgs/by-name/bi/biff/package.nix | 41 --------------------------------
 pkgs/by-name/bt/bttf/package.nix | 39 ++++++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix       |  1 +
 3 files changed, 40 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/by-name/bi/biff/package.nix
 create mode 100644 pkgs/by-name/bt/bttf/package.nix

diff --git a/pkgs/by-name/bi/biff/package.nix b/pkgs/by-name/bi/biff/package.nix
deleted file mode 100644
index 422d74d9c7cc..000000000000
--- a/pkgs/by-name/bi/biff/package.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  nix-update-script,
-  rustPlatform,
-  versionCheckHook,
-  withLocaleSupport ? true,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "biff";
-  version = "0.1.1";
-
-  src = fetchFromGitHub {
-    owner = "BurntSushi";
-    repo = "biff";
-    tag = finalAttrs.version;
-    hash = "sha256-7KkzmaWbUHrLUd7lADJLPLSeE/RYJvVAEL+FcE5KIhY=";
-  };
-
-  buildFeatures = lib.optional withLocaleSupport "locale";
-
-  cargoHash = "sha256-pGY1KDcsBz5J/mf4c8zDVbivgzfimSy8ruNoa+Pn9p8=";
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Command line tool for datetime arithmetic, parsing, formatting and more";
-    homepage = "https://github.com/BurntSushi/biff";
-    changelog = "https://github.com/BurntSushi/biff/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = [
-      lib.licenses.mit
-      lib.licenses.unlicense
-    ];
-    maintainers = [ lib.maintainers.kpbaks ];
-    mainProgram = "biff";
-    platforms = lib.platforms.all;
-  };
-})
diff --git a/pkgs/by-name/bt/bttf/package.nix b/pkgs/by-name/bt/bttf/package.nix
new file mode 100644
index 000000000000..65d426a32dc4
--- /dev/null
+++ b/pkgs/by-name/bt/bttf/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "bttf";
+  version = "0.1.4";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "BurntSushi";
+    repo = "bttf";
+    tag = finalAttrs.version;
+    hash = "sha256-KB9ix/4UTNoxXAT+EuCtcjjFKurwPYrYBcx4H2ctv/E=";
+  };
+
+  cargoHash = "sha256-afmzxV+rN2Cw1cQltsml4Z6NsP3E5FEf/VY9RRWE+uc=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Command line tool for datetime arithmetic, parsing, formatting and more. Replaces biff.";
+    homepage = "https://github.com/BurntSushi/bttf";
+    changelog = "https://github.com/BurntSushi/bttf/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      mit
+      unlicense
+    ];
+    maintainers = with lib.maintainers; [
+      kpbaks
+      paepcke
+    ];
+    mainProgram = "bttf";
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aadc6a1d69f3..4c17e5182b9d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -379,6 +379,7 @@ mapAliases {
   bencode = throw "'bencode' has been removed because it is unmaintained upstream"; # Added 2026-04-09
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   bfr = throw "bfr has been removed, did not update since 2004, fails to build on gcc-15, no homepage"; # Added 2026-01-28
+  biff = throw "biff has been renamed to/replaced by 'bttf'"; # Added 2026-06-04
   bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
   binserve = throw "'binserve' has been removed because it is unmaintained upstream."; # Added 2025-11-29
   bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27

From 89797b325ab4b63fe8e6795e3627407d88145fde Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Wed, 3 Jun 2026 15:53:44 +0200
Subject: [PATCH 12/56] nebula-de-esser: init at 3.2.0

Assisted-by: gemini cli
---
 pkgs/by-name/ne/nebula-de-esser/package.nix | 90 +++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 pkgs/by-name/ne/nebula-de-esser/package.nix

diff --git a/pkgs/by-name/ne/nebula-de-esser/package.nix b/pkgs/by-name/ne/nebula-de-esser/package.nix
new file mode 100644
index 000000000000..80db86f1e337
--- /dev/null
+++ b/pkgs/by-name/ne/nebula-de-esser/package.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libGL,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxinerama,
+  libxi,
+  libxcb,
+  libxkbcommon,
+  fontconfig,
+  freetype,
+  autoPatchelfHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nebula-de-esser";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "subhankardas15071992-cloud";
+    repo = "Nebula-De-Esser";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-N+tVlhGTBRXZDKGRYo2WUamiekTe1FXvpqm34lwu2Z8=";
+  };
+
+  cargoHash = "sha256-+z6oFjmPr2bLf81F4Q3dJC+x+RWeZnnnMHrWLphTsq0=";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
+    libx11
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
+    libxcb
+    libxkbcommon
+    fontconfig
+    freetype
+  ];
+
+  cargoBuildFlags = [
+    "--package"
+    "xtask"
+  ];
+
+  postBuild = ''
+    cargo run --release --package xtask -- bundle nebula_desser --release
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    clapDir="${
+      if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/CLAP" else "$out/lib/clap"
+    }"
+    vst3Dir="${
+      if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/VST3" else "$out/lib/vst3"
+    }"
+
+    mkdir -p "$clapDir" "$vst3Dir"
+
+    cp -r "target/bundled/Nebula De-Esser.clap" "$clapDir/"
+    cp -r "target/bundled/Nebula De-Esser.vst3" "$vst3Dir/"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Nebula De-Esser - Rust de-esser plugin for CLAP and VST3";
+    homepage = "https://github.com/subhankardas15071992-cloud/Nebula-De-Esser";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ eymeric ];
+    platforms = lib.platforms.unix;
+  };
+})

From 9ecff5e56ef7832eee56e28f6047f724a43a0cd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Jun 2026 15:06:18 +0000
Subject: [PATCH 13/56] giada: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index f33e389cf511..c76f5c574370 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "giada";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = "giada";
     tag = finalAttrs.version;
-    hash = "sha256-/pcBQBu2/7fkXuu2N6aLokLXNzXQf7uZI6ePnHe1r2k=";
+    hash = "sha256-GVK/VyqRatxptuQGINaev5RVmafZNxogdKUzC5b4ns4=";
     fetchSubmodules = true;
   };
 

From 699d54fd13afe8550b0b46d86501b2b29492d80c Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sun, 24 May 2026 00:52:10 +0800
Subject: [PATCH 14/56] scx-loader: init at 1.1.1

---
 pkgs/by-name/sc/scx-loader/package.nix | 53 ++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/sc/scx-loader/package.nix

diff --git a/pkgs/by-name/sc/scx-loader/package.nix b/pkgs/by-name/sc/scx-loader/package.nix
new file mode 100644
index 000000000000..c496eeac6bb4
--- /dev/null
+++ b/pkgs/by-name/sc/scx-loader/package.nix
@@ -0,0 +1,53 @@
+{
+  fetchFromGitHub,
+  rustPlatform,
+  lib,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "scx-loader";
+  version = "1.1.1";
+
+  cargoHash = "sha256-uX2lCVDa8eAKWi/bj94+JQHoOLll0OjKRHT0EPZELNc=";
+
+  src = fetchFromGitHub {
+    owner = "sched-ext";
+    repo = "scx-loader";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5OvdtW/Li+ubHDBSKe2ssE9ZyNSCcxNFSJffzxQ9WMk=";
+  };
+
+  __structuredAttrs = true;
+
+  env = {
+    VENDOR_PREFIX = "";
+    VENDOR_DATADIR = "/share";
+  };
+
+  postInstall = ''
+    cargo xtask install --destdir $out
+    rm $out/bin/xtask
+  '';
+
+  postFixup = ''
+    substituteInPlace $out/lib/systemd/system/scx_loader.service \
+      --replace-fail "/usr/bin/scx_loader" "$out/bin/scx_loader"
+    substituteInPlace $out/share/dbus-1/system-services/org.scx.Loader.service \
+      --replace-fail "/usr/bin/scx_loader" "$out/bin/scx_loader"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    mainProgram = "scxctl";
+    homepage = "https://github.com/sched-ext/scx-loader";
+    changelog = "https://github.com/sched-ext/scx-loader/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      Gliczy
+      michaelBelsanti
+      ccicnce113424
+    ];
+  };
+})

From 472e7bfd454db8fe097e100dd9b9eae20877b7a5 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sun, 24 May 2026 00:52:10 +0800
Subject: [PATCH 15/56] nixos/scx-loader: init

---
 .../manual/release-notes/rl-2611.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 .../services/scheduling/scx-loader.nix        | 95 +++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 nixos/modules/services/scheduling/scx-loader.nix

diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index f993a9c3cbd6..cacb4a132c37 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -12,6 +12,8 @@
 
 - [tranquil](https://tangled.org/tranquil.farm/tranquil-pds) is an ATProto PDS (personal data server) implementation in Rust. A featureful, spec conscious and community driven alternative to the Bluesky reference implementation PDS. Available as [services.tranquil-pds](#opt-services.tranquil-pds.enable).
 
+- [scx_loader](https://github.com/sched-ext/scx-loader), a system daemon and DBus-based loader for sched_ext schedulers. `scxctl` is the command-line client for interacting with the loader, allowing users to switch schedulers, modes, and arguments dynamically. Available as [services.scx-loader](#opt-services.scx-loader.enable)
+
 - [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable).
 
 ## Backward Incompatibilities {#sec-release-26.11-incompatibilities}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3ba8703f8555..6c5b1c80397f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1483,6 +1483,7 @@
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
   ./services/scheduling/prefect.nix
+  ./services/scheduling/scx-loader.nix
   ./services/scheduling/scx.nix
   ./services/search/elasticsearch-curator.nix
   ./services/search/elasticsearch.nix
diff --git a/nixos/modules/services/scheduling/scx-loader.nix b/nixos/modules/services/scheduling/scx-loader.nix
new file mode 100644
index 000000000000..70c4df00c3bb
--- /dev/null
+++ b/nixos/modules/services/scheduling/scx-loader.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  cfg = config.services.scx-loader;
+  settingsFormat = pkgs.formats.toml { };
+  configFile = settingsFormat.generate "scx_loader.toml" (
+    lib.filterAttrsRecursive (_: v: v != null) cfg.config
+  );
+
+  schedulers = builtins.concatMap (
+    x: x.passthru.schedulers or (throw "Scheduler not found in package ${x.name}")
+  ) cfg.schedsPackages;
+in
+{
+  options.services.scx-loader = {
+    enable = lib.mkEnableOption "SCX Loader service, a daemon to run schedulers from userspace using dbus. This requires kernel version 6.12 and later.";
+
+    package = lib.mkPackageOption pkgs "scx-loader" { };
+
+    schedsPackages = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      default = [ pkgs.scx.rustscheds ];
+      defaultText = lib.literalExpression "[ pkgs.scx.rustscheds ]";
+      example = lib.literalExpression "[ pkgs.scx.full ]";
+      description = ''
+        `scx` package to use. Defaults to `scx.rustscheds`, which includes all currently by `scx_loader` supported schedulers.
+      '';
+    };
+
+    config = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = settingsFormat.type;
+
+        options = {
+          default_sched = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "scx_bpfland";
+            description = ''
+              Default scheduler that will be started automatically when `scx_loader` starts.
+              If not set or set to an empty string, `scx_loader` will not start any scheduler by default.
+            '';
+          };
+        };
+      };
+      default = { };
+      description = ''
+        Configuration for `scx_loader`.
+
+        See <https://github.com/sched-ext/scx-loader/blob/main/crates/scx_loader/configuration.md> for the full list of options.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.12";
+        message = "SCX is only supported on kernel version 6.12 and above.";
+      }
+      {
+        assertion = !config.services.scx.enable;
+        message = "services.scx and services.scx_loader cannot be enabled simultaneously. Please enable only one of them.";
+      }
+      {
+        assertion =
+          cfg.config.default_sched == null || lib.elem cfg.config.default_sched ([ "" ] ++ schedulers);
+        message = ''
+          Invalid default scheduler: ${cfg.config.default_sched}. It must be one of: ${lib.concatStringsSep ", " schedulers}.
+        '';
+      }
+    ];
+
+    environment.systemPackages = [ cfg.package ] ++ cfg.schedsPackages;
+    systemd.packages = [ cfg.package ];
+    services.dbus.packages = [ cfg.package ];
+
+    security.polkit.enable = true;
+
+    systemd.services.scx_loader = {
+      path = cfg.schedsPackages;
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        TemporaryFileSystem = [ "/etc" ];
+        BindReadOnlyPaths = [ "${configFile.outPath}:/etc/scx_loader.toml" ];
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ ccicnce113424 ];
+}

From 62e65ad348efac9cb36b7496527ad50fb639b8ae Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sun, 24 May 2026 00:52:10 +0800
Subject: [PATCH 16/56] nixosTests.scx-loader: init

---
 nixos/tests/all-tests.nix              |  1 +
 nixos/tests/scx/loader.nix             | 20 ++++++++++++++++++++
 pkgs/by-name/sc/scx-loader/package.nix |  6 +++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/scx/loader.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index fa2faafc5054..543e9fd481b6 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1493,6 +1493,7 @@ in
   scion-freestanding-deployment = runTest ./scion/freestanding-deployment;
   scrutiny = runTest ./scrutiny.nix;
   scx = runTest ./scx/default.nix;
+  scx-loader = runTest ./scx/loader.nix;
   sddm = import ./sddm.nix { inherit runTest; };
   sdl3 = runTest ./sdl3.nix;
   searx = runTest ./searx.nix;
diff --git a/nixos/tests/scx/loader.nix b/nixos/tests/scx/loader.nix
new file mode 100644
index 000000000000..236e84017be6
--- /dev/null
+++ b/nixos/tests/scx/loader.nix
@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }:
+
+{
+  name = "scx-loader";
+  meta.maintainers = with lib.maintainers; [ ccicnce113424 ];
+
+  nodes.machine = {
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+    services.scx-loader = {
+      enable = true;
+      config.default_sched = "scx_bpfland";
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    output = machine.succeed("scxctl get").strip()
+    assert output == "running Bpfland in Auto mode", f"Unexpected scxctl output: {output!r}"
+  '';
+}
diff --git a/pkgs/by-name/sc/scx-loader/package.nix b/pkgs/by-name/sc/scx-loader/package.nix
index c496eeac6bb4..1e2a932bd164 100644
--- a/pkgs/by-name/sc/scx-loader/package.nix
+++ b/pkgs/by-name/sc/scx-loader/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   lib,
   nix-update-script,
+  nixosTests,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scx-loader";
@@ -36,7 +37,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "/usr/bin/scx_loader" "$out/bin/scx_loader"
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = { inherit (nixosTests) scx-loader; };
+  };
 
   meta = {
     mainProgram = "scxctl";

From 8376dc5d4a0586c22cd3a7396f72ebdbba115b52 Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 20:28:59 +0200
Subject: [PATCH 17/56] budget_tracker_tui: init at 1.4.0

---
 .../by-name/bu/budget-tracker-tui/package.nix | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/bu/budget-tracker-tui/package.nix

diff --git a/pkgs/by-name/bu/budget-tracker-tui/package.nix b/pkgs/by-name/bu/budget-tracker-tui/package.nix
new file mode 100644
index 000000000000..ad6125fbebfe
--- /dev/null
+++ b/pkgs/by-name/bu/budget-tracker-tui/package.nix
@@ -0,0 +1,31 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "budget-tracker-tui";
+  version = "1.4.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Feromond";
+    repo = "budget_tracker_tui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rVNAYMfTGYRepeNSlm+d/bJq11lRNFZjpoQjQpclSzY=";
+  };
+  cargoHash = "sha256-u9XlckBJCRzpmY+Hs5x9cBWtxIN1zwMuIYMCuS7i6rQ=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/Feromond/budget_tracker_tui";
+    description = "Terminal User Interface (TUI) budget tracker";
+    changelog = "https://github.com/Feromond/budget_tracker_tui/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = "Budget_Tracker";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ tomasrivera ];
+  };
+})

From c7816616742f057d529e42963e2887115e5c060d Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 4 Jun 2026 11:45:38 +0800
Subject: [PATCH 18/56] tests.overriding: attach fetchgit tests

tests-fetchgit was implemented in commit 4e37d03ba265
("fetchgit: reference hash from finalAttrs.hash"),
but not attach to tests.overriding,
hence this fix.
---
 pkgs/test/overriding.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 5e6fe09b7890..4f3f6cd0245e 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -8,6 +8,7 @@ let
   tests =
     tests-stdenv
     // test-extendMkDerivation
+    // tests-fetchgit
     // tests-fetchhg
     // tests-fetchurl
     // tests-go

From 0e04a3c31d0a708f4d24a33aa7bb9079c0e2ebfb Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@nibelheim.ch>
Date: Tue, 30 Dec 2025 17:11:38 +0100
Subject: [PATCH 19/56] python3Packages.wagtail-localize: add missing assets

---
 .../wagtail-localize/default.nix              | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix
index aedbc54f4bc1..b91643784af6 100644
--- a/pkgs/development/python-modules/wagtail-localize/default.nix
+++ b/pkgs/development/python-modules/wagtail-localize/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  buildNpmPackage,
 
   # build-system
   flit-core,
@@ -22,11 +23,10 @@
   freezegun,
   python,
 }:
-
-buildPythonPackage rec {
+let
   pname = "wagtail-localize";
+
   version = "1.13.1";
-  pyproject = true;
 
   src = fetchFromGitHub {
     repo = "wagtail-localize";
@@ -35,6 +35,33 @@ buildPythonPackage rec {
     hash = "sha256-iJwX/N8/aaAjinU1htVasp88fuuZCOomVPgJ1Ymxre4=";
   };
 
+  assets = buildNpmPackage {
+    pname = "${pname}-assets";
+    npmDepsHash = "sha256-mLZaa3BBvbbgaSgZhsdUVPRXR6X5xy/sWRiOXnzV2cQ=";
+
+    NODE_OPTIONS = "--openssl-legacy-provider";
+
+    inherit version src;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir $out
+
+      for static_dir in wagtail_localize/static; do
+        cp --parents -r $static_dir $out
+      done
+
+      runHook postInstall
+    '';
+  };
+in
+
+buildPythonPackage rec {
+  inherit pname version src;
+
+  pyproject = true;
+
   build-system = [ flit-core ];
 
   dependencies = [
@@ -56,6 +83,10 @@ buildPythonPackage rec {
     google-cloud-translate
   ];
 
+  preBuild = ''
+    cp -r ${assets}/wagtail_localize .
+  '';
+
   # See https://github.com/wagtail/wagtail-localize/issues/922
   patches = [ ./failing-test.patch ];
 

From 15157039dfa2d6d767ee94c1ec95b4b7a42027c4 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sun, 7 Jun 2026 23:26:26 +0200
Subject: [PATCH 20/56] teleport_17: 17.7.23 -> 17.7.24

Changelog: https://github.com/gravitational/teleport/releases/tag/v17.7.24
Diff: https://github.com/gravitational/teleport/compare/v17.7.23...v17.7.24
---
 pkgs/by-name/te/teleport_17/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 6c166deafdc4..e70b5709bfeb 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "17.7.23";
-  hash = "sha256-o1aYmNN4yytgJFQ7V1sPjq6r2pDzf4mG/juyYK5IF3A=";
-  vendorHash = "sha256-cL2U1GOV6PtxSl8N8gjKOHCpj5jhun5D+DbeWBixnxI=";
+  version = "17.7.24";
+  hash = "sha256-45vaxznxRfa4X/V7hZsQKVIWvbVG8F2cEQN19xp4WQg=";
+  vendorHash = "sha256-ERwCdWdp230wkqsRUCnd1hbO4PqXo+gDPsoGbxQqt04=";
   cargoHash = "sha256-cDcDfptq8z0pwjImuAovv/5XwoaPb/ostyxkyNEbkRM=";
-  pnpmHash = "sha256-NTH5YnqeZg/jEkjguSXGS3/MI/r8us11By/fZ1m1caQ=";
+  pnpmHash = "sha256-hk9DI3GSBm2XttCYCi5kjhEhUMm5ToRQcbT+RYI+S2Q=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   inherit buildGoModule withRdpClient extPatches;

From 7328b0d9f1a29debcdb29ab6c141fbacc292f6a6 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 7 Jun 2026 13:25:38 +0800
Subject: [PATCH 21/56] tests.overriding: tests-fetchgit: use generated
 non-zero hashes

Don't use zero hashes where the hash is supposed to be non-zero.

Don't depend on nix.src.hash as nix.src might be wrapped to accept patches.
---
 pkgs/test/overriding.nix | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 4f3f6cd0245e..2c38c6bf17e8 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -148,11 +148,41 @@ let
       };
     };
 
+  /**
+    Take two positional arguments `fakeHash` and `partialHash`,
+    and return a modified version of fakeHash whose hash body is partially substituted by `partialHash` from the beginning,
+    used to assert a specific fake hash variant is used by an overridden FOD.
+
+    # Inputs
+
+    `fakeHash`
+
+    : The specified zero fake hash
+
+    `partialHash`
+
+    : A trimmed non-zero hash body, to substitute the beginning of the zero hash body.
+  */
+  genNonzeroFakeHash =
+    fakeHash:
+    let
+      isSRIHash = lib.hasInfix "-" fakeHash;
+      defaultHashAlgo = lib.optionalString isSRIHash lib.head (lib.splitString "-" lib.fakeHash);
+      defaultHashPrefix = lib.optionalString isSRIHash (defaultHashAlgo + "-");
+      defaultHashBody = lib.removePrefix defaultHashPrefix fakeHash;
+    in
+    partialHash:
+    defaultHashPrefix
+    + partialHash
+    + (lib.substring (lib.stringLength partialHash) (lib.stringLength defaultHashBody) defaultHashBody);
+
   tests-fetchgit =
     let
+      fakeSha256-1 = genNonzeroFakeHash lib.fakeSha256 "1";
+      fakeHash-2 = genNonzeroFakeHash lib.fakeHash "B";
       src-with-sha256 = pkgs.fetchgit {
         url = "https://example.com/source.git";
-        sha256 = lib.fakeSha256;
+        sha256 = fakeSha256-1;
       };
     in
     {
@@ -164,19 +194,19 @@ let
             ;
         };
         expected = {
-          outputHash = lib.fakeSha256;
+          outputHash = fakeSha256-1;
           outputHashAlgo = "sha256";
         };
       };
       test-fetchgit-overrideAttrs-hash = {
         expr = {
-          inherit (src-with-sha256.overrideAttrs { hash = pkgs.nix.src.hash; })
+          inherit (src-with-sha256.overrideAttrs { hash = fakeHash-2; })
             outputHash
             outputHashAlgo
             ;
         };
         expected = {
-          outputHash = pkgs.nix.src.hash;
+          outputHash = fakeHash-2;
           outputHashAlgo = null;
         };
       };

From eb76b98770601cfd6888240612b68499010f04c1 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 7 Jun 2026 13:25:38 +0800
Subject: [PATCH 22/56] tests.overriding: tests-fetchurl: use generated
 non-zero hashes

Don't use zero hashes where the hash is supposed to be non-zero.

Don't depend on nix.src.hash as nix.src might be wrapped to accept patches.
---
 pkgs/test/overriding.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 2c38c6bf17e8..f0244c530bf4 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -226,9 +226,11 @@ let
 
   tests-fetchurl =
     let
+      fakeSha256-1 = genNonzeroFakeHash lib.fakeSha256 "1";
+      fakeHash-2 = genNonzeroFakeHash lib.fakeHash "B";
       src-with-sha256 = pkgs.fetchurl {
         url = "https://example.com/source.tar.gz";
-        sha256 = lib.fakeSha256;
+        sha256 = fakeSha256-1;
       };
     in
     {
@@ -240,19 +242,19 @@ let
             ;
         };
         expected = {
-          outputHash = lib.fakeSha256;
+          outputHash = fakeSha256-1;
           outputHashAlgo = "sha256";
         };
       };
       test-fetchurl-overrideAttrs-hash = {
         expr = {
-          inherit (src-with-sha256.overrideAttrs { hash = pkgs.hello.src.hash; })
+          inherit (src-with-sha256.overrideAttrs { hash = fakeHash-2; })
             outputHash
             outputHashAlgo
             ;
         };
         expected = {
-          outputHash = pkgs.hello.src.hash;
+          outputHash = fakeHash-2;
           outputHashAlgo = null;
         };
       };

From 0a961e9a9eed30296f49663dc8a9f7baf918316d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 8 Jun 2026 12:25:31 +0400
Subject: [PATCH 23/56] the-foundation: migrate to pcre2

Part of #356387
---
 pkgs/by-name/th/the-foundation/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/the-foundation/package.nix b/pkgs/by-name/th/the-foundation/package.nix
index c041ba532b99..399860371833 100644
--- a/pkgs/by-name/th/the-foundation/package.nix
+++ b/pkgs/by-name/th/the-foundation/package.nix
@@ -7,7 +7,7 @@
   curl,
   libunistring,
   openssl,
-  pcre,
+  pcre2,
   zlib,
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libunistring
     openssl
-    pcre
+    pcre2
     zlib
   ];
 

From 57d5b90985792ce7538627cef74edbcca93af733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Mon, 8 Jun 2026 08:29:35 -0400
Subject: [PATCH 24/56] secretspec: 0.10.1 -> 0.12.0

https://github.com/cachix/secretspec/releases/tag/v0.12.0
---
 pkgs/by-name/se/secretspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index 25e763668471..e65d78e9765f 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "secretspec";
-  version = "0.10.1";
+  version = "0.12.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-aFfMgYwRLDSMRAAsh9UpTzKREKgGONycTV71Fyf1fCY=";
+    hash = "sha256-gPavr9V/mtr7mfdmgaVkE6GwIfal44JUOPR/SW1ZPqY=";
   };
 
-  cargoHash = "sha256-I91sGPtCZxfhGYgeQDKZcs1yfSKiqlIcnC5wD3LB0BY=";
+  cargoHash = "sha256-ZO+vwclanqZ8z8mXTP3ytwMqsKauMceR/soPC3vXNmo=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];

From dcb916de009671e1080f1ad0b6efb23ee01e4f8b Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Mon, 8 Jun 2026 16:21:25 +0200
Subject: [PATCH 25/56] shadowsocks-libev: 3.3.5 -> 3.3.6

---
 pkgs/by-name/sh/shadowsocks-libev/package.nix | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/sh/shadowsocks-libev/package.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix
index f324d0cda36c..aed2c88bc4d1 100644
--- a/pkgs/by-name/sh/shadowsocks-libev/package.nix
+++ b/pkgs/by-name/sh/shadowsocks-libev/package.nix
@@ -8,40 +8,38 @@
   mbedtls,
   libev,
   c-ares,
-  pcre,
+  pcre2,
   asciidoc,
   xmlto,
   docbook_xml_dtd_45,
   docbook_xsl,
   libxslt,
+  nixosTests,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
   pname = "shadowsocks-libev";
-  version = "3.3.5";
+  version = "3.3.6";
 
   # Git tag includes CMake build files which are much more convenient.
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = "shadowsocks-libev";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vDmzQ8N3uDpiKCNB8CtR6SbfMjevKwR6WI2UMTusF8c=";
+    hash = "sha256-XrS/qi4oAchdisvicrGmpe3jeDgYDACsvVU6iXQyQCM=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/shadowsocks/shadowsocks-libev/commit/9afa3cacf947f910be46b69fc5a7a1fdd02fd5e6.patch";
-      hash = "sha256-rpWXe8f95UU1DjQpbKMVMwA6r5yGVaDHwH/iWxW7wcw=";
-    })
-  ];
-
   buildInputs = [
     libsodium
     mbedtls
     libev
     c-ares
-    pcre
+    pcre2
   ];
   nativeBuildInputs = [
     cmake
@@ -53,29 +51,16 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DWITH_STATIC=OFF"
-    "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+    (lib.cmakeBool "WITH_STATIC" false)
+    (lib.cmakeBool "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR" true)
     # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
-    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+    (lib.cmakeBool "-DCMAKE_SKIP_BUILD_RPATH" true)
   ];
 
   postPatch = ''
-    # cmake 4 compatibility
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
-
-    # https://github.com/shadowsocks/shadowsocks-libev/issues/2901
-    substituteInPlace CMakeLists.txt \
-      --replace-fail '# pkg-config' \
-                '# pkg-config
-                 include(GNUInstallDirs)'
     substituteInPlace cmake/shadowsocks-libev.pc.cmake \
-      --replace-fail @prefix@ @CMAKE_INSTALL_PREFIX@ \
-      --replace-fail '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ \
-      --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_FULL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
+      --replace-fail '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
       --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \
-      --replace-fail '$'{prefix}/@CMAKE_INSTALL_DATAROOTDIR@ @CMAKE_INSTALL_FULL_DATAROOTDIR@ \
-      --replace-fail '$'{prefix}/@CMAKE_INSTALL_MANDIR@ @CMAKE_INSTALL_FULL_MANDIR@
 
     # https://github.com/dcreager/libcork/issues/173 but needs a different patch (yay vendoring)
     substituteInPlace libcork/src/libcork.pc.in \
@@ -87,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
     cp lib/* $out/lib
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = lib.recurseIntoAttrs {
+      inherit (nixosTests.shadowsocks) basic-libev v2ray-plugin-libev;
+    };
+  };
+
   meta = {
     description = "Lightweight secured SOCKS5 proxy";
     longDescription = ''
@@ -95,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/shadowsocks/shadowsocks-libev";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hmenke ];
     platforms = lib.platforms.all;
   };
 })

From 682823e9c3467a69c109410436480eb9680b25fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 8 Jun 2026 09:25:06 -0700
Subject: [PATCH 26/56] deltachat-tauri: inherit from deltachat-desktop

---
 pkgs/by-name/de/deltachat-desktop/package.nix |  2 ++
 pkgs/by-name/de/deltachat-tauri/package.nix   | 22 +++++--------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 80aeb4f63933..d65168a448be 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -4,6 +4,7 @@
   electron_41,
   fetchFromGitHub,
   deltachat-rpc-server,
+  deltachat-tauri,
   makeDesktopItem,
   makeWrapper,
   nodejs,
@@ -149,6 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
     version = testers.testVersion {
       package = deltachat-desktop;
     };
+    inherit deltachat-tauri;
   };
 
   meta = {
diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix
index 8194eaf8a6c3..bb615208c925 100644
--- a/pkgs/by-name/de/deltachat-tauri/package.nix
+++ b/pkgs/by-name/de/deltachat-tauri/package.nix
@@ -2,6 +2,7 @@
   apple-sdk_14,
   cargo-tauri,
   darwin,
+  deltachat-desktop,
   fetchFromGitHub,
   fetchPnpmDeps,
   gst_all_1,
@@ -27,24 +28,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deltachat-tauri";
-  version = "2.51.0";
+  inherit (deltachat-desktop)
+    version
+    src
+    pnpmDeps
+    ;
   __structuredAttrs = true;
 
-  src = fetchFromGitHub {
-    owner = "deltachat";
-    repo = "deltachat-desktop";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-ORp8lZcHzswrSCe30cGKpZdyqZCcvqLgu2hwvadMHN0=";
-  };
-
-  pnpmDeps = fetchPnpmDeps {
-    pname = "deltachat-desktop";
-    inherit (finalAttrs) version src;
-    inherit pnpm;
-    fetcherVersion = 4;
-    hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo=";
-  };
-
   cargoHash = "sha256-JhsoIQZrU4GVcs/TCIug6y/84gODyEWl0Bl2jRNxL5Y=";
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

From 1e688f13244ae676ae6ab53583504f8436745dc5 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 01:04:02 +0300
Subject: [PATCH 27/56] llvmPackages.bintools-unwrapped: inherit `meta.teams`
 from `llvm`

---
 pkgs/development/compilers/llvm/common/bintools.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/llvm/common/bintools.nix b/pkgs/development/compilers/llvm/common/bintools.nix
index 64d165a0f21f..afa512a86a75 100644
--- a/pkgs/development/compilers/llvm/common/bintools.nix
+++ b/pkgs/development/compilers/llvm/common/bintools.nix
@@ -23,6 +23,9 @@ runCommand "${pname}-${version}"
       inherit targetPrefix;
       inherit llvm lld;
     };
+    meta = {
+      inherit (llvm.meta) teams;
+    };
   }
   ''
     mkdir -p $out/bin

From 34e34f9bf71ce0c68ad3e5d9a72baa1f1fda756e Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sun, 7 Jun 2026 23:28:14 +0200
Subject: [PATCH 28/56] teleport_18: 18.7.6 -> 18.8.3

Upstream moved the declaration of default paths into a module, which
breaks applying a patch.
Adapting the patch and applying it conditionally based on the version
mitigates this problem.

Changelogs: https://github.com/gravitational/teleport/releases/tag/v18.8.0 https://github.com/gravitational/teleport/releases/tag/v18.8.1 https://github.com/gravitational/teleport/releases/tag/v18.8.2 https://github.com/gravitational/teleport/releases/tag/v18.8.3
Diff: https://github.com/gravitational/teleport/compare/v18.7.6...v18.8.3
---
 ...-fix-add-nix-path-to-exec-env-reexec.patch | 28 +++++++++++++++++++
 pkgs/build-support/teleport/default.nix       | 15 +++++++---
 pkgs/by-name/te/teleport_18/package.nix       | 10 +++----
 3 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env-reexec.patch

diff --git a/pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env-reexec.patch b/pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env-reexec.patch
new file mode 100644
index 000000000000..2ab25db3784a
--- /dev/null
+++ b/pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env-reexec.patch
@@ -0,0 +1,28 @@
+From e3651ca79c0edb66c04e0d3381f3b0b6f76d37d2 Mon Sep 17 00:00:00 2001
+From: 5aaee9 <jiduye@gmail.com>
+Date: Thu, 24 Mar 2022 17:34:38 +0800
+Subject: [PATCH] fix: add nix path to exec env
+# Adapted to new path starting from 18.8
+
+---
+ session/reexec/exec.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/session/reexec/exec.go b/session/reexec/exec.go
+index 253fbafef..815a2e1e0 100644
+--- a/session/reexec/exec.go
++++ b/session/reexec/exec.go
+@@ -30,8 +30,8 @@ import (
+ )
+ 
+ const (
+-	defaultPath          = "/bin:/usr/bin:/usr/local/bin:/sbin"
++	defaultPath          = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/bin:/usr/bin:/usr/local/bin:/sbin"
+ 	defaultEnvPath       = "PATH=" + defaultPath
+-	defaultRootPath      = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
++	defaultRootPath      = "/run/wrappers/bin:/etc/profiles/per-user/root/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ 	defaultEnvRootPath   = "PATH=" + defaultRootPath
+ 	defaultLoginDefsPath = "/etc/login.defs"
+-- 
+2.32.0 (Apple Git-132)
+
diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index 025c4a149bdd..d696a6243627 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -157,10 +157,17 @@ buildGoModule (finalAttrs: {
     pkg-config
   ];
 
-  patches = extPatches ++ [
-    ./0001-fix-add-nix-path-to-exec-env.patch
-    ./rdpclient.patch
-  ];
+  patches =
+    extPatches
+    ++ [
+      ./rdpclient.patch
+    ]
+    ++ lib.optional (lib.versionOlder version "18.8.0") [
+      ./0001-fix-add-nix-path-to-exec-env.patch
+    ]
+    ++ lib.optional (lib.versionAtLeast version "18.8.0") [
+      ./0001-fix-add-nix-path-to-exec-env-reexec.patch
+    ];
 
   # Reduce closure size for client machines
   outputs = [
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index d93d3874fe32..71fb509ee77e 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "18.7.6";
-  hash = "sha256-p7qwsUr6n6OAl/b20SgropAubfPfwBiVTvbReb2HpO8=";
-  vendorHash = "sha256-/ZY0J0yB/8qMG6vEIta7Nf2Uv3xTZ/WPoMz+Dj5hwZA=";
-  pnpmHash = "sha256-uRsS5m0Q4fAFvJ3Qp6xcEAB8QFriLXbeGtD0o0n46RE=";
-  cargoHash = "sha256-KkFwMSBXsRmDuaPU1n6FPq2P5UQiQnb7+HEDOhhmjd0=";
+  version = "18.8.3";
+  hash = "sha256-DHPOWIvzBCOT3GU0YHBtG46ctB0Nh8XwSmpl9vgCET8=";
+  vendorHash = "sha256-0+fIoprAQyoom9xBpXGiEgmE4dWktcqlZQOzkRXYlKo=";
+  pnpmHash = "sha256-8FlC9Sm12A5kfS9X0qYDNJOePZjeJU7LDTRlWUIEneA=";
+  cargoHash = "sha256-IX0HCeCosXCe/oTYa8PImemf9op2AeagSnl44uBnSbM=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
   buildGoModule = buildGo125Module;

From a30bc54b6a5b6b7b0ec5b87d2be3a4b013aef369 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 9 Jun 2026 08:48:56 +0200
Subject: [PATCH 29/56] ty: 0.0.44 -> 0.0.46

Changelogs:
- https://github.com/astral-sh/ty/releases/tag/0.0.45
- https://github.com/astral-sh/ty/releases/tag/0.0.46

Diff: https://github.com/astral-sh/ty/compare/0.0.44...0.0.46
---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index fad959f944ae..c1a1f061bebe 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -17,7 +17,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.44";
+  version = "0.0.46";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-P19+C6u0mkIrR0H8M/l7Wn3r8JSY4Ul9p64oXaLdWCQ=";
+    hash = "sha256-IZgQduqsQU8wMu0yW3SYypEzAJ0gmDObTJ75xG88xbA=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-d2iV7iWf7lVhj1Bbaxxk5Zao4KK3oC7whppRvk0erzA=";
+  cargoHash = "sha256-rSvaYddm5n1qtPRHfY6du0aA1t2TsIqzTPnHQ9NHMP8=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];

From 75133828a2f9d442a25598c997aeb452ddb81c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 9 Jun 2026 15:52:13 +0200
Subject: [PATCH 30/56] rclone: 1.74.2 -> 1.74.3

Diff: https://github.com/rclone/rclone/compare/v1.74.2...v1.74.3

Changelog: https://github.com/rclone/rclone/blob/v1.74.3/docs/content/changelog.md
---
 pkgs/by-name/rc/rclone/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index bf9adacb7452..6bf7b41a4e80 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "rclone";
-  version = "1.74.2";
+  version = "1.74.3";
 
   outputs = [
     "out"
@@ -27,10 +27,10 @@ buildGoModule (finalAttrs: {
     owner = "rclone";
     repo = "rclone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ynPRzzS0aoEbDiCgeIyi2Ce3+NHjQcazm7KJeK6cdiM=";
+    hash = "sha256-GLl8juSCVKEjsVZAzvvfKx1TxC/rcM7lMBek9BLosi0=";
   };
 
-  vendorHash = "sha256-fiZyN94l0Eq3BjJzW3lF5ld37VBurWjtr1v5kVWCc/Q=";
+  vendorHash = "sha256-FuSqI5fCmt/fr4AwJhdFaolYugZDTYeOcity/VZzYZ0=";
 
   subPackages = [ "." ];
 

From b127e7745e48ed4efd66689ca4b47381b5b3d54c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 16:45:15 +0000
Subject: [PATCH 31/56] qgis: 4.0.2 -> 4.0.3

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 7c8a276675c3..5178a6288af7 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -89,14 +89,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "qgis-unwrapped";
-  version = "4.0.2";
+  version = "4.0.3";
   outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-4tQ7Jv03/S6+xt3NU7jZLsZk3rQyaj+XsVnpCWW1uqg=";
+    hash = "sha256-vHKDc+OeIVfi+7Gp1ROUDYon+wKb24Nr5nCVfmhknvc=";
   };
 
   passthru = {

From c77f429a2567b857b71077c4b62f612a139d78b1 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 9 Jun 2026 17:56:09 +0000
Subject: [PATCH 32/56] linux_xanmod: 6.18.34 -> 6.18.35

- Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.35-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.18.34-xanmod1..6.18.35-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 4c3518feb4ea..823b8552f4f6 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.18.34";
-      hash = "sha256-lDHBPXY716pDs+Hr6qS7zPJPEN1shMSK/V32SBLv4/s=";
+      version = "6.18.35";
+      hash = "sha256-as5IBHZlphht6LqSzLdUaNAGxvGsgtTWNtwoCj12FNA=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 771def51e5384f5dd107a58e8316e637460a3b86 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 9 Jun 2026 17:58:44 +0000
Subject: [PATCH 33/56] linux_xanmod_latest: 7.0.11 -> 7.0.12

- Changelog: https://dl.xanmod.org/changelog/7.0/ChangeLog-7.0.12-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/7.0.11-xanmod1..7.0.12-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 823b8552f4f6..46dd217568c8 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "7.0.11";
-      hash = "sha256-33/oVWqVRITtYeGfOATSe9Wckm/PeI1mioDrTPe8OmY=";
+      version = "7.0.12";
+      hash = "sha256-yqyHkdSLSyTrhnwsWJ0jq4bhqaCrJ+qzkUzxdrVJP6A=";
     };
   };
 

From f84fa8eb11e8b07778d663cd0c5fab15f7d08ff9 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 29 May 2026 13:33:01 +0200
Subject: [PATCH 34/56] zellijPlugins: move docs to wiki.nixos.org

---
 pkgs/by-name/ze/zellij/plugins/README.md | 83 ------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 pkgs/by-name/ze/zellij/plugins/README.md

diff --git a/pkgs/by-name/ze/zellij/plugins/README.md b/pkgs/by-name/ze/zellij/plugins/README.md
deleted file mode 100644
index bf643ce98969..000000000000
--- a/pkgs/by-name/ze/zellij/plugins/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Zellij plugins
-
-Zellij offers a Webassembly / WASI plugin system, allowing plugin developers to
-develop plugins in many different languages. Currently, nixpkgs focuses only on
-Rust plugins (the majority of them).
-
-Most of the plugins were generated using `nix-init` on [awesome-zellij].
-Excluded plugins from that list (should be packaged later anyway):
-
-- [bar-theme-config](https://github.com/allisonhere/zellij-bar-theme-config): not a plugin, but a separate application
-- [fzf-zellij](https://github.com/k-kuroguro/fzf-zellij): [closed source](https://github.com/k-kuroguro/fzf-zellij/issues/1)
-- [gitpod-zellij](https://github.com/ona-samples/gitpod.zellij): not a plugin, but a separate application?
-- [opencode-zellij-namer](https://github.com/24601/opencode-zellij-namer): written in TypeScript, not Rust
-- [theme-configurator](https://rosmur.github.io/zellij-theme-configurator/): not a plugin, but a separate application
-- [yazelix](https://github.com/luccahuguet/yazelix): written in Nushell
-- [zeco](https://github.com/julianbuettner/zeco): not a plugin, but a separate application?
-- [zellij-load](https://github.com/Christian-Prather/zellij-load): has daemon, so that needs to be packaged too
-- [zellij-vscode-toolkit](https://github.com/atoolz/zellij-vscode-toolkit): not a plugin, but a VSCode plugin
-- [zellix](https://github.com/EmeraldPandaTurtle/zellix): written in Nushell
-- [zj-quit](https://github.com/cristiand391/zj-quit): archived
-- [zj-status-bar](https://github.com/cristiand391/zj-status-bar): archived
-- [zrw](https://github.com/ivoronin/zrw): written in Go
-
-Contributions are welcome!
-
-[awesome-zellij]: https://github.com/zellij-org/awesome-zellij/blob/95fce2c02a2dcca33e4972eed3eba64d516693c9/README.md
-
-## Specifying runtime dependencies
-
-Runtime dependencies are packages, that will be used by the plugin inside
-a Zellij session. Those are specified in `passthru.runtimeDeps` attribute from
-`pkgsBuildBuild` attrset.
-
-Since we compile all plugins on WASI, everything that the plugin gets as
-derivation arguments are also get compiled for WASI. However, `coreutils` is
-not available on WASI and so is the vast majority of packages. This is why
-runtime dependencies need to be specified from `pkgsBuildBuild` attrs set
-(which points to the user's system).
-
-```nix
-# assume we build the plugin on a x86_64-linux machine
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-
-  # these will be compiled for WASI, not x86_64-linux!
-  just,
-  bacon,
-  # but pkgsBuildBuild points to x86_64-linux
-  pkgsBuildBuild,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "jbz";
-  version = "0.39.0";
-
-  src = fetchFromGitHub {
-    owner = "nim65s";
-    repo = "jbz";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-3n3Bv3YDb1+MYJTTAmMkIgGY7kX9IVUoDNV4c/n0Ydo=";
-  };
-
-  cargoHash = "sha256-U+P2LlhmXwaZy2a2eigrg545HTuV1T01jZfUOEUQ5+w=";
-
-  # this is the only way how to specify dependencies
-  passthru.runtimeDeps = with pkgsBuildBuild; [
-    bacon
-    just
-  ];
-
-  meta = {
-    description = "Display your Just commands wrapped in Bacon";
-    homepage = "https://github.com/nim65s/jbz";
-    changelog = "https://github.com/nim65s/jbz/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ PerchunPak ];
-  };
-})
-```
-
-If you are wondering why `pkgsBuildBuild` is named like that, refer to
-[the docs on cross-compilation](https://nixos.org/manual/nixpkgs/unstable/#possible-dependency-types).

From aeaabce790c1219d1a28cbb7ed20212bd28adc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Jun 2026 11:56:05 -0700
Subject: [PATCH 35/56] onionshare: 2.6.3 -> 2.6.4

Diff: https://github.com/onionshare/onionshare/compare/v2.6.3...v2.6.4

Changelog: https://github.com/onionshare/onionshare/releases/tag/v2.6.4
---
 pkgs/by-name/on/onionshare/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix
index 56603f187137..6358a382c86a 100644
--- a/pkgs/by-name/on/onionshare/package.nix
+++ b/pkgs/by-name/on/onionshare/package.nix
@@ -18,14 +18,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "onionshare-cli";
-  version = "2.6.3";
+  version = "2.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "onionshare";
     repo = "onionshare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DY5rSHkmiqLIa49gcbq7VfcMM1AMFTJ5FPQtS2kR2Zs=";
+    hash = "sha256-VkfS9coUIejRAcu+/e6jjh+eknd56fA3NpFwikd5n9c=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/cli";
@@ -49,6 +49,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   pythonRelaxDeps = true;
 
+  pythonRemoveDeps = [
+    "pkgconfig"
+  ];
+
   dependencies =
     with python3Packages;
     [

From 895b0b78999f782e8588c70493df438c93522873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Jun 2026 12:27:01 -0700
Subject: [PATCH 36/56] libdeltachat: 2.51.0 -> 2.52.0

Diff: https://github.com/chatmail/core/compare/v2.51.0...v2.52.0

Changelog: https://github.com/chatmail/core/blob/v2.52.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 4b3149fd07c1..5357638c0418 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdeltachat";
-  version = "2.51.0";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OXazjp3w4NxbcTUNsyeU46erbdj27n1I7dvt+Io/AZ0=";
+    hash = "sha256-AQo27qnHPCK6q/3+Umk6ueqkOIVBA8n4q9S5iEZ7TkM=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit (finalAttrs) version src;
-    hash = "sha256-gt//65v9PF2nnX/zkZGU9hm73lfzOTmw36rbkWu9VX0=";
+    hash = "sha256-ni8iaVPHXWhxfiBvtVzGRyPcxkbV0HiqcQCHGmAqk7s=";
   };
 
   nativeBuildInputs = [

From 47f2f25308df6e3167b0a405f0a123b6b5dd510b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 23:15:43 +0000
Subject: [PATCH 37/56] kazumi: 2.1.3 -> 2.1.4

---
 pkgs/by-name/ka/kazumi/git-hashes.json   | 18 +++++-----
 pkgs/by-name/ka/kazumi/package.nix       |  4 +--
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 42 ++++++++++++------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json
index 740dbb06f326..ca269ae4d04d 100644
--- a/pkgs/by-name/ka/kazumi/git-hashes.json
+++ b/pkgs/by-name/ka/kazumi/git-hashes.json
@@ -2,14 +2,14 @@
   "audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
   "audio_service_win": "sha256-OZq2waTr0WLJ6uki/VLdUBdDdui25PvXnMNFohs7gjs=",
   "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
-  "media_kit": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_android_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_ios_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_linux": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_macos_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_ohos": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_libs_windows_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
-  "media_kit_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_android_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_ios_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_linux": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_macos_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_ohos": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_libs_windows_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
+  "media_kit_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=",
   "webview_windows": "sha256-afBTwbam9YA0xvIYMtiJe+CKi8GWit1HqDR3J72r2o0="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index e760af510ddc..222e4e390873 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-GpHLqqvjfgLRICIHO7YPLdzrQWHexJlg0ilqCJkkOfw=";
+    hash = "sha256-rGziris2/4UiedviO+2L4cguC4DLGGCuGc1GK/Lyr3c=";
   };
 in
 flutter.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 8a467b2833d7..0b7aaff48812 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -785,11 +785,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_volume_controller",
-        "sha256": "27b95004d8abd7c6b24a63e555d721ef5f958fbe54551246567b72321494c6c8",
+        "sha256": "78297fd48ce6330d39a11a4c1ae219a3256249f99dec34cfbe9323d2cbb5ebb9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.0.1"
     },
     "flutter_web_plugins": {
       "dependency": "transitive",
@@ -1151,8 +1151,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1162,8 +1162,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1173,8 +1173,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1184,8 +1184,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1195,8 +1195,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1206,8 +1206,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ohos/media_kit_libs_ohos",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1217,8 +1217,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1228,8 +1228,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1239,8 +1239,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
-        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
+        "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -2396,6 +2396,6 @@
   },
   "sdks": {
     "dart": ">=3.11.0 <4.0.0",
-    "flutter": ">=3.44.0"
+    "flutter": ">=3.44.1"
   }
 }

From d7aa66a085e8d7ce5fee94889a7a41fb7bec82b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 23:37:44 +0000
Subject: [PATCH 38/56] deja: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/de/deja/package.nix b/pkgs/by-name/de/deja/package.nix
index 41af3d9332ec..075791180dfa 100644
--- a/pkgs/by-name/de/deja/package.nix
+++ b/pkgs/by-name/de/deja/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "deja";
-  version = "0.3.0";
+  version = "0.3.1";
   __structuredAttrs = true;
   src = fetchFromGitHub {
     owner = "Giammarco-Ferranti";
     repo = "deja";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xxbClKhhSwo+jUjAZ2gS4yOS5sSI76dfPpDzA3qdV18";
+    hash = "sha256-3fwjPvxCoFBb4a7vKFfGk+sIaLzTSiLxpGp2UIB0llk=";
   };
 
   vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8=";

From 23461d1d14315e2494b1aa9e2bd4c7147a1fc9ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 23:45:15 +0000
Subject: [PATCH 39/56] terraform-providers.jianyuan_sentry: 0.14.13 -> 0.15.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 938e3af60545..4b8d9e495fb3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -787,13 +787,13 @@
     "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
   },
   "jianyuan_sentry": {
-    "hash": "sha256-5PXljI0uRjmpJXwJZsoEod/GCgxCA4ti94ubflyaNJY=",
+    "hash": "sha256-/FOpuCdMkUHpJN3z18guNqzG4Ujv8B+gZ67R2TgqKBk=",
     "homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
     "owner": "jianyuan",
     "repo": "terraform-provider-sentry",
-    "rev": "v0.14.13",
+    "rev": "v0.15.1",
     "spdx": "MIT",
-    "vendorHash": "sha256-RAVDPsbCnZ/3TSpq5lZb9Ega0AigNLxyG5wsLWPkoaU="
+    "vendorHash": "sha256-6XGS1T1bMUQKPOTqS3i92ZMfyD00ZovTuCViYyM/OEU="
   },
   "joneshf_openwrt": {
     "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",

From e7e8d4f799e4bf1764cabc4446a1d6f99301b0ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 23:59:29 +0000
Subject: [PATCH 40/56] bobgen: 0.42.0 -> 0.45.0

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

diff --git a/pkgs/by-name/bo/bobgen/package.nix b/pkgs/by-name/bo/bobgen/package.nix
index ddb7529aac7b..fdccbda4ef39 100644
--- a/pkgs/by-name/bo/bobgen/package.nix
+++ b/pkgs/by-name/bo/bobgen/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "bobgen";
-  version = "0.42.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "stephenafamo";
     repo = "bob";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-reTvQDUqsRmdl0RyCWoUoF8dc/ZrSZxR8x8++VC4H3A=";
+    hash = "sha256-dmZ9aOiVn0QEBvPwulvFEisZRw0PIid7NH22gD3Yzuc=";
   };
 
-  vendorHash = "sha256-Jqlah37+tfNqsgeL/MnbVUmSfU2JWMJDb9AQrEqXnXU=";
+  vendorHash = "sha256-WzSUUgfWGz5XXq3iQrtpF91yOEr0QypTWq1rOJMntGQ=";
 
   subPackages = [
     "gen/bobgen-sql"

From c88305b485fb2423753fa9fadf44b6d2bb495494 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 10 Jun 2026 02:03:32 +0200
Subject: [PATCH 41/56] localsend: set meta.donationPage

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

diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index f8b254df99f3..0db8997810e4 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -141,6 +141,7 @@ let
   metaCommon = {
     description = "Open source cross-platform alternative to AirDrop";
     homepage = "https://localsend.org/";
+    donationPage = "https://localsend.org/donate";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       sikmir

From c209164583faa8ae728d663e03a8fdc5d305cce9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 00:27:36 +0000
Subject: [PATCH 42/56] msgpack-c: 7.0.0 -> 7.0.1

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

diff --git a/pkgs/by-name/ms/msgpack-c/package.nix b/pkgs/by-name/ms/msgpack-c/package.nix
index 6c8e8400f682..4804a261ead4 100644
--- a/pkgs/by-name/ms/msgpack-c/package.nix
+++ b/pkgs/by-name/ms/msgpack-c/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "msgpack-c";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-c";
     tag = "c-${finalAttrs.version}";
-    hash = "sha256-mCVczuKsLGQsOjGQLt0aBW4++GMEkuCHzGifAJk5C54=";
+    hash = "sha256-uMSOECctnUaThhB0vKKSvrjBmFzXDMIeusdiCrfOoI4=";
   };
 
   strictDeps = true;

From 1c7f0fab6606764b3e4a957ae60d5f43e657ff27 Mon Sep 17 00:00:00 2001
From: coolGi <me@coolgi.dev>
Date: Tue, 26 May 2026 16:43:42 +1200
Subject: [PATCH 43/56] rmfakecloud: 0.0.29 -> 0.0.31

---
 pkgs/by-name/rm/rmfakecloud/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index 821484bbd4fc..c751ea34cd57 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -11,16 +11,16 @@
 }:
 buildGoModule rec {
   pname = "rmfakecloud";
-  version = "0.0.29";
+  version = "0.0.31";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
-    rev = "v${version}";
-    hash = "sha256-N6hAv8dVCM3VWuKpHlK82mjQh6RB7W+n9KBNNQXDrC8=";
+    tag = "v${version}";
+    hash = "sha256-0eESaBe9FGqDrAumS8ANEEaB4FgbZsgWX1487J3Li4I=";
   };
 
-  vendorHash = "sha256-XksCJ9b5NDIutwqnWP63R2udp/Y5qkkgo2a4TPUi0Z4=";
+  vendorHash = "sha256-A+y63w+sEleXFh4ZHgFo1IhsQ2KhqqKW4vRPi393atI=";
 
   # if using webUI build it
   # use env because of https://github.com/NixOS/nixpkgs/issues/358844
@@ -35,7 +35,7 @@ buildGoModule rec {
     pnpmLock = "${src}/ui/pnpm-lock.yaml";
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-5dsrf6Iff8z4ujzUccuNFwChChbWzXeXDilh8uZyl+U=";
+    hash = "sha256-pggGMLQ08i8irCDQ1A0u41EXDleaRtSKusDWXuU7khA";
   };
   preBuild = lib.optionals enableWebui ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

From 851cbf9e1e9a5998726145c2f6814e359a777c1c Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 8 Jun 2026 08:18:01 +0900
Subject: [PATCH 44/56] rmfakecloud: use pnpm 11

pnpm9 is now EOL and should no longer be used (#529285)

Also update fetchPnpmDeps to fetcherVersion=4 as recommended
---
 pkgs/by-name/rm/rmfakecloud/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index c751ea34cd57..6e99808b59b4 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   buildGoModule,
   enableWebui ? true,
-  pnpm_9,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -33,9 +33,9 @@ buildGoModule rec {
       ;
     sourceRoot = "${src.name}/ui";
     pnpmLock = "${src}/ui/pnpm-lock.yaml";
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-pggGMLQ08i8irCDQ1A0u41EXDleaRtSKusDWXuU7khA";
+    pnpm = pnpm_11;
+    fetcherVersion = 4;
+    hash = "sha256-UQT6uYusDw7Hd+1URrSQkyorajih6oF0LSMpPZy9K1w=";
   };
   preBuild = lib.optionals enableWebui ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
@@ -49,7 +49,7 @@ buildGoModule rec {
   nativeBuildInputs = lib.optionals enableWebui [
     nodejs
     pnpmConfigHook
-    pnpm_9
+    pnpm_11
   ];
 
   # ... or don't embed it in the server

From a674bceafd017bbb2bf1299021037ac5f3b48d9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 00:48:07 +0000
Subject: [PATCH 45/56] supabase-cli: 2.102.0 -> 2.105.0

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

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 8b9bd40f6520..06dd5018291c 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "supabase-cli";
-  version = "2.102.0";
+  version = "2.105.0";
 
   __structuredAttrs = true;
 
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
     owner = "supabase";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vJCAem5qAiF9H2xYe8r1lE56W4k60VgNFcTFPY9xP9I=";
+    hash = "sha256-L56P2ao1N+M9+b76E4gjHfRVGU2JBKE31VxVaDeQk5E=";
   };
 
   # Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli.
   sourceRoot = "${finalAttrs.src.name}/apps/cli-go";
 
-  vendorHash = "sha256-O+dFhk+JLKs+hqxh/6VHDTxZ/TBUl4LBGEuFBHgAyS8=";
+  vendorHash = "sha256-1uzkvu1EcIk3+AVnv3GVCQLUPhCKNPvyFIstJvswET0=";
 
   ldflags = [
     "-s"

From 451f9f558e8a83f4c7194fb94384d62bc05fc40f Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 10 Jun 2026 03:03:01 +0200
Subject: [PATCH 46/56] bttf: adjust meta.description

---
 pkgs/by-name/bt/bttf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bt/bttf/package.nix b/pkgs/by-name/bt/bttf/package.nix
index 65d426a32dc4..94eb71eb8ec7 100644
--- a/pkgs/by-name/bt/bttf/package.nix
+++ b/pkgs/by-name/bt/bttf/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
 
   meta = {
-    description = "Command line tool for datetime arithmetic, parsing, formatting and more. Replaces biff.";
+    description = "Command line tool for datetime arithmetic, parsing, formatting and more. Replacment for biff";
     homepage = "https://github.com/BurntSushi/bttf";
     changelog = "https://github.com/BurntSushi/bttf/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [

From 1030a31acd677f5cf3e75b485ff9dd6b6aa6bd29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 01:15:04 +0000
Subject: [PATCH 47/56] python3Packages.xiaomi-ble: 1.12.3 -> 1.14.3

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

diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix
index 1658cf4401be..18714d430f77 100644
--- a/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "xiaomi-ble";
-  version = "1.12.3";
+  version = "1.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "xiaomi-ble";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FjLrwEfhHVypF8XH7yvFjmG5oZL7VI/DOWPLbNZ50ng=";
+    hash = "sha256-MUAowfbJ3vktUUDNLR5UWrbYq/xXmODwVIxv7GeB1EM=";
   };
 
   build-system = [ poetry-core ];

From abf2b51f9348817dbd33e25086cbf698a0c20122 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 02:09:16 +0000
Subject: [PATCH 48/56] rclip: 3.0.10 -> 3.2.1

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

diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix
index cc8950b3f2dd..5cda43c7605a 100644
--- a/pkgs/by-name/rc/rclip/package.nix
+++ b/pkgs/by-name/rc/rclip/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "rclip";
-  version = "3.0.10";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yurijmikhalevich";
     repo = "rclip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FRsdZ0sM8Ato+v7239bZygZ98eYOQqiD0vLXa/+ybIg=";
+    hash = "sha256-C/93z6iUulwjeqAqzqya57vtlEynSde7Txn9mfphBpA=";
   };
 
   postPatch = ''

From dda2ee2929d384a82d98487a213a4f2d5349c063 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 02:14:01 +0000
Subject: [PATCH 49/56] python3Packages.zwave-js-server-python: 0.71.0 ->
 0.72.0

---
 .../python-modules/zwave-js-server-python/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix
index b9aa7cf2eddb..f76391c284fd 100644
--- a/pkgs/development/python-modules/zwave-js-server-python/default.nix
+++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "zwave-js-server-python";
-  version = "0.71.0";
+  version = "0.72.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "zwave-js-server-python";
     tag = finalAttrs.version;
-    hash = "sha256-uzM7T+2H5CwUqqodMDpYlU16kIRNEIdeSeoexxRLAGo=";
+    hash = "sha256-SgAKtmyTG36S/Au7uv1U3MLXcINqQql6XEGWAEEHyw0=";
   };
 
   build-system = [ setuptools ];

From d71cc463cc184b82baec685e9df46afd31ae4eb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 03:03:32 +0000
Subject: [PATCH 50/56] databricks-cli: 1.1.0 -> 1.2.1

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

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 34f41e29083b..35713557d1c4 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "1.1.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MMVwypMxnFBYVlBmuJ2KWwfL1hXuro5BH7V5wrgl3lc=";
+    hash = "sha256-pIcLZQm/53AMk51jEgM0j1yUR2FU3fhDgVGDBk7yaj4=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-OK7P+0pBaL/sn+iTrVr0m3EuqA/Pssp19JRKo6nGipk=";
+  vendorHash = "sha256-TAyB9hpiNDDct2We7bbOiNr7ZkbRtF5cYjPmeLfUDkE=";
 
   excludedPackages = [
     "bundle/internal"

From b92f00f1aa2dd915f568c63ad3474e1998b0741d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 03:06:44 +0000
Subject: [PATCH 51/56] neowall: 0.4.7 -> 0.5.0

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

diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix
index fa02765dcdf6..597a9d694396 100644
--- a/pkgs/by-name/ne/neowall/package.nix
+++ b/pkgs/by-name/ne/neowall/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neowall";
-  version = "0.4.7";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "1ay1";
     repo = "neowall";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QtPxt0NS2u5DXNLT8XjBiPb2Jy73Pk2QO+itFCJ/9cU=";
+    hash = "sha256-hmfHcKXDmMHlFlaODo+BrbHUyx9BHn9BiCbPDp5CMG0=";
   };
 
   nativeBuildInputs = [

From 8fdae5e0c03475b039056b609764033b1c0cd5ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 03:13:12 +0000
Subject: [PATCH 52/56] pi-coding-agent: 0.78.0 -> 0.79.1

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

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index 8c1c2386cdb9..ea3429bc6213 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.78.0";
+  version = "0.79.1";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cw+W5w6yuL+cH+JfgCbEwiyeXloMb7yFd46TXJPZGTg=";
+    hash = "sha256-MvH8e21GVfzRQ9vsxFNC1GHJfB9GZpqY1Z2t8GCUaiQ=";
   };
 
-  npmDepsHash = "sha256-TxMiT7nJqLZRXKFoxb4FpsETGe3I99qU7olTgNsoQd4=";
+  npmDepsHash = "sha256-ZWdfDDs+Hv+GWTmsNmpWNlUDBOMALw7H4lwo7CJHVCM=";
 
   npmWorkspace = "packages/coding-agent";
 

From 7fd554a3e7f7cce02bcab11cd336ad65be3a7eb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 03:31:12 +0000
Subject: [PATCH 53/56] python3Packages.alibabacloud-credentials: 1.0.8 ->
 1.0.9

---
 .../python-modules/alibabacloud-credentials/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/alibabacloud-credentials/default.nix b/pkgs/development/python-modules/alibabacloud-credentials/default.nix
index 92b8a7d5c32a..94c183ae33d6 100644
--- a/pkgs/development/python-modules/alibabacloud-credentials/default.nix
+++ b/pkgs/development/python-modules/alibabacloud-credentials/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "alibabacloud-credentials";
-  version = "1.0.8";
+  version = "1.0.9";
   pyproject = true;
 
   src = fetchPypi {
     pname = "alibabacloud_credentials";
     inherit (finalAttrs) version;
-    hash = "sha256-Nkwiq+8tJAslnOrfHOaAABfxmjNnKVU5VpKKHt0S52k=";
+    hash = "sha256-Ea1iBs4rrMW0ul8ses/sk9cERN/i4sBlyAF1EugoAZs=";
   };
 
   pythonRelaxDeps = [ "aiofiles" ];

From 3ee31dd40cd45db6ddc5cf6bd7763c344c4424cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 03:57:05 +0000
Subject: [PATCH 54/56] tfswitch: 1.18.0 -> 1.19.0

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

diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index 2b77315de3e9..3dbb8f032bd4 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "tfswitch";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-VIRH58HvHVbSteLarGEpesXsMxgd3G03qwvbxPpwabc=";
+    sha256 = "sha256-4a7noh05dA0alPnOtkDTFHynfwtf0MR74NNptgLGdKI=";
   };
 
-  vendorHash = "sha256-eCXHoVzw2ny2LNWrI5uD6Rjzo8SdRYwG5xCjs158uNU=";
+  vendorHash = "sha256-wUWEGRyF6gyitTBfEcEsylczI/uTMfgI4gx/N91n08w=";
 
   # Disable tests since it requires network access and relies on the
   # presence of release.hashicorp.com

From 7a46ac95fb5137c5f0950cc508172d422db5fec7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 04:31:26 +0000
Subject: [PATCH 55/56] dutctl: 0-unstable-2026-05-21 ->
 1.0.0-alpha.1-unstable-2026-06-03

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

diff --git a/pkgs/by-name/du/dutctl/package.nix b/pkgs/by-name/du/dutctl/package.nix
index 7b10aa2cb912..15c1e0575bed 100644
--- a/pkgs/by-name/du/dutctl/package.nix
+++ b/pkgs/by-name/du/dutctl/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dutctl";
-  version = "0-unstable-2026-05-21";
+  version = "1.0.0-alpha.1-unstable-2026-06-03";
 
   src = fetchFromGitHub {
     owner = "BlindspotSoftware";
     repo = "dutctl";
-    rev = "710bbcd16264e62af932698a229f9be2f83f6286";
-    hash = "sha256-SJfnUUo5vmmwa8qFLY4KaVyjyVnlEcVqLU1Yo3PjWug=";
+    rev = "f2b5ea834299c5716a90662549fcef64408df0f9";
+    hash = "sha256-lw8qkhXt2ZpgyZdfpJVLxr/7UxTcmhFg3fXKI/z9F40=";
   };
 
   vendorHash = "sha256-vOBz9gi/cnUJ04ns1ZOgfNqzbVBE3Fd3oOfV04VSmFQ=";

From bf6ada5d786e8aa4faff128e7e73a4792c2e99fe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 10 Jun 2026 09:28:51 +0300
Subject: [PATCH 56/56] Revert "pkgs-lib/formats: Use .attrs.json where
 possible"

---
 pkgs/pkgs-lib/formats.nix | 46 +++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 57517472e08f..2f3e5ad9d191 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -142,12 +142,14 @@ optionalAttrs allowAliases aliases
           runCommand name
             {
               nativeBuildInputs = [ jq ];
-              inherit value;
+              value = builtins.toJSON value;
               preferLocalBuild = true;
               __structuredAttrs = true;
             }
             ''
-              jq .value "$NIX_ATTRS_JSON_FILE" > $out
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
+              jq . "$valuePath" > $out
             ''
         ) { };
 
@@ -165,12 +167,14 @@ optionalAttrs allowAliases aliases
           runCommand name
             {
               nativeBuildInputs = [ remarshal_0_17 ];
-              inherit value;
+              value = builtins.toJSON value;
               preferLocalBuild = true;
               __structuredAttrs = true;
             }
             ''
-              json2yaml --unwrap value "$NIX_ATTRS_JSON_FILE" "$out"
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
+              json2yaml "$valuePath" "$out"
             ''
         ) { };
 
@@ -188,12 +192,14 @@ optionalAttrs allowAliases aliases
           runCommand name
             {
               nativeBuildInputs = [ remarshal ];
-              inherit value;
+              value = builtins.toJSON value;
               preferLocalBuild = true;
               __structuredAttrs = true;
             }
             ''
-              json2yaml --unwrap value "$NIX_ATTRS_JSON_FILE" "$out"
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
+              json2yaml "$valuePath" "$out"
             ''
         ) { };
 
@@ -932,8 +938,8 @@ optionalAttrs allowAliases aliases
                 python3
                 black
               ];
-              imports = value._imports or [ ];
-              value = removeAttrs value [ "_imports" ];
+              imports = builtins.toJSON (value._imports or [ ]);
+              value = builtins.toJSON (removeAttrs value [ "_imports" ]);
               pythonGen = pkgs.writeText "pythonGen" ''
                 import json
                 import os
@@ -956,20 +962,26 @@ optionalAttrs allowAliases aliases
                     else:
                         return repr(value)
 
-                with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f:
-                    attrs = json.load(f)
-                    if attrs["imports"] is not None:
-                        for i in attrs["imports"]:
+                with open(os.environ["importsPath"], "r") as f:
+                    imports = json.load(f)
+                    if imports is not None:
+                        for i in imports:
                             print(f"import {i}")
                         print()
 
-                    for key, value in attrs["value"].items():
+                with open(os.environ["valuePath"], "r") as f:
+                    for key, value in json.load(f).items():
                         print(f"{key} = {recursive_repr(value)}")
               '';
               preferLocalBuild = true;
               __structuredAttrs = true;
             }
             ''
+              export importsPath="$TMPDIR/imports"
+              printf "%s" "$imports" > "$importsPath"
+              export valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
+              cat "$valuePath"
               python3 "$pythonGen" > $out
               black $out
             ''
@@ -999,14 +1011,14 @@ optionalAttrs allowAliases aliases
                   python3Packages.xmltodict
                   libxml2Python
                 ];
-                inherit value;
+                value = builtins.toJSON value;
                 pythonGen = pkgs.writeText "pythonGen" ''
                   import json
                   import os
                   import xmltodict
 
-                  with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f:
-                      print(xmltodict.unparse(json.load(f)["value"], full_document=${
+                  with open(os.environ["valuePath"], "r") as f:
+                      print(xmltodict.unparse(json.load(f), full_document=${
                         if withHeader then "True" else "False"
                       }, pretty=True, indent=" " * 2))
                 '';
@@ -1014,6 +1026,8 @@ optionalAttrs allowAliases aliases
                 __structuredAttrs = true;
               }
               ''
+                export valuePath="$TMPDIR/value"
+                printf "%s" "$value" > "$valuePath"
                 python3 "$pythonGen" > $out
                 xmllint $out > /dev/null
               ''