From 590d99ed5f9e0a7250f7fd684542bd8c7f89a626 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sun, 26 Apr 2026 21:31:40 -0400
Subject: [PATCH 01/28] lib/systems: remove old isCompatible

---
 lib/systems/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index f60ece0c8f5c..eb99498b896a 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -109,9 +109,6 @@ let
               )
           );
 
-        isCompatible =
-          _:
-          throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
         # Derived meta-data
         useLLVM = final.isFreeBSD || final.isOpenBSD;
 

From 0f0f29fcf1a17717ebd1f0fff951838562198835 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sun, 26 Apr 2026 21:42:04 -0400
Subject: [PATCH 02/28] lib/systems: store version of elaborated system without
 functions

---
 lib/systems/default.nix | 32 ++++++++++-----
 lib/tests/systems.nix   | 88 ++++++++++++++++++++++++++---------------
 2 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index eb99498b896a..2511f8cdd854 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -3,8 +3,6 @@
 let
   inherit (lib)
     any
-    attrNames
-    filter
     foldl
     hasInfix
     isAttrs
@@ -36,17 +34,31 @@ let
     compare the value with a reconstruction of itself, e.g. with `f == a: f a`,
     or perhaps calling `elaborate` twice, and one will see reflexivity fail as described.
 
-    Hence a custom equality test.
+    To solve this, the elaborated systems also store a version of their data
+    without any functions to be compared.
 
     Note that this does not canonicalize the systems, so you'll want to make sure
     both arguments have been `elaborate`-d.
   */
-  equals =
-    let
-      # System attrs are never __functor-style attrsets, so builtins.isFunction suffices.
-      removeFunctions = a: removeAttrs a (filter (n: builtins.isFunction a.${n}) (attrNames a));
-    in
-    a: b: removeFunctions a == removeFunctions b;
+  equals = a: b: a._withoutFunctions == b._withoutFunctions;
+
+  /**
+    The attribute names within an elaborated system that store functions.
+
+    Due to object identity semantics, `systems.equals` needs a way to compare
+    all non-function attributes. It does this by storing a version of itself
+    without any functions under the attribute name `_withoutFunctions`. The
+    attribute names that contain functions are exposed for regression testing.
+  */
+  functionNames = [
+    "canExecute"
+    "emulator"
+    "emulatorAvailable"
+    "staticEmulatorAvailable"
+  ];
+
+  # Avoiding infrec
+  ignoredNames = functionNames ++ [ "_withoutFunctions" ];
 
   /**
     List of all Nix system doubles the nixpkgs flake will expose the package set
@@ -85,6 +97,7 @@ let
       rust = args.rust or args.rustc or { };
 
       final = {
+        _withoutFunctions = removeAttrs final ignoredNames;
         # Prefer to parse `config` as it is strictly more informative.
         parsed = parse.mkSystemFromString (args.config or allArgs.system);
         # This can be losslessly-extracted from `parsed` iff parsing succeeds.
@@ -646,6 +659,7 @@ in
     equals
     examples
     flakeExposed
+    functionNames
     inspect
     parse
     platforms
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index e912d18cc73c..2cc8f7aa607e 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -226,10 +226,22 @@ lib.runTests (
       expr = toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux");
       expected = "x86_64-linux";
     };
-    test_toLosslessStringMaybe_fail = {
-      expr = toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux" // { something = "extra"; });
-      expected = null;
-    };
+    test_toLosslessStringMaybe_fail = (
+      let
+        baseSystem = lib.systems.elaborate "x86_64-linux";
+      in
+      {
+        expr = toLosslessStringMaybe (
+          baseSystem
+          // {
+            _withoutFunctions = baseSystem._withoutFunctions // {
+              something = "extra";
+            };
+          }
+        );
+        expected = null;
+      }
+    );
     test_elaborate_config_over_system = {
       expr =
         (lib.systems.elaborate {
@@ -255,36 +267,48 @@ lib.runTests (
       expected = "i686";
     };
   }
+  // {
+    # equals.functionNames must list exactly the function-valued attrs of an
+    # elaborated system, so that _withoutFunctions stays correct without
+    # iterating.
+    test_equals_functionNames_in_sync =
+      let
+        sys = lib.systems.elaborate "x86_64-linux";
+        actual = lib.filter (n: builtins.isFunction sys.${n}) (builtins.attrNames sys);
+        expected = lib.sort lib.lessThan lib.systems.functionNames;
+      in
+      {
+        expr = lib.sort lib.lessThan actual;
+        inherit expected;
+      };
+  }
 
   # Generate test cases to assert that a change in any non-function attribute makes a platform unequal
-  //
-    lib.concatMapAttrs
-      (platformAttrName: origValue: {
+  // (
+    let
+      # arbitrary choice, just to get all the elaborated attrNames
+      baseSystem = lib.systems.elaborate "x86_64-linux";
+    in
+    lib.concatMapAttrs (platformAttrName: origValue: {
+      ${"test_equals_unequal_${platformAttrName}"} =
+        let
+          # lib.systems.equals only checks the subattrset
+          modified =
+            assert origValue != arbitraryValue;
+            baseSystem
+            // {
+              _withoutFunctions = baseSystem._withoutFunctions // {
+                ${platformAttrName} = arbitraryValue;
+              };
+            };
+          arbitraryValue = x: "<<modified>>";
+        in
+        {
+          expr = lib.systems.equals baseSystem modified;
+          expected = false;
+        };
 
-        ${"test_equals_unequal_${platformAttrName}"} =
-          let
-            modified =
-              assert origValue != arbitraryValue;
-              lib.systems.elaborate "x86_64-linux" // { ${platformAttrName} = arbitraryValue; };
-            arbitraryValue = x: "<<modified>>";
-          in
-          {
-            expr = lib.systems.equals (lib.systems.elaborate "x86_64-linux") modified;
-            expected =
-              {
-                # Changes in these attrs are not detectable because they're function.
-                # The functions should be derived from the data, so this is not a problem.
-                canExecute = null;
-                emulator = null;
-                emulatorAvailable = null;
-                staticEmulatorAvailable = null;
-                isCompatible = null;
-              } ? ${platformAttrName};
-          };
-
-      })
-      (
-        lib.systems.elaborate "x86_64-linux" # arbitrary choice, just to get all the elaborated attrNames
-      )
+    }) baseSystem
+  )
 
 )

From 0f857ff930674beaed29b7c1cba597b1278b209b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 May 2026 20:15:02 +0000
Subject: [PATCH 03/28] teams-for-linux: 2.8.1 -> 2.9.0

---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index b01f5392b4a0..6c03b695a5e4 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.8.1";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-kD04SMErq92k+F4/3v6bpoJf2lfaGM6bAn+bCa9ACbA=";
+    hash = "sha256-lJduUoD/bw4cAvk30fmYWsQznAFQOnUiVzIubuN7/Mk=";
   };
 
-  npmDepsHash = "sha256-497bL7l3OIAgkbXP3FkeFFpPz2VtRENrw6sQmJsnXBY=";
+  npmDepsHash = "sha256-CxAPb5MXc6auF219Rg0ocfijSY59j7R9lXeFhFglTPI=";
 
   nativeBuildInputs = [
     makeWrapper

From 62d38ee3ac36ec99660562a5ad76d219e1253ec5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 10 May 2026 20:52:43 +0200
Subject: [PATCH 04/28] ssh-tpm-agent: install man pages

---
 pkgs/by-name/ss/ssh-tpm-agent/package.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
index a7fe43b561b4..b6892641a216 100644
--- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix
+++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
@@ -3,6 +3,8 @@
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
+  installShellFiles,
+  asciidoctor,
   openssh,
   openssl,
 }:
@@ -22,13 +24,14 @@ buildGoModule (finalAttrs: {
 
   vendorHash = "sha256-N7JuMUy5Z+HVhxsqESlBkHcHVipRYM8ncx/wR77k1fw=";
 
-  buildInputs = [
-    openssl
+  nativeBuildInputs = [
+    installShellFiles
+    asciidoctor
   ];
 
-  nativeCheckInputs = [
-    openssh
-  ];
+  buildInputs = [ openssl ];
+
+  nativeCheckInputs = [ openssh ];
 
   # disable broken tests, see https://github.com/NixOS/nixpkgs/pull/394097
   preCheck = ''
@@ -37,6 +40,11 @@ buildGoModule (finalAttrs: {
     substituteInPlace internal/keyring/threadkeyring_test.go --replace-fail ENOKEY ENOENT
   '';
 
+  postInstall = ''
+    make man
+    installManPage man/*.1
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From fa3bf1b024a944529d6358abbdc19239ddee3c71 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 10 May 2026 20:44:33 +0200
Subject: [PATCH 05/28] ssh-tpm-agent: add defelo as maintainer

---
 pkgs/by-name/ss/ssh-tpm-agent/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
index b6892641a216..8e88198279e8 100644
--- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix
+++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
@@ -53,7 +53,10 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/Foxboron/ssh-tpm-agent/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ sgo ];
+    maintainers = with lib.maintainers; [
+      sgo
+      defelo
+    ];
     mainProgram = "ssh-tpm-agent";
   };
 })

From d92bbb7099fa47b0086b3c8f35d48939fe2dd50d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 10:31:32 +0000
Subject: [PATCH 06/28] crossmacro: 1.0.1 -> 1.1.0

---
 pkgs/by-name/cr/crossmacro/deps.json   | 191 +++++++++++++++++--------
 pkgs/by-name/cr/crossmacro/package.nix |   4 +-
 2 files changed, 135 insertions(+), 60 deletions(-)

diff --git a/pkgs/by-name/cr/crossmacro/deps.json b/pkgs/by-name/cr/crossmacro/deps.json
index ccc7a8ca29c6..469d0449149f 100644
--- a/pkgs/by-name/cr/crossmacro/deps.json
+++ b/pkgs/by-name/cr/crossmacro/deps.json
@@ -1,103 +1,138 @@
 [
+  {
+    "pname": "Acornima",
+    "version": "1.4.0",
+    "hash": "sha256-7SCe3Bgcyzlv6nXQfTOy3UZLc7ilZ3YXxgl6mcTF82s="
+  },
   {
     "pname": "Avalonia",
-    "version": "11.3.13",
-    "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
+    "version": "12.0.2",
+    "hash": "sha256-Ht2h4cBtnVhrk9VWsHDOEvU1wd/y80CxMDWn8W0lHKk="
   },
   {
     "pname": "Avalonia.BuildServices",
     "version": "11.3.2",
     "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
   },
-  {
-    "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.13",
-    "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg="
-  },
-  {
-    "pname": "Avalonia.Diagnostics",
-    "version": "11.3.13",
-    "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg="
-  },
   {
     "pname": "Avalonia.Fonts.Inter",
-    "version": "11.3.13",
-    "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4="
+    "version": "12.0.2",
+    "hash": "sha256-23iKfc71xCy+vaHlxSRi19ZsJ48Dey6mdOx9CGzg2SA="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.13",
-    "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw="
+    "version": "12.0.2",
+    "hash": "sha256-raEQGX8Vwr+c7W5SzkEZ/phEEs/a5N0xeUfAWKEpl6A="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop.AtSpi",
+    "version": "12.0.2",
+    "hash": "sha256-5AQPlWW6g7G6pm7qI8RHR/MQ45VGd7iAFWseXUitIVI="
+  },
+  {
+    "pname": "Avalonia.HarfBuzz",
+    "version": "12.0.2",
+    "hash": "sha256-FUYKVfweWiFix+LJZt9scI7HYiIl3C+8j9K0/yKsOIE="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.13",
-    "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
+    "version": "12.0.2",
+    "hash": "sha256-19hc0GSsa9JujiZlHxLKn7x6fUjAeJSH3lO43hL0bD0="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.13",
-    "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU="
+    "version": "12.0.0",
+    "hash": "sha256-w8i8lTkf3yp78rPxg7LlcsrKF/K3J7ATOTy3D/Bt6CA="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "12.0.2",
+    "hash": "sha256-ZzNoO/8/SYG4xN0RmPz9AC6N1RtPTnSaTVrQ0+NNvGU="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.13",
-    "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM="
-  },
-  {
-    "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.13",
-    "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE="
+    "version": "12.0.2",
+    "hash": "sha256-H8AXau1gV8m33lKYrSzxp0GDmoCuyx7+B93gTfcpXXU="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.13",
-    "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg="
+    "version": "12.0.2",
+    "hash": "sha256-not3Qv87nbN6Bi8sE49WKDSNzUTISBdcNR3rcFqgwHE="
   },
   {
     "pname": "CommunityToolkit.Mvvm",
     "version": "8.4.2",
     "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU="
   },
+  {
+    "pname": "ExCSS",
+    "version": "4.3.1",
+    "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
+  },
   {
     "pname": "HarfBuzzSharp",
-    "version": "8.3.1.1",
-    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.1.3",
+    "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "8.3.1.1",
-    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "8.3.1.3",
+    "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "8.3.1.1",
-    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "8.3.1.3",
+    "hash": "sha256-6WKsJ/jF9pHnaWcQvaezc5AV6flu3XsOxQs7i4BGYJs="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "8.3.1.1",
-    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
+    "version": "8.3.1.3",
+    "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "8.3.1.1",
-    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.1.3",
+    "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM="
+  },
+  {
+    "pname": "Jint",
+    "version": "4.8.0",
+    "hash": "sha256-+K8NGiJ1SChiyMrjn4dJOiBdnWXP6UOfXSsNsJ5//tI="
   },
   {
     "pname": "MicroCom.Runtime",
-    "version": "0.11.0",
-    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+    "version": "0.11.4",
+    "hash": "sha256-hd13T4Z9DsF1Sb56bS+SDpWjksJVzb4m/Kp37jaUhkU="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "10.0.5",
-    "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+    "version": "10.0.7",
+    "hash": "sha256-dICogdaqa5mHqyvFA0lTomFa39Dqm4nn7Pit6qi6eQY="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.5",
-    "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+    "version": "10.0.7",
+    "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk="
   },
   {
     "pname": "Serilog",
@@ -134,39 +169,79 @@
     "version": "7.0.0",
     "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
   },
+  {
+    "pname": "ShimSkiaSharp",
+    "version": "4.6.0",
+    "hash": "sha256-t2QHrLvtB9gONm2LA7GzGZIQXN5T0OrNDEdMqogWLic="
+  },
   {
     "pname": "SkiaSharp",
     "version": "2.88.9",
     "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.119.4-preview.1.1",
+    "hash": "sha256-yUHsoau6WVQkzYV5UVnKcgpABiapa9aoTDd1pw/J5r8="
+  },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.9",
-    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+    "version": "3.119.4-preview.1.1",
+    "hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.9",
-    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+    "version": "3.119.4-preview.1.1",
+    "hash": "sha256-olbqFOHmkiCdlnXHU4l1lTb04yAPn21CvLNMP4AGncs="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.9",
-    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+    "version": "3.119.4-preview.1.1",
+    "hash": "sha256-R+67ADA6luDa9b7xvsE4PSL6GWwQTaNYzw2WYou/ofQ="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.9",
-    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+    "version": "3.119.4-preview.1.1",
+    "hash": "sha256-Sd+KnMezIKbc4OLklHsfeM7EVZERtmawWuSCoaySteM="
   },
   {
-    "pname": "Tmds.DBus",
-    "version": "0.91.1",
-    "hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4="
+    "pname": "Svg.Animation",
+    "version": "4.6.0",
+    "hash": "sha256-KwXuouxbsgb98pyrYEL9HGWVkAXUzmfOsWYttCJQ1fk="
+  },
+  {
+    "pname": "Svg.Controls.Skia.Avalonia",
+    "version": "12.0.0.6",
+    "hash": "sha256-W0SLHlfzXIAO1YrbxwXcXBwV1CH18inaUv5l2qL/D68="
+  },
+  {
+    "pname": "Svg.Custom",
+    "version": "4.6.0",
+    "hash": "sha256-Vp2VtpY1GMKh9FVTbgX5l6OtX/KKO+T+uj6KczNVLZk="
+  },
+  {
+    "pname": "Svg.JavaScript",
+    "version": "4.6.0",
+    "hash": "sha256-u9Bf3OU+cB5VnQr/CL7wBQw3YBxfh4OIXehXumDCYnI="
+  },
+  {
+    "pname": "Svg.Model",
+    "version": "4.6.0",
+    "hash": "sha256-2b2g4TyQEYIEoubJHrB8Fpu2ZWb7eHN4vM/PZqJ1tbw="
+  },
+  {
+    "pname": "Svg.SceneGraph",
+    "version": "4.6.0",
+    "hash": "sha256-8O89YBURkaJS08paV/LqLP4Z8oTdMJPrgkm8HAjWCcs="
+  },
+  {
+    "pname": "Svg.Skia",
+    "version": "4.6.0",
+    "hash": "sha256-kOUnFu2asUQqd3TfxN25WKbxR2TbcXOPTDCaR7LScP0="
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.92.0",
+    "hash": "sha256-WZSB9eqSOIzsBfnpOJDIIopIhNxAH+UcZuD6W94PIN4="
   }
 ]
diff --git a/pkgs/by-name/cr/crossmacro/package.nix b/pkgs/by-name/cr/crossmacro/package.nix
index 07856440a205..7ce53fca1090 100644
--- a/pkgs/by-name/cr/crossmacro/package.nix
+++ b/pkgs/by-name/cr/crossmacro/package.nix
@@ -29,13 +29,13 @@
 
 buildDotnetModule rec {
   pname = "crossmacro";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "alper-han";
     repo = "CrossMacro";
     tag = "v${version}";
-    hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks=";
+    hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is=";
   };
 
   projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj";

From 51a8cf75096a9f0e114037b305b7b8c179083ed7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 10:33:41 +0000
Subject: [PATCH 07/28] crossmacro-daemon: 1.0.1 -> 1.1.0

---
 pkgs/by-name/cr/crossmacro-daemon/deps.json   | 9 ++-------
 pkgs/by-name/cr/crossmacro-daemon/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cr/crossmacro-daemon/deps.json b/pkgs/by-name/cr/crossmacro-daemon/deps.json
index e712b6c324cf..e7c1dcd91d03 100644
--- a/pkgs/by-name/cr/crossmacro-daemon/deps.json
+++ b/pkgs/by-name/cr/crossmacro-daemon/deps.json
@@ -1,8 +1,8 @@
 [
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.5",
-    "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+    "version": "10.0.7",
+    "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk="
   },
   {
     "pname": "Serilog",
@@ -38,10 +38,5 @@
     "pname": "Serilog.Sinks.File",
     "version": "7.0.0",
     "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
-  },
-  {
-    "pname": "Tmds.DBus",
-    "version": "0.91.1",
-    "hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4="
   }
 ]
diff --git a/pkgs/by-name/cr/crossmacro-daemon/package.nix b/pkgs/by-name/cr/crossmacro-daemon/package.nix
index b28b53b918ff..f9b31c295935 100644
--- a/pkgs/by-name/cr/crossmacro-daemon/package.nix
+++ b/pkgs/by-name/cr/crossmacro-daemon/package.nix
@@ -14,13 +14,13 @@
 
 buildDotnetModule rec {
   pname = "crossmacro-daemon";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "alper-han";
     repo = "CrossMacro";
     tag = "v${version}";
-    hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks=";
+    hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is=";
   };
 
   projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj";

From 75429919df44a2b9d036da4f2fca26cf6202a277 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 30 Apr 2026 09:14:05 -0400
Subject: [PATCH 08/28] pkgs/toplevel: avoid elaborating crossSystem if not
 passed

Later on, `if crossSystem0 == null` is performed to avoid a
`lib.systems.elaborate` if possible. We'd like to take that chance!
---
 pkgs/top-level/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 12fdbed08197..42df9d2fc674 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -44,7 +44,7 @@ in
   localSystem,
 
   # The system packages will ultimately be run on.
-  crossSystem ? localSystem,
+  crossSystem ? null,
 
   # Allow a configuration attribute set to be passed in as an argument.
   config ? { },

From c7c0ac8c11015f517be305b5ab85bbd7f9a6c25a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 14:51:26 +0000
Subject: [PATCH 09/28] ctx7: 0.3.9 -> 0.4.2

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

diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix
index 9df02ddda524..8c67a9b21c11 100644
--- a/pkgs/by-name/ct/ctx7/package.nix
+++ b/pkgs/by-name/ct/ctx7/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ctx7";
-  version = "0.3.9";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
     tag = "${finalAttrs.pname}@${finalAttrs.version}";
-    hash = "sha256-nrJCYezH9VDd1Ptpg5xATx0ByweTw8dkKT2y3rnFHd8=";
+    hash = "sha256-ozUFnUFyxQ8M0W2e2Pr+uXrinI4LJoeSEQi3ZMPwPc4=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q=";
+    hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c=";
   };
 
   buildPhase = ''

From 6bed2dcff6519682260257f80b8819e322022ecc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 16:49:55 +0000
Subject: [PATCH 10/28] spirit: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix
index bc8a14d7620f..99261d5dc914 100644
--- a/pkgs/by-name/sp/spirit/package.nix
+++ b/pkgs/by-name/sp/spirit/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "spirit";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "spirit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5H/yDujoxzeslZ4rm6qrBIy9pM3F6o/XmqPyG960M/0=";
+    hash = "sha256-6hdsJ20nI85ngDC6trA+85mMPAq9hT9bgBvkRzdONlE=";
   };
 
-  vendorHash = "sha256-dC+qryYDiYPuMlgkHsXYOsqHxl1O5QtGUFbNnkRE3eU=";
+  vendorHash = "sha256-bJCwHmt8P6pnnIehYh8nBMHsB6Kff532c3mUTbtrogc=";
 
   subPackages = [ "cmd/spirit" ];
 

From 246213d9d218f1515b6c39cabde90d875030c5c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 16:54:01 +0000
Subject: [PATCH 11/28] hyprwhspr-rs: 0.3.26 -> 0.3.27

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

diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
index 260c56c58477..2979c45ab61c 100644
--- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix
+++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprwhspr-rs";
-  version = "0.3.26";
+  version = "0.3.27";
 
   src = fetchFromGitHub {
     owner = "better-slop";
     repo = "hyprwhspr-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dR7nLQCYxCSkbHd9K4gr3emmVgjK3h4NP7T8nnToqJI=";
+    hash = "sha256-+A+AJUMSOXwpOI+bo/g55yfdhQazdSbmHookHXVL9Xk=";
   };
 
-  cargoHash = "sha256-olmYjxR1mz5Hx4FOv2k+KFs3p3a29WuMrZ2scKNDX2A=";
+  cargoHash = "sha256-PA7lC6aQTEK566ADOIC+EvsPDYvjZRi8tc14EQ7gihE=";
 
   nativeBuildInputs = [
     pkg-config

From f1e25ec47769b1feb134e1d800f02e400dd28a25 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 25 Feb 2026 03:33:22 +0100
Subject: [PATCH 12/28] bazaar: 0.7.8 -> 0.7.15

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

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index 573a087aa29f..d520e1896418 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -18,9 +18,12 @@
   libdex,
   libglycin,
   libglycin-gtk4,
+  libproxy,
   libsoup_3,
   libxmlb,
+  libxml2,
   libyaml,
+  malcontent,
   md4c,
   webkitgtk_6_0,
   libsecret,
@@ -29,18 +32,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bazaar";
-  version = "0.7.8";
+  version = "0.7.15";
 
   src = fetchFromGitHub {
     owner = "kolunmi";
     repo = "bazaar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s3NKRh1xUcLXVGWm0oYY4fVX7t7+bZIZ2jAYe1W0LKA=";
+    hash = "sha256-+52W2iU8rdzN4cCxjkKe80qAbvyeqkvDYRRIiBB5yCg=";
   };
 
   nativeBuildInputs = [
     blueprint-compiler
     desktop-file-utils
+    libxml2
     meson
     ninja
     pkg-config
@@ -58,9 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
     libglycin
     libglycin-gtk4
     glycin-loaders
+    libproxy
     libsoup_3
     libxmlb
     libyaml
+    malcontent
     md4c
     webkitgtk_6_0
     libsecret

From 53d6eeb434ee5f92bbba91ca51622fce47cc29cc Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 25 Mar 2026 18:50:53 +0100
Subject: [PATCH 13/28] bazaar: update src.owner to reflect moved repo

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

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index d520e1896418..784d06ce4ccf 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.7.15";
 
   src = fetchFromGitHub {
-    owner = "kolunmi";
+    owner = "bazaar-org";
     repo = "bazaar";
     tag = "v${finalAttrs.version}";
     hash = "sha256-+52W2iU8rdzN4cCxjkKe80qAbvyeqkvDYRRIiBB5yCg=";

From 6e32e7fff657423c6644e61ecb72ccd0eda39fc5 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 12 May 2026 12:25:33 +0200
Subject: [PATCH 14/28] bazaar: add missing python deps

https://github.com/bazaar-org/bazaar/blob/307770fb3645390d1abd82627d56a3b6ffcc9f3f/scripts/countries.py
---
 pkgs/by-name/ba/bazaar/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index 784d06ce4ccf..9a154f5a889d 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -5,6 +5,7 @@
   blueprint-compiler,
   desktop-file-utils,
   meson,
+  python3,
   ninja,
   pkg-config,
   wrapGAppsHook4,
@@ -49,6 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     wrapGAppsHook4
+    (python3.withPackages (p: [
+      p.babel
+      p.pygobject3
+    ]))
   ];
 
   buildInputs = [

From 237097e3b89aead404ffd9fd1596aa18b8b2ddc1 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 12 May 2026 18:38:53 +0200
Subject: [PATCH 15/28] bazaar: set __structuredAttrs and strictDeps

---
 pkgs/by-name/ba/bazaar/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index 9a154f5a889d..f20c7d115173 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "bazaar";
   version = "0.7.15";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "bazaar-org";
     repo = "bazaar";

From 520352c6e5e03b448d0e613e99f51c933f283e78 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 12 May 2026 18:39:14 +0200
Subject: [PATCH 16/28] bazaar: split into multiple outputs

---
 pkgs/by-name/ba/bazaar/package.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index f20c7d115173..260cacae8c1f 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -38,6 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
   strictDeps = true;
 
+  outputs = [
+    "out"
+    # for libbge
+    "lib"
+    "dev"
+  ];
+
   src = fetchFromGitHub {
     owner = "bazaar-org";
     repo = "bazaar";
@@ -80,11 +87,21 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
   ];
 
-  # bazaar needs bazaar-dl-worker in path
+  postInstall = ''
+    moveToOutput bin/bge-demo $dev
+  '';
+
   preFixup = ''
     gappsWrapperArgs+=(
+      # bazaar needs bazaar-dl-worker in path
       --prefix PATH : $out/bin
+      --prefix LD_LIBRARY_PATH : $lib/lib
+      # gsettings schemas are moved to $lib
+      --prefix XDG_DATA_DIRS : $lib/share
     )
+
+    # isn't automatically picked out for some reason, while $dev/bin/bge-demo is...
+    wrapGApp $out/bin/bazaar
   '';
 
   passthru = {

From 80134e5ae62fd1149b9d82cd7c93a824ef613d00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 21:38:33 +0000
Subject: [PATCH 17/28] algia: 0.0.111 -> 0.0.112

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

diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
index 33d2de791842..4dd54b2427a7 100644
--- a/pkgs/by-name/al/algia/package.nix
+++ b/pkgs/by-name/al/algia/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "algia";
-  version = "0.0.111";
+  version = "0.0.112";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "algia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jih/KR3m2Qjn8ZizaoVakbrIXiqSSL/FxZgBYegXzaU=";
+    hash = "sha256-y0mOzgWuuRAJQnP6Zg9lvjeOGMsJrRQgvPTmznK1PRA=";
   };
 
   vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";

From 7f963f1dd4ead27e6dd2fa3911fb4debd60febf2 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 13 May 2026 00:43:59 +0200
Subject: [PATCH 18/28] u2ps: fix build with gcc 15

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

diff --git a/pkgs/by-name/u2/u2ps/package.nix b/pkgs/by-name/u2/u2ps/package.nix
index fbf8111d7b90..d92efd1b34fe 100644
--- a/pkgs/by-name/u2/u2ps/package.nix
+++ b/pkgs/by-name/u2/u2ps/package.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-sa0CL47PwYVDykxzF8KeWhz7HXAX6jZ0AcfecD+aFyg=";
   };
 
+  postPatch = ''
+    # Fix for newer C standards
+    substituteInPlace u2ps.h \
+      --replace-fail "typedef unsigned char bool;" "#include <stdbool.h>"
+  '';
+
   buildInputs = [ ghostscript_headless ];
 
   # gcc 15 defaults to C23 where bool is a keyword; u2ps does `typedef unsigned char bool;`

From 92f1bafd6e1d40d05a16db0e3fb5a91ca35dc874 Mon Sep 17 00:00:00 2001
From: MithicSpirit <rpc01234@gmail.com>
Date: Tue, 12 May 2026 17:58:43 -0500
Subject: [PATCH 19/28] hyprshutdown: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix
index a10b21a17b9c..b2fcc788c7a3 100644
--- a/pkgs/by-name/hy/hyprshutdown/package.nix
+++ b/pkgs/by-name/hy/hyprshutdown/package.nix
@@ -18,13 +18,13 @@
 
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprshutdown";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprshutdown";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dp5lyZzKsjdqJLfwr0S4ILets8eu1kLfBB2y/LxspsU=";
+    hash = "sha256-msCMXV9k9+1siOPaxSzNJwx/o8pn2srCR4h0pxyW/WE=";
   };
 
   nativeBuildInputs = [

From 6bac182036c75712618c24b46d2578abf40bfaf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 23:16:59 +0000
Subject: [PATCH 20/28] luau: 0.718 -> 0.720

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

diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index e94f1b447b26..cc2b70ce687c 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.718";
+  version = "0.720";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-PB+sUCRmvz5ijdtPyDNxpP7asQAhe9GczEHx962GLKA=";
+    hash = "sha256-OF0Zsy1O+9rCcOlWRiBmoets7dAZES4Yy6X4QJ3ZdvQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From 68f5cbe2932870d82ba8cbc7a4c2661603376905 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 23:35:04 +0000
Subject: [PATCH 21/28] kiro: 0.11.133 -> 0.12.184

---
 pkgs/by-name/ki/kiro/package.nix  |  2 +-
 pkgs/by-name/ki/kiro/sources.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 6b85602f9638..b61e6c5f1db3 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -14,7 +14,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
-  version = "0.11.133";
+  version = "0.12.184";
   pname = "kiro";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index c15c2c1df602..e8054a56d5f8 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -1,14 +1,14 @@
 {
   "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.11.133/tar/kiro-ide-0.11.133-stable-linux-x64.tar.gz",
-    "hash": "sha256-D8Y1w3YmbgKvNpN3sLv+GZLcT7HAQaGjCL9YSdrHbbA="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.184/tar/kiro-ide-0.12.184-stable-linux-x64.tar.gz",
+    "hash": "sha256-6T3ZS6KaEBkW0ESQMiNO3UBytk0Ad4g1moBS6dYCTAs="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.11.133/kiro-ide-0.11.133-stable-darwin-x64.dmg",
-    "hash": "sha256-kCPDrcwIx7VLW0sEEvilIO+vobWlrRqS97pbztGkAl4="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.184/kiro-ide-0.12.184-stable-darwin-x64.dmg",
+    "hash": "sha256-fqsdcFdCR/fSxmqpjJ2fxfbtcmfd9RunuW+/RV2khAQ="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.11.133/kiro-ide-0.11.133-stable-darwin-arm64.dmg",
-    "hash": "sha256-P0BxS2xQqZSVpYQw6I496B/asN9ov9n18bEKfYjSVU4="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.184/kiro-ide-0.12.184-stable-darwin-arm64.dmg",
+    "hash": "sha256-LpBdGzmDTVlGIYEWxeR9l9ywJ0T5HE4rbCoXGxf4Vxs="
   }
 }

From 1eb8919b259dc94f6232eced2a0dd5b6f5541583 Mon Sep 17 00:00:00 2001
From: mfukuba <12195032+mfukuba@users.noreply.github.com>
Date: Tue, 12 May 2026 10:28:44 +0900
Subject: [PATCH 22/28] ruby_4_0: 4.0.3 -> 4.0.4

Release notes: https://github.com/ruby/ruby/releases/tag/v4.0.4
---
 pkgs/development/interpreters/ruby/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index db3d8685ee2b..797dbf854657 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -181,6 +181,10 @@ let
             // lib.optionalAttrs docSupport {
               # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
               NROFF = "${groff}/bin/nroff";
+            }
+            // lib.optionalAttrs (docSupport && ver.majMin == "4.0") {
+              # RDoc parses referenced source files with the locale encoding.
+              LANG = "C.UTF-8";
             };
 
           enableParallelBuilding = true;
@@ -411,8 +415,8 @@ in
   };
 
   ruby_4_0 = generic {
-    version = rubyVersion "4" "0" "3" "";
-    hash = "sha256-d5ZKzDcNXIN1uVAuW6bBPAPvkaueufUhyE+0K5yaaw8=";
+    version = rubyVersion "4" "0" "4" "";
+    hash = "sha256-819u36Pauz9yP50M8ZBsZRKud/TkEqseaMxukdIw+oA=";
     cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
   };
 

From 69a753bcf290c5b48fd782cd9c3449bc9d52f719 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 00:07:49 +0000
Subject: [PATCH 23/28] gemini-cli-bin: 0.40.1 -> 0.42.0

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

diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix
index 06ec7a8a9ea2..d2bcfa5291aa 100644
--- a/pkgs/by-name/ge/gemini-cli-bin/package.nix
+++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix
@@ -11,11 +11,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gemini-cli-bin";
-  version = "0.40.1";
+  version = "0.42.0";
 
   src = fetchzip {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini-cli-bundle.zip";
-    hash = "sha256-lSwBnrPX9RjKs0HVR64BcAhgzD4hVMethgnwRErXpDQ=";
+    hash = "sha256-Qkb39ehFabpRGxqpl3wCzoK3A2z5TMnKswngLz6kP/s=";
     stripRoot = false;
   };
 

From 0f3facedfe6bc382926858b8aced0c2c70461f5e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 13 May 2026 02:43:26 +0200
Subject: [PATCH 24/28] python3Packages.matter-python-client: 0.6.4 -> 0.6.8

https://github.com/matter-js/matterjs-server/compare/v0.6.4...v0.6.8
---
 .../python-modules/matter-python-client/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matter-python-client/default.nix b/pkgs/development/python-modules/matter-python-client/default.nix
index 26c3308dde0e..31a8b90d8816 100644
--- a/pkgs/development/python-modules/matter-python-client/default.nix
+++ b/pkgs/development/python-modules/matter-python-client/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "matter-python-client";
-  version = "0.6.4";
+  version = "0.6.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "matter-js";
     repo = "matterjs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iHTc5PDlg4KvOY+oY9GU2l/pPNMrnmIyFqxjCL7w0kw=";
+    hash = "sha256-EfngXyT802jG6zjCpOIUwKZG4MUJ/DLIsIHDEwwQ+XI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python_client";

From 36072e25a421e9b46d1242fed30e540be52981dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 01:02:26 +0000
Subject: [PATCH 25/28] kdePackages.ktextaddons: 2.0.1 -> 2.0.2

---
 pkgs/kde/misc/ktextaddons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index f8f8eb1020cd..397b97686aed 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-tSNWvgchXwrOC44qbfi82PNXLvXAr/iWMbBDsQrbDIo=";
+    hash = "sha256-DX+CqXbvaC9FgisiHi8VzvwAOUiLyMcAprDnWUquveo=";
   };
 
   extraBuildInputs = [

From 71daeebef101d47dc3494383b22972f17efa2e67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 01:07:15 +0000
Subject: [PATCH 26/28] avdl: 0.1.8+1.12.1 -> 0.1.9+1.12.1

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

diff --git a/pkgs/by-name/av/avdl/package.nix b/pkgs/by-name/av/avdl/package.nix
index a9a20ec96ab6..73fc9d463746 100644
--- a/pkgs/by-name/av/avdl/package.nix
+++ b/pkgs/by-name/av/avdl/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "avdl";
-  version = "0.1.8+1.12.1";
+  version = "0.1.9+1.12.1";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "avdl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NQ0IUC51tKfcREQRQLjdxj8+TKw/I2yRMlNIcG158aM=";
+    hash = "sha256-HfcDSv3RzmoFbwt7iAP/UXdeJupfng8oeaeerUwW1Ik=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-8GoS31OxpvtWfT+DcHIa6a6+YlrhmO/YkV7YSd2vrd4=";
+  cargoHash = "sha256-5ftBXywOUQKzIwjaQVHtxO/6A1bb1jGZAxYYY7GttCg=";
 
   meta = {
     description = "Rust port of avro-tools' IDL tooling";

From 8dd181f77c57596ef0d086d6410f4c3c2dfe2af5 Mon Sep 17 00:00:00 2001
From: Bet4 <0xbet4@gmail.com>
Date: Wed, 13 May 2026 10:18:06 +0800
Subject: [PATCH 27/28] marktext: fix build

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

diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix
index e27e971ca820..6f3503763737 100644
--- a/pkgs/by-name/ma/marktext/package.nix
+++ b/pkgs/by-name/ma/marktext/package.nix
@@ -8,6 +8,7 @@
   nodejs,
   electron,
   python3,
+  node-gyp,
   libx11,
   xorgproto,
   libxkbfile,
@@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     (python3.withPackages (ps: with ps; [ packaging ]))
     pkg-config
     nodejs
+    node-gyp
     node-gyp-build
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [

From 46407b9000d1880c03eaa591c7f0cdf12cc25e51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 May 2026 05:11:18 +0000
Subject: [PATCH 28/28] context7-mcp: 2.2.3 -> 2.2.5

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

diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index 7544d9edaa64..5cc0be16a4c2 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "context7-mcp";
-  version = "2.2.3";
+  version = "2.2.5";
 
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
     tag = "${tag-prefix}@${finalAttrs.version}";
-    hash = "sha256-Vse6mOfzDC65V3qoL1tZu5S9DU93PmVNI8NRm94Gcn8=";
+    hash = "sha256-ozUFnUFyxQ8M0W2e2Pr+uXrinI4LJoeSEQi3ZMPwPc4=";
   };
 
   nativeBuildInputs = [