From 54be2f6470bf2a28c9e50fc36c330c55bec90768 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 21 Feb 2026 13:12:39 +0100
Subject: [PATCH 01/68] yquake2: move icon to spec-compliant location

---
 pkgs/games/quake2/yquake2/default.nix | 2 +-
 pkgs/games/quake2/yquake2/wrapper.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 9de788e5afb8..76654c232d45 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -74,7 +74,7 @@ let
       ln -s $out/lib/yquake2/quake2 $out/bin/yquake2
       ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded
       cp $src/stuff/yq2.cfg $out/share/games/quake2/baseq2
-      install -Dm644 stuff/icon/Quake2.png $out/share/pixmaps/yamagi-quake2.png;
+      install -Dm644 stuff/icon/Quake2.png $out/share/icons/hicolor/512x512/apps/yamagi-quake2.png;
       runHook postInstall
     '';
 
diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix
index d174dcae1e7b..a5bc42fa9d8d 100644
--- a/pkgs/games/quake2/yquake2/wrapper.nix
+++ b/pkgs/games/quake2/yquake2/wrapper.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
       --add-flags "+set game ${game.id}"
   '') games
   + ''
-    install -Dm644 ${yquake2}/share/pixmaps/yamagi-quake2.png $out/share/pixmaps/yamagi-quake2.png;
+    install -Dm644 ${yquake2}/share/icons/hicolor/512x512/apps/yamagi-quake2.png $out/share/icons/hicolor/512x512/apps/yamagi-quake2.png;
     runHook postInstall
   '';
 

From b2236f4a585c31438718a76165aa854ca4001fe7 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 21 Feb 2026 13:13:15 +0100
Subject: [PATCH 02/68] yquake2: fix build with GCC 15

---
 pkgs/games/quake2/yquake2/games.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix
index 86cd05f6c7d8..3d3f11032438 100644
--- a/pkgs/games/quake2/yquake2/games.nix
+++ b/pkgs/games/quake2/yquake2/games.nix
@@ -48,6 +48,12 @@ let
         rev = "${lib.toUpper id}_${builtins.replaceStrings [ "." ] [ "_" ] version}";
       };
 
+      env =
+        # Uses `false` and `true` as enum constants, which are keywords in C23 (GCC 15 default)
+        lib.optionalAttrs stdenv.cc.isGNU {
+          NIX_CFLAGS_COMPILE = "-std=gnu17";
+        };
+
       installPhase = ''
         runHook preInstall
         mkdir -p $out/lib/yquake2/${id}

From e08d9a444bccb9fe7baded44f248a434ddbef91a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 10:57:59 +0000
Subject: [PATCH 03/68] vikunja-desktop: 2.2.2 -> 2.3.0

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

diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix
index 169b0dd7cbed..6c23462109d4 100644
--- a/pkgs/by-name/vi/vikunja-desktop/package.nix
+++ b/pkgs/by-name/vi/vikunja-desktop/package.nix
@@ -15,12 +15,12 @@
 
 let
   executableName = "vikunja-desktop";
-  version = "2.2.2";
+  version = "2.3.0";
   src = fetchFromGitHub {
     owner = "go-vikunja";
     repo = "vikunja";
     rev = "v${version}";
-    hash = "sha256-+Tqo9z+QXzcYNWZl+DoHaClkMokTa6a2S1FlazZBDyI=";
+    hash = "sha256-bdHiSFaN0vNQMhy6GPlpoFeYrk2CLvO7E30d8J/9GC0=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10_29_2;
     fetcherVersion = 3;
-    hash = "sha256-/dPjUxD01G1H3nRZfW8x046x33OaiChYuiLhZYOPrTo=";
+    hash = "sha256-phvNUUYh858CDt0O8GCWkgO402C0wiYtzEorOIV789M=";
   };
 
   env = {

From c000d37230a711e05ab391c92009381c1b1209d7 Mon Sep 17 00:00:00 2001
From: Patrick Chilton <chpatrick@gmail.com>
Date: Mon, 27 Apr 2026 21:14:39 +0200
Subject: [PATCH 04/68] colmap: 4.0.3 -> 4.0.4

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

diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix
index baf0b23fb91c..35b258738c98 100644
--- a/pkgs/by-name/co/colmap/package.nix
+++ b/pkgs/by-name/co/colmap/package.nix
@@ -100,14 +100,14 @@ let
     }
   ];
 in
-stdenv'.mkDerivation {
-  version = "4.0.3";
+stdenv'.mkDerivation rec {
+  version = "4.0.4";
   pname = "colmap";
   src = fetchFromGitHub {
     owner = "colmap";
     repo = "colmap";
-    rev = "e5b4a3e2276fe0cb81c3643d8ffdf124020c372e";
-    hash = "sha256-VV+ROjhrg7bEMV3QU6r4zCcMzC7tAPwTu6gV6/cmiH0=";
+    tag = version;
+    hash = "sha256-n9YwEqMSIh6vM2MVf7qxxVvDpsTLEsT37xoHiX66bL0=";
   };
 
   cmakeFlags = [

From 8318bd7dbfe32acd5f8f55f1752cce22dd4445f9 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 6 May 2026 20:06:01 +0200
Subject: [PATCH 05/68] hiredis: 1.2.0 -> 1.3.0

changelog: https://github.com/redis/hiredis/releases/tag/v1.3.0

diff: https://github.com/redis/hiredis/compare/v1.2.0...v1.3.0
---
 pkgs/by-name/hi/hiredis/package.nix             |  4 ++--
 pkgs/development/php-packages/relay/default.nix | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix
index c692c92fd0ec..60ab683c3ef5 100644
--- a/pkgs/by-name/hi/hiredis/package.nix
+++ b/pkgs/by-name/hi/hiredis/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hiredis";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg=";
+    hash = "sha256-gbCLIz6nOpPbu0xbsxUVvr7XmvGdVWZQJWjpE76NIXY=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index 4f84accf0b55..592635bb6682 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -83,6 +83,16 @@ stdenv.mkDerivation (finalAttrs: {
   internalDeps = [ php.extensions.session ];
   installPhase = ''
     runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # Temporary patch as relay isn't compatible with the latest version of hiredis out of
+    # the box.
+    patchelf \
+      --replace-needed libhiredis.so.1.1.0 libhiredis.so.1 \
+      --replace-needed libhiredis_ssl.so.1.1.0 libhiredis_ssl.so.1 \
+        relay.so
+  ''
+  + ''
     install -Dm755 relay.so -t $out/lib/php/extensions
   ''
   + (

From 1bb4c6be164ea1aa78987c7bf41605508a95d553 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 6 May 2026 20:06:59 +0200
Subject: [PATCH 06/68] hiredis: add hythera as maintainer

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

diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix
index 60ab683c3ef5..ec2f605cbd00 100644
--- a/pkgs/by-name/hi/hiredis/package.nix
+++ b/pkgs/by-name/hi/hiredis/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/redis/hiredis";
     description = "Minimalistic C client for Redis >= 1.2";
     license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ hythera ];
     platforms = lib.platforms.all;
   };
 })

From 61a6f7df26ccb9efea49a974ab56b0822ec6e696 Mon Sep 17 00:00:00 2001
From: Alan Clucas <alan@clucas.org>
Date: Thu, 7 May 2026 21:32:55 +0100
Subject: [PATCH 07/68] maintainers: add joibel

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 85a354481d6d..0ef31e993511 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13090,6 +13090,13 @@
     githubId = 168684553;
     name = "João Marques";
   };
+  joibel = {
+    email = "alan@clucas.org";
+    github = "Joibel";
+    githubId = 1827156;
+    name = "Alan Clucas";
+    keys = [ { fingerprint = "EBE6 85B9 4904 22E1 EC94  7B17 79C7 9CBD BAF6 4C13"; } ];
+  };
   joinemm = {
     email = "joonas@rautiola.co";
     github = "joinemm";

From cd2a230462b965ff04b05de7dc0536ba6bc37fde Mon Sep 17 00:00:00 2001
From: Alan Clucas <alan@clucas.org>
Date: Thu, 7 May 2026 21:34:27 +0100
Subject: [PATCH 08/68] argo-workflows: add joibel as maintainer

---
 pkgs/by-name/ar/argo-workflows/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix
index ef94087b5dfc..a8f0b6fe331a 100644
--- a/pkgs/by-name/ar/argo-workflows/package.nix
+++ b/pkgs/by-name/ar/argo-workflows/package.nix
@@ -58,7 +58,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/argoproj/argo-workflows";
     changelog = "https://github.com/argoproj/argo-workflows/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ groodt ];
+    maintainers = with lib.maintainers; [
+      groodt
+      joibel
+    ];
     platforms = lib.platforms.unix;
   };
 })

From c8031835375819f9aee536875dbbb30b761d92aa Mon Sep 17 00:00:00 2001
From: Johan Thomsen <write@ownrisk.dk>
Date: Thu, 7 May 2026 23:09:49 +0200
Subject: [PATCH 09/68] coredns: 1.14.2 -> 1.14.3

---
 nixos/tests/coredns.nix             | 2 +-
 pkgs/by-name/co/coredns/package.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/coredns.nix b/nixos/tests/coredns.nix
index 9be6e79c2048..6ee6572d57c8 100644
--- a/nixos/tests/coredns.nix
+++ b/nixos/tests/coredns.nix
@@ -28,7 +28,7 @@
               position = "start-of-file";
             }
           ];
-          vendorHash = "sha256-MGgFbglyW/1CMhT1b83ETH70gRkz89s/Gp4seR2g7xI=";
+          vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY=";
         };
       };
     };
diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index 8fa46e05caa9..189ab608471b 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -6,7 +6,7 @@
   installShellFiles,
   nixosTests,
   externalPlugins ? [ ],
-  vendorHash ? "sha256-qodzzBee+4NeZ+XifMknFPayBcWDmbyYq1R6Xhuras0=",
+  vendorHash ? "sha256-9LLTgIjOOMvYx4nhy+6X9bEBvqlKeTx//39q+YWXeHw=",
 }:
 
 let
@@ -14,13 +14,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "coredns";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c0xXZnc0muXViPqMCJsD8TTGMbVCOKE49ElAHEPnKlw=";
+    hash = "sha256-Uk4oWsUxaGdLQzX5JywYzi7pmQHGo06uQdLeOkP4U/s";
   };
 
   inherit vendorHash;

From 5c602540df22517252cfb67d1ea9476b8ed678b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 May 2026 09:29:24 +0000
Subject: [PATCH 10/68] sourcegit: 2026.07 -> 2026.10

---
 pkgs/by-name/so/sourcegit/deps.json   | 143 +++++++++++++-------------
 pkgs/by-name/so/sourcegit/package.nix |   4 +-
 2 files changed, 71 insertions(+), 76 deletions(-)

diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json
index 280b9727d440..061befd74ad5 100644
--- a/pkgs/by-name/so/sourcegit/deps.json
+++ b/pkgs/by-name/so/sourcegit/deps.json
@@ -1,24 +1,14 @@
 [
   {
     "pname": "Avalonia",
-    "version": "11.0.0",
-    "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
-  },
-  {
-    "pname": "Avalonia",
-    "version": "11.3.12",
-    "hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
+    "version": "11.3.13",
+    "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
     "version": "2.1.25547.20250602",
     "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
-  {
-    "pname": "Avalonia.BuildServices",
-    "version": "0.0.28",
-    "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
-  },
   {
     "pname": "Avalonia.BuildServices",
     "version": "11.3.2",
@@ -26,48 +16,43 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.12",
-    "hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
+    "version": "11.3.13",
+    "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.12",
-    "hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8="
+    "version": "11.3.13",
+    "hash": "sha256-uqpRip0O+DUk/zsytLdJhZz103har19xPqMq0hI/Ppg="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.12",
-    "hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA="
+    "version": "11.3.13",
+    "hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.12",
-    "hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
+    "version": "11.3.13",
+    "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg="
   },
   {
     "pname": "Avalonia.Fonts.Inter",
-    "version": "11.3.12",
-    "hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8="
+    "version": "11.3.13",
+    "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.12",
-    "hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
+    "version": "11.3.13",
+    "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.12",
-    "hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q="
+    "version": "11.3.13",
+    "hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.0.0",
-    "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
-  },
-  {
-    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.12",
-    "hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
+    "version": "11.3.13",
+    "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
   },
   {
     "pname": "Avalonia.Skia",
@@ -76,28 +61,28 @@
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.12",
-    "hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
+    "version": "11.3.13",
+    "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.12",
-    "hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U="
+    "version": "11.3.13",
+    "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.12",
-    "hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
+    "version": "11.3.13",
+    "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.12",
-    "hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc="
+    "version": "11.3.13",
+    "hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.12",
-    "hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
+    "version": "11.3.13",
+    "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg="
   },
   {
     "pname": "Azure.AI.OpenAI",
@@ -116,8 +101,8 @@
   },
   {
     "pname": "CommunityToolkit.Mvvm",
-    "version": "8.4.0",
-    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
+    "version": "8.4.2",
+    "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU="
   },
   {
     "pname": "HarfBuzzSharp",
@@ -151,18 +136,18 @@
   },
   {
     "pname": "LiveChartsCore",
-    "version": "2.0.0-rc6.1",
-    "hash": "sha256-bz71i+8phXf8H/MG+DhF0m7RsNw2TLtPjREI55V4Mos="
+    "version": "2.0.0",
+    "hash": "sha256-PZDNCp9wx7JjkV4z6FwAxEOzHT21zWqefW+RpVp5tpQ="
   },
   {
     "pname": "LiveChartsCore.SkiaSharpView",
-    "version": "2.0.0-rc6.1",
-    "hash": "sha256-ftkvP9ow2jSxOXQsGSDUDp232iY+cLEcwW4u1Bj+qN8="
+    "version": "2.0.0",
+    "hash": "sha256-sZDLxn4hNdEaPyaFcDZwLk7WAJp7Zc6sPCIS70rpz8g="
   },
   {
     "pname": "LiveChartsCore.SkiaSharpView.Avalonia",
-    "version": "2.0.0-rc6.1",
-    "hash": "sha256-OWvyQ72JtajDlN1BDXHyTYP/U0TKnogNDOWCOCqpk6M="
+    "version": "2.0.0",
+    "hash": "sha256-LUW2zxJPIGPIdsy4tpofuDD3fUzp7bOC9U2BvZtGaXs="
   },
   {
     "pname": "MicroCom.Runtime",
@@ -181,43 +166,43 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
+    "version": "10.0.3",
+    "hash": "sha256-OfcPeDv7RJvvv7ns+wCMAQCdG/He2KtxV6MRlwvp35I="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
+    "version": "10.0.3",
+    "hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-Aob6wq51LdquE7SkkxtCzcuHBKWrJcb3Ebi/dU3aqA4="
+    "version": "10.0.3",
+    "hash": "sha256-JglKtC6+jfiggRUU5AXC6mR0cW1t3M33wR7WXKyJjBs="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-tibCkkT9WliU2E/i0ufx7/Va6H6QZX4hR/1oUp8ecgQ="
+    "version": "10.0.3",
+    "hash": "sha256-uWAZh/RdMEiwTM2311KlDKK2LBo81tIYXPTUzJXbceA="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-mkeKUXepn4bfEdZFXdURmNEFdGiHQdpcxnm6joG+pUA="
+    "version": "10.0.3",
+    "hash": "sha256-d8zXyTfgVdok+Cgg5EC04DH4iPQtLxlU9CsGy5+dr6s="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
+    "version": "10.0.3",
+    "hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "10.0.2",
-    "hash": "sha256-12AfUEDdta/pmZUyEyqSUfOk0YoA7JOfGmIYnZQ//qk="
+    "version": "10.0.3",
+    "hash": "sha256-KDYaVBSdNEuhs3U164RV0n20cjwrpi7uI71B0j/UFsA="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "10.0.2",
-    "hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA="
+    "version": "10.0.3",
+    "hash": "sha256-w0G+IW9kz70ug1BEuJTeS1N7werQhms3gQl6ODzNIpQ="
   },
   {
     "pname": "Microsoft.SourceLink.Common",
@@ -236,8 +221,8 @@
   },
   {
     "pname": "OpenAI",
-    "version": "2.9.1",
-    "hash": "sha256-gYBNaOe49S0VyZxv8Cb1tOcRAvZEn7SwYMAvq7TrZ0w="
+    "version": "2.10.0",
+    "hash": "sha256-wCgr11NfZ3DdDq870CEL9gh+kbVVyi5qiMh277K076w="
   },
   {
     "pname": "Pfim",
@@ -274,21 +259,31 @@
     "version": "2.88.9",
     "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
+  {
+    "pname": "StbImageSharp",
+    "version": "2.30.15",
+    "hash": "sha256-Wvc6uAKOsOx3D2/P3PKDs2KdogRNOBzXli/fwNv15E4="
+  },
+  {
+    "pname": "System.ClientModel",
+    "version": "1.10.0",
+    "hash": "sha256-TVrfx/IagmiZHd3HIrkwlIF/9rbbIONUeqOpamI68Vs="
+  },
   {
     "pname": "System.ClientModel",
     "version": "1.9.0",
     "hash": "sha256-8/feim+EOvZj0MU+ghFz257QzNUN+ila9p7eCAOCpug="
   },
-  {
-    "pname": "System.ComponentModel.Annotations",
-    "version": "4.5.0",
-    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
-  },
   {
     "pname": "System.Memory.Data",
     "version": "10.0.1",
     "hash": "sha256-C4AaCiuS1BLljZq+3VUTJyHRA6IFPIO0gWZKw2hbt5o="
   },
+  {
+    "pname": "System.Memory.Data",
+    "version": "10.0.3",
+    "hash": "sha256-HefKyCuNJ7bONOVqGi2WScG6XIoFyfGSwTQM9Ol06+U="
+  },
   {
     "pname": "TextMateSharp",
     "version": "2.0.2",
diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix
index 62ed91cab6ff..121e55b9185f 100644
--- a/pkgs/by-name/so/sourcegit/package.nix
+++ b/pkgs/by-name/so/sourcegit/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "sourcegit";
-  version = "2026.07";
+  version = "2026.10";
 
   src = fetchFromGitHub {
     owner = "sourcegit-scm";
     repo = "sourcegit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g7V3EbbI8kIy2CW3sof5sdSPp4u7ZbuawqSp63OlV44=";
+    hash = "sha256-9uVU+m+GZKlBlF3jlhmk+f/afMjhgt9JzzLJoHtPeT4=";
     fetchSubmodules = true;
   };
 

From d69586c587ad85008daa66997b34f86183276dc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 04:18:34 +0000
Subject: [PATCH 11/68] ansel: 0-unstable-2026-05-01 -> 0-unstable-2026-05-08

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

diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 6f4ce57a2d7e..f60ff477b9e9 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2026-05-01";
+  version = "0-unstable-2026-05-08";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "31c4dcb406b26a18e86e0b88232696ee476b5705";
-    hash = "sha256-brbk5/ujjmwbiTLk3gwyIZP9ihupg6dxjVV/eeztg0o=";
+    rev = "6612c07ad1fd9b6411ece87ba49e02b46880c576";
+    hash = "sha256-peAkfXrJPpjwUO1So9HklhqNw+gnVuliphVP3LWob1w=";
     fetchSubmodules = true;
   };
 

From 75cdc30cf6788f3b9833b7bac5447476724c19df Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 10 May 2026 05:53:46 -0600
Subject: [PATCH 12/68] i2pd-tools: 2.56.0 -> 2.58.0-unstable-2026-04-29

Diff: https://github.com/PurpleI2P/i2pd-tools/compare/33fce4b087d92ee90653460bbe7a07cdc0c7b121...34944bbd5d0bab34694b1f57edba4b5a783f8b7b
---
 pkgs/by-name/i2/i2pd-tools/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/i2/i2pd-tools/package.nix b/pkgs/by-name/i2/i2pd-tools/package.nix
index 1d843f9ff192..62715e96452e 100644
--- a/pkgs/by-name/i2/i2pd-tools/package.nix
+++ b/pkgs/by-name/i2/i2pd-tools/package.nix
@@ -9,15 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "i2pd-tools";
-  version = "2.56.0";
-
-  #tries to access the network during the tests, which fails
+  version = "2.58.0-unstable-2026-04-29";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = "i2pd-tools";
-    rev = "33fce4b087d92ee90653460bbe7a07cdc0c7b121";
-    hash = "sha256-mmCs8AHHKhx1/rDp/Vc1p2W3pufoTa4FcJyJwD919zw=";
+    rev = "34944bbd5d0bab34694b1f57edba4b5a783f8b7b";
+    hash = "sha256-W0khA1uVHmMBQdUwPMo/q64P9I6t6Eatf/KPaamJg7I=";
     fetchSubmodules = true;
   };
 
@@ -26,13 +24,15 @@ stdenv.mkDerivation {
     openssl
     boost
   ];
+
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/bin
     for bin in \
         routerinfo keygen vain keyinfo regaddr \
-        regaddr_3ld regaddralias x25519 famtool autoconf;
+        regaddr_3ld regaddralias x25519 famtool autoconf_i2pd \
+        verifyhost offlinekeys b33address i2pbase64;
     do
       install -Dm755 $bin -t $out/bin
     done
@@ -45,6 +45,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/PurpleI2P/i2pd-tools";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ MulliganSecurity ];
-    mainProgram = "i2pd-tools";
+    platforms = lib.platforms.linux;
   };
 }

From cc022de1a213b9ac4e5a59abbb24ac6a68b1379b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 11 May 2026 15:35:06 -0600
Subject: [PATCH 13/68] i2pd-tools: add ryand56 as maintainer

---
 pkgs/by-name/i2/i2pd-tools/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/i2/i2pd-tools/package.nix b/pkgs/by-name/i2/i2pd-tools/package.nix
index 62715e96452e..a4cf1c55f1d3 100644
--- a/pkgs/by-name/i2/i2pd-tools/package.nix
+++ b/pkgs/by-name/i2/i2pd-tools/package.nix
@@ -44,7 +44,10 @@ stdenv.mkDerivation {
     description = "Toolsuite to work with keys and eepsites";
     homepage = "https://github.com/PurpleI2P/i2pd-tools";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ MulliganSecurity ];
+    maintainers = with lib.maintainers; [
+      MulliganSecurity
+      ryand56
+    ];
     platforms = lib.platforms.linux;
   };
 }

From 754c621946024136827446d321ce301564b14e75 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Mon, 20 Apr 2026 14:14:59 +0800
Subject: [PATCH 14/68] kvrocks: add test hook

---
 pkgs/by-name/kv/kvrocks/hook-test.nix | 47 ++++++++++++++++++++++++
 pkgs/by-name/kv/kvrocks/hook.nix      | 15 ++++++++
 pkgs/by-name/kv/kvrocks/hook.sh       | 53 +++++++++++++++++++++++++++
 pkgs/by-name/kv/kvrocks/package.nix   |  8 ++++
 4 files changed, 123 insertions(+)
 create mode 100644 pkgs/by-name/kv/kvrocks/hook-test.nix
 create mode 100644 pkgs/by-name/kv/kvrocks/hook.nix
 create mode 100644 pkgs/by-name/kv/kvrocks/hook.sh

diff --git a/pkgs/by-name/kv/kvrocks/hook-test.nix b/pkgs/by-name/kv/kvrocks/hook-test.nix
new file mode 100644
index 000000000000..8d35aa0648f7
--- /dev/null
+++ b/pkgs/by-name/kv/kvrocks/hook-test.nix
@@ -0,0 +1,47 @@
+{
+  valkey,
+  kvrocks,
+  stdenv,
+}:
+
+stdenv.mkDerivation {
+  name = "kvrocks-test-hook-test";
+
+  nativeCheckInputs = [
+    valkey
+    kvrocks.hook
+  ];
+
+  dontUnpack = true;
+  doCheck = true;
+
+  preCheck = ''
+    kvrocksTestPort=6380
+    KVROCKS_SOCKET=/tmp/customkvrocks.sock
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    echo "running test"
+    if redis-cli --scan -p $kvrocksTestPort; then
+      echo "connected to kvrocks via localhost"
+      PORT_TEST_RAN=1
+    fi
+
+    if redis-cli --scan -s $KVROCKS_SOCKET; then
+      echo "connected to kvrocks via domain socket"
+      SOCKET_TEST_RAN=1
+    fi
+
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    [[ $PORT_TEST_RAN == 1 && $SOCKET_TEST_RAN == 1 ]]
+    echo "test passed"
+    touch $out
+  '';
+
+  __darwinAllowLocalNetworking = true;
+}
diff --git a/pkgs/by-name/kv/kvrocks/hook.nix b/pkgs/by-name/kv/kvrocks/hook.nix
new file mode 100644
index 000000000000..ea8034419181
--- /dev/null
+++ b/pkgs/by-name/kv/kvrocks/hook.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  makeSetupHook,
+  kvrocks,
+  valkey,
+}:
+
+makeSetupHook {
+  name = "kvrocks-test-hook";
+
+  substitutions = {
+    cli = lib.getExe' valkey "redis-cli";
+    server = lib.getExe' kvrocks "kvrocks";
+  };
+} ./hook.sh
diff --git a/pkgs/by-name/kv/kvrocks/hook.sh b/pkgs/by-name/kv/kvrocks/hook.sh
new file mode 100644
index 000000000000..48f227dae8f7
--- /dev/null
+++ b/pkgs/by-name/kv/kvrocks/hook.sh
@@ -0,0 +1,53 @@
+# shellcheck shell=bash
+
+preCheckHooks+=('kvrocksStart')
+postCheckHooks+=('kvrocksStop')
+
+kvrocksStart() {
+  if [[ ${kvrocksTestPort:-} == "" ]]; then
+    kvrocksTestPort=6666
+  fi
+
+  mkdir -p "$NIX_BUILD_TOP/run/kvrocks"
+
+  if [[ "${KVROCKS_SOCKET:-}" == "" ]]; then
+    KVROCKS_SOCKET="$NIX_BUILD_TOP/run/kvrocks.sock"
+  fi
+  export KVROCKS_SOCKET
+
+  KVROCKS_CONF="$NIX_BUILD_TOP/run/kvrocks.conf"
+  export KVROCKS_CONF
+
+  cat <<EOF >"$KVROCKS_CONF"
+bind 127.0.0.1 ::1
+unixsocket ${KVROCKS_SOCKET}
+port ${kvrocksTestPort}
+dir $NIX_BUILD_TOP/run/kvrocks
+daemonize no
+EOF
+
+  echo 'starting kvrocks'
+
+  @server@ -c "$KVROCKS_CONF" &
+  KVROCKS_PID=$!
+
+  echo 'waiting for kvrocks to be ready'
+  kvrocks_start_timeout=60
+  kvrocks_start_deadline=$((SECONDS + kvrocks_start_timeout))
+  while ! @cli@ --scan -s "$KVROCKS_SOCKET"; do
+    if ! kill -0 "$KVROCKS_PID" 2>/dev/null; then
+      echo "kvrocks exited before becoming ready"
+      return 1
+    fi
+    if (( SECONDS >= kvrocks_start_deadline )); then
+      echo "timed out after ${kvrocks_start_timeout}s waiting for kvrocks to be ready"
+      return 1
+    fi
+    sleep 1
+  done
+}
+
+kvrocksStop() {
+  echo 'stopping kvrocks'
+  kill "$KVROCKS_PID"
+}
diff --git a/pkgs/by-name/kv/kvrocks/package.nix b/pkgs/by-name/kv/kvrocks/package.nix
index 79da29d3d7b4..b4d28bdd6b63 100644
--- a/pkgs/by-name/kv/kvrocks/package.nix
+++ b/pkgs/by-name/kv/kvrocks/package.nix
@@ -1,4 +1,5 @@
 {
+  callPackage,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -319,6 +320,13 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    hook = callPackage ./hook.nix { kvrocks = finalAttrs.finalPackage; };
+    tests = {
+      hook = callPackage ./hook-test.nix { kvrocks = finalAttrs.finalPackage; };
+    };
+  };
+
   meta = {
     description = "Distributed key value NoSQL database that uses RocksDB as storage engine and is compatible with Redis protocol";
     homepage = "https://kvrocks.apache.org/";

From 6870f80bb0a75abca79fabe98aa76d0d9844b4a1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 13 May 2026 21:42:08 +0700
Subject: [PATCH 15/68] yacas: fix build with jsoncpp 1.9.7

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

diff --git a/pkgs/by-name/ya/yacas/package.nix b/pkgs/by-name/ya/yacas/package.nix
index 51914b99cceb..4be4eb5aee79 100644
--- a/pkgs/by-name/ya/yacas/package.nix
+++ b/pkgs/by-name/ya/yacas/package.nix
@@ -46,6 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
       sha256 = "sha256-aPO5T8iYNkGtF8j12YxNJyUPJJPKrXje1DmfCPt317A=";
     })
   ];
+  # jsoncpp 1.9.7 rejects std::sub_match in Json::Value::operator[].
+  postPatch = ''
+    substituteInPlace cyacas/yacas-kernel/src/yacas_kernel.cpp \
+      --replace-fail 'content_data[m[2]] = base64_encode(img);' \
+                     'content_data[m[2].str()] = base64_encode(img);'
+  '';
   preCheck = ''
     patchShebangs ../tests/test-yacas
   '';

From 85f334bf833a12dad6b40d6e405907110213e14d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 20:11:55 +0000
Subject: [PATCH 16/68] simpleitk: 2.5.4 -> 2.5.5

---
 pkgs/development/libraries/simpleitk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index f0d216933fd2..ae57eca11acd 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simpleitk";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "SimpleITK";
     repo = "SimpleITK";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9EJwdF0ja1GuMJ7HU3Xg2IHyz/zWSsS1JdWrvla61HI=";
+    hash = "sha256-biCrtfewxptDGHlN6xGmsv+m4RGgWDIBu7zMfa8XIRg=";
   };
 
   nativeBuildInputs = [

From 6955269652823c379b7ad89deab4f6ca430c9bfb Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Tue, 12 May 2026 21:30:40 -0700
Subject: [PATCH 17/68] 
 home-assistant-custom-lovelace-modules.xiaomi-vacuum-map-card: init at 2.3.2

---
 .../xiaomi-vacuum-map-card/package.nix        | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/xiaomi-vacuum-map-card/package.nix

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/xiaomi-vacuum-map-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/xiaomi-vacuum-map-card/package.nix
new file mode 100644
index 000000000000..0f5624aa41b3
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/xiaomi-vacuum-map-card/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "lovelace-xiaomi-vacuum-map-card";
+  version = "2.3.2";
+
+  src = fetchFromGitHub {
+    owner = "PiotrMachowski";
+    repo = "lovelace-xiaomi-vacuum-map-card";
+    tag = "v${version}";
+    hash = "sha256-3329L+2Su2XvrKQIKa5btJz3CQWgS+c8qHD/9vxuEbM=";
+  };
+
+  npmDepsHash = "sha256-vLxmzqDSmB+6VKjiwG5WH9FUvn0NlVHo9TBmbx5UkG0=";
+
+  # rollup-plugin-typescript2 tries to require tslib/package.json, but the
+  # bundled tslib 2.1.0 uses the legacy "./": "./" exports subpath pattern that
+  # newer Node no longer honours. Rewrite it to the supported wildcard form.
+  preBuild = ''
+    substituteInPlace node_modules/rollup-plugin-typescript2/node_modules/tslib/package.json \
+      --replace-fail '"./": "./"' '"./*": "./*"'
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp dist/xiaomi-vacuum-map-card.js $out
+
+    runHook postInstall
+  '';
+
+  passthru.entrypoint = "xiaomi-vacuum-map-card.js";
+
+  meta = {
+    description = "Interactive map card for map-based vacuums in Home Assistant";
+    homepage = "https://github.com/PiotrMachowski/lovelace-xiaomi-vacuum-map-card";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+    platforms = lib.platforms.all;
+  };
+}

From 2f7529a04c7206f5c1cd0240a722ca34c0fe1929 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 14 May 2026 11:53:51 +0200
Subject: [PATCH 18/68] gitlab: 18.11.2 -> 18.11.3

https://docs.gitlab.com/releases/patches/patch-release-gitlab-18-11-3-released/
---
 pkgs/by-name/gi/gitaly/package.nix                 |  4 ++--
 pkgs/by-name/gi/gitlab-pages/package.nix           |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                   | 14 +++++++-------
 .../by-name/gi/gitlab/gitlab-workhorse/default.nix |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile             |  5 +++++
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock        |  3 ++-
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix          |  4 ++--
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 3840d3c25ab4..1edeea3f7662 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.11.2";
+  version = "18.11.3";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-UmoMZ55FqEVYTjfgdoZsbJcs/+4x80KKxq6Cfatv4K4=";
+      hash = "sha256-oFQevVXbxu9G4LF3BrC0EUUviypSwB4cKRjipdiO3jU=";
     };
 
     vendorHash = "sha256-123WUtoUaPIyDywcTKEhiZP2SYYHxAQoOPyCebsHYRI=";
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 13f6020fc420..37f07212cec5 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-pages";
-  version = "18.11.2";
+  version = "18.11.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lxmwTC02WHwlrMgvTs2lkDj4AX8ovFuW73OHB6CIWTo=";
+    hash = "sha256-ozkrU3QF/LK0uqfF52dnm2MCga+vRD8dGsLNnze6E+Y=";
   };
 
   vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index d3d825e95794..3472cc5bcb94 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "18.11.2",
-  "repo_hash": "sha256-TAc3bNFwq/QKR+X/P9BqQHA2T5viD+SAOXXUZ7StDP4=",
+  "version": "18.11.3",
+  "repo_hash": "sha256-QxaLdWErE+b4SpwHtxnCa2tqheWUfEixRcQwYD/A9s8=",
   "yarn_hash": "sha256-k8JHi0f/XfSV4kICyPW01Erk3YnKw33yeUWYrOaPdTM=",
   "frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.11.2-ee",
+  "rev": "v18.11.3-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.11.2",
-    "GITLAB_KAS_VERSION": "18.11.2",
-    "GITLAB_PAGES_VERSION": "18.11.2",
+    "GITALY_SERVER_VERSION": "18.11.3",
+    "GITLAB_KAS_VERSION": "18.11.3",
+    "GITLAB_PAGES_VERSION": "18.11.3",
     "GITLAB_SHELL_VERSION": "14.49.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1",
-    "GITLAB_WORKHORSE_VERSION": "18.11.2"
+    "GITLAB_WORKHORSE_VERSION": "18.11.3"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 101519703304..7d705541e88a 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule (finalAttrs: {
   pname = "gitlab-workhorse";
 
-  version = "18.11.2";
+  version = "18.11.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 10a92f3b6e81..705e6ba9ffe6 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -363,6 +363,11 @@ gem 'loofah', '~> 2.25.0', feature_category: :shared # rubocop:todo Gemfile/Miss
 # Used to provide license templates
 gem 'licensee', '~> 9.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
+# Pinned below 1.8 so rugged.so links libgit2's old http-parser instead of
+# the bundled llhttp, which collides with llhttp-ffi symbols at runtime.
+# See https://gitlab.com/gitlab-org/gitlab/-/issues/598564
+gem 'rugged', '~> 1.7.2', require: false, feature_category: :gitaly
+
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index 0139d4d72a34..28e0d494d85c 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -1871,7 +1871,7 @@ GEM
     rubyntlm (0.6.3)
     rubypants (0.2.0)
     rubyzip (2.4.1)
-    rugged (1.9.0)
+    rugged (1.7.2)
     safe_yaml (1.0.4)
     safety_net_attestation (0.5.0)
       jwt (>= 2.0, < 4.0)
@@ -2491,6 +2491,7 @@ DEPENDENCIES
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.18)
   rubyzip (~> 2.4.0)
+  rugged (~> 1.7.2)
   sanitize (~> 6.0.2)
   sd_notify (~> 0.1.0)
   seed-fu (~> 2.3.7)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 3a74b9199fae..d800df27924b 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -8651,10 +8651,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz";
+      sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.7.2";
   };
   safe_yaml = {
     groups = [

From f5b526ea58d77bd61cb048008cc116cd17e51df9 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 14 May 2026 22:01:14 +0200
Subject: [PATCH 19/68] libmodsecurity: 3.0.14 -> 3.0.15

changelog: https://github.com/owasp-modsecurity/ModSecurity/releases/tag/v3.0.15

diff: https://github.com/owasp-modsecurity/ModSecurity/compare/v3.0.14...v3.0.15
---
 pkgs/by-name/li/libmodsecurity/package.nix | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libmodsecurity/package.nix b/pkgs/by-name/li/libmodsecurity/package.nix
index 123a55756e8f..0725a6a29569 100644
--- a/pkgs/by-name/li/libmodsecurity/package.nix
+++ b/pkgs/by-name/li/libmodsecurity/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmodsecurity";
-  version = "3.0.14";
+  version = "3.0.15";
 
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "ModSecurity";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SaeBO3+WvPhHiJoiOmijB0G3/QYxjAdxgeCVqESS+4U=";
+    hash = "sha256-gI874wkqy8VuwxUmIgb8d7fULJUQ+rKBBF492NtuRMY=";
     fetchSubmodules = true;
   };
 
@@ -81,6 +81,27 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "ssdeep_inc_path=\"\''${path}/include\"" "ssdeep_inc_path=\"${ssdeep}/include\""
     substituteInPlace modsecurity.conf-recommended \
       --replace "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127"
+
+    # https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.15/build.sh#L6-L25
+    cd src
+    echo "noinst_HEADERS = \\" > headers.mk
+    ls -1 \
+        actions/*.h \
+        actions/ctl/*.h \
+        actions/data/*.h \
+        actions/disruptive/*.h \
+        actions/transformations/*.h \
+        debug_log/*.h \
+        audit_log/writer/*.h \
+        collection/backend/*.h \
+        operators/*.h \
+        parser/*.h \
+        request_body_processor/*.h \
+        utils/*.h \
+        variables/*.h \
+        engine/*.h \
+        *.h | tr "\012" " " >> headers.mk
+    cd ../
   '';
 
   postInstall = ''

From 49dc5dbdedb095e5c829795129100f467bf1bbf2 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 14 May 2026 22:19:06 +0200
Subject: [PATCH 20/68] resonarium: init at 0.0.11

---
 pkgs/by-name/re/resonarium/package.nix | 225 +++++++++++++++++++++++++
 1 file changed, 225 insertions(+)
 create mode 100644 pkgs/by-name/re/resonarium/package.nix

diff --git a/pkgs/by-name/re/resonarium/package.nix b/pkgs/by-name/re/resonarium/package.nix
new file mode 100644
index 000000000000..26f52c5ef11e
--- /dev/null
+++ b/pkgs/by-name/re/resonarium/package.nix
@@ -0,0 +1,225 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  python3,
+  writableTmpDirAsHomeHook,
+  copyDesktopItems,
+  makeDesktopItem,
+  nix-update-script,
+  alsa-lib,
+  curl,
+  fontconfig,
+  freetype,
+  libGL,
+  libjack2,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "resonarium";
+  version = "0.0.11";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "gabrielsoule";
+    repo = "resonarium";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-/ezkq1er/OteoLrqXe60/QmC5BOqoRcoGvtr93wBioE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    # find_package(Python3 COMPONENTS Interpreter Development REQUIRED) is
+    # called unconditionally at the top of CMakeLists.txt, so Python is needed
+    # at configure time even though we don't build the python bindings.
+    python3
+    # JUCE's COPY_PLUGIN_AFTER_BUILD writes into $HOME/.{vst3,lv2}; also
+    # fontconfig wants a writable cache dir at build time.
+    writableTmpDirAsHomeHook
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    alsa-lib
+    curl
+    fontconfig
+    freetype
+    libGL
+    libjack2
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+  ];
+
+  postPatch = ''
+    # Upstream forgot to bump the in-source version for v0.0.11; sync it
+    # to the git tag so the About screen and plugin metadata agree.
+    substituteInPlace CMakeLists.txt \
+    --replace-fail "set(PLUGIN_VERSION 0.0.10)" \
+                    "set(PLUGIN_VERSION ${finalAttrs.version})"
+    substituteInPlace plugin/Source/PluginProcessor.cpp \
+    --replace-fail '"0.0.10 (INST) ALPHA"' '"${finalAttrs.version} (INST) ALPHA"' \
+    --replace-fail '"0.0.10 (FX) ALPHA"'   '"${finalAttrs.version} (FX) ALPHA"'
+
+    # melatonin_perfetto's CMakeLists fetches CPM.cmake and the Perfetto SDK
+    # from the network at configure time, which the Nix sandbox blocks. The
+    # PERFETTO compile-time switch is OFF here, so melatonin_perfetto.h
+    # compiles every tracing macro to a no-op and never includes <perfetto.h>.
+    # Replace the module's CMakeLists with a stub that just registers the
+    # JUCE module and exposes the expected target/alias names.
+    cat > modules/melatonin_perfetto/CMakeLists.txt <<'EOF'
+    juce_add_module("''${CMAKE_CURRENT_LIST_DIR}/melatonin_perfetto")
+    add_library(perfetto INTERFACE)
+    add_library(perfetto::perfetto ALIAS perfetto)
+    target_link_libraries(melatonin_perfetto INTERFACE perfetto::perfetto)
+    add_library(Melatonin::Perfetto ALIAS melatonin_perfetto)
+    EOF
+  '';
+
+  enableParallelBuilding = true;
+
+  env = {
+    # JUCE dlopen's these at runtime; standalone executable crashes without them.
+    NIX_LDFLAGS = toString [
+      "-lX11"
+      "-lXext"
+      "-lXcursor"
+      "-lXinerama"
+      "-lXrandr"
+      "-ljack"
+    ];
+
+    NIX_CFLAGS_COMPILE = toString [
+      # juce, compiled in this build as part of a Git submodule, uses `-flto` as
+      # a Link Time Optimization flag, and instructs the plugin compiled here to
+      # use this flag to. This breaks the build for us. Using _fat_ LTO allows
+      # successful linking while still providing LTO benefits. If our build of
+      # `juce` was used as a dependency, we could have patched that `-flto` line
+      # in our juce's source, but that is not possible because it is used as a
+      # Git Submodule.
+      "-ffat-lto-objects"
+    ];
+
+    # Fontconfig error: Cannot load default config file: No such file: (null)
+    FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
+  };
+
+  # Build only the plugin/standalone targets; skip Resonarium_Python so we
+  # don't have to install a python module as part of an audio-plugin package.
+  ninjaFlags = [
+    "Resonarium_Instrument_All"
+    "Resonarium_Effect_All"
+  ];
+
+  # The upstream `install` rules target "Applications" / "Program Files",
+  # which makes no sense on Linux and trips CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.
+  dontUseCmakeInstall = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    instArt="Resonarium_Instrument_artefacts/Release"
+    fxArt="Resonarium_Effect_artefacts/Release"
+
+    # VST3 bundles
+    install -dm755 "$out/lib/vst3"
+    cp -r "$instArt/VST3/Resonarium.vst3"           "$out/lib/vst3/"
+    cp -r "$fxArt/VST3/Resonarium Effect.vst3"      "$out/lib/vst3/"
+
+    # LV2 bundles
+    install -dm755 "$out/lib/lv2"
+    cp -r "$instArt/LV2/Resonarium.lv2"             "$out/lib/lv2/"
+    cp -r "$fxArt/LV2/Resonarium Effect.lv2"        "$out/lib/lv2/"
+
+    # Standalone executables (drop the space in the Effect binary name)
+    install -Dm755 "$instArt/Standalone/Resonarium"        "$out/bin/Resonarium"
+    install -Dm755 "$fxArt/Standalone/Resonarium Effect"   "$out/bin/Resonarium-Effect"
+
+    # Icon for the .desktop entries
+    install -Dm644 "$src/plugin/Resources/resonarium_logo.png" \
+      "$out/share/icons/hicolor/512x512/apps/resonarium.png"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "resonarium";
+      desktopName = "Resonarium";
+      genericName = "Physical Modelling Synthesizer";
+      comment = "MPE-compatible physical modelling synthesizer based on coupled string waveguides";
+      exec = "Resonarium";
+      icon = "resonarium";
+      categories = [
+        "AudioVideo"
+        "Audio"
+        "Music"
+      ];
+      keywords = [
+        "synth"
+        "synthesizer"
+        "audio"
+        "MPE"
+        "waveguide"
+      ];
+    })
+    (makeDesktopItem {
+      name = "resonarium-effect";
+      desktopName = "Resonarium Effect";
+      genericName = "Physical Modelling Audio Effect";
+      comment = "Resonarium as an audio effect, applying its physical models to external input";
+      exec = "Resonarium-Effect";
+      icon = "resonarium";
+      categories = [
+        "AudioVideo"
+        "Audio"
+      ];
+      keywords = [
+        "audio"
+        "effect"
+        "resonator"
+        "waveguide"
+      ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "MPE-compatible physical modelling synthesizer based on coupled string waveguides";
+    longDescription = ''
+      Resonarium is a physical-modelling synthesizer plugin and standalone
+      application designed for abstract sound design, exploration and
+      open-ended play. Its voice is a network of coupled waveguide
+      resonators driven by configurable exciters, and it is intended to be
+      played with MPE-capable controllers such as the Ableton Push 3, the
+      Expressive E Osmose or the ROLI Seaboard.
+
+      This package builds the Instrument (synth) and Effect variants and
+      installs VST3 and LV2 bundles as well as the standalone applications.
+    '';
+    homepage = "https://github.com/gabrielsoule/resonarium";
+    changelog = "https://github.com/gabrielsoule/resonarium/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "Resonarium";
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})

From e7a0324be03a2c17dec0043efb5e7c889d3dad6e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Thu, 14 May 2026 15:27:00 -0700
Subject: [PATCH 21/68] qradiolink: move icon to spec-compliant location

---
 pkgs/by-name/qr/qradiolink/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qr/qradiolink/package.nix b/pkgs/by-name/qr/qradiolink/package.nix
index 8849739115e6..bb674fbe6de1 100644
--- a/pkgs/by-name/qr/qradiolink/package.nix
+++ b/pkgs/by-name/qr/qradiolink/package.nix
@@ -44,9 +44,11 @@ gnuradio.pkgs.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
     install -Dm755 qradiolink -t $out/bin
     install -Dm644 qradiolink.desktop -t $out/share/applications
-    install -Dm644 src/res/icon.png $out/share/pixmaps/qradiolink.png
+    install -Dm644 src/res/icon.png $out/share/icons/hicolor/64x64/apps/qradiolink.png
+    runHook postInstall
   '';
 
   buildInputs = [

From 85cd0639ecb2b5e7e634551d1db4bfbba6dcb20d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 12:46:46 +0000
Subject: [PATCH 22/68] tideways-daemon: 1.17.0 -> 1.17.2

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

diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index 791579e780d7..cda18941e214 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.17.0";
+  version = "1.17.2";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-ST1wQs2Z9/3fX95YAQqoHZjKsYtxPjR+VlUv3VJmESA=";
+        hash = "sha256-jD8nPQxMVrr7Ota5l8ILg9Jm8ddzPESORI6/G0Bh/DU=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-TswqlF8Nmc3zyzPnJNg5yMo2Y2gKJWBo7MdUMZfc7Ms=";
+        hash = "sha256-cnH5qJXVJI72MP6Rdffo6KMB1Vltd3FetOf6BKrtZKE=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-ePEJIJcG3745RVsXm4rvc6ZXVX2Ugv6fCoqezihV30M=";
+        hash = "sha256-Gw3kGmwTv1eX9N+rOIiyth93xIojJWAPzHa3Ju/Vk6g=";
       };
     };
     updateScript = "${

From 331fc30de36b1491c260e6bbab505307a9e6f364 Mon Sep 17 00:00:00 2001
From: Taylor Howard <taylor.howard@absiko.com.au>
Date: Sat, 4 Apr 2026 21:40:26 +1100
Subject: [PATCH 23/68] gamescope: add compatibility patch for
 stb_image_resize2.h

Pulls in a pending upstream patch (ValveSoftware/gamescope#2130) that
supports both the old stb_image_resize.h and the new stb_image_resize2.h
using __has_include for compile-time detection. This prepares gamescope
for the upcoming stb update (NixOS/nixpkgs#491159) which removes
stb_image_resize.h in favor of stb_image_resize2.h.

Tested against both old stb (0-unstable-2023-01-29) and new stb
(0-unstable-2025-10-25) on x86_64-linux and aarch64-linux.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pkgs/by-name/ga/gamescope/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index b47b12849218..575250041433 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -92,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
       extraPrefix = "subprojects/wlroots/";
       hash = "sha256-q2zekWNn111lX8N938y8HjREvlNMtdCLJ4RveX9z8u8=";
     })
+
+    # Pending upstream patch to support stb_image_resize2.h
+    # See: https://github.com/ValveSoftware/gamescope/pull/2130
+    (fetchpatch {
+      url = "https://github.com/ValveSoftware/gamescope/commit/d49a2aded261030e649fee42ad295f1ef56b736b.diff";
+      hash = "sha256-Uh08ZRaV912ZOsl1DMpbVLxIgh4jEXevgihQf2W9KFk=";
+    })
   ];
 
   # We can't substitute the patch itself because substituteAll is itself a derivation,

From 2f0dcf83cba8bac00a3442f83088a9882c5d1f30 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Fri, 27 Feb 2026 13:49:25 +0800
Subject: [PATCH 24/68] prometheus-kvrocks-exporter: init at 1.0.9

---
 .../prometheus-kvrocks-exporter/package.nix   | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/pr/prometheus-kvrocks-exporter/package.nix

diff --git a/pkgs/by-name/pr/prometheus-kvrocks-exporter/package.nix b/pkgs/by-name/pr/prometheus-kvrocks-exporter/package.nix
new file mode 100644
index 000000000000..53c493316c75
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-kvrocks-exporter/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  kvrocks,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "prometheus-kvrocks-exporter";
+  version = "1.0.9";
+
+  src = fetchFromGitHub {
+    owner = "RocksLabs";
+    repo = "kvrocks_exporter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nyNdQfSXD6mAusO5VCEfvKuyvNawH4C5xDGOZSnTn7A=";
+  };
+
+  vendorHash = "sha256-QVbcHQQr6o3jnF3CWw2NCCeRkGBDdA8OkmDd/GPfHuI=";
+
+  __structuredAttrs = true;
+
+  ldflags = [
+    "-X main.BuildVersion=${finalAttrs.version}"
+    "-X main.BuildCommitSha=unknown"
+    "-X main.BuildDate=unknown"
+  ];
+
+  nativeCheckInputs = [ kvrocks.hook ];
+
+  preCheck = ''
+    export TEST_REDIS_URI="redis://127.0.0.1:6666"
+  '';
+
+  __darwinAllowLocalNetworking = true;
+
+  checkFlags =
+    let
+      skippedTests = [
+        # The following tests require a real Redis/Kvrocks instance with specific configuration
+        # or multiple instances which are not easily provided by a single kvrocks.hook.
+        "TestPasswordProtectedInstance" # Requires TEST_PWD_REDIS_URI and TEST_USER_PWD_REDIS_URI
+        "TestPasswordInvalid" # Requires TEST_PWD_REDIS_URI
+        "TestHTTPScrapeWithPasswordFile" # Requires specific redis instances from password file
+        "TestSimultaneousMetricsHttpRequests" # Requires multiple redis instances
+        "TestClusterMaster" # Requires TEST_REDIS_CLUSTER_MASTER_URI
+        "TestClusterSlave" # Requires TEST_REDIS_CLUSTER_SLAVE_URI
+
+        # The following tests fail due to "target" parameter requirement in kvrocks_exporter's /scrape endpoint
+        # which is not satisfied in the test's HTTP requests in http_test.go.
+        "TestHTTPScrapeMetricsEndpoints"
+
+        # These tests require a running instance and are sensitive to the environment
+        "TestIncludeSystemMemoryMetric"
+
+        # These tests require valid JSON in password files or valid certs
+        "TestLoadPwdFile"
+        "TestPasswordMap"
+        "TestCreateClientTLSConfig"
+        "TestGetServerCertificateFunc"
+      ];
+    in
+    [ "-skip=^(${builtins.concatStringsSep "|" skippedTests})$" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Prometheus exporter for Kvrocks metrics";
+    homepage = "https://github.com/RocksLabs/kvrocks_exporter";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xyenon ];
+    mainProgram = "kvrocks_exporter";
+  };
+})

From e6ff5554037ccd2f5c35ea202316fac74ce57dbd Mon Sep 17 00:00:00 2001
From: Artur Taranchiev <git@in.ewok.email>
Date: Fri, 15 May 2026 22:22:44 +0600
Subject: [PATCH 25/68] maintainers: update ewok info

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 065c165477ee..250c0a34ec8f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8535,9 +8535,9 @@
     email = "evysgarden@protonmail.com";
   };
   ewok = {
-    email = "ewok@ewok.ru";
-    github = "ewok-old";
-    githubId = 454695;
+    email = "github@in.ewok.email";
+    github = "ewok";
+    githubId = 125148819;
     name = "Artur Taranchiev";
   };
   ewuuwe = {

From eb612b889beb43e6a23f13b8a891f49b4d4e9a34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 18:27:25 +0000
Subject: [PATCH 26/68] woodpecker-plugin-git: 2.9.0 -> 2.9.1

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

diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 1a3199253657..d0397beae0ec 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "woodpecker-plugin-git";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = finalAttrs.version;
-    hash = "sha256-Ib4Jdo8KT1DUncWi2oCJRBeEwqCNi98D9eXHrhYVo64=";
+    hash = "sha256-Au+eaJzcjARQsWThIK3N1SNkBl39mb3xx0d8D3VyXOU=";
   };
 
-  vendorHash = "sha256-IPqtAwre3Fs6TvWdmuDkvD/abzZwtE5OKEGEkCtdCI8=";
+  vendorHash = "sha256-zCcYAWO0hn6iLxTxOsjn2bS0+sHuzpq3K24N9jd+qPY=";
 
   env.CGO_ENABLED = "0";
 

From 6574f25e9111e13817a6c397b742f89f9f6e0806 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 May 2026 00:09:47 +0300
Subject: [PATCH 27/68] netbird: 0.70.5 -> 0.71.1

Diff: https://github.com/netbirdio/netbird/compare/v0.70.5...v0.71.1

Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.71.1
---
 pkgs/by-name/ne/netbird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index e93a8d6f3b48..5eca510c1a9a 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -67,16 +67,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.70.5";
+  version = "0.71.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AsM+MEeBqxnwD1jE8ocI93tF3l/7s+s5nF073ZMAi/Y=";
+    hash = "sha256-xU2P4COLufGdFrit8+IRn96FT1IJKGQ97R9eGv5cjqU=";
   };
 
-  vendorHash = "sha256-ebhjN6o/519ayxWTcscNinKuiL3LSPmE2VNgSitxj5g=";
+  vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 

From 2819ebbc0bdf9270f3125ac5e8601e79c16d13e1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 May 2026 00:11:54 +0300
Subject: [PATCH 28/68] netbird-dashboard: 2.37.1 -> 2.38.0

Diff: https://github.com/netbirdio/dashboard/compare/v2.37.1...v2.38.0
---
 pkgs/by-name/ne/netbird-dashboard/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index 6d9d92c75128..cdba47303a02 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.37.1";
+  version = "2.38.0";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-/mrDwRj6A2reMYdbBphgx+cFqjKwefbyWcSiyUOuU00=";
+    hash = "sha256-9YtAqfSIpntpXpCNBUE7VwEoy6SNrusPTnH62HeghXY=";
   };
 
   npmDepsHash = "sha256-Ze+1r5Uh+wdm3MuVr93oS2itodx9Zdv+JYO6Uji1saw=";

From d2b4eb2e26a51e45e062ca8c637b9f260aa914c0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 15 May 2026 00:45:27 +0300
Subject: [PATCH 29/68] netbird-dashboard: report version correctly

---
 pkgs/by-name/ne/netbird-dashboard/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index cdba47303a02..afd35aa63266 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -24,6 +24,7 @@ buildNpmPackage rec {
 
   env = {
     CYPRESS_INSTALL_BINARY = 0;
+    NEXT_PUBLIC_DASHBOARD_VERSION = version;
   };
 
   meta = {

From 2b92b8d5db8ee963c83d56e3b1ba78ea73b95a8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 21:31:08 +0000
Subject: [PATCH 30/68] brewtarget: 5.0.4 -> 5.1.0

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

diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 10b8d1413ed4..af314d2e8e0d 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brewtarget";
-  version = "5.0.4";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "Brewtarget";
     repo = "brewtarget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lwrs2ZRHEbBXKzszlCE+WyclM7m4iX639tT0aFanFR0=";
+    hash = "sha256-CVFj/tsOOFj/LpkmMy4h9dnCBTOq9WGkXFUr/yJdcK0=";
     fetchSubmodules = true;
   };
 

From 6ec314963fdc4ceb660fa8189df20becb5804db2 Mon Sep 17 00:00:00 2001
From: Saad Nadeem <saadndm.sn@gmail.com>
Date: Fri, 15 May 2026 19:17:18 -0400
Subject: [PATCH 31/68] vimPlugins.fff-nvim: 0.6.4 -> 0.8.0

---
 .../vim/plugins/non-generated/fff-nvim/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 14a30d0d410a..f625dcfdccb2 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -13,18 +13,18 @@
   writableTmpDirAsHomeHook,
 }:
 let
-  version = "0.6.4";
+  version = "0.8.0";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
     tag = "v${version}";
-    hash = "sha256-vu5yqOvVAPXHMi8sZFQuH9rNsFDffh3Ja74Be0Cs64c=";
+    hash = "sha256-JbV2dTQhTyZgDZYvFoR1mz9CeM2IPv59Qmp2iiJC8a0=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-w6KwiE0rAT00fiRa1rT8uthVgcMB7EFGoG3+M5MYEBo=";
+    cargoHash = "sha256-L/Ens/wzw/jKaa1T3A2pLIBKs09saPEk/0bRhgRezPQ=";
 
     cargoBuildFlags = [
       "-p"
@@ -45,8 +45,14 @@ let
       perl
       rustPlatform.bindgenHook
       writableTmpDirAsHomeHook
+      zig
     ];
 
+    dontUseZigConfigure = true;
+    dontUseZigBuild = true;
+    dontUseZigCheck = true;
+    dontUseZigInstall = true;
+
     # Some tests need git
     nativeCheckInputs = [ gitMinimal ];
 
@@ -69,8 +75,6 @@ let
 
       # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
       RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
-
-      ZIG = lib.getExe zig; # zlob requires zig
     };
   };
 in

From e94a18a936ddf153fc7f533693379938d692c36c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 00:08:40 +0000
Subject: [PATCH 32/68] python3Packages.txtai: 9.8.0 -> 9.9.0

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

diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index 9b4e2347fadd..80c799e48417 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -93,7 +93,7 @@
   pytestCheckHook,
 }:
 let
-  version = "9.8.0";
+  version = "9.9.0";
   agent = [
     mcpadapt
     smolagents
@@ -241,7 +241,7 @@ let
     owner = "neuml";
     repo = "txtai";
     tag = "v${version}";
-    hash = "sha256-AcNx6pdaZpfCMwjTMu2OTod3ISii4Qq28ZV0yIqNXbA=";
+    hash = "sha256-lbNWDHSZDZt8V5OEyVxvOoX6se4/GXG13BeqAeU+FHc=";
   };
 in
 buildPythonPackage {

From 9b1365e80cfe5882e3a7a7ab8dca028d414fcadb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 01:36:07 +0000
Subject: [PATCH 33/68] home-assistant-custom-lovelace-modules.sankey-chart:
 5.0.0 -> 5.0.1

---
 .../custom-lovelace-modules/sankey-chart/package.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index 4437e2441b36..59a9fa5ad391 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "sankey-chart";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-E7tljTa/DTo5+V6ahc94B+26QfazcItCxYvF3OOvGL0=";
+    hash = "sha256-KpdxXZDNdUfV/h4D9Ucx8cTtPt0dbG5iBvJ6TVUulqY=";
   };
 
-  npmDepsHash = "sha256-cOOq+dYO87LxuerXhLehlpwngj/Ok2+tAqkv8YPVuis=";
+  npmDepsHash = "sha256-8gHH4C54l2JiGTGpSiRtRHd8Sg6F9B0SCwvXz9zioO0=";
 
   installPhase = ''
     runHook preInstall

From a652c0d9dc4612cbf44124ed9f69fb75d28ae649 Mon Sep 17 00:00:00 2001
From: Thibaut Smith <thibaut.smith@mailbox.org>
Date: Thu, 31 Jul 2025 16:11:06 +0200
Subject: [PATCH 34/68] unixbench: unstable-2023-02-27 -> 6.0.0

https://github.com/kdlucas/byte-unixbench/releases/tag/v6.0.0
Diff: https://github.com/kdlucas/byte-unixbench/compare/a07fcc03264915c624f0e4818993c5b4df3fa703..v6.0.0
---
 pkgs/by-name/un/unixbench/common.patch | 48 +++++++++++++++++---------
 pkgs/by-name/un/unixbench/package.nix  | 22 +++++++-----
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/un/unixbench/common.patch b/pkgs/by-name/un/unixbench/common.patch
index 68961cbe2edd..1f6fb6b58446 100644
--- a/pkgs/by-name/un/unixbench/common.patch
+++ b/pkgs/by-name/un/unixbench/common.patch
@@ -1,13 +1,13 @@
 diff --git a/UnixBench/Run b/UnixBench/Run
-index 34d2c72..130b56e 100755
+index 41637be..0b71c0b 100755
 --- a/UnixBench/Run
 +++ b/UnixBench/Run
-@@ -81,23 +81,23 @@ my $longIterCount = 10;
+@@ -86,23 +86,23 @@ my $longIterCount = 10;
  my $shortIterCount = 3;
  
  # C compiler to use in compilation tests.
 -my $cCompiler = 'gcc';
-+my $cCompiler = 'cc -w';
++my $cCompiler = 'cc -w -std=gnu89';
  
  # Establish full paths to directories.  These need to be full pathnames
  # (or do they, any more?).  They can be set in env.
@@ -29,9 +29,9 @@ index 34d2c72..130b56e 100755
 -my $TESTDIR = getDir('UB_TESTDIR', $FindBin::Bin . "/testdir");
 +my $TESTDIR = getDir('UB_TESTDIR', '@out@/share/testdir');
  
- 
- ############################################################################
-@@ -330,19 +330,19 @@ my $testParams = {
+ my $quietMode = 0;
+ my $notQuietMode = 1;
+@@ -339,19 +339,19 @@ my $testParams = {
          "logmsg" => "Shell Scripts (1 concurrent)",
          "cat"    => 'system',
          "prog" => "${BINDIR}/looper",
@@ -54,7 +54,7 @@ index 34d2c72..130b56e 100755
      },
  
      ##########################
-@@ -434,7 +434,7 @@ my $testParams = {
+@@ -443,7 +443,7 @@ my $testParams = {
          "logmsg" => "C Compiler Throughput ($cCompiler)",
          "cat"    => 'misc',
          "prog" => "${BINDIR}/looper",
@@ -63,7 +63,7 @@ index 34d2c72..130b56e 100755
      },
      "arithoh" => {
          "logmsg" => "Arithoh",
-@@ -873,16 +873,6 @@ sub preChecks {
+@@ -1037,16 +1037,6 @@ sub preChecks {
      # Set the language.
      $ENV{'LANG'} = $language;
  
@@ -80,29 +80,43 @@ index 34d2c72..130b56e 100755
      # Create a script to kill this run.
      system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\"");
      chmod(0755, $TMPDIR . "/kill_run");
-@@ -923,7 +913,10 @@ sub parseArgs {
+@@ -1089,6 +1079,9 @@ sub parseArgs {
                  $params->{'copies'} = [ ];
              }
              push(@{$params->{'copies'}}, shift(@words));
--        } else {
 +        } elsif ($word eq "--help" || $word eq "-h") {
-+	    print "Run: please see ubench(1) for available options\n";
-+	    exit 0;
-+	}else {
++	        print "Run: please see ubench(1) for available options\n";
++	        exit 0;
+         } else {
              die("Run: unknown option $word\n");
          }
-     }
 diff --git a/UnixBench/pgms/multi.sh b/UnixBench/pgms/multi.sh
-index 72e8716..d2f5f48 100755
+index 72e8716..b5c5847 100755
 --- a/UnixBench/pgms/multi.sh
 +++ b/UnixBench/pgms/multi.sh
-@@ -15,7 +15,8 @@
+@@ -15,8 +15,11 @@
  ###############################################################################
  ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
  instance=1
 -sort_src=sort.src
 +sort_src=$3/sort.src
-+cd $2
  work_factor=${MULTI_SH_WORK_FACTOR:-1}
++
++cd $2
++
  if [ $work_factor -gt 1 ]; then
  	inputs=
+ 	for i in $(seq $work_factor); do inputs="$inputs $sort_src"; done
+diff --git a/UnixBench/src/syscall.c b/UnixBench/src/syscall.c
+index 97a22e8..f0e5fac 100644
+--- a/UnixBench/src/syscall.c
++++ b/UnixBench/src/syscall.c
+@@ -105,7 +105,7 @@ char	*argv[];
+                     fprintf(stderr,"%s: fork failed\n", argv[0]);
+                     exit(1);
+                 } else if (pid == 0) {
+-                    execl("/bin/true", "/bin/true", (char *) 0);
++                    execl("@coreutils@/bin/true", "@coreutils@/bin/true", (char *) 0);
+                     fprintf(stderr,"%s: exec /bin/true failed\n", argv[0]);
+                     exit(1);
+                 } else {
diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix
index 4745e660f8eb..d50553908846 100644
--- a/pkgs/by-name/un/unixbench/package.nix
+++ b/pkgs/by-name/un/unixbench/package.nix
@@ -19,16 +19,15 @@
   withGL ? true,
   withX11perf ? true,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "unixbench";
-  version = "unstable-2023-02-27";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "kdlucas";
     repo = "byte-unixbench";
-    rev = "a07fcc03264915c624f0e4818993c5b4df3fa703";
-    hash = "sha256-gmRWAqE9/HBb0S9rK0DXoaCoiGbtat0gmdeozhbv0NI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GQYejkIf7g2abHafJJQTl0nWqRGsg9VDtYQgyBY/jOg=";
   };
 
   patches = [
@@ -41,7 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "-Wa,-q" ""
+      --replace-fail "-Wa,-q" ""
+
+    substituteInPlace src/syscall.c \
+      --replace-fail @coreutils@ "${coreutils}"
   '';
 
   nativeBuildInputs = [
@@ -78,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
     "GRAPHIC_TESTS=defined"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu89";
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/{bin,libexec,share}
@@ -89,16 +93,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     substituteInPlace USAGE \
-      --replace 'Run"' 'ubench"' \
-      --replace './Run' 'ubench' \
-      --replace 'Run ' 'ubench '
+      --replace-fail 'Run"' 'ubench"' \
+      --replace-fail './Run' 'ubench' \
+      --replace-fail 'Run ' 'ubench '
     pandoc -f rst -t man USAGE -o ubench.1
     installManPage ubench.1
   '';
 
   preFixup = ''
     substituteInPlace $out/libexec/pgms/multi.sh \
-      --replace '/bin/sh "$' '${runtimeShell} "$'
+      --replace-fail '/bin/sh "$' '${runtimeShell} "$'
 
     substituteInPlace $out/bin/ubench \
       --subst-var out

From b605ef3ac171e83defce53c523a930b2de3aa130 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 15 May 2026 20:56:04 -0600
Subject: [PATCH 35/68] kdePackages.audiotube: add patch for pybind11

---
 pkgs/kde/gear/audiotube/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix
index 1ebd8bbfb3fc..0ac2a0f3ce93 100644
--- a/pkgs/kde/gear/audiotube/default.nix
+++ b/pkgs/kde/gear/audiotube/default.nix
@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  fetchpatch,
   qtdeclarative,
   qtmultimedia,
   qtsvg,
@@ -25,6 +26,16 @@ in
 mkKdeDerivation {
   pname = "audiotube";
 
+  patches = [
+    # https://bugs.kde.org/show_bug.cgi?id=520142
+    # https://github.com/NixOS/nixpkgs/issues/520685
+    (fetchpatch {
+      name = "pybind11-ecm-6.26.patch";
+      url = "https://invent.kde.org/multimedia/audiotube/-/commit/273d9b926dfadb1b85a4a0d21c352bd5968ffa1f.patch";
+      hash = "sha256-V5HghJxKYMRZP4vqIhQZeRveOcfpGXwMMEgSM3ZDbUE=";
+    })
+  ];
+
   extraNativeBuildInputs = [
     ps.pybind11
   ];

From 9d896607f63ae7d9eb7c23a5ac5ae35b35ff7ce9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 06:34:38 +0000
Subject: [PATCH 36/68] libretro.pcsx-rearmed: 0-unstable-2026-04-25 ->
 0-unstable-2026-05-15

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

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index 808ac6e5a3b9..b579ede72fec 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-04-25";
+  version = "0-unstable-2026-05-15";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "a97efbb0646dd7766bd66fe9e93118206edec36a";
-    hash = "sha256-2MAj/UdEg/kRZuGZcVQ+hBMe2pRlZWvEQnXeqb+444Y=";
+    rev = "c88070df8e0e84106ecc4b6394860a413a7bc046";
+    hash = "sha256-ZngYExWmL4NlmSfaRbTpSthNY1QRwKXtSiSX8zS/teo=";
   };
 
   dontConfigure = true;

From 3b47fd27ca82978d8b54a19efaf85c734025ac30 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 16 May 2026 07:08:38 +0000
Subject: [PATCH 37/68] linux_xanmod: 6.18.30 -> 6.18.31

- Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.31-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.18.30-xanmod1..6.18.31-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 2ee18b683b9e..5742726d31f4 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.30";
-      hash = "sha256-INIvc/mSio+yRwyQPMaypUbk/0NqPijhC5s+W2gWAYE=";
+      version = "6.18.31";
+      hash = "sha256-AvsMS5Za+k+b08Nz4UOey9Uzg0Z9hT5lkwMN5cf5ZG8=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 4842f26a4249483658b5674068b753ba8efcee96 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 16 May 2026 07:10:38 +0000
Subject: [PATCH 38/68] linux_xanmod_latest: 7.0.7 -> 7.0.8

- Changelog: https://dl.xanmod.org/changelog/7.0/ChangeLog-7.0.8-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/7.0.7-xanmod1..7.0.8-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 5742726d31f4..ec8de3f2ea8f 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.7";
-      hash = "sha256-HlmUAGhwI0NciwTO/WBirk8oVCsw0qcX/YBKfPcLbWY=";
+      version = "7.0.8";
+      hash = "sha256-bB/qCLw3m+g3Z/JcYl7XNYT313jBbQdcMzvZaK8Fw4Q=";
     };
   };
 

From d7db91a921b661ad6a2fa133d2c69b8fa74bf766 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 07:11:46 +0000
Subject: [PATCH 39/68] python3Packages.mkdocs-callouts: 1.16.0 -> 1.16.1

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

diff --git a/pkgs/development/python-modules/mkdocs-callouts/default.nix b/pkgs/development/python-modules/mkdocs-callouts/default.nix
index 6222a80f13d6..62353286c221 100644
--- a/pkgs/development/python-modules/mkdocs-callouts/default.nix
+++ b/pkgs/development/python-modules/mkdocs-callouts/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mkdocs-callouts";
-  version = "1.16.0";
+  version = "1.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sondregronas";
     repo = "mkdocs-callouts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CffhtU5ur/QleVOk2twh+7kbHUB6HWEXt+E1YbI5I94=";
+    hash = "sha256-I7KHZgUV67Ff9Nt1z1LVjia9eQ5V+7y24ZepkpooT2w=";
   };
 
   build-system = [

From 14b172fea0b283922f0ec8d3618752fdf84fe187 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 03:48:11 -0400
Subject: [PATCH 40/68] bat: modernize

Tag, structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ba/bat/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index 013e9b85b0c9..88dd238bfc8e 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -14,10 +14,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bat";
   version = "0.26.1";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "bat";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-IbTvFT37BFo0tKOiApDL9sT+/nMD33MO3TXuho+lF2c=";
   };
 

From cb6a099ac4e16ebfb95c7f0ff285536cf21e04d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 07:48:51 +0000
Subject: [PATCH 41/68] biome: 2.4.14 -> 2.4.15

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

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 19589d9fabdb..c4fba227b0de 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.4.14";
+  version = "2.4.15";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-kiA6qgW/kWaoLMIrWd7HraK7DOERMwCSvOTk5y7fkmY=";
+    hash = "sha256-Q7yx5ZKIrZdnsG3OS9CZ3jyuv71V7l9crCwYRZDuFpU=";
   };
 
-  cargoHash = "sha256-sSZEukcCyEdoJ1GD1bNnXJkDYtNX6phiCj2EKJhHJZw=";
+  cargoHash = "sha256-UzTE+Grg6RaTWAYIsaKgluVsSZXbDwIK5HY9rY2oIVo=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 427a3f529110468e0bf8069fecd467cf78ddddf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 08:01:50 +0000
Subject: [PATCH 42/68] home-assistant-custom-components.home_connect_alt:
 1.3.6 -> 1.4.0

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

diff --git a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
index 84ec392731b6..23b79ab0be6a 100644
--- a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "ekutner";
   domain = "home_connect_alt";
-  version = "1.3.6";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "ekutner";
     repo = "home-connect-hass";
     tag = version;
-    hash = "sha256-Zi3l4bRS8O+jyrxaY8BB1XCbU9FEQSDMNE9b5DH8oCs=";
+    hash = "sha256-y4IzSRJrqOeKAZN1kibmsV/l23hjSQIuOoeEdYmbmBo=";
   };
 
   dependencies = [ home-connect-async ];

From 9c0002a6563256317002ea8cda5692d3ca4489a1 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:02:19 -0400
Subject: [PATCH 43/68] eza: modernize

Add versionCheckHook, structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ez/eza/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index 19293a765010..2bbc21ac8708 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -8,6 +8,7 @@
   pkg-config,
   zlib,
   installShellFiles,
+  versionCheckHook,
   # once eza upstream gets support for setting up a compatibility symlink for exa, we should change
   # the handling here from postInstall to passing the required argument to the builder.
   exaAlias ? true,
@@ -17,6 +18,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eza";
   version = "0.23.4";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
@@ -57,6 +60,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ln -s eza $out/bin/exa
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "Modern, maintained replacement for ls";
     longDescription = ''

From 1c29db7cdbb792b04785ed25d034e3a2c2093c3e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:10:50 -0400
Subject: [PATCH 44/68] gh: modernize

installBin, structuredAttrs, and versionCheckHook

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/gh/gh/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index dfb17f621cfc..040823be21be 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -4,7 +4,7 @@
   buildGoModule,
   installShellFiles,
   stdenv,
-  testers,
+  versionCheckHook,
   makeWrapper,
 }:
 
@@ -12,6 +12,8 @@ buildGoModule (finalAttrs: {
   pname = "gh";
   version = "2.92.0";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
@@ -36,7 +38,7 @@ buildGoModule (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dm755 bin/gh -t $out/bin
+    installBin bin/gh
     wrapProgram $out/bin/gh \
       --set-default GH_TELEMETRY false
   ''
@@ -55,9 +57,8 @@ buildGoModule (finalAttrs: {
   # most tests require network access
   doCheck = false;
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
   meta = {
     description = "GitHub CLI tool";

From 669f21a1b5ff3dd32228ca87519a8be3148e71cf Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 16 May 2026 12:10:57 +0400
Subject: [PATCH 45/68] =?UTF-8?q?hittekaart:=200.1.0=20=E2=86=92=200.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/hi/hittekaart/package.nix b/pkgs/by-name/hi/hittekaart/package.nix
index 2320fda4e76d..4dac740a9750 100644
--- a/pkgs/by-name/hi/hittekaart/package.nix
+++ b/pkgs/by-name/hi/hittekaart/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hittekaart";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "dunj3";
     repo = "hittekaart";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bog00/pkpTaUtLDfuR9d8yEhDt9mn9YDyF17ojZMM38=";
+    hash = "sha256-Pp4biN20NWrTB11Bi14INl9g5VPPP79j9tbgXUe40qQ=";
   };
 
-  cargoHash = "sha256-Izcgxkl7QdNWYRrz9+nKMlCkEDtqiZTIAnJO/b7ZJKs=";
+  cargoHash = "sha256-bo8PnAShrQJ9qPYk/yEhD8E0DZH2uJ427w0Wr34Xz/U=";
 
   nativeBuildInputs = [ python3 ];
 

From 0c462983fb705568b75b253a0f98ef348bab5296 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:14:56 -0400
Subject: [PATCH 46/68] fastfetch: enable strictDeps, structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/fa/fastfetch/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index db3f089e7cfb..3aacbea8b007 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -65,6 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
   version = "2.63.1";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "fastfetch-cli";
     repo = "fastfetch";

From b1e7706745d73f36e44272beb92281dc7677406b Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:05:57 -0400
Subject: [PATCH 47/68] fzf: modernize

structuredAttrs, versionCheckHook, tag

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/fz/fzf/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 601532bd68c4..6a2521018aef 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -6,18 +6,19 @@
   installShellFiles,
   bc,
   ncurses,
-  testers,
-  fzf,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "fzf";
   version = "0.72.0";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rUxbC2+VASAEBmL8WOpywk0SD0gyHArisl4pxnqK32I=";
   };
 
@@ -75,9 +76,8 @@ buildGoModule (finalAttrs: {
     chmod +x $out/bin/fzf-share
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = fzf;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
   meta = {
     changelog = "https://github.com/junegunn/fzf/blob/${finalAttrs.src.rev}/CHANGELOG.md";

From c5aeb7cc642d688ca04c2a07ce1783e66fb11df7 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:22:50 -0400
Subject: [PATCH 48/68] nixpkgs-track: set __structuredAttrs, fix
 versionCheckHook

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ni/nixpkgs-track/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-track/package.nix b/pkgs/by-name/ni/nixpkgs-track/package.nix
index f3e8c76c8d18..52e62d6dc39f 100644
--- a/pkgs/by-name/ni/nixpkgs-track/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-track/package.nix
@@ -11,6 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixpkgs-track";
   version = "0.6.0";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "uncenter";
     repo = "nixpkgs-track";
@@ -21,11 +23,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-lnv0nCyb2+7Xl+qAAeaHdbk4XOGdq4FINxPOIPchDhg=";
 
   buildInputs = [ openssl ];
-  nativeBuildInputs = [
-    pkg-config
-    versionCheckHook
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };

From 880753cad36bf35c67a176d32c214aed68af20ef Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:31:47 -0400
Subject: [PATCH 49/68] bspwm: fix hash, set strictDeps, structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/bs/bspwm/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index 047de693024f..842027ff9b04 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -14,11 +14,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "bspwm";
   version = "0.9.12";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "bspwm";
     tag = finalAttrs.version;
-    sha256 = "sha256-sEheWAZgKVDCEipQTtDLNfDSA2oho9zU9gK2d6W6WSU=";
+    hash = "sha256-sEheWAZgKVDCEipQTtDLNfDSA2oho9zU9gK2d6W6WSU=";
   };
 
   buildInputs = [

From c37c8968a4700e64065d6fbeba185b98bd2bd99b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 08:39:31 +0000
Subject: [PATCH 50/68] pnpm: 11.1.1 -> 11.1.2

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

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 42f43ad121f8..8d64ad10b04c 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -26,8 +26,8 @@ let
       hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw=";
     };
     "11" = {
-      version = "11.1.1";
-      hash = "sha256-BbKC0GMyKVxzbwsgyL3xhTJb8bymgske2BFUo8aFHMA=";
+      version = "11.1.2";
+      hash = "sha256-v+TSssejIQVlu6YpKfnv5JPrXyRicgGhAupFFOroz4A=";
     };
   };
 

From 3c8124ebe51946f633c580b03b9ce8dfd9953c29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 08:56:58 +0000
Subject: [PATCH 51/68] typos: 1.46.0 -> 1.46.1

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

diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index a084aef8a576..03f5ea622afe 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typos";
-  version = "1.46.0";
+  version = "1.46.1";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "typos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lABMjUOopauvfMF86SWO8YYIxNimzuFC2FnrOYT7Tfk=";
+    hash = "sha256-PEN9RA/8YdcjJcRTpT8i5D/HweLBEE162/WLWCEizZQ=";
   };
 
-  cargoHash = "sha256-WQeprJvfvH50Wmh7m8WThGE8T4ewbIYicfacQghd2ao=";
+  cargoHash = "sha256-uHfKSS0Qlo3dU8w1h2ia4D8JYxIPq1ZLTsTFPBIuwc0=";
 
   passthru.updateScript = nix-update-script { };
 

From 686eab80918a78ca69081d7823e472d820b2f2e1 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 16 May 2026 04:58:51 -0400
Subject: [PATCH 52/68] sxiv: migrate to by-name, modernize

tag, hash, strictDeps, structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../sxiv/default.nix => by-name/sx/sxiv/package.nix}  | 11 +++++++----
 pkgs/top-level/all-packages.nix                       |  4 ----
 2 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{applications/graphics/sxiv/default.nix => by-name/sx/sxiv/package.nix} (82%)

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/by-name/sx/sxiv/package.nix
similarity index 82%
rename from pkgs/applications/graphics/sxiv/default.nix
rename to pkgs/by-name/sx/sxiv/package.nix
index 20b813d59904..38ee448bdfa7 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/by-name/sx/sxiv/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxft,
-  imlib2,
+  imlib2Full,
   giflib,
   libexif,
   conf ? null,
@@ -13,11 +13,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sxiv";
   version = "26";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "sxiv";
-    rev = "v${finalAttrs.version}";
-    sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jrCEx1o7Go0jgwQ3YJ0L97Q5BCHvVTTqOWId3xzlSnU=";
   };
 
   configFile = lib.optionalString (conf != null) (builtins.toFile "config.def.h" conf);
@@ -25,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxft
-    imlib2
+    imlib2Full
     giflib
     libexif
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ff153d3cf05..c4ecea237155 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10089,10 +10089,6 @@ with pkgs;
     })
   );
 
-  sxiv = callPackage ../applications/graphics/sxiv {
-    imlib2 = imlib2Full;
-  };
-
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };

From 4ade26f5bfa8c7fa5b23608f859bb49fd7b95567 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 09:12:06 +0000
Subject: [PATCH 53/68] libretro.stella: 0-unstable-2026-04-28 ->
 0-unstable-2026-05-16

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index 8b89949cc74c..2fce70de09a1 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-04-28";
+  version = "0-unstable-2026-05-16";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "0c1b944387b5ac2b1bf753c2c4221db4fdc10f79";
-    hash = "sha256-mohkp6oOP8MtRs/WHw4Rxs3FrB6h4X6/ENrRdjiiXlQ=";
+    rev = "03dbb069fd2d6fee0d58c5d96077bdf9c686a1e2";
+    hash = "sha256-BiyicKZsoRXd/w0U2uvCjd0E3gzNvfNPbAt34nGdXdw=";
   };
 
   makefile = "Makefile";

From 6842f5c792562e571aa99c52501504baae336f6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 09:13:49 +0000
Subject: [PATCH 54/68] dnscontrol: 4.37.1 -> 4.38.0

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

diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index 215700e21886..f5acfc082c44 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnscontrol";
-  version = "4.37.1";
+  version = "4.38.0";
 
   src = fetchFromGitHub {
     owner = "DNSControl";
     repo = "dnscontrol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qpvT1jhFNNmHsiJe3RsbxmgXd4OOX7+uqxjCBKERwkw=";
+    hash = "sha256-lM+9xuNB88csciIC5eu2oRl0IBqZE7CCPCxf8BEZSz0=";
   };
 
-  vendorHash = "sha256-M+Wx3I2KCKI3fHHw6t5WhCcJkHvxswC3G0Zt8SAQ0ZI=";
+  vendorHash = "sha256-pzdOW+L/w74ANaCKXWQviBMDlSTOfebAVE7Cdd+lZLo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 63c46acc96222b6a8ddbf26188942d446c08c78a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 09:20:52 +0000
Subject: [PATCH 55/68] par-lang: 0-unstable-2026-05-06 ->
 0-unstable-2026-05-13

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

diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix
index 2a85b21b105d..73c45c84f376 100644
--- a/pkgs/by-name/pa/par-lang/package.nix
+++ b/pkgs/by-name/pa/par-lang/package.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "par-lang";
-  version = "0-unstable-2026-05-06";
+  version = "0-unstable-2026-05-13";
 
   src = fetchFromGitHub {
     owner = "par-team";
     repo = "par-lang";
-    rev = "b045eda333bd7e02ae4f7ad7c6f84b3ba7d58d45";
-    hash = "sha256-jOADgr7d154QskEc772hLP0um9UQzVhG+DYuHDdVdDo=";
+    rev = "c850458a4732bbe7d14551c1b50d8a2055622625";
+    hash = "sha256-1YEtq71chZhPO1q5V+QwRhqJDMUdDw5cFv8s8PRzUHc=";
   };
 
-  cargoHash = "sha256-+vhmSSzgeC26zq0P53oFKyu+RBg4qQjEvURCkAHNCp8=";
+  cargoHash = "sha256-hg5okkDqOFRkUc4e/cs/C5AB1EROIUtfYpoDatJ0EAo=";
 
   nativeBuildInputs = [
     pkg-config

From ce311512f5f89cfb7b57fea37f18fb5723699226 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 09:28:25 +0000
Subject: [PATCH 56/68] plantuml: 1.2026.2 -> 1.2026.3

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

diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix
index e2612cb367c7..b1e83cfe04fa 100644
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plantuml";
-  version = "1.2026.2";
+  version = "1.2026.3";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
-    hash = "sha256-jbQjZrcUh9PTeizylcqb3Q7A4kKZH9ZcaEReymc3lo8=";
+    hash = "sha256-ElMmvC2H8NRYwcEY5oIqo7fsiKAJBZDNqRFXOv2o5IE=";
   };
 
   nativeBuildInputs = [

From 0738a4d37dfb14b1a6e02c2e6b8b2c617af6fa9f Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 16 May 2026 09:42:23 +0000
Subject: [PATCH 57/68] turingdb: 1.30 -> 1.31

---
 pkgs/by-name/tu/turingdb/package.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tu/turingdb/package.nix b/pkgs/by-name/tu/turingdb/package.nix
index 091b7e8b7cb7..3f842534fed4 100644
--- a/pkgs/by-name/tu/turingdb/package.nix
+++ b/pkgs/by-name/tu/turingdb/package.nix
@@ -4,11 +4,13 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
+  python3,
   gitMinimal,
   bison,
   flex,
   inih,
   minio-cpp,
+  arrow-cpp,
   curl,
   curlpp,
   nlohmann_json,
@@ -26,18 +28,19 @@ let
 in
 turingstdenv.mkDerivation (finalAttrs: {
   pname = "turingdb";
-  version = "1.30";
+  version = "1.31";
 
   src = fetchFromGitHub {
     owner = "turing-db";
     repo = "turingdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dYggkkuTC+amR/Alz+B1YCNo5kHgmrt/dNLRW5EgaZY=";
+    hash = "sha256-dorRoDWylZo/QRJbqEZOUf+JNHSKCIi/s8wxZ2HwZsI=";
 
     fetchSubmodules = true;
 
     leaveDotGit = true;
     postFetch = ''
+      git -C $out log -1 --format=%H > $out/HEAD_COMMIT_HASH
       git -C $out log -1 --format=%ct > $out/HEAD_COMMIT_TIMESTAMP
       rm -rf $out/.git
     '';
@@ -46,6 +49,20 @@ turingstdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace storage/dump/DumpConfig.h \
       --replace-fail HEAD_COMMIT_TIMESTAMP "$(cat $src/HEAD_COMMIT_TIMESTAMP)"
+
+    substituteInPlace io/parquet/CMakeLists.txt \
+      --replace-fail "Parquet::parquet_static" "Parquet::parquet_shared"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'COMMAND git rev-parse HEAD' 'COMMAND cat HEAD_COMMIT_HASH' \
+      --replace-fail 'COMMAND git show --no-patch --format=%at' 'COMMAND cat HEAD_COMMIT_TIMESTAMP'
+
+    substituteInPlace tools/turingdb/TuringDBTool.cpp \
+      --replace-fail '"turingdb", "1.0"' '"turingdb", "${finalAttrs.version}"'
+
+    for dir in test samples regress fuzz examples; do
+      substituteInPlace CMakeLists.txt --replace-fail "add_subdirectory($dir)" ""
+    done
   '';
 
   strictDeps = true;
@@ -56,9 +73,11 @@ turingstdenv.mkDerivation (finalAttrs: {
     flex
     gitMinimal
     pkg-config
+    python3
   ];
 
   buildInputs = [
+    arrow-cpp
     curl
     curlpp
     faiss

From 2a6a67b8d4f9cfbda2c61c1f035e9f00c646908c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 16 May 2026 12:52:09 +0300
Subject: [PATCH 58/68] nixos/oauth2-proxy: fix warning condition

---
 nixos/modules/services/security/oauth2-proxy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/oauth2-proxy.nix b/nixos/modules/services/security/oauth2-proxy.nix
index 756857524f14..d0a5051c7b76 100644
--- a/nixos/modules/services/security/oauth2-proxy.nix
+++ b/nixos/modules/services/security/oauth2-proxy.nix
@@ -629,7 +629,7 @@ in
       }
     ];
 
-    warnings = lib.mkIf (cfg.reverseProxy -> cfg.trustedProxyIP == [ ]) [
+    warnings = lib.mkIf (cfg.reverseProxy && cfg.trustedProxyIP == [ ]) [
       ''
         When config.services.oauth2-proxy.reverseProxy is enabled, configure config.services.oauth2-proxy.trustedProxyIP to the IPs or CIDR range(s) of the reverse proxies that are allowed to send X-Forwarded-* headers.
         If you leave it unset, OAuth2 Proxy currently trusts all source IPs for backwards compatibility, which means a client that can reach OAuth2 Proxy directly may be able to spoof forwarded headers.

From 7a7eb45c07c22d5788ad56a7b3a3f54aed6f58be Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 16 May 2026 11:54:47 +0200
Subject: [PATCH 59/68] sdl3-mixer: 3.2.0 -> 3.2.2

Changelog: https://github.com/libsdl-org/SDL_mixer/releases/tag/release-3.2.2
Diff: https://github.com/libsdl-org/SDL_mixer/compare/release-3.2.0...release-3.2.2

Contains bugfixes for BE systems, which i can't test.
---
 pkgs/by-name/sd/sdl3-mixer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sd/sdl3-mixer/package.nix b/pkgs/by-name/sd/sdl3-mixer/package.nix
index 4efbc0338649..1b17fd932e2a 100644
--- a/pkgs/by-name/sd/sdl3-mixer/package.nix
+++ b/pkgs/by-name/sd/sdl3-mixer/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3-mixer";
-  version = "3.2.0";
+  version = "3.2.2";
   __structuredAttrs = true;
 
   outputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL_mixer";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-+kOxmBX/zPCTq51F9ysSGsZdJSb21uM56U50mEgprbo=";
+    hash = "sha256-J4qyb5zeeDowile8p2qJzBWP0lnBR8nYSF0fuZUshiM=";
   };
 
   strictDeps = true;

From 17c5d16ed086c54ec1d7ee58373a67ab5d762633 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 16 May 2026 12:00:30 +0200
Subject: [PATCH 60/68] fmd-server: fix darwin

by not copying ui files to `/build` (since it doesn't exist on that
platform), and instead copying them relative to `web`, before the build.
---
 pkgs/by-name/fm/fmd-server/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fm/fmd-server/package.nix b/pkgs/by-name/fm/fmd-server/package.nix
index e5fad6c9ac32..5ed9b08dc0ab 100644
--- a/pkgs/by-name/fm/fmd-server/package.nix
+++ b/pkgs/by-name/fm/fmd-server/package.nix
@@ -35,6 +35,10 @@ buildGoModule (
 
     vendorHash = "sha256-cFIg9mOSQbrYHW4kg4aTeTaF+gy1jNpAlg8qepb81Jc=";
 
+    preBuild = ''
+      cp -r ${ui}/${ui.distRoot} web/
+    '';
+
     nativeInstallCheckInputs = [ versionCheckHook ];
     versionCheckProgramArg = "version";
 
@@ -74,10 +78,6 @@ buildGoModule (
       '';
     };
 
-    postUnpack = ''
-      cp -r ${ui}/${ui.distRoot} /build/source/web/
-    '';
-
     meta = {
       description = "Server to communicate with the FindMyDevice app and save the latest (encrypted) location";
       homepage = "https://fmd-foss.org/";

From 40d77b7280a741750ab99aae7194a5bc3adcbb83 Mon Sep 17 00:00:00 2001
From: Lyna <git@blooym.dev>
Date: Sat, 16 May 2026 11:23:05 +0100
Subject: [PATCH 61/68] nixos/porxie: update option descriptions

---
 nixos/modules/services/networking/porxie.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/porxie.nix b/nixos/modules/services/networking/porxie.nix
index cb02f1cb067f..5b29831ff87a 100644
--- a/nixos/modules/services/networking/porxie.nix
+++ b/nixos/modules/services/networking/porxie.nix
@@ -76,22 +76,23 @@ in
             default = null;
             apply = v: if v != null then lib.concatStringsSep "," v else null;
             description = ''
-              Blob MIME types that can be served.
+              Blob mimetypes that can be served. Wildcards are supported "*/*", "image/*", etc.
 
-              Validation is done loosely via content inference. Further validation can be done by
-              a layer above this proxy, such as an image transformation service. When inference
-              fails, the blob's type falls back to `application/octet-stream`. When that type is
-              allowed, blobs failing inference can still be served.
+              Validation is done loosely via content sniffing. Further validation can be done by a layer
+              above this proxy, such as an image transformation service. When inference fails, the blob's
+              type falls back to `application/octet-stream`. When that type is allowed, blobs failing
+              inference can still be served.
             '';
           };
           PORXIE_BLOB_MAX_SIZE = lib.mkOption {
             type = lib.types.nullOr lib.types.str;
             default = null;
             description = ''
-              Maximum blob size that can be fetched and served.
+              Maximum blob size that can be served.
 
-              Blobs that exceed this limit will return HTTP 413. The minimum value is 512kb
-              and the maximum is the system's total memory.
+              Blobs that exceed this limit will return HTTP 413.
+
+              The minimum value is 512kb and the maximum is the system's total memory.
             '';
           };
           PORXIE_BLOB_CACHE_HEADER = lib.mkOption {

From 0d2152baee68c61376c55f8e92ec65480b49bdb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 10:24:59 +0000
Subject: [PATCH 62/68] python3Packages.stanza: 1.11.1 -> 1.12.0

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

diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix
index b8aeb560448e..ce4d4d1003f5 100644
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "stanza";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stanfordnlp";
     repo = "stanza";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Rq+2DutK46Mc9HeMRsGt26raZiC7zjE9M4A6hLbTINk=";
+    hash = "sha256-uarx5HY6sxm2Fr12Vti4IluqOhFosf8QYIP2WMxdFfI=";
   };
 
   build-system = [ setuptools ];

From f9fffd0a7952122ce3467f77e7e9e3596737c759 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 10:25:47 +0000
Subject: [PATCH 63/68] libretro.np2kai: 0-unstable-2026-04-01 ->
 0-unstable-2026-05-09

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

diff --git a/pkgs/applications/emulators/libretro/cores/np2kai.nix b/pkgs/applications/emulators/libretro/cores/np2kai.nix
index adbadf5e6914..c8ce21d781ed 100644
--- a/pkgs/applications/emulators/libretro/cores/np2kai.nix
+++ b/pkgs/applications/emulators/libretro/cores/np2kai.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "np2kai";
-  version = "0-unstable-2026-04-01";
+  version = "0-unstable-2026-05-09";
 
   src = fetchFromGitHub {
     owner = "AZO234";
     repo = "NP2kai";
-    rev = "cbadd7572e0b13de0c0c011a86758ca4dc4a74ae";
-    hash = "sha256-4p5SpXgGzfj2lc+0yAgwrRLDkYWrIkZi+XREQpNhdKA=";
+    rev = "eebb95c060f82df45a5615be676c3fa4b7bb7ae0";
+    hash = "sha256-KBvxqxCeYyIKCTHdcczwpgHBIZds6xMfHt6LblRRoFc=";
     fetchSubmodules = true;
   };
 

From a7e40a174b121b1fbba6e47a064d9ea9400e7876 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 16 May 2026 12:53:45 +0200
Subject: [PATCH 64/68] lasuite-docs: mark as linux only

Failing Hydra build: https://hydra.nixos.org/build/328963970

Breaks the build and to my knowledge none of the maintainers / users
will have the bandwidth to debug Darwin issues, so making this state
explicit.
---
 pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix | 2 +-
 pkgs/by-name/la/lasuite-docs-frontend/package.nix             | 2 +-
 pkgs/by-name/la/lasuite-docs/package.nix                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
index 2cfc05c5b251..5e16542be6a8 100644
--- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
       soyouzpanda
       ma27
     ];
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
index f4559db67265..8ad50e89bbe5 100644
--- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
@@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
       soyouzpanda
       ma27
     ];
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix
index 024b16dd7fb0..39f940778262 100644
--- a/pkgs/by-name/la/lasuite-docs/package.nix
+++ b/pkgs/by-name/la/lasuite-docs/package.nix
@@ -181,6 +181,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
       ma27
     ];
     mainProgram = "docs";
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.linux;
   };
 })

From eaf835c7b6a264edce4f787b1ed9eb250c223542 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 10:54:32 +0000
Subject: [PATCH 65/68] terraform-providers.dnsimple_dnsimple: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 393b6e641400..af40564ff327 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -328,11 +328,11 @@
     "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
   },
   "dnsimple_dnsimple": {
-    "hash": "sha256-j3O1gztyDCiq0Rchcx1lYktY2EhaNaa3t1yL+lH7IAg=",
+    "hash": "sha256-8ZanbgHaszFiorzY/ulpVvUesmyx7O3SKXmwOi5WUSU=",
     "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
     "owner": "dnsimple",
     "repo": "terraform-provider-dnsimple",
-    "rev": "v2.1.1",
+    "rev": "v2.1.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-1CpswocnTe6aj4TP7fMGy6mv0d/yX8FcYAKkAW5k7kk="
   },

From 97f26b23b8741ed0f67fdd65d6ec610b6b975bd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 11:18:58 +0000
Subject: [PATCH 66/68] 
 home-assistant-custom-components.waste_collection_schedule: 2.22.0 -> 2.23.0

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

diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 6d3edf24d1f9..cbe69f53c0cb 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -20,13 +20,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.22.0";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = "v${version}";
-    hash = "sha256-eUpfeWfMHsBBlDJpq0lBo1aQ7VF3THTXQTXDaXL5+tQ=";
+    hash = "sha256-YZBIh828kYhRxoRe5uIUJY4ZPJuJYZKCfA6BF/Fx2nk=";
   };
 
   dependencies = [

From 3335d0bd89aa95e5ef25884a8892e918af65af02 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 16 May 2026 13:08:50 +0200
Subject: [PATCH 67/68] lasuite-meet: mark as linux only

Failing Hydra build: https://hydra.nixos.org/build/328928972

Same motivation as for lasuite-docs in
https://github.com/NixOS/nixpkgs/pull/520840#issuecomment-4466658295
---
 pkgs/by-name/la/lasuite-meet/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index ee936d36244a..b152e3c53db3 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   nixosTests,
   python3,
-  stdenv,
 }:
 let
   version = "1.15.0";
@@ -21,7 +20,7 @@ let
     changelog = "https://github.com/suitenumerique/meet/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ soyouzpanda ];
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.linux;
   };
 
   mail = callPackage ./mail.nix { inherit src version meta; };
@@ -48,16 +47,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build"
-  ''
-  # Otherwise fails with:
-  # socket.gaierror: [Errno 8] nodename nor servname provided, or not known
-  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace impress/settings.py \
-      --replace-fail \
-        "gethostname()" \
-        "gethostname() + '.local'"
-  '');
-  __darwinAllowLocalNetworking = true;
+  '';
 
   build-system = with python.pkgs; [ uv-build ];
 

From 0ff8f99a9014525ad179de9979ca71411606fdd2 Mon Sep 17 00:00:00 2001
From: Lyna <git@blooym.dev>
Date: Sat, 16 May 2026 12:26:08 +0100
Subject: [PATCH 68/68] porxie: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix
index 8a0369e2026e..e79164f44503 100644
--- a/pkgs/by-name/po/porxie/package.nix
+++ b/pkgs/by-name/po/porxie/package.nix
@@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "porxie";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromCodeberg {
     owner = "Blooym";
     repo = "porxie";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mClUYDBgOtX0WcCG0rXhgnKFqnvE2UOFH3PABeF+pkI=";
+    hash = "sha256-XtJD9W0eF6jNWk0xyvGlV6h0JCAUUjFnMk/MRiVBv9I=";
   };
-  cargoHash = "sha256-SImynSnWJ/tiEoSYuFYQ/JncMeierAioZO2Fnx6FHN4=";
+  cargoHash = "sha256-q/Q4h39EzkjdWApfVf2VT1Rac+/2nQxpn+gp3l8tbeQ=";
 
   buildInputs = [ rust-jemalloc-sys ];