From 40c21b15cdee8302afb5d89a140daf0114fdf147 Mon Sep 17 00:00:00 2001
From: Gaute Ravndal <gaute.ravndal@gmail.com>
Date: Sat, 10 Jan 2026 09:12:57 +0100
Subject: [PATCH 001/389] nixos/programs/fish: set absolute path in
 babelfishTranslate

Babelfish translates `source script.sh` to `argv0 < script.sh | source`,
which is impure, and breaks when babelfish isn't in `systemPackages`.

To fix this, exec babelfish with argv0 set to babelfish from the final
system.
---
 nixos/modules/programs/fish.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 98915f530e82..4c622bd7dcfc 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -48,7 +48,7 @@ let
     path: name:
     pkgs.runCommandLocal "${name}.fish" {
       nativeBuildInputs = [ pkgs.babelfish ];
-    } "babelfish < ${path} > $out;";
+    } "exec -a ${lib.getExe pkgs.babelfish} babelfish < ${path} > $out;";
 in
 {
   options = {

From 5b851ac087c537cabbde84e0102185b971f52bf8 Mon Sep 17 00:00:00 2001
From: Ignacio Perez <ignacio@feuer.me>
Date: Mon, 26 Jan 2026 15:31:02 -0300
Subject: [PATCH 002/389] cartero: 25 -> 26

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

diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix
index a80124417b7b..0920e8c67502 100644
--- a/pkgs/by-name/ca/cartero/package.nix
+++ b/pkgs/by-name/ca/cartero/package.nix
@@ -24,18 +24,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cartero";
-  version = "25.0";
+  version = "26.0";
 
   src = fetchFromGitHub {
     owner = "danirod";
     repo = "cartero";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XUf5Gfg+ZyyzcbZYSxFTM4ot84FF2bgGJoQg2ZAIZ3g=";
+    hash = "sha256-EBQqJuIcgpLtRu5DcAaWnCiFyiuuG+DCkdAWsoWwn3E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-T1OR8okOm5hFYsRLqqNYhP39Av/veHnoomkC29/JyAY=";
+    hash = "sha256-Te6foGMcy8q0u6wn/D4RkhoOEjke5HTv3xxaS2EbiIE=";
   };
 
   nativeBuildInputs = [

From 6f1cdfed2083f59854add1d1793eeeb3673d3ece Mon Sep 17 00:00:00 2001
From: andreashgk <andreas@hgk.me>
Date: Mon, 2 Feb 2026 14:06:19 +0100
Subject: [PATCH 003/389] iroh-{dns-server,relay}: 0.95.1 -> 0.96.0

---
 pkgs/tools/networking/iroh/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix
index fdb4f8196b53..86d3af8ead0e 100644
--- a/pkgs/tools/networking/iroh/default.nix
+++ b/pkgs/tools/networking/iroh/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  lld,
   fetchFromGitHub,
   rustPlatform,
 }:
@@ -11,16 +12,16 @@ let
     }:
     rustPlatform.buildRustPackage rec {
       pname = name;
-      version = "0.95.1";
+      version = "0.96.0";
 
       src = fetchFromGitHub {
         owner = "n0-computer";
         repo = "iroh";
         rev = "v${version}";
-        hash = "sha256-YxifH/mH6x6b8J5xyG+/f18o9ngmiLVKvRaDgIv3ok8=";
+        hash = "sha256-J7FiKIBFUnTUJJwzwzfyk7+CK0UKlAPNFjVDDGlHMqM=";
       };
 
-      cargoHash = "sha256-MdJpGCLf90fTjbJKHCrLLZbLyb4gmQn4SsF5iCqNVVI=";
+      cargoHash = "sha256-W8PVysQffGuxBIDpcZ77ujOQ5KBED6svwEXPeZpQmTc=";
 
       buildFeatures = cargoFeatures;
       cargoBuildFlags = [
@@ -28,6 +29,10 @@ let
         name
       ];
 
+      nativeBuildInputs = [
+        lld
+      ];
+
       # Some tests require network access which is not available in nix build sandbox.
       doCheck = false;
 

From a7d4d7418ba835b695de85e4d82c2ec9423ba146 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Fri, 6 Feb 2026 13:03:15 +0100
Subject: [PATCH 004/389] nixos/netbird: fixes login not working properly on
 first login

When the netbird client is initially started, the first status
command will return a seemingly normal output which contains
`Peers 0/0 Connected`. This is treated as if already logged in,
which is not the case, as a subsequent status command will
display the `NeedsLogin` message. This PR fixes that, by
checking for `: Connected`, which is used in e.g. `Managament: Connected`,
---
 nixos/modules/services/networking/netbird.nix | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index 9012d448e33b..e675ebe897e6 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -760,35 +760,25 @@ in
             };
 
             environment.NB_SETUP_KEY_FILE = "%d/setup-key";
-            /*
-              might want to do something similar to the docker entrypoint (watching log messages) instead
-              see https://github.com/netbirdio/netbird/blob/dc30dcacce4c322502975f1f491e6774efd7e1e9/client/netbird-entrypoint.sh
-            */
+
             script = ''
               set -x
-              # uses a file on a `tmpfs`, because variable updates get lost in the loop
-              status_file="/tmp/status.txt"
 
-              refresh_status() {
-                '${lib.getExe client.wrapper}' status &>"$status_file" || :
-              }
-
-              print_short_setup_key() {
-                cut -b1-8 <"$NB_SETUP_KEY_FILE"
+              get_status() {
+                '${lib.getExe client.wrapper}' status 2>&1 || :
               }
 
               main() {
-                refresh_status
-                <"$status_file" sed 's/^/STATUS:PRE-CONNECT : /g'
-
-                until refresh_status && <"$status_file" grep --quiet 'Connected\|NeedsLogin' ; do
+                # grep for `: Connected` as well, as `Connected` appears other
+                # places even when not connected, and before NeedsLogin
+                until get_status | grep --quiet ': Connected\|NeedsLogin' ; do
                   sleep 1
                 done
-                <"$status_file" sed 's/^/STATUS:POST-CONNECT: /g'
 
-                if <"$status_file" grep --quiet 'NeedsLogin' ; then
-                  echo "Using Setup Key File with key: $(print_short_setup_key)" >&2
-                  '${lib.getExe client.wrapper}' up --setup-key-file="$NB_SETUP_KEY_FILE"
+                if get_status | grep --quiet 'NeedsLogin' ; then
+                  # setup key is in $NB_SETUP_KEY_FILE, and is
+                  # automatically picked up by the cli
+                  '${lib.getExe client.wrapper}' up
                 fi
               }
 

From 2930054a0da19f4c3a8303172c2e58a8e1624a7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Feb 2026 16:07:30 +0000
Subject: [PATCH 005/389] z3: 4.15.8 -> 4.16.0

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

diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index 6378631ee7fc..afb9666777ee 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -29,13 +29,13 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "z3";
-  version = "4.15.8";
+  version = "4.16.0";
 
   src = fetchFromGitHub {
     owner = "Z3Prover";
     repo = "z3";
     rev = "z3-${finalAttrs.version}";
-    hash = "sha256-6HCymxICyxGUWD1aq5Vb1t/AYODFQ6ZzoOr3owr+nvY=";
+    hash = "sha256-DnhX3kxggnFmyYwXEPBsBA1rh4oor1oIJR5TMJk/jvc=";
   };
 
   patches = lib.optionals useCmakeBuild [

From adcd0616494d4c75f8bd291599d098a40bec871e Mon Sep 17 00:00:00 2001
From: commitmaniac <201806046+commitmaniac@users.noreply.github.com>
Date: Sun, 22 Feb 2026 17:05:00 -0500
Subject: [PATCH 006/389] ipatool: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix
index 977dede6cea9..ba8eaab711c1 100644
--- a/pkgs/by-name/ip/ipatool/package.nix
+++ b/pkgs/by-name/ip/ipatool/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ipatool";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "majd";
     repo = "ipatool";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-z6f5PNxAH+8mS2kWjhST0LFhwTR01m7rR5O95ee+p2E=";
+    hash = "sha256-ME3fvYziI3fjlQ0KBPMJJXsCG3hW0z2iz1gKoBh0grk=";
   };
 
-  vendorHash = "sha256-f6mXTePiM5kZUdrYqvbN5pyNp1OGNMeJZMUJ3pvaRrc=";
+  vendorHash = "sha256-TmP7NjDrxTcsnVU9Hi4S1wXSzQNCJOVH02j5QpjvMgw=";
 
   ldflags = [
     "-s"

From 41897c023f464cdcfb8ae1ec9db8b1d07ab3a1ee Mon Sep 17 00:00:00 2001
From: kpbaks <kristoffer.pbs@tuta.io>
Date: Mon, 23 Feb 2026 19:32:00 +0100
Subject: [PATCH 007/389] yaml-schema-router: init at 0.2.0

---
 .../by-name/ya/yaml-schema-router/package.nix | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/ya/yaml-schema-router/package.nix

diff --git a/pkgs/by-name/ya/yaml-schema-router/package.nix b/pkgs/by-name/ya/yaml-schema-router/package.nix
new file mode 100644
index 000000000000..b119eeafd653
--- /dev/null
+++ b/pkgs/by-name/ya/yaml-schema-router/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "yaml-schema-router";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "traiproject";
+    repo = "yaml-schema-router";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GFe5NPW8nxv+bQsG5G26WCf2Z6qrW1WAZBMWFZD8MFI=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Content-based JSON schema routing for yaml-language-server";
+    homepage = "https://github.com/traiproject/yaml-schema-router";
+    changelog = "https://github.com/traiproject/yaml-schema-router/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kpbaks ];
+    mainProgram = "yaml-schema-router";
+  };
+})

From 5a7178746709bb3781aa0fcd612bd169310e4037 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Feb 2026 22:56:58 +0000
Subject: [PATCH 008/389] kyverno: 1.16.2 -> 1.17.1

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

diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index a73c3a1a1717..f80f458e7865 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kyverno";
-  version = "1.16.2";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wXoqE3AZ5PQ8nxkJhfGrNdyJBKW8BF0loqqCs6A2Etg=";
+    hash = "sha256-/5ax23jkD+DlR9566ok09kXX0E0fZTH4x5/AyopKnr4=";
   };
 
   ldflags = [
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
   ];
 
-  vendorHash = "sha256-7zonEXXrd5+QaQQcgHwGwj665YB9gBxtE8Yi09SGsPU=";
+  vendorHash = "sha256-GTleFbdf7LYmtPaCYYpQ5NUdsP1nstzXIFJe75HajBY=";
 
   subPackages = [ "cmd/cli/kubectl-kyverno" ];
 

From 40e8630165883403f2065e3bff5bc004a9e9bea5 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 25 Feb 2026 21:57:38 +0900
Subject: [PATCH 009/389] magika-cli: 1.0.1 -> 1.0.2

Diff: https://github.com/google/magika/compare/cli/v1.0.1...cli/v1.0.2

- Remove `versionCheckProgramArg` to align style with 116036d574992ee61d97d16c4b065dca3f871974

- Set envs for ort-sys@2.0.0-rc.11 update

- Note: This version drops x86_64-darwin support.
  However, no updates to the `meta` section are needed:
  https://github.com/google/magika/commit/6236689eee514912453b34b8a61a03dc6f25315c
---
 pkgs/by-name/ma/magika-cli/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/magika-cli/package.nix b/pkgs/by-name/ma/magika-cli/package.nix
index 9184d58d9b9b..6ea3a46014cc 100644
--- a/pkgs/by-name/ma/magika-cli/package.nix
+++ b/pkgs/by-name/ma/magika-cli/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "magika-cli";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "magika";
     tag = "cli/v${finalAttrs.version}";
-    hash = "sha256-g/fnSdh2jpOHOLTuR4DUPB1kbC0eKADHLKcfB1q08XI=";
+    hash = "sha256-1WJRkqFQqlSFzr4wkEbRwj1WoxDKTG/1OCtC+914ryY=";
   };
 
-  cargoHash = "sha256-uqnTyedry9nWyO2518r0D3hk6oWb4wQE/Ku0cOkSjBA=";
+  cargoHash = "sha256-rA+GYCWuinwRVWf3VuFbPgmAwl3vDsaxLjCtsKMtpiU=";
 
   cargoRoot = "rust/cli";
   buildAndTestSubdir = finalAttrs.cargoRoot;
@@ -41,13 +41,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env = {
     OPENSSL_NO_VENDOR = "true";
+    ORT_STRATEGY = "system";
+    ORT_LIB_LOCATION = "${lib.getLib onnxruntime}/lib";
+
+    # Required to prevent "ort-sys could not link to the ONNX Runtime build":
+    # https://github.com/pykeio/ort/issues/517#issuecomment-3761926178
+    ORT_PREFER_DYNAMIC_LINK = "true";
   };
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests = {

From 9070363bfc882c60f4af9a608bd4711618e15e90 Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Thu, 29 Jan 2026 07:37:33 +1100
Subject: [PATCH 010/389] rustcast: init at 0.5.6

Co-authored-by: Hythera <87016780+Hythera@users.noreply.github.com>
---
 pkgs/by-name/ru/rustcast/package.nix | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ru/rustcast/package.nix

diff --git a/pkgs/by-name/ru/rustcast/package.nix b/pkgs/by-name/ru/rustcast/package.nix
new file mode 100644
index 000000000000..e8da09e7e8db
--- /dev/null
+++ b/pkgs/by-name/ru/rustcast/package.nix
@@ -0,0 +1,35 @@
+{
+  nix-update-script,
+  fetchFromGitHub,
+  rustPlatform,
+  apple-sdk,
+  lib,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "rustcast";
+  version = "0.5.6";
+
+  src = fetchFromGitHub {
+    owner = "unsecretised";
+    repo = "rustcast";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-88vg+xdASskbYwLbEPGmHf8P1PL4PihJDXT1ua/cfCQ=";
+  };
+
+  nativeBuildInputs = [
+    apple-sdk
+  ];
+
+  cargoHash = "sha256-IvpvbsnWWI1I/1PmVfP6qXf8DzRknRBJjMixUp01xo8=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/unsecretised/rustcast/releases/tag/v${finalAttrs.version}";
+    description = "Modern Spotlight Alternative made opensource";
+    homepage = "https://github.com/unsecretised/rustcast";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ eveeifyeve ];
+  };
+})

From 1d2cd594f96f2072416d216c42903359c18fd1ea Mon Sep 17 00:00:00 2001
From: Alexander Hernandez <ahernandezjr0@gmail.com>
Date: Tue, 3 Mar 2026 03:23:36 -0600
Subject: [PATCH 011/389] rimsort: 1.0.47 -> 1.0.73

---
 pkgs/by-name/ri/rimsort/package.nix     | 10 +++++++---
 pkgs/by-name/ri/rimsort/steam-run.patch | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ri/rimsort/package.nix b/pkgs/by-name/ri/rimsort/package.nix
index 562cd797a68b..ef675ed6a5bc 100644
--- a/pkgs/by-name/ri/rimsort/package.nix
+++ b/pkgs/by-name/ri/rimsort/package.nix
@@ -16,13 +16,13 @@
 }:
 let
   pname = "rimsort";
-  version = "1.0.47";
+  version = "1.0.73";
 
   src = fetchFromGitHub {
     owner = "RimSort";
     repo = "RimSort";
     rev = "v${version}";
-    hash = "sha256-1wn3WIflrhH3IMBeGFwcHi0zOREakuk/5gqwPY720eA=";
+    hash = "sha256-xNmJ1XvnLTKhicVchzG9CQtRVoZjRkBEvfn/WWesDRU=";
     fetchSubmodules = true;
   };
 
@@ -111,10 +111,14 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   nativeCheckInputs = with python3Packages; [
+    aiohttp
+    pytest-asyncio
     pytestCheckHook
     pytest-cov-stub
+    pytest-mock
     pytest-qt
     pytest-xvfb
+    rapidfuzz
   ];
 
   doCheck = true;
@@ -126,7 +130,7 @@ stdenv.mkDerivation {
   '';
 
   disabledTestPaths = [
-    # requires network
+    # requires network (clones GitHub: Community-Rules-Database, Steam-Workshop-Database)
     "tests/models/metadata/test_metadata_factory.py"
   ];
 
diff --git a/pkgs/by-name/ri/rimsort/steam-run.patch b/pkgs/by-name/ri/rimsort/steam-run.patch
index 6d22eaf62064..ce7193a77983 100644
--- a/pkgs/by-name/ri/rimsort/steam-run.patch
+++ b/pkgs/by-name/ri/rimsort/steam-run.patch
@@ -2,17 +2,17 @@ diff --git a/app/utils/generic.py b/app/utils/generic.py
 index f23aa5c..9ff4a04 100644
 --- a/app/utils/generic.py
 +++ b/app/utils/generic.py
-@@ -260,6 +260,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
-                 + str(args)
-                 + "`"
-             )
-+
-+            args = [executable_path, *args]
-+            executable_path = "@steam-run@/bin/steam-run"
-+
-             pid, popen_args = launch_process(
-                 executable_path, args, str(game_install_path)
-             )
+@@ -299,7 +299,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
+     logger.info(
+         f"Launching the game with subprocess.Popen(): `{executable_path}` "
+         f"with env_vars: {list(env_vars.keys())}, wrappers: {wrapper_commands}, args: {game_args}"
+     )
++    if sys.platform == "linux":
++        game_args = [executable_path] + game_args
++        executable_path = "@steam-run@/bin/steam-run"
+     pid, popen_args = launch_process(
+         executable_path,
+         game_args,
 diff --git a/app/utils/steam/steamcmd/wrapper.py b/app/utils/steam/steamcmd/wrapper.py
 index 398e0fd..79bb162 100644
 --- a/app/utils/steam/steamcmd/wrapper.py
@@ -24,7 +24,7 @@ index 398e0fd..79bb162 100644
 -                self.steamcmd,
 -                [f'+runscript "{script_path}"'],
 +                "@steam-run@/bin/steam-run",
-+                [self.steamcmd,  f'+runscript "{script_path}"'],
++                [self.steamcmd, f'+runscript "{script_path}"'],
                  len(publishedfileids),
              )
          else:

From 42d97148a41b93703ab31526aedd58a51a5e0bd5 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Thu, 5 Mar 2026 12:09:02 +0100
Subject: [PATCH 012/389] phpPackages.php-cs-fixer: add updateScript

---
 .../php-packages/php-cs-fixer/default.nix     |  2 ++
 .../php-packages/php-cs-fixer/update.sh       | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100755 pkgs/development/php-packages/php-cs-fixer/update.sh

diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index 0fe964af6b9c..cf9fe25e48b0 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -22,6 +22,8 @@ php.buildComposerProject2 (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
     description = "Tool to automatically fix PHP coding standards issues";
diff --git a/pkgs/development/php-packages/php-cs-fixer/update.sh b/pkgs/development/php-packages/php-cs-fixer/update.sh
new file mode 100755
index 000000000000..1be73ee41aaf
--- /dev/null
+++ b/pkgs/development/php-packages/php-cs-fixer/update.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq php82.packages.composer nix-update coreutils
+
+set -eou pipefail
+
+PACKAGE_NAME="phpPackages.php-cs-fixer"
+PACKAGE_VERSION=$(nix eval --raw -f. $PACKAGE_NAME.version)
+PACKAGE_DIR="$(dirname "${BASH_SOURCE[0]}")"
+
+# Get latest version from git
+GIT_VERSION="$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/releases/latest" | jq '.tag_name' --raw-output)"
+NEW_VERSION="${GIT_VERSION#v}"
+
+# Fail if package and git version are the same
+if [[ "$PACKAGE_VERSION" == "$NEW_VERSION" ]]; then
+    echo "${PACKAGE_NAME} is up-to-date: ${PACKAGE_VERSION}"
+    exit 0
+fi
+
+# Generate composer.lock file
+TMPDIR=$(mktemp -d)
+trap 'rm -rf -- "${TMPDIR}"' EXIT
+
+git clone --depth 1 --branch "${GIT_VERSION}" https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git "${TMPDIR}/php-cs-fixer"
+rm -f "${TMPDIR}/php-cs-fixer/composer.lock"
+composer -d "${TMPDIR}/php-cs-fixer" update --no-scripts
+cp "${TMPDIR}/php-cs-fixer/composer.lock" "${PACKAGE_DIR}/composer.lock"
+
+# update package.nix version, hash and vendorHash
+nix-update $PACKAGE_NAME --version="${NEW_VERSION}"

From 8a9c90e696a7f0e68e04bce1447091850fe46ca1 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Sat, 13 Dec 2025 22:36:00 +0800
Subject: [PATCH 013/389] nixos/zswap: init module

---
 nixos/modules/module-list.nix       |   1 +
 nixos/modules/system/boot/zswap.nix | 170 ++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 nixos/modules/system/boot/zswap.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 430872242d57..63bda8834a70 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1895,6 +1895,7 @@
   ./system/boot/unl0kr.nix
   ./system/boot/uvesafb.nix
   ./system/boot/zram-as-tmp.nix
+  ./system/boot/zswap.nix
   ./system/etc/etc-activation.nix
   ./system/service/systemd/system.nix
   ./system/service/systemd/user.nix
diff --git a/nixos/modules/system/boot/zswap.nix b/nixos/modules/system/boot/zswap.nix
new file mode 100644
index 000000000000..827539baef6e
--- /dev/null
+++ b/nixos/modules/system/boot/zswap.nix
@@ -0,0 +1,170 @@
+# Zswap - Compressed Cache for Swap Pages
+#
+# Reference documentation:
+# - https://docs.kernel.org/admin-guide/mm/zswap.html
+# - https://www.kernel.org/doc/html/v6.1/admin-guide/mm/zswap.html
+#
+# IMPORTANT: When modifying this file, ensure that activationScripts implementation
+# remains consistent with config implementation (kernel parameters and sysfs settings)
+
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.boot.zswap;
+
+  # Get the current configured kernel version string
+  kernelVersion = config.boot.kernelPackages.kernel.version;
+
+  # Check if kernel supports zsmalloc as zswap backend (>= 6.3)
+  zsmallocSupported = versionAtLeast kernelVersion "6.3";
+in
+{
+  options.boot.zswap = {
+    enable = mkEnableOption "Zswap (Compressed Cache for Swap Pages)";
+
+    compressor = mkOption {
+      type = types.enum [
+        "zstd"
+        "lz4"
+        "lzo"
+        "lz4hc"
+        "deflate"
+        "842"
+      ];
+      default = "zstd";
+      description = ''
+        Compression algorithm to use for zswap.
+
+        Available options:
+        - 'zstd': Best compression ratio, excellent for Nix builds (default)
+        - 'lz4': Fastest compression, lowest latency
+        - 'lz4hc': High-compression variant of lz4, slower but better ratio
+        - 'lzo': Good balance of speed and compression (kernel default)
+        - 'deflate': Higher compression, slower processing
+        - '842': Hardware-accelerated compression on supported systems
+
+        Note: The chosen algorithm must be supported by your kernel configuration.
+      '';
+    };
+
+    zpool = mkOption {
+      type = types.enum [
+        "zsmalloc"
+        "zbud"
+      ];
+      default = if zsmallocSupported then "zsmalloc" else "zbud";
+      defaultText = literalExpression "if kernel >= 6.3 then \"zsmalloc\" else \"zbud\"";
+      description = ''
+        Kernel zpool allocator.
+        'zsmalloc' is strongly recommended for kernels >= 6.3 as it offers the best density.
+        For older kernels, 'zbud' is the fallback.
+
+        Note: 'z3fold' was removed from Linux kernel 6.8 and later.
+      '';
+    };
+
+    maxPoolPercent = mkOption {
+      type = types.ints.between 1 100;
+      default = 25;
+      description = ''
+        The maximum percentage of system memory that Zswap can occupy (1-100).
+
+        Higher values provide more compression cache but increase memory pressure.
+        Default is 25% (higher than kernel default of 20%) for better Nix build performance.
+
+        Recommended ranges:
+        - Desktop systems: 15-25%
+        - Low-memory systems: 30-50%
+        - Server systems: 10-20%
+      '';
+    };
+
+    acceptThresholdPercent = mkOption {
+      type = types.ints.between 1 100;
+      default = 90;
+      description = ''
+        Threshold percentage at which zswap starts accepting pages again after the pool becomes full (1-100).
+
+        This parameter provides hysteresis to prevent pool oscillation.
+        When the pool usage drops below this threshold, zswap starts accepting new pages.
+        Default is 90% as recommended by kernel documentation.
+      '';
+    };
+
+    shrinkerEnabled = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Enable the zswap shrinker to reclaim memory when under pressure.
+
+        When enabled, the shrinker will automatically reclaim compressed pages
+        from the zswap pool when the system is under memory pressure, helping
+        to prevent out-of-memory situations.
+
+        It is recommended to keep this enabled for most workloads, especially
+        on systems with limited memory.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # 1. Core configuration: kernel parameters
+    boot.kernelParams = [
+      "zswap.enabled=1"
+      "zswap.compressor=${cfg.compressor}"
+      "zswap.zpool=${cfg.zpool}"
+      "zswap.max_pool_percent=${toString cfg.maxPoolPercent}"
+      "zswap.accept_threshold_percent=${toString cfg.acceptThresholdPercent}"
+      "zswap.shrinker_enabled=${if cfg.shrinkerEnabled then "1" else "0"}"
+    ];
+
+    # 2. Dependency management: ensure required modules are included in initrd or kernel
+    # This ensures Zswap is ready early in the boot process (before swap is mounted)
+    boot.initrd.kernelModules = [
+      cfg.compressor
+      cfg.zpool
+    ];
+
+    assertions = [
+      {
+        assertion = !config.zramSwap.enable;
+        message = ''
+          Conflicting options enabled: 'boot.zswap.enable' and 'zramSwap.enable'.
+
+          You cannot enable Zswap and Zram simultaneously as it leads to double compression
+          and inefficient memory management.
+
+          Please disable one of them:
+            - To use Zswap (requires a physical swap device): Set 'zramSwap.enable = false'.
+            - To use Zram (swap in RAM): Set 'boot.zswap.enable = false'.
+        '';
+      }
+      {
+        assertion = config.swapDevices != [ ];
+        message = ''
+          Zswap requires at least one physical swap device to function as a backing store.
+
+          Try adding the following to your configuration (example):
+
+          swapDevices = [ {
+            device = "/var/lib/swapfile";
+            size = 16 * 1024; # 16GB
+          } ];
+        '';
+      }
+      {
+        assertion = (cfg.zpool == "zsmalloc") -> zsmallocSupported;
+        message = ''
+          Zswap allocator 'zsmalloc' is not supported on kernel version ${kernelVersion}.
+          Support for zsmalloc in Zswap was added in Linux 6.3.
+
+          Please use 'zbud' instead: boot.zswap.zpool = "zbud";
+        '';
+      }
+    ];
+  };
+
+  meta.maintainers = with lib.maintainers; [ luochen1990 ];
+}

From c1870198aa5bd254efc932b11aa6d1475a195275 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Sat, 13 Dec 2025 22:36:09 +0800
Subject: [PATCH 014/389] nixos/zswap: add activationScripts

---
 nixos/modules/system/boot/zswap.nix | 52 +++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/nixos/modules/system/boot/zswap.nix b/nixos/modules/system/boot/zswap.nix
index 827539baef6e..e69a71a658b5 100644
--- a/nixos/modules/system/boot/zswap.nix
+++ b/nixos/modules/system/boot/zswap.nix
@@ -127,6 +127,58 @@ in
       cfg.zpool
     ];
 
+    # 3. Activation scripts for runtime configuration and rebuild handling
+    system.activationScripts.zswap-stop = {
+      supportsDryActivation = true;
+      deps = [ "specialfs" ];
+      text = ''
+        # Stop zswap during system rebuild to prevent state conflicts
+        # This script runs before the new configuration is activated
+        if [ -f /sys/module/zswap/parameters/enabled ]; then
+          current_enabled=$(cat /sys/module/zswap/parameters/enabled)
+          if [ "$current_enabled" = "Y" ] || [ "$current_enabled" = "1" ]; then
+            echo "Stopping zswap for system rebuild..."
+            # Disable zswap to clear any existing state
+            echo N > /sys/module/zswap/parameters/enabled 2>/dev/null || true
+            # Wait a moment for the disable to take effect
+            sleep 1
+          fi
+        fi
+      '';
+    };
+
+    system.activationScripts.zswap-start = {
+      supportsDryActivation = true;
+      deps = [
+        "zswap-stop"
+        "filesystems"
+      ];
+      text = ''
+        # Start zswap with the configured parameters
+        # This script runs after the new configuration is activated
+        if [ -f /sys/module/zswap/parameters/enabled ]; then
+          echo "Starting zswap with configured parameters..."
+
+          # Configure zswap parameters via sysfs
+          # Note: These may already be set via kernel parameters, but we set them
+          # here to ensure they're correct even if the kernel parameters change
+          echo ${cfg.compressor} > /sys/module/zswap/parameters/compressor 2>/dev/null || true
+          echo ${cfg.zpool} > /sys/module/zswap/parameters/zpool 2>/dev/null || true
+          echo ${toString cfg.maxPoolPercent} > /sys/module/zswap/parameters/max_pool_percent 2>/dev/null || true
+          echo ${toString cfg.acceptThresholdPercent} > /sys/module/zswap/parameters/accept_threshold_percent 2>/dev/null || true
+          echo Y > /sys/module/zswap/parameters/same_filled_pages_enabled 2>/dev/null || true
+          echo Y > /sys/module/zswap/parameters/writeback 2>/dev/null || true
+
+          # Enable zswap
+          echo Y > /sys/module/zswap/parameters/enabled 2>/dev/null || true
+
+          echo "Zswap enabled with compressor=${cfg.compressor}, zpool=${cfg.zpool}, max_pool_percent=${toString cfg.maxPoolPercent}%, accept_threshold_percent=${toString cfg.acceptThresholdPercent}%"
+        else
+          echo "Warning: zswap sysfs interface not available. Check kernel configuration."
+        fi
+      '';
+    };
+
     assertions = [
       {
         assertion = !config.zramSwap.enable;

From 9bcddd22fd5454aaa97345975837518686dd658c Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Sat, 13 Dec 2025 22:36:25 +0800
Subject: [PATCH 015/389] nixos/zswap: use boot.kernel.sysfs to simplify
 dynamic reload

---
 nixos/modules/system/boot/zswap.nix | 66 ++++++-----------------------
 1 file changed, 13 insertions(+), 53 deletions(-)

diff --git a/nixos/modules/system/boot/zswap.nix b/nixos/modules/system/boot/zswap.nix
index e69a71a658b5..bc5c3d97159a 100644
--- a/nixos/modules/system/boot/zswap.nix
+++ b/nixos/modules/system/boot/zswap.nix
@@ -4,8 +4,9 @@
 # - https://docs.kernel.org/admin-guide/mm/zswap.html
 # - https://www.kernel.org/doc/html/v6.1/admin-guide/mm/zswap.html
 #
-# IMPORTANT: When modifying this file, ensure that activationScripts implementation
-# remains consistent with config implementation (kernel parameters and sysfs settings)
+# IMPORTANT: When modifying this file, ensure that boot.kernel.sysfs configuration
+# remains consistent with kernel parameters configuration. The sysfs settings provide
+# runtime management while kernel parameters ensure early-boot availability.
 
 { config, lib, ... }:
 
@@ -110,7 +111,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    # 1. Core configuration: kernel parameters
+    # 1. Core configuration: kernel parameters for early boot
     boot.kernelParams = [
       "zswap.enabled=1"
       "zswap.compressor=${cfg.compressor}"
@@ -127,56 +128,15 @@ in
       cfg.zpool
     ];
 
-    # 3. Activation scripts for runtime configuration and rebuild handling
-    system.activationScripts.zswap-stop = {
-      supportsDryActivation = true;
-      deps = [ "specialfs" ];
-      text = ''
-        # Stop zswap during system rebuild to prevent state conflicts
-        # This script runs before the new configuration is activated
-        if [ -f /sys/module/zswap/parameters/enabled ]; then
-          current_enabled=$(cat /sys/module/zswap/parameters/enabled)
-          if [ "$current_enabled" = "Y" ] || [ "$current_enabled" = "1" ]; then
-            echo "Stopping zswap for system rebuild..."
-            # Disable zswap to clear any existing state
-            echo N > /sys/module/zswap/parameters/enabled 2>/dev/null || true
-            # Wait a moment for the disable to take effect
-            sleep 1
-          fi
-        fi
-      '';
-    };
-
-    system.activationScripts.zswap-start = {
-      supportsDryActivation = true;
-      deps = [
-        "zswap-stop"
-        "filesystems"
-      ];
-      text = ''
-        # Start zswap with the configured parameters
-        # This script runs after the new configuration is activated
-        if [ -f /sys/module/zswap/parameters/enabled ]; then
-          echo "Starting zswap with configured parameters..."
-
-          # Configure zswap parameters via sysfs
-          # Note: These may already be set via kernel parameters, but we set them
-          # here to ensure they're correct even if the kernel parameters change
-          echo ${cfg.compressor} > /sys/module/zswap/parameters/compressor 2>/dev/null || true
-          echo ${cfg.zpool} > /sys/module/zswap/parameters/zpool 2>/dev/null || true
-          echo ${toString cfg.maxPoolPercent} > /sys/module/zswap/parameters/max_pool_percent 2>/dev/null || true
-          echo ${toString cfg.acceptThresholdPercent} > /sys/module/zswap/parameters/accept_threshold_percent 2>/dev/null || true
-          echo Y > /sys/module/zswap/parameters/same_filled_pages_enabled 2>/dev/null || true
-          echo Y > /sys/module/zswap/parameters/writeback 2>/dev/null || true
-
-          # Enable zswap
-          echo Y > /sys/module/zswap/parameters/enabled 2>/dev/null || true
-
-          echo "Zswap enabled with compressor=${cfg.compressor}, zpool=${cfg.zpool}, max_pool_percent=${toString cfg.maxPoolPercent}%, accept_threshold_percent=${toString cfg.acceptThresholdPercent}%"
-        else
-          echo "Warning: zswap sysfs interface not available. Check kernel configuration."
-        fi
-      '';
+    # 3. Runtime configuration using boot.kernel.sysfs
+    # This ensures zswap parameters are properly set and maintained during system rebuilds
+    boot.kernel.sysfs.module.zswap.parameters = {
+      enabled = true;
+      compressor = cfg.compressor;
+      zpool = cfg.zpool;
+      max_pool_percent = cfg.maxPoolPercent;
+      accept_threshold_percent = cfg.acceptThresholdPercent;
+      shrinker_enabled = true;
     };
 
     assertions = [

From 52186e6c48c4e45b582052a1cfb9826035eca05f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2026 08:09:13 +0000
Subject: [PATCH 016/389] phpPackages.castor: 1.2.0 -> 1.3.0

---
 pkgs/development/php-packages/castor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix
index 663988548b5a..f3c33e6c3b9c 100644
--- a/pkgs/development/php-packages/castor/default.nix
+++ b/pkgs/development/php-packages/castor/default.nix
@@ -9,16 +9,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "castor";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "jolicode";
     repo = "castor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yTfSRB+Kr244lX4uIttCJltunGe3C67Ti8EUkZQsOIA=";
+    hash = "sha256-C/Pdw4bGJmt94wPCKFAAPq4w9Gh5eEjOLoqZG5PDQT8=";
   };
 
-  vendorHash = "sha256-OkW7I8nowjqd3bmvQwnqog6V73T9C+F763/QNcCXZNM=";
+  vendorHash = "sha256-QEaz11lWQVnQi5AoouFCQsDomRFVAg0v5xx/4TwVoXA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ee979d9ced99bc2d7aae6bde0b07acaf84d4596e Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sun, 8 Mar 2026 21:16:08 +0100
Subject: [PATCH 017/389] python3Packages.kaldi-native-fbank: init at 1.22.3

---
 .../kaldi-native-fbank/default.nix            | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/kaldi-native-fbank/default.nix

diff --git a/pkgs/development/python-modules/kaldi-native-fbank/default.nix b/pkgs/development/python-modules/kaldi-native-fbank/default.nix
new file mode 100644
index 000000000000..3d1d2d78009a
--- /dev/null
+++ b/pkgs/development/python-modules/kaldi-native-fbank/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cmake,
+  setuptools,
+  pybind11,
+  kissfft,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "kaldi-native-fbank";
+  version = "1.22.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "csukuangfj";
+    repo = "kaldi-native-fbank";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Wu4wM52T6NoQ1t5/iAyPtkEGnZki5P0jx0eYMFZMb5o=";
+  };
+
+  build-system = [
+    cmake
+    setuptools
+  ];
+
+  buildInputs = [ pybind11 ];
+
+  dontUseCmakeConfigure = true;
+
+  env.KALDI_NATIVE_FBANK_CMAKE_ARGS = lib.concatStringsSep " " [
+    "-DFETCHCONTENT_SOURCE_DIR_KISSFFT=${kissfft.src}"
+    "-DFETCHCONTENT_SOURCE_DIR_PYBIND11=${pybind11.src}"
+    "-DKALDI_NATIVE_FBANK_BUILD_TESTS=OFF"
+    "-DKALDI_NATIVE_FBANK_BUILD_PYTHON=ON"
+  ];
+
+  pythonImportsCheck = [ "kaldi_native_fbank" ];
+
+  meta = {
+    description = "Kaldi-compatible online fbank extractor without external dependencies";
+    homepage = "https://github.com/csukuangfj/kaldi-native-fbank";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lach ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71cde6210b1a..cc7d09532fa2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8149,6 +8149,8 @@ self: super: with self; {
 
   kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { };
 
+  kaldi-native-fbank = callPackage ../development/python-modules/kaldi-native-fbank { };
+
   kaleido = callPackage ../development/python-modules/kaleido { };
 
   kalshi-python = callPackage ../development/python-modules/kalshi-python { };

From 86096c22912605eea82a54cd8683538c9bb5c7ba Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Wed, 11 Mar 2026 11:12:44 +0100
Subject: [PATCH 018/389] grafanaPlugins.grafana-clickhouse-datasource: 4.8.2
 -> 4.14.0

---
 .../plugins/grafana-clickhouse-datasource/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
index 594465af314a..9666486063f4 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin rec {
   pname = "grafana-clickhouse-datasource";
-  version = "4.8.2";
+  version = "4.14.0";
   zipHash = {
-    x86_64-linux = "sha256-gegkpks7KIHKUG3nmNzEulbhH18eOsx8Afr0tprHFkk=";
-    aarch64-linux = "sha256-wvde2c+goezC1xFPZZ9MnHEk287E2ScyExKNXDTbcT8=";
-    x86_64-darwin = "sha256-zS9LfvSOWCKQIv5GsRS48taM31ZN4i2REY+IIQbqisk=";
-    aarch64-darwin = "sha256-0QfTdgOkfs27EW1VB+AgHPwF1GRcFBxMPBZ9nRyovrs=";
+    x86_64-linux = "sha256-+4RoyDRGLgD46FelK9zWfjokiXtgBhEU5RdsGheCEns=";
+    aarch64-linux = "sha256-9CJy8Wf/B17T64NyL4SBrmLYecdVYSXA5qnpKhcdAHs=";
+    x86_64-darwin = "sha256-ixrSa02vC/MBg29FNmBRd6YvhkL3QZnzOysLLFgjHEA=";
+    aarch64-darwin = "sha256-g7ovNQ5jJWcG82EJr6mnc2ijD/Wk6dY3cYhSchZOs5M=";
   };
   meta = {
     description = "Connects Grafana to ClickHouse";

From 4fdedf5f0810efc4dd28f4586c2f7e972e60acc5 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Wed, 11 Mar 2026 11:13:11 +0100
Subject: [PATCH 019/389] grafanaPlugins: prefer per-platform hashes to 'any'

Some packages have both per-platform _and_ an 'any' packages (e.g.
grafana-clickhouse-datasource) and the update script fails for those
cases. Prefer the per-platform packages if available.
---
 .../monitoring/grafana/plugins/update-grafana-plugin.sh       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh
index db1463c7333c..34638be8d264 100755
--- a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh
+++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh
@@ -35,8 +35,8 @@ update() {
     update-source-version $system "grafanaPlugins.${plugin_name}" "$latest_version" "$hash"
 }
 
-if echo "$api_response" | jq -e .packages.any > /dev/null; then
-    # the package contains an "any" package, so there should be only one zipHash.
+if echo "$api_response" | jq -e '.packages | select(length == 1) | .any' > /dev/null; then
+    # the package only contains an "any" package, so there should be only one zipHash.
     update "any"
 else
     update "linux-amd64" "x86_64-linux"

From 9504b0148d8bba1602481413de62792ed10375b1 Mon Sep 17 00:00:00 2001
From: nuexq <nuexqq@gmail.com>
Date: Wed, 11 Mar 2026 23:00:36 +0000
Subject: [PATCH 020/389] maintainers: add nuexq

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ed0dd6819d6d..751c80daf735 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19697,6 +19697,12 @@
     github = "Noodlesalat";
     githubId = 12748782;
   };
+  nuexq = {
+    email = "nuexqq@gmail.com";
+    github = "nuexq";
+    githubId = 145666753;
+    name = "nuexq";
+  };
   nukaduka = {
     email = "ksgokte@gmail.com";
     github = "NukaDuka";

From 3ea837cd43c8581385da961d1a8b16663a277240 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2026 08:08:37 +0000
Subject: [PATCH 021/389] liquibase: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/by-name/li/liquibase/package.nix b/pkgs/by-name/li/liquibase/package.nix
index 480f9e53494c..f5693eb176b7 100644
--- a/pkgs/by-name/li/liquibase/package.nix
+++ b/pkgs/by-name/li/liquibase/package.nix
@@ -26,11 +26,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liquibase";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz";
-    hash = "sha256-OuEczc1MCA5CHl/QQ729Yk1W/PybKU1dnYmMuLB05Ek=";
+    hash = "sha256-EDVr6p3FeGilf8OviK1HH1An1nrR9fyIqcIiFAHLriM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 45ed0fed81214baded760449d740a0098e47e99c Mon Sep 17 00:00:00 2001
From: Phillip Susemiehl <psusemiehl@gmail.com>
Date: Thu, 12 Mar 2026 12:26:04 +0100
Subject: [PATCH 022/389] mcrl2: fixed darwin build

---
 pkgs/by-name/mc/mcrl2/package.nix | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mc/mcrl2/package.nix b/pkgs/by-name/mc/mcrl2/package.nix
index 0118eecc98a9..c08219fe7d18 100644
--- a/pkgs/by-name/mc/mcrl2/package.nix
+++ b/pkgs/by-name/mc/mcrl2/package.nix
@@ -7,6 +7,7 @@
   libGL,
   qt6,
   boost,
+  ninja,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +20,33 @@ stdenv.mkDerivation rec {
     hash = "sha256-Ur7GGXbYvVmrEUq/CTRyuVNLDHKfFrYHJibo0JvYhyM=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  postInstall = lib.optional stdenv.hostPlatform.isDarwin ''
+    mkdir $out/Applications
+    mv $out/mCRL2.app $out/Applications
+  '';
+
+  postFixup = lib.optional stdenv.hostPlatform.isDarwin ''
+    APP_DIR="$out/Applications/mCRL2.app/Contents"
+    find "$APP_DIR/lib" -name "*.dylib" | while read lib; do
+      install_name_tool -id "@rpath/$(basename "$lib")" "$lib" || true
+      otool -L "$lib" | grep "$out" | awk '{print $1}' | while read old_path; do
+        install_name_tool -change "$old_path" "@rpath/$(basename "$old_path")" "$lib" || true
+      done
+    done
+    find "$APP_DIR/bin" -type f | while read bin; do
+      install_name_tool -add_rpath "@loader_path/../lib" "$bin" || true
+      otool -L "$bin" | grep "$out" | awk '{print $1}' | while read old_path; do
+        libname=$(basename "$old_path")
+        install_name_tool -change "$old_path" "@rpath/$libname" "$bin" || true
+      done
+    done
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
   buildInputs = [
     libGLU
     libGL
@@ -30,7 +57,6 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Toolset for model-checking concurrent systems and protocols";
     longDescription = ''
       A formal specification language with an associated toolset,

From 1af1956174a7db5e9f8046cbeb92bc1e0d49175b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 12 Mar 2026 15:17:08 +0100
Subject: [PATCH 023/389] xcompose: init at 0.5.1

---
 pkgs/by-name/xc/xcompose/package.nix | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/xc/xcompose/package.nix

diff --git a/pkgs/by-name/xc/xcompose/package.nix b/pkgs/by-name/xc/xcompose/package.nix
new file mode 100644
index 000000000000..f80ee6d014ea
--- /dev/null
+++ b/pkgs/by-name/xc/xcompose/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  xorgproto,
+  libx11,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "xcompose";
+  version = "0.5.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Udzu";
+    repo = "xcompose";
+    rev = "v${version}";
+    hash = "sha256-TO7HqGoq9uq6USkvvDubBK3VC0i23yOqSo/t5B1xTiI=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/xcompose/__init__.py \
+      --replace-fail /usr/include/X11 ${xorgproto}/include/X11 \
+      --replace-fail /usr/share/X11 ${libx11}/share/X11
+  '';
+
+  build-system = [
+    python3.pkgs.hatchling
+  ];
+
+  dependencies = with python3.pkgs; [
+    pygtrie
+  ];
+
+  pythonImportsCheck = [
+    "xcompose"
+  ];
+
+  meta = {
+    description = "Utility for managing X11 compose key sequences";
+    homepage = "https://github.com/Udzu/xcompose";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ncfavier ];
+    mainProgram = "xcompose";
+  };
+}

From e392deb9cb94240ef29e69a832d6e8d545d45bd9 Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Thu, 12 Mar 2026 16:46:32 +0100
Subject: [PATCH 024/389] gargoyle: 2023.1 -> 2026.1.1

---
 pkgs/by-name/ga/gargoyle/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix
index 831fe0ce1e34..3852a29212ad 100644
--- a/pkgs/by-name/ga/gargoyle/package.nix
+++ b/pkgs/by-name/ga/gargoyle/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchDebianPatch,
-  fetchpatch,
   cmake,
   pkg-config,
   fluidsynth,
@@ -20,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gargoyle";
-  version = "2023.1";
+  version = "2026.1.1";
 
   src = fetchFromGitHub {
     owner = "garglk";
     repo = "garglk";
     tag = finalAttrs.version;
-    hash = "sha256-XsN5FXWJb3DSOjipxr/HW9R7QS+7iEaITERTrbGEMwA=";
+    hash = "sha256-cBFsxbXQa2xqCwW6Gd90vupAykkHvRjeM5yjA383doQ=";
   };
 
   patches = [
@@ -37,17 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
       patch = "ftbfs_gcc14.patch";
       hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI=";
     })
-    (fetchpatch {
-      name = "cmake4-fix";
-      url = "https://github.com/garglk/garglk/commit/8d976852e2db0215e9cf4f926e626f1aa766f751.patch?full_index=1";
-      hash = "sha256-lJAuiOErSp3oDmeoqrfCdnHH816VLYiVthIG4U8BJ5E=";
-    })
   ];
 
   postPatch = ''
     substituteInPlace garglk/garglk.pc.in \
-      --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \
-      --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
+      --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \
+      --replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
   '';
 
   nativeBuildInputs = [

From 1f4d0fc3652fafabe4c1b73ef4cf9195cb418489 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 12 Mar 2026 20:37:20 +0100
Subject: [PATCH 025/389] cucumber: 9.2.1 -> 10.2.0

Changelog: https://github.com/cucumber/cucumber-ruby/blob/main/CHANGELOG.md
---
 pkgs/by-name/cu/cucumber/Gemfile      |  2 +-
 pkgs/by-name/cu/cucumber/Gemfile.lock | 54 +++++++++--------
 pkgs/by-name/cu/cucumber/gemset.nix   | 83 +++++++++++++++++++--------
 3 files changed, 88 insertions(+), 51 deletions(-)

diff --git a/pkgs/by-name/cu/cucumber/Gemfile b/pkgs/by-name/cu/cucumber/Gemfile
index f738129eca4f..b1568843a135 100644
--- a/pkgs/by-name/cu/cucumber/Gemfile
+++ b/pkgs/by-name/cu/cucumber/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'cucumber'
+gem 'cucumber', '10.2.0'
diff --git a/pkgs/by-name/cu/cucumber/Gemfile.lock b/pkgs/by-name/cu/cucumber/Gemfile.lock
index 5730c2bb6b82..145b1e24596e 100644
--- a/pkgs/by-name/cu/cucumber/Gemfile.lock
+++ b/pkgs/by-name/cu/cucumber/Gemfile.lock
@@ -1,45 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     builder (3.3.0)
-    cucumber (9.2.1)
+    cucumber (10.2.0)
+      base64 (~> 0.2)
       builder (~> 3.2)
-      cucumber-ci-environment (> 9, < 11)
-      cucumber-core (> 13, < 14)
-      cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 28)
-      cucumber-html-formatter (> 20.3, < 22)
-      cucumber-messages (> 19, < 25)
+      cucumber-ci-environment (> 9, < 12)
+      cucumber-core (> 15, < 17)
+      cucumber-cucumber-expressions (> 17, < 20)
+      cucumber-html-formatter (> 21, < 23)
       diff-lcs (~> 1.5)
+      logger (~> 1.6)
       mini_mime (~> 1.1)
       multi_test (~> 1.1)
-      sys-uname (~> 1.2)
-    cucumber-ci-environment (10.0.1)
-    cucumber-core (13.0.3)
-      cucumber-gherkin (>= 27, < 28)
-      cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (> 5, < 7)
-    cucumber-cucumber-expressions (17.1.0)
+      sys-uname (~> 1.3)
+    cucumber-ci-environment (11.0.0)
+    cucumber-core (16.2.0)
+      cucumber-gherkin (> 36, < 40)
+      cucumber-messages (> 31, < 33)
+      cucumber-tag-expressions (> 6, < 9)
+    cucumber-cucumber-expressions (19.0.0)
       bigdecimal
-    cucumber-gherkin (27.0.0)
-      cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.9.0)
-      cucumber-messages (> 19, < 28)
-    cucumber-messages (22.0.0)
-    cucumber-tag-expressions (6.1.2)
+    cucumber-gherkin (39.0.0)
+      cucumber-messages (>= 31, < 33)
+    cucumber-html-formatter (22.3.0)
+      cucumber-messages (> 23, < 33)
+    cucumber-messages (32.2.0)
+    cucumber-tag-expressions (8.1.0)
     diff-lcs (1.6.2)
-    ffi (1.17.2)
+    ffi (1.17.3)
+    logger (1.7.0)
+    memoist3 (1.0.0)
     mini_mime (1.1.5)
     multi_test (1.1.0)
-    sys-uname (1.3.1)
+    sys-uname (1.5.0)
       ffi (~> 1.1)
+      memoist3 (~> 1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber
+  cucumber (= 10.2.0)
 
 BUNDLED WITH
-   2.6.6
+   2.7.2
diff --git a/pkgs/by-name/cu/cucumber/gemset.nix b/pkgs/by-name/cu/cucumber/gemset.nix
index 2bbb79135cd8..f23fd3246e00 100644
--- a/pkgs/by-name/cu/cucumber/gemset.nix
+++ b/pkgs/by-name/cu/cucumber/gemset.nix
@@ -1,13 +1,23 @@
 {
+  base64 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
   bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "4.0.1";
   };
   builder = {
     groups = [ "default" ];
@@ -21,14 +31,14 @@
   };
   cucumber = {
     dependencies = [
+      "base64"
       "builder"
       "cucumber-ci-environment"
       "cucumber-core"
       "cucumber-cucumber-expressions"
-      "cucumber-gherkin"
       "cucumber-html-formatter"
-      "cucumber-messages"
       "diff-lcs"
+      "logger"
       "mini_mime"
       "multi_test"
       "sys-uname"
@@ -37,20 +47,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cbi1g6qwdh38z2jxm8a1mc63iz887108747c99s3g452hwn2hgs";
+      sha256 = "0n41b80fg8bz49m9rhms1g1zai2wl4m3z1841yv5h27lxhqvvvgx";
       type = "gem";
     };
-    version = "9.2.1";
+    version = "10.2.0";
   };
   cucumber-ci-environment = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cc6w7dqlmnp59ymi7pyspm3w4m7fn37x6b18pziv62wr373yvmv";
+      sha256 = "1qnif57qqcvaz361jkbg43pnzn80jac0ys7gklymn08b3ng9mxqd";
       type = "gem";
     };
-    version = "10.0.1";
+    version = "11.0.0";
   };
   cucumber-core = {
     dependencies = [
@@ -62,10 +72,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i2k5j3l8yy1367hzmg7x3xy984bnmihnzjh0ic8s2nwb3b2h770";
+      sha256 = "02wprwvf2f3ffzvbrzv8clxvm11p6s7gcjd3wpwfwbzlbjlmhasr";
       type = "gem";
     };
-    version = "13.0.3";
+    version = "16.2.0";
   };
   cucumber-cucumber-expressions = {
     dependencies = [ "bigdecimal" ];
@@ -73,10 +83,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14fkk7bfzm9cyacgcyzgkjc3nblflz4rcnlyz0pzd1ypwpqrvgm1";
+      sha256 = "0fnrr6hzcgg5ayfmf26f3vvm8c1418x9jiibsjzcjakk0kr8y81k";
       type = "gem";
     };
-    version = "17.1.0";
+    version = "19.0.0";
   };
   cucumber-gherkin = {
     dependencies = [ "cucumber-messages" ];
@@ -84,10 +94,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "063p0slf6fvigdn3jynp5pjf9b05byyyi0jhsyapy46hq4984sif";
+      sha256 = "0m9yb7icwn4s1clah4x495qjwaya50050fzfbhy1rx0hx63ivxa6";
       type = "gem";
     };
-    version = "27.0.0";
+    version = "39.0.0";
   };
   cucumber-html-formatter = {
     dependencies = [ "cucumber-messages" ];
@@ -95,30 +105,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18bfg6gpijjbka0pp7604src1ajjkmsr79nyvr6zjgw4j0nvdsfn";
+      sha256 = "0a873ll5305g8gbp4sbf4006pn4bck6c491qbwxdgnw8ap88wxpr";
       type = "gem";
     };
-    version = "21.9.0";
+    version = "22.3.0";
   };
   cucumber-messages = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06d7dnixz68ivngf6qflmi6xrjshjyi85gmyjrl07pbmhqi6r2nh";
+      sha256 = "06kk01xnpgkiw1jnpdw9azrxmyry4fqji2k7pw3rvpgprin0bi22";
       type = "gem";
     };
-    version = "22.0.0";
+    version = "32.2.0";
   };
   cucumber-tag-expressions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vcifp1fiha6yqi36m26n1vr8sz3dpnn5966hcz4a3dq43lf947p";
+      sha256 = "089fynlhyzcjng7x8ffda1gafdi1yfv2k4y9m7r5p3jgcnvc9n4v";
       type = "gem";
     };
-    version = "6.1.2";
+    version = "8.1.0";
   };
   diff-lcs = {
     groups = [ "default" ];
@@ -135,10 +145,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
+      sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
       type = "gem";
     };
-    version = "1.17.2";
+    version = "1.17.3";
+  };
+  logger = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  memoist3 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0vyma0mpjibqigzl6j9lij7zh3kvqlyi88qc0mia6l7i5i044vk8";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   mini_mime = {
     groups = [ "default" ];
@@ -161,14 +191,17 @@
     version = "1.1.0";
   };
   sys-uname = {
-    dependencies = [ "ffi" ];
+    dependencies = [
+      "ffi"
+      "memoist3"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "177l8rrqnb4rxf657mw28sgvgc8a2m7nlqcbdbra5m4xga0ypcxp";
+      sha256 = "0lrh3h15s3mpf0sa5cf7jwwr9wjlkjaf9qim8519cdsqpihnja0m";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.5.0";
   };
 }

From 0d439672eec88f713835aaa4bf9de87bb4895077 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2026 19:44:49 +0000
Subject: [PATCH 026/389] kythe: 0.0.74 -> 0.0.75

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

diff --git a/pkgs/by-name/ky/kythe/package.nix b/pkgs/by-name/ky/kythe/package.nix
index dae83b35bfbf..b9d536501b3a 100644
--- a/pkgs/by-name/ky/kythe/package.nix
+++ b/pkgs/by-name/ky/kythe/package.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.0.74";
+  version = "0.0.75";
   pname = "kythe";
 
   src = fetchurl {
     url = "https://github.com/kythe/kythe/releases/download/v${finalAttrs.version}/kythe-v${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-UqnG6BESNwQ7jQthJ2N/DrjSujp3bkdJsDbpEew1Kc4=";
+    sha256 = "sha256-ZFZh3kt32UeqAl8AYbvrwjhqRVWtgyI/3k+Vb4/jAGo=";
   };
 
   buildInputs = [ binutils ];

From a513c0a4162a126cd83a1f1e60c8e97ca4819b9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2026 23:26:05 +0000
Subject: [PATCH 027/389] plasticscm-client-gui-unwrapped: 11.0.16.9973 ->
 11.0.16.9998

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

diff --git a/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix b/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix
index 5b885c126c5f..07ecf45abcbd 100644
--- a/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix
+++ b/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix
@@ -11,11 +11,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasticscm-client-gui-unwrapped";
-  version = "11.0.16.9973";
+  version = "11.0.16.9998";
 
   src = fetchurl {
     url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-gui_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-NdX8XQCf3bRKbiRYnLRV89kC/kN7NUzeBqS5jlPhCLE=";
+    hash = "sha256-zDhAXgOq9Sqboly+tNH/afiS1BklHwQToDgZwIqMVtI=";
     nativeBuildInputs = [ dpkg ];
     downloadToTemp = true;
     recursiveHash = true;

From 0d4956c51b2365839af59105e5c32ff37f66543d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2026 23:32:16 +0000
Subject: [PATCH 028/389] plasticscm-theme: 11.0.16.9973 -> 11.0.16.9998

---
 pkgs/by-name/pl/plasticscm-theme/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pl/plasticscm-theme/package.nix b/pkgs/by-name/pl/plasticscm-theme/package.nix
index a24a76b7f6cc..0626639105f3 100644
--- a/pkgs/by-name/pl/plasticscm-theme/package.nix
+++ b/pkgs/by-name/pl/plasticscm-theme/package.nix
@@ -11,7 +11,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasticscm-theme";
-  version = "11.0.16.9973";
+  version = "11.0.16.9998";
 
   src = fetchurl {
     url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-theme_${finalAttrs.version}_amd64.deb";

From b6febb90bad61dde2b57c0319b87816dc6076c13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2026 23:35:21 +0000
Subject: [PATCH 029/389] plasticscm-client-core-unwrapped: 11.0.16.9973 ->
 11.0.16.9998

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

diff --git a/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix b/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix
index 0c52ca22a0f5..ac882f4cf0a6 100644
--- a/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix
+++ b/pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix
@@ -12,11 +12,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasticscm-client-core-unwrapped";
-  version = "11.0.16.9973";
+  version = "11.0.16.9998";
 
   src = fetchurl {
     url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-core_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-Pu9Q+lzgCeg3TZ6d+TvmJ3Z1Lr3UNJ20ByjovLpk+qw=";
+    hash = "sha256-pNuPV+DpOSE7WLbKmNCtr7Cnd/RCQGz95kcBqN7iIgA=";
     nativeBuildInputs = [ dpkg ];
     downloadToTemp = true;
     recursiveHash = true;

From 2607b463ccdcf0cb20d5874b46473d4c0e122e5f Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 13 Mar 2026 09:56:27 +0100
Subject: [PATCH 030/389] convertall: add updateScript

---
 pkgs/by-name/co/convertall/package.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/by-name/co/convertall/package.nix b/pkgs/by-name/co/convertall/package.nix
index b97f042061bc..5a88138b80b2 100644
--- a/pkgs/by-name/co/convertall/package.nix
+++ b/pkgs/by-name/co/convertall/package.nix
@@ -2,6 +2,10 @@
   lib,
   flutter341,
   fetchFromGitHub,
+  runCommand,
+  nix-update-script,
+  yq-go,
+  _experimental-update-script-combinators,
 }:
 
 flutter341.buildFlutterApplication rec {
@@ -17,6 +21,27 @@ flutter341.buildFlutterApplication rec {
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          inherit src;
+          nativeBuildInputs = [ yq-go ];
+        }
+        ''
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "convertall.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
+    ];
+  };
+
   meta = {
     homepage = "https://convertall.bellz.org";
     description = "Graphical unit converter";

From 3f4c955c88a50e3726420998358ff95e7fb89136 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 13 Mar 2026 10:17:52 +0100
Subject: [PATCH 031/389] convertall: 1.0.2 -> 1.0.3

https://github.com/doug-101/ConvertAll/releases/tag/v1.0.3
---
 pkgs/by-name/co/convertall/package.nix       |   4 +-
 pkgs/by-name/co/convertall/pubspec.lock.json | 256 ++++++++++++-------
 2 files changed, 160 insertions(+), 100 deletions(-)

diff --git a/pkgs/by-name/co/convertall/package.nix b/pkgs/by-name/co/convertall/package.nix
index 5a88138b80b2..4f9aad5e7384 100644
--- a/pkgs/by-name/co/convertall/package.nix
+++ b/pkgs/by-name/co/convertall/package.nix
@@ -10,13 +10,13 @@
 
 flutter341.buildFlutterApplication rec {
   pname = "convertall";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "doug-101";
     repo = "ConvertAll";
     tag = "v${version}";
-    hash = "sha256-esc2xhL0Jx5SaqM0GnnVzdtnSN9bX8zln66We/2RqoA=";
+    hash = "sha256-f9HfLfxY2G/3rZoWJ1xLeGmkdFiIyUFkr65Jf8QMqjY=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/co/convertall/pubspec.lock.json b/pkgs/by-name/co/convertall/pubspec.lock.json
index 785310699ebc..a4bf451fdfb2 100644
--- a/pkgs/by-name/co/convertall/pubspec.lock.json
+++ b/pkgs/by-name/co/convertall/pubspec.lock.json
@@ -4,11 +4,11 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.9"
     },
     "args": {
       "dependency": "transitive",
@@ -24,11 +24,11 @@
       "dependency": "direct main",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -44,21 +44,21 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "checked_yaml": {
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "cli_util": {
       "dependency": "transitive",
@@ -90,16 +90,6 @@
       "source": "hosted",
       "version": "1.19.1"
     },
-    "crypto": {
-      "dependency": "transitive",
-      "description": {
-        "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.6"
-    },
     "cupertino_icons": {
       "dependency": "transitive",
       "description": {
@@ -110,45 +100,55 @@
       "source": "hosted",
       "version": "1.0.8"
     },
+    "dart_numerics": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_numerics",
+        "sha256": "47408d4890551636204851325e5649bf1a1616ebc325184c36722a1716cbaba4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.6"
+    },
     "decimal": {
       "dependency": "direct main",
       "description": {
         "name": "decimal",
-        "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21",
+        "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "3.2.4"
     },
     "eval_ex": {
       "dependency": "direct main",
       "description": {
         "name": "eval_ex",
-        "sha256": "3f8853d996ee41955f2232ad3730e95698fb1040d03f6ebc6ab01f1c2bc3be53",
+        "sha256": "a99e20fb004275b38f27f186718a157d4d8687e69f75b5780e6c02b9cc9e6c0d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.8"
+      "version": "1.2.0"
     },
     "fake_async": {
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "file": {
       "dependency": "transitive",
@@ -170,21 +170,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.14.3"
+      "version": "0.14.4"
     },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "6.0.0"
     },
     "flutter_markdown_selectionarea": {
       "dependency": "direct main",
@@ -222,11 +222,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.6.0"
     },
     "http_parser": {
       "dependency": "transitive",
@@ -242,61 +242,71 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.8.0"
+    },
+    "intl": {
+      "dependency": "transitive",
+      "description": {
+        "name": "intl",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.20.2"
     },
     "json_annotation": {
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.9.0"
+      "version": "4.11.0"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
+        "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.0"
+      "version": "6.1.0"
     },
     "markdown": {
       "dependency": "transitive",
@@ -312,31 +322,31 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
     },
     "meta": {
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.17.0"
     },
     "nested": {
       "dependency": "transitive",
@@ -352,21 +362,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.2.1"
     },
     "path": {
       "dependency": "transitive",
@@ -412,11 +422,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.2"
     },
     "platform": {
       "dependency": "transitive",
@@ -442,21 +452,21 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.5.0"
     },
     "provider": {
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "6.1.5+1"
     },
     "rational": {
       "dependency": "transitive",
@@ -472,41 +482,81 @@
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever",
-        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.9"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.21"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.6"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -558,11 +608,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.1"
+      "version": "1.10.2"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -608,11 +658,21 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.10"
+    },
+    "tuple": {
+      "dependency": "transitive",
+      "description": {
+        "name": "tuple",
+        "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -628,51 +688,51 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.28"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.4.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
+        "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.5"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -688,21 +748,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.2"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
+        "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.4"
+      "version": "3.1.5"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -718,41 +778,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1"
+      "version": "1.1.1"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.15.0"
     },
     "window_manager": {
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.9"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -768,11 +828,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -786,7 +846,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "dart": ">=3.10.0 <4.0.0",
+    "flutter": ">=3.38.0"
   }
 }

From 33cc0a803d0efe0d7124167507e17128c113b9d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2026 01:03:47 +0000
Subject: [PATCH 032/389] qgis-ltr: 3.40.15 -> 3.44.8

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

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 6ca7116a458f..25fba630ee11 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -81,14 +81,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.40.15";
+  version = "3.44.8";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-N1ip6lMMpACDCr/Za26LGP455+iZiZe24s2MCkrYm8A=";
+    hash = "sha256-FL/JqvcLqKhHsG96o/7Mel8wH8OaL+2LDtq6jngjW50=";
   };
 
   passthru = {

From 8a8ff586cccbec8954052427f6023873897dc490 Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <mail@pascalj.de>
Date: Mon, 16 Mar 2026 23:28:56 +0100
Subject: [PATCH 033/389] distcc: 2021-03-11 -> 3.4

---
 pkgs/development/tools/misc/distcc/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 51541298b9bc..26d7a72f675b 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -15,20 +15,21 @@
   procps,
   libiberty_static,
   runtimeShell,
+  gitUpdater,
   sysconfDir ? "", # set this parameter to override the default value $out/etc
   static ? false,
 }:
 
 let
   pname = "distcc";
-  version = "2021-03-11";
+  version = "3.4";
   distcc = stdenv.mkDerivation {
     inherit pname version;
     src = fetchFromGitHub {
       owner = "distcc";
       repo = "distcc";
-      rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1";
-      sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4";
+      tag = "v${version}";
+      hash = "sha256-S3EHJ8s+bYWBmOfKP5ErNSa+UIalIK82MgKhWvPnwFo=";
     };
 
     nativeBuildInputs = [
@@ -95,6 +96,10 @@ let
             chmod +x $out/bin/g++
           fi
         '');
+
+      updateScript = gitUpdater {
+        rev-prefix = "v";
+      };
     };
 
     meta = {

From 23b59a318908abe51657f9af5bb0ee99d7bac897 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Tue, 17 Mar 2026 13:39:52 -0400
Subject: [PATCH 034/389] bisq2: 2.1.9 -> 2.1.10

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

diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix
index 1b8ed0fc5a92..4e20c8f99e03 100644
--- a/pkgs/by-name/bi/bisq2/package.nix
+++ b/pkgs/by-name/bi/bisq2/package.nix
@@ -24,7 +24,7 @@
 }:
 
 let
-  version = "2.1.9";
+  version = "2.1.10";
 
   jdk = zulu25.override { enableJavaFX = true; };
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   # nixpkgs-update: no auto update
   src = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
-    hash = "sha256-E7GV4YGbF0Nj6aWVqJNUUpwLH1G5v5bEQamHP7OUzQY=";
+    hash = "sha256-e1b2F4JKm7i7iMEqi+OTBryScWWhdvLJW3iKecQgqvg=";
 
     # Verify the upstream Debian package prior to extraction.
     # See https://bisq.wiki/Bisq_2#Installation
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   signature = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
-    hash = "sha256-bNZNRbm9uNGfLzGvshXNaRLUNX38Uz58GGy6WqJwV1E=";
+    hash = "sha256-2B8rmNwCcJ/cSv7P0FYi2DlRcWkG0o0lMFPsr5zaoIk=";
   };
 
   nativeBuildInputs = [

From 5541b29046f40bf343d8867f7a5e81e3c5b4d15b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 18 Mar 2026 01:14:42 +0100
Subject: [PATCH 035/389] pulsar: 1.131.1 -> 1.131.2

Changelog: https://github.com/pulsar-edit/pulsar/blob/v1.131.2/CHANGELOG.md
---
 pkgs/by-name/pu/pulsar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index e2fcacc10542..70c737f9ebe7 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -89,7 +89,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pulsar";
-  version = "1.131.1";
+  version = "1.131.2";
 
   src =
     finalAttrs.passthru.srcs.${stdenv.hostPlatform.system}
@@ -98,11 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/pulsar-edit/pulsar/releases/download/v${finalAttrs.version}/Linux.pulsar-${finalAttrs.version}.tar.gz";
-      hash = "sha256-Is+KAnPuHUrj87KFTjB/v/LMDflq4LbX3VP8Cv7/CNQ=";
+      hash = "sha256-9KziiAKvfzh1yERPRakMCuQmW0ZlUQiaNFI2plWgb/c=";
     };
     aarch64-linux = fetchurl {
       url = "https://github.com/pulsar-edit/pulsar/releases/download/v${finalAttrs.version}/ARM.Linux.pulsar-${finalAttrs.version}-arm64.tar.gz";
-      hash = "sha256-P2ZBV9Al6xw347yUs3BOWnwJGWegRh52oygLFgjoBcw=";
+      hash = "sha256-0AG87yQfg/osTtCBV10/X/4MXkWxD7lkDXcyFIGKvEs=";
     };
   };
 

From 3ad13542c182a1504d1e1ed6f198adc0ad812ed8 Mon Sep 17 00:00:00 2001
From: Leonardo <noreply@leoflo.me>
Date: Tue, 17 Mar 2026 21:29:55 +0100
Subject: [PATCH 036/389] maintainers: add leoflo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cc686617e69b..f3f5c4c54a7b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15073,6 +15073,12 @@
     name = "leo60228";
     keys = [ { fingerprint = "5BE4 98D5 1C24 2CCD C21A  4604 AC6F 4BA0 78E6 7833"; } ];
   };
+  leoflo = {
+    email = "noreply@leoflo.me";
+    github = "le0flo";
+    githubId = 128467278;
+    name = "Leonardo";
+  };
   leona = {
     email = "nix@leona.is";
     github = "leona-ya";

From 6f27c3f6833f05d423bbfa7115193bff9fd55301 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2026 09:28:02 +0000
Subject: [PATCH 037/389] blueprint-compiler: 0.18.0 -> 0.20.4

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

diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix
index b588dcb95dcd..efb9de334831 100644
--- a/pkgs/by-name/bl/blueprint-compiler/package.nix
+++ b/pkgs/by-name/bl/blueprint-compiler/package.nix
@@ -15,14 +15,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blueprint-compiler";
-  version = "0.18.0";
+  version = "0.20.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "blueprint-compiler";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3vAFkP/psM/IsFtzVOIVSU77Z+RV4d3N70U7ggrDqfo=";
+    hash = "sha256-dA+FQTRmTz6rl5ToZJ8CXY1Zd7Em7VwvF3U3Qoyvu80=";
   };
 
   postPatch = ''

From ab2b06e48ea10edb95fd68349bfa7b1e1a6b75ec Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Sat, 21 Mar 2026 15:32:45 -0400
Subject: [PATCH 038/389] processing: Use jogl from nixpkgs

Resolves https://github.com/NixOS/nixpkgs/issues/501949.

Following https://github.com/NixOS/nixpkgs/pull/466611, JOGL from Maven
was being used instead of JOGL in nixpkgs. The nixpkgs JOGL contains a
patch to nixify a reference to /bin/true.

Assisted-by: GLM-5
---
 pkgs/by-name/pr/processing/package.nix            | 12 ++++++++----
 pkgs/by-name/pr/processing/use-nixpkgs-jogl.patch | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/pr/processing/use-nixpkgs-jogl.patch

diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix
index 8c46e511ba13..0d0b774afaec 100644
--- a/pkgs/by-name/pr/processing/package.nix
+++ b/pkgs/by-name/pr/processing/package.nix
@@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
 
     # dirPermissions: Without this, some gradle tasks (e.g. includeJdk) fail to copy contents of read-only subfolders within the nix store
     ./fix-permissions.patch
+
+    # Use jogl from nixpkgs instead of downloading from maven
+    ./use-nixpkgs-jogl.patch
   ];
 
   nativeBuildInputs = [
@@ -104,8 +107,7 @@ stdenv.mkDerivation rec {
     runHook preBuild
     runHook preGradleUpdate
 
-    mkdir -p app/lib core/library
-    ln -s ${jogl}/share/java/* core/library/
+    mkdir -p app/lib
     ln -s ${vaqua} app/lib/VAqua9.jar
     ln -s ${flatlaf} app/lib/flatlaf.jar
     ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
@@ -129,13 +131,15 @@ stdenv.mkDerivation rec {
     substituteInPlace app/build.gradle.kts \
       --replace-fail "https://github.com/processing/processing-examples/archive/refs/heads/main.zip" "https://github.com/processing/processing-examples/archive/b10c9e9a05a0d6c20d233ca7f30d315b5047720e.zip" \
       --replace-fail "https://github.com/processing/processing-website/archive/refs/heads/main.zip" "https://github.com/processing/processing-website/archive/f11676d1b7464291a23ae834f2ef6ab00baaed8e.zip"
+
+    substituteInPlace core/build.gradle.kts \
+      --replace-fail "@@joglPath@@" "${jogl}"
   '';
 
   buildPhase = ''
     runHook preBuild
 
-    mkdir -p app/lib core/library
-    ln -s ${jogl}/share/java/* core/library/
+    mkdir -p app/lib
     ln -s ${vaqua} app/lib/VAqua9.jar
     ln -s ${flatlaf} app/lib/flatlaf.jar
     ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
diff --git a/pkgs/by-name/pr/processing/use-nixpkgs-jogl.patch b/pkgs/by-name/pr/processing/use-nixpkgs-jogl.patch
new file mode 100644
index 000000000000..edb5b0bf86e9
--- /dev/null
+++ b/pkgs/by-name/pr/processing/use-nixpkgs-jogl.patch
@@ -0,0 +1,14 @@
+diff --git a/core/build.gradle.kts b/core/build.gradle.kts
+index 8f7211b13..82c229f76 100644
+--- a/core/build.gradle.kts
++++ b/core/build.gradle.kts
+@@ -29,8 +29,7 @@ sourceSets{
+ }
+ 
+ dependencies {
+-    implementation(libs.jogl)
+-    implementation(libs.gluegen)
++    implementation(fileTree("@@joglPath@@/share/java") { include("*.jar") })
+
+     testImplementation(libs.junit)
+ }

From d4d8d95dcd721948e34900bef6e3c045cef8a812 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 10:23:05 +0000
Subject: [PATCH 039/389] tree-sitter-grammars.tree-sitter-php-only:
 0.24.2-unstable-2025-11-24 -> 0.24.2-unstable-2026-03-19

---
 .../tools/parsing/tree-sitter/grammars/grammar-sources.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 8d1e6f580439..fbdcc9a8fb16 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -1910,10 +1910,10 @@
   };
 
   php-only = {
-    version = "0.24.2-unstable-2025-11-24";
+    version = "0.24.2-unstable-2026-03-19";
     url = "github:tree-sitter/tree-sitter-php";
-    rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
-    hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo=";
+    rev = "3f2465c217d0a966d41e584b42d75522f2a3149e";
+    hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From d777e6d6e44fee9a3d350ac763d739bd2d6844f4 Mon Sep 17 00:00:00 2001
From: DSeeLP <46624152+DSeeLP@users.noreply.github.com>
Date: Sun, 22 Mar 2026 22:48:16 +0100
Subject: [PATCH 040/389] dart.fetchGitHashesScript: fetch submodules to match
 behavior of fetchgit

---
 pkgs/development/compilers/dart/fetch-git-hashes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dart/fetch-git-hashes.py b/pkgs/development/compilers/dart/fetch-git-hashes.py
index b2b3f67746db..fdb34830bc12 100755
--- a/pkgs/development/compilers/dart/fetch-git-hashes.py
+++ b/pkgs/development/compilers/dart/fetch-git-hashes.py
@@ -9,7 +9,7 @@ from pathlib import Path
 
 def fetch_git_hash(url: str, rev: str) -> str:
     result = subprocess.run(
-        ["nix-prefetch-git", "--url", url, "--rev", rev],
+        ["nix-prefetch-git", "--fetch-submodules", "--url", url, "--rev", rev],
         capture_output=True,
         text=True,
         check=True,

From f69cbc9e2aa81cde38eba6453982a622d7794431 Mon Sep 17 00:00:00 2001
From: DSeeLP <46624152+DSeeLP@users.noreply.github.com>
Date: Sun, 22 Mar 2026 23:42:42 +0100
Subject: [PATCH 041/389] finamp: add update script

---
 pkgs/by-name/fi/finamp/git-hashes.json | 12 ++++++
 pkgs/by-name/fi/finamp/package.nix     | 53 +++++++++++++++++++-------
 2 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/fi/finamp/git-hashes.json

diff --git a/pkgs/by-name/fi/finamp/git-hashes.json b/pkgs/by-name/fi/finamp/git-hashes.json
new file mode 100644
index 000000000000..22c51a622dda
--- /dev/null
+++ b/pkgs/by-name/fi/finamp/git-hashes.json
@@ -0,0 +1,12 @@
+{
+  "balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=",
+  "isar_generator": "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I=",
+  "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=",
+  "media_kit_libs_windows_audio": "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs=",
+  "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=",
+  "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=",
+  "flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=",
+  "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=",
+  "just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=",
+  "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw="
+}
\ No newline at end of file
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 61f0e26d507c..8e0b329cef18 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -7,6 +7,12 @@
   fetchFromGitHub,
   copyDesktopItems,
   makeDesktopItem,
+  runCommand,
+  yq,
+  finamp,
+  _experimental-update-script-combinators,
+  nix-update-script,
+  dart,
 }:
 let
   version = "0.9.22-beta";
@@ -20,27 +26,17 @@ flutter338.buildFlutterApplication {
     rev = version;
     hash = "sha256-SPt1p9+uyvfSry8Ry2BJyLC7HyWZe43wfAPK9BVkcnc=";
   };
+
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
+  gitHashes = lib.importJSON ./git-hashes.json;
+
   nativeBuildInputs = [
     patchelf
     copyDesktopItems
   ];
   buildInputs = [ mpv-unwrapped ];
 
-  gitHashes = {
-    balanced_text = "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=";
-    isar_generator = "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I=";
-    isar_flutter_libs = "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=";
-    media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs=";
-    palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=";
-    split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=";
-    flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=";
-    smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=";
-    just_audio = "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=";
-    just_audio_media_kit = "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=";
-  };
-
   postFixup = ''
     patchelf $out/app/$pname/finamp --add-needed libisar.so --add-needed libmpv.so --add-needed libflutter_discord_rpc.so --add-rpath ${
       lib.makeLibraryPath [ mpv-unwrapped ]
@@ -70,6 +66,37 @@ flutter338.buildFlutterApplication {
     })
   ];
 
+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          nativeBuildInputs = [ yq ];
+          inherit (finamp) src;
+        }
+        ''
+          cat $src/pubspec.lock | yq > $out
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { extraArgs = [ "--version=unstable" ]; })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "finamp.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
+      {
+        command = [
+          dart.fetchGitHashesScript
+          "--input"
+          ./pubspec.lock.json
+          "--output"
+          ./git-hashes.json
+        ];
+        supportedFeatures = [ ];
+      }
+    ];
+  };
+
   meta = {
     # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/jmshrv/finamp/issues/766
     broken = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64;

From 612c21bae471a887181e239ec0f7f50f4d19b6c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 19:59:51 +0000
Subject: [PATCH 042/389] nomad_1_11: 1.11.1 -> 1.11.3

---
 pkgs/applications/networking/cluster/nomad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 0d8e2121910f..640fb08ed35e 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -84,9 +84,9 @@ rec {
 
   nomad_1_11 = generic {
     buildGoModule = buildGo125Module;
-    version = "1.11.1";
-    hash = "sha256-xP3wSxDo59hme9G4+ATfGD0LTdf11+c/cSfPoKfeBLc=";
-    vendorHash = "sha256-CXWaEwJCKzggyCrHsa+PrLnQNQKI8G14uWno2NAvOwU=";
+    version = "1.11.3";
+    hash = "sha256-J+w53HlMlrXX5yKjDYhf3rSGt1pmOyNcPlOqyUrkLWE=";
+    vendorHash = "sha256-67etQUjcPXz4VVpNXLVusQlEybxEqKfYQcNTNL4X8bA=";
     license = lib.licenses.bsl11;
     passthru.tests.nomad = nixosTests.nomad;
     preCheck = ''

From 93db890c7ef9e5ad0f36349a887bc5debaa61ad3 Mon Sep 17 00:00:00 2001
From: NilaTheDragon <nilathedragon@pm.me>
Date: Tue, 24 Mar 2026 00:57:33 +0100
Subject: [PATCH 043/389] proxyman: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix
index 9220bdda4773..13a43f11737a 100644
--- a/pkgs/by-name/pr/proxyman/package.nix
+++ b/pkgs/by-name/pr/proxyman/package.nix
@@ -3,14 +3,15 @@
   appimageTools,
   fetchurl,
   asar,
+  nix-update-script,
 }:
 let
   pname = "proxyman";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchurl {
     url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
-    hash = "sha256-hv0TYlCHoiWrMRLcPrruI09SC24Pafo9B5kkUpFDyKI=";
+    hash = "sha256-kprkRi50/GASHZ/NiP6tuYiVp0019W4wIjUXL9H4aBg=";
   };
 
   appimageContents = appimageTools.extract {
@@ -42,6 +43,11 @@ appimageTools.wrapAppImage {
       --replace-fail "Exec=AppRun" "Exec=proxyman --"
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+    inherit src; # needed for nix-update to find the GitHub URL
+  };
+
   meta = {
     description = "Capture, inspect, and manipulate HTTP(s) requests/responses with ease";
     homepage = "https://proxyman.com";

From a91a30e7f4f9868c6c9c2fc04386df888d4db6e9 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Sun, 22 Mar 2026 22:19:47 -0700
Subject: [PATCH 044/389] pianobooster: 1.0.0 -> 1.0.0-unstable-2023-01-22; add
 ulysseszhan as maintainer

---
 .../bump-cmake-minimum-required-version.patch | 33 ---------
 pkgs/by-name/pi/pianobooster/package.nix      | 73 ++++++++++++-------
 pkgs/by-name/pi/pianobooster/soundfont.patch  | 31 ++++++++
 3 files changed, 78 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch
 create mode 100644 pkgs/by-name/pi/pianobooster/soundfont.patch

diff --git a/pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch b/pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch
deleted file mode 100644
index 5b02d1b8ac95..000000000000
--- a/pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From aba8b1570051e17e9568cfcc2a2b0ed316e90075 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Sat, 11 Oct 2025 15:39:08 +0300
-Subject: [PATCH] Bump cmake_minimum_required to support CMake 4
-
----
- CMakeLists.txt     | 2 +-
- src/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8432a843..c4bbe56e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.4)
-+cmake_minimum_required(VERSION 3.5)
- if(COMMAND cmake_policy)
-     cmake_policy(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 02867c8f..23bc9eff 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,7 +10,7 @@ else()
-    option(USE_BUNDLED_RTMIDI "Build with bundled rtmidi" ON)
- endif()
- 
--cmake_minimum_required(VERSION 2.4)
-+cmake_minimum_required(VERSION 3.5)
- if(COMMAND cmake_policy)
-     cmake_policy(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
diff --git a/pkgs/by-name/pi/pianobooster/package.nix b/pkgs/by-name/pi/pianobooster/package.nix
index c13f2aaf283e..4de5ff47b054 100644
--- a/pkgs/by-name/pi/pianobooster/package.nix
+++ b/pkgs/by-name/pi/pianobooster/package.nix
@@ -1,79 +1,100 @@
 {
   lib,
   stdenv,
+  replaceVars,
   fetchFromGitHub,
   cmake,
   pkg-config,
   alsa-lib,
   ftgl,
+  freetype,
   libGLU,
   rtmidi,
   libjack2,
   fluidsynth,
   soundfont-fluid,
+  soundFonts ? [ soundfont-fluid ],
+  dejavu_fonts,
   unzip,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pianobooster";
-  version = "1.0.0";
+  version = "1.0.0-unstable-2023-01-22"; # use unstable version for Qt 6 support
 
   src = fetchFromGitHub {
     owner = "pianobooster";
     repo = "PianoBooster";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";
+    rev = "6dafdcbdfc5d35d12cecb051c30632d0f5be5806";
+    hash = "sha256-ZOgTgN1CWiPHe9of8NjgoPP5xzAY1k2v9xSAY1m2Bu0=";
   };
 
   patches = [
-    # Bump cmake_minimum_required to support CMake 4
-    # https://github.com/pianobooster/PianoBooster/pull/349
-    ./bump-cmake-minimum-required-version.patch
+    # more sensible soundfont discovery
+    (replaceVars ./soundfont.patch {
+      possibleSoundFontFolders = lib.concatMapStringsSep ", " (
+        p: "\"${p}/share/soundfonts\", \"${p}/share/sounds/sf2\""
+      ) soundFonts;
+    })
   ];
 
   postPatch = ''
-    substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \
-      --replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \
-      --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2"
+    substituteInPlace src/CMakeLists.txt --replace-fail "ADD_DEFINITIONS(-std=c++11)" ""
   '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
-  ]
-  ++ (with libsForQt5; [
-    qttools
-    wrapQtAppsHook
-  ]);
+    qt6.qttools
+    qt6.wrapQtAppsHook
+  ];
 
   buildInputs = [
-    alsa-lib
     ftgl
+    freetype # required by ftgl; somehow qt provides freetype on linux but not on darwin
     libGLU
-    libsForQt5.qtbase
+    qt6.qtbase
+    qt6.qt5compat
     rtmidi
     libjack2
     fluidsynth
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
 
   cmakeFlags = [
-    "-DOpenGL_GL_PREFERENCE=GLVND"
-    "-DUSE_JACK=ON"
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
+    (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND")
+    (lib.cmakeFeature "QT_PACKAGE_NAME" "Qt6")
+    (lib.cmakeBool "WITH_MAN" true)
+    (lib.cmakeBool "USE_BUNDLED_RTMIDI" false)
+    (lib.cmakeBool "USE_JACK" true)
+    (lib.cmakeBool "USE_SYSTEM_FONT" true)
+    (lib.cmakeFeature "MACOSX_BUNDLE_GUI_IDENTIFIER" "pianobooster")
+    (lib.cmakeFeature "MACOSX_BUNDLE_SHORT_VERSION_STRING" finalAttrs.version)
+    (lib.cmakeFeature "MACOSX_BUNDLE_BUNDLE_VERSION" finalAttrs.version)
   ];
 
   postInstall = ''
-    qtWrapperArgs+=(
-      --prefix PATH : "${lib.makeBinPath [ unzip ]}"
-    )
+    qtWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ unzip ]}")
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -p $out/share/games/pianobooster/fonts
+    # use readlink to avoid referencing dejavu-fonts but dejavu-fonts-minimal instead
+    ln -s $(readlink -f ${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf) $out/share/games/pianobooster/fonts/DejaVuSans.ttf
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    cp -r build/pianobooster.app $out/Applications
+    ln -s $out/Applications/pianobooster.app/Contents/MacOS/pianobooster $out/bin/pianobooster
   '';
 
   meta = {
     description = "MIDI file player that teaches you how to play the piano";
     mainProgram = "pianobooster";
-    homepage = "https://github.com/pianobooster/PianoBooster";
+    homepage = "https://www.pianobooster.org";
     license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
   };
 })
diff --git a/pkgs/by-name/pi/pianobooster/soundfont.patch b/pkgs/by-name/pi/pianobooster/soundfont.patch
new file mode 100644
index 000000000000..4e322fb72407
--- /dev/null
+++ b/pkgs/by-name/pi/pianobooster/soundfont.patch
@@ -0,0 +1,31 @@
+diff --git a/src/GuiMidiSetupDialog.cpp b/src/GuiMidiSetupDialog.cpp
+index 64d6538..2756611 100644
+--- a/src/GuiMidiSetupDialog.cpp
++++ b/src/GuiMidiSetupDialog.cpp
+@@ -286,12 +286,7 @@ void GuiMidiSetupDialog::on_fluidLoadButton_clicked ( bool checked )
+ 
+         lastSoundFont = QDir::homePath();
+ 
+-        QStringList possibleSoundFontFolders;
+-#if defined (Q_OS_LINUX) || defined (Q_OS_UNIX)
+-        possibleSoundFontFolders.push_back("/usr/share/soundfonts");
+-        possibleSoundFontFolders.push_back("/usr/share/sounds/sf2");
+-#endif
+-        for (const QString &soundFontFolder : possibleSoundFontFolders){
++        for (const QString &soundFontFolder : {@possibleSoundFontFolders@}){
+             if (QDir(soundFontFolder).exists()){
+                 lastSoundFont=soundFontFolder;
+                 break;
+diff --git a/src/Settings.cpp b/src/Settings.cpp
+index 0bfc649..9b9ea3b 100644
+--- a/src/Settings.cpp
++++ b/src/Settings.cpp
+@@ -568,7 +568,7 @@ void CSettings::setupDefaultSoundFont(){
+ #if defined (Q_OS_LINUX) || defined (Q_OS_UNIX)
+         if (!defaultSoundFont.isFile())
+         {
+-            QStringList possibleSoundFontFolders = {"/usr/share/soundfonts","/usr/share/sounds/sf2"};
++            QStringList possibleSoundFontFolders = {@possibleSoundFontFolders@};
+             for (QString soundFontFolder:possibleSoundFontFolders)
+             {
+                 // fluid-soundfont-gm Fluid (R3) General MIDI SoundFont (GM) package

From 45677415e39b231d32867df43ef343f900af4261 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Wed, 25 Mar 2026 16:55:05 +0800
Subject: [PATCH 045/389] ytermusic: 0.1.0 -> 0.1.5

Changelog: https://github.com/ccgauche/ytermusic/releases/tag/beta-0.1.5
---
 pkgs/by-name/yt/ytermusic/package.nix      | 26 ++++++++----
 pkgs/by-name/yt/ytermusic/time-crate.patch | 48 ----------------------
 2 files changed, 17 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/by-name/yt/ytermusic/time-crate.patch

diff --git a/pkgs/by-name/yt/ytermusic/package.nix b/pkgs/by-name/yt/ytermusic/package.nix
index 8897f7912ad4..99725c45c0bf 100644
--- a/pkgs/by-name/yt/ytermusic/package.nix
+++ b/pkgs/by-name/yt/ytermusic/package.nix
@@ -5,32 +5,35 @@
   lib,
   openssl,
   pkg-config,
+  gitMinimal,
   rustPlatform,
+  writeShellScript,
+  curl,
+  jq,
+  gnused,
+  nix-update,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ytermusic";
-  version = "0.1.0";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "ccgauche";
     repo = "ytermusic";
     tag = "beta-${finalAttrs.version}";
-    hash = "sha256-nu/vedQNs5TgCG1v5qwwDTnFTyXCS2KnLVrnEhCtzCs=";
+    hash = "sha256-eZoh3eZL9x5ni5eSHwatCinGcBqFRd0GOBSz+9CjvhE=";
   };
 
-  cargoPatches = [
-    # Fix compilation with Rust 1.80 (https://github.com/NixOS/nixpkgs/issues/332957)
-    ./time-crate.patch
-  ];
+  cargoHash = "sha256-GyFny1V7Cl/ktKvyNbdWyX90m3P/bZ5/tZz7uZISV+s=";
 
-  cargoHash = "sha256-5KbqX8HU7s5ZLoCVUmZhvrliAl3wXV4/nMEI5tq2piU=";
-
-  doCheck = true;
+  # need network
+  doCheck = false;
 
   cargoBuildType = "release";
 
   nativeBuildInputs = [
+    gitMinimal
     pkg-config
   ];
 
@@ -40,6 +43,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
   ];
 
+  passthru.updateScript = writeShellScript "update-script" ''
+    latestVersion=$(${lib.getExe curl} ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/ccgauche/ytermusic/tags | ${lib.getExe jq} --raw-output '.[0].name' | ${lib.getExe gnused} -E 's/beta-//')
+    ${lib.getExe nix-update} $UPDATE_NIX_ATTR_PATH --version $latestVersion
+  '';
+
   meta = {
     description = "TUI based Youtube Music Player that aims to be as fast and simple as possible";
     homepage = "https://github.com/ccgauche/ytermusic";
diff --git a/pkgs/by-name/yt/ytermusic/time-crate.patch b/pkgs/by-name/yt/ytermusic/time-crate.patch
deleted file mode 100644
index b984d7843416..000000000000
--- a/pkgs/by-name/yt/ytermusic/time-crate.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 1fbd706..6578477 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -884,9 +884,9 @@ dependencies = [
- 
- [[package]]
- name = "deranged"
--version = "0.3.11"
-+version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
- dependencies = [
-  "powerfmt",
- ]
-@@ -3710,9 +3710,9 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.41"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -3725,15 +3725,15 @@ dependencies = [
- 
- [[package]]
- name = "time-core"
--version = "0.1.2"
-+version = "0.1.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
- dependencies = [
-  "num-conv",
-  "time-core",

From d23ca67c2f2dfd1f8c058669fca47c04c716e71d Mon Sep 17 00:00:00 2001
From: Jakuzure <shin@posteo.jp>
Date: Thu, 26 Mar 2026 08:48:08 +0100
Subject: [PATCH 046/389] certinfo: set version via ldflags and drop stale
 libx11 input

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

diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 2a7c06bb7c87..f442ff5b503d 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -3,7 +3,6 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libx11,
 }:
 
 buildGoModule (finalAttrs: {
@@ -17,10 +16,9 @@ buildGoModule (finalAttrs: {
     sha256 = "sha256-2Feb2+7UJ+39waO9rFyT3ZDlEdS5s3uLuxUiDh4iuJE=";
   };
 
-  # clipboard functionality not working on Darwin
-  doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
+  ldflags = [
+    "-X main.Version=${finalAttrs.version}"
+  ];
 
   vendorHash = null;
 

From b7547244dc6a3b32b376511b868de175e467d93f Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Mon, 23 Mar 2026 12:35:50 +0100
Subject: [PATCH 047/389] nitrokey-fido2-firmware: drop

---
 .../ni/nitrokey-fido2-firmware/package.nix    | 84 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix

diff --git a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
deleted file mode 100644
index b5aeac3f4f0c..000000000000
--- a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  writeShellScriptBin,
-  gcc-arm-embedded,
-  pynitrokey,
-  python3,
-
-  # The make target to run
-  makeTarget ? "release-buildv",
-  # Whether the firmware should include the production public key for the bootloader
-  release ? true,
-}:
-
-let
-  # The latest release is found on the releases page; do not rely on the latest tag.
-  # They normally contain the suffix `.nitrokey`.
-  # https://github.com/Nitrokey/nitrokey-fido2-firmware/releases
-  version = "2.4.1";
-
-  # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program.
-  fakeGit = writeShellScriptBin "git" ''
-    echo "${version}.nitrokey"
-  '';
-
-in
-stdenv.mkDerivation {
-  pname = "nitrokey-fido2-firmware";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "Nitrokey";
-    repo = "nitrokey-fido2-firmware";
-    tag = "${version}.nitrokey";
-    hash = "sha256-7AsnxRf8mdybI6Mup2mV01U09r5C/oUX6fG2ymkkOOo=";
-    fetchSubmodules = true;
-  };
-
-  postPatch = ''
-    # Remove a duplicate firmware_version definition. Without this,
-    # firmware_version is defined multiple times, triggering a build error.
-    substituteInPlace fido2/version.h \
-      --replace-fail "const version_t firmware_version ;" ""
-  '';
-
-  nativeBuildInputs = [
-    fakeGit
-    # only gcc-arm-embedded includes libc_nano.a
-    gcc-arm-embedded
-    pynitrokey
-    python3
-  ];
-
-  preBuild = ''
-    cd targets/stm32l432
-  '';
-
-  makeFlags = [
-    "${makeTarget}"
-    "RELEASE=${toString release}"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    cp -r release $out
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Firmware for the Nitrokey FIDO2 device";
-    homepage = "https://github.com/Nitrokey/nitrokey-fido2-firmware";
-    maintainers = with lib.maintainers; [
-      amerino
-      kiike
-      imadnyc
-    ];
-    license = with lib.licenses; [
-      asl20
-      mit
-    ];
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b35874eec9ab..f99d7be70ed9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1433,6 +1433,7 @@ mapAliases {
   nginxQuic = throw "'nginxQuic' has been removed. QUIC support is now available in the default nginx builds.";
   ngrid = throw "'ngrid' has been removed as it has been unmaintained upstream and broken"; # Added 2025-11-15
   nimbo = throw "'nimbo' has been removed due to being archived upstream."; # Added 2026-01-18
+  nitrokey-fido2-firmware = throw "'nitrokey-fido2-firmware' has been removed as it was broken and unmaintained upstream since 2022"; # Added 2026-03-23
   nix-direnv-flakes = throw "'nix-direnv-flakes' has been renamed to/replaced by 'nix-direnv'"; # Converted to throw 2025-10-27
   nix-ld-rs = throw "'nix-ld-rs' has been renamed to/replaced by 'nix-ld'"; # Converted to throw 2025-10-27
   nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06

From 11ae3fcad63fe661a52fb6d6084f624417a8f103 Mon Sep 17 00:00:00 2001
From: DSeeLP <46624152+DSeeLP@users.noreply.github.com>
Date: Fri, 6 Mar 2026 14:55:28 +0100
Subject: [PATCH 048/389] finamp: 0.9.22-beta -> 0.9.23-beta

---
 pkgs/by-name/fi/finamp/git-hashes.json   | 15 +++---
 pkgs/by-name/fi/finamp/package.nix       | 14 ++---
 pkgs/by-name/fi/finamp/pubspec.lock.json | 67 +++++++++++++++++++-----
 3 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/fi/finamp/git-hashes.json b/pkgs/by-name/fi/finamp/git-hashes.json
index 22c51a622dda..6f0c48bd26a5 100644
--- a/pkgs/by-name/fi/finamp/git-hashes.json
+++ b/pkgs/by-name/fi/finamp/git-hashes.json
@@ -1,12 +1,13 @@
 {
   "balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=",
-  "isar_generator": "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I=",
-  "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=",
-  "media_kit_libs_windows_audio": "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs=",
-  "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=",
-  "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=",
   "flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=",
-  "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=",
+  "isar": "sha256-Wg1m/HM7UnK+aC1DOyY41Bo4HuLrEaAxCtQw12ZrnN0=",
+  "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=",
+  "isar_generator": "sha256-fM8ygT6il7TdjmeTdmk8o4exc3Z/F1tYF878eoDK37E=",
   "just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=",
-  "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw="
+  "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=",
+  "media_kit_libs_windows_audio": "sha256-XAObjn7wcN4qA7MW+hKqjNZv/L2Ec8t/cTF+d2ZoZ+k=",
+  "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=",
+  "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=",
+  "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="
 }
\ No newline at end of file
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 8e0b329cef18..4e2a80b5b16d 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  flutter338,
+  flutter341,
   mpv-unwrapped,
   patchelf,
   fetchFromGitHub,
@@ -15,16 +15,16 @@
   dart,
 }:
 let
-  version = "0.9.22-beta";
+  version = "0.9.23-beta";
 in
-flutter338.buildFlutterApplication {
+flutter341.buildFlutterApplication {
   inherit version;
   pname = "finamp";
   src = fetchFromGitHub {
-    owner = "jmshrv";
+    owner = "UnicornsOnLSD";
     repo = "finamp";
     rev = version;
-    hash = "sha256-SPt1p9+uyvfSry8Ry2BJyLC7HyWZe43wfAPK9BVkcnc=";
+    hash = "sha256-N1+6rB16geFMYMbfiF7eppnXfXC/pqv90I9aY/57lKI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -98,10 +98,10 @@ flutter338.buildFlutterApplication {
   };
 
   meta = {
-    # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/jmshrv/finamp/issues/766
+    # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/UnicornsOnLSD/finamp/issues/766
     broken = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64;
     description = "Open source Jellyfin music player";
-    homepage = "https://github.com/jmshrv/finamp";
+    homepage = "https://github.com/UnicornsOnLSD/finamp";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ dseelp ];
     mainProgram = "finamp";
diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json
index 517986f5ff6d..1a20e4851435 100644
--- a/pkgs/by-name/fi/finamp/pubspec.lock.json
+++ b/pkgs/by-name/fi/finamp/pubspec.lock.json
@@ -30,6 +30,16 @@
       "source": "hosted",
       "version": "0.13.0"
     },
+    "ansicolor": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ansicolor",
+        "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
     "app_links": {
       "dependency": "direct main",
       "description": {
@@ -325,11 +335,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -491,6 +501,16 @@
       "source": "hosted",
       "version": "3.0.7"
     },
+    "csslib": {
+      "dependency": "transitive",
+      "description": {
+        "name": "csslib",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
     "custom_lint": {
       "dependency": "direct dev",
       "description": {
@@ -773,6 +793,16 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "flutter_native_splash": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_native_splash",
+        "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.7"
+    },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
@@ -1006,6 +1036,16 @@
       "source": "hosted",
       "version": "4.3.0"
     },
+    "html": {
+      "dependency": "transitive",
+      "description": {
+        "name": "html",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.15.6"
+    },
     "http": {
       "dependency": "direct main",
       "description": {
@@ -1089,18 +1129,19 @@
     "isar": {
       "dependency": "direct main",
       "description": {
-        "name": "isar",
-        "sha256": "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea",
-        "url": "https://pub.dev"
+        "path": "packages/isar",
+        "ref": "a602cd8999048faba043f7e1ce7ba92f4d812762",
+        "resolved-ref": "a602cd8999048faba043f7e1ce7ba92f4d812762",
+        "url": "https://github.com/Komodo5197/isar-community.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "3.1.0+1"
     },
     "isar_flutter_libs": {
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "HEAD",
+        "ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
         "resolved-ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
         "url": "https://github.com/MrLittleWhite/isar_flutter_libs.git"
       },
@@ -1284,21 +1325,21 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.18"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
     },
     "media_kit": {
       "dependency": "transitive",
@@ -2114,11 +2155,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
+        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.7"
+      "version": "0.7.9"
     },
     "threshold": {
       "dependency": "transitive",

From 2f1e98e7200dfc2ef3b1a09e032269829de97df8 Mon Sep 17 00:00:00 2001
From: clotodex <clotodex@online.de>
Date: Fri, 27 Mar 2026 18:45:49 +0100
Subject: [PATCH 049/389] ashell: 0.7.0 -> 0.8.0

Diff: https://github.com/MalpenZibo/ashell/compare/0.7.0...0.8.0
---
 pkgs/by-name/as/ashell/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
index 04e08896b906..60c2ab0f4b5f 100644
--- a/pkgs/by-name/as/ashell/package.nix
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ashell";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "MalpenZibo";
     repo = "ashell";
     tag = finalAttrs.version;
-    hash = "sha256-nQrBW2pfsExHERGZzJqMG7MskzsJ3zwVyoX6wJZBils=";
+    hash = "sha256-X9TU866PAzaf52qKsCpeJvwE0suu1lJndHNQdPg51HM=";
   };
 
-  cargoHash = "sha256-F8oh8uQFthx5gex/ovKADO+ukqzIbmlBM5+shej/OTA=";
+  cargoHash = "sha256-nhYbehlgB8pzMoj39G0BHRca9mIT+0QjUaebCx+DDE0=";
 
   nativeBuildInputs = [
     pkg-config

From 3bb0e12822c83ef69c2909f419d559fb3c8c2a66 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Fri, 27 Mar 2026 16:36:27 -0700
Subject: [PATCH 050/389] {,python3Packages.}rpatool: init at 1.0.0

---
 .../python-modules/rpatool/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/rpatool/default.nix

diff --git a/pkgs/development/python-modules/rpatool/default.nix b/pkgs/development/python-modules/rpatool/default.nix
new file mode 100644
index 000000000000..6d689a5dd2a5
--- /dev/null
+++ b/pkgs/development/python-modules/rpatool/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitea,
+  buildPythonPackage,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "rpatool";
+  version = "1.0.0";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "shiz";
+    repo = "rpatool";
+    tag = "v${version}";
+    hash = "sha256-AHFL0pahwS8/MH13NgPiKtKAP+nBqfbcUVWzV+Jdco0=";
+  };
+
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "rpatool" ];
+
+  meta = {
+    homepage = "https://codeberg.org/shiz/rpatool";
+    description = "Simple tool allowing you to create, modify and extract Ren'Py Archive (.rpa/.rpi) files";
+    mainProgram = "rpatool";
+    license = lib.licenses.wtfpl;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13bbd539c786..aa548b191d48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3357,6 +3357,8 @@ with pkgs;
     inherit (python3Packages) sphinx;
   };
 
+  rpatool = with python3Packages; toPythonApplication rpatool;
+
   rpm = callPackage ../tools/package-management/rpm {
     lua = lua5_4;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea8eaec3b412..94da802ec293 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17007,6 +17007,8 @@ self: super: with self; {
 
   rowan = callPackage ../development/python-modules/rowan { };
 
+  rpatool = callPackage ../development/python-modules/rpatool { };
+
   rpcq = callPackage ../development/python-modules/rpcq { };
 
   rpdb = callPackage ../development/python-modules/rpdb { };

From 10e6892e35afd87d293e95e7f7c0d4fa9020e621 Mon Sep 17 00:00:00 2001
From: Shiphan <140245703+Shiphan@users.noreply.github.com>
Date: Sat, 28 Mar 2026 16:00:46 +0800
Subject: [PATCH 051/389] fontc: 0.3.0 -> 0.6.0, switch to fetchCrate, add
 updateScript

---
 pkgs/by-name/fo/fontc/Cargo.lock  | 3145 -----------------------------
 pkgs/by-name/fo/fontc/package.nix |   31 +-
 2 files changed, 13 insertions(+), 3163 deletions(-)
 delete mode 100644 pkgs/by-name/fo/fontc/Cargo.lock

diff --git a/pkgs/by-name/fo/fontc/Cargo.lock b/pkgs/by-name/fo/fontc/Cargo.lock
deleted file mode 100644
index caa4c9bb9d70..000000000000
--- a/pkgs/by-name/fo/fontc/Cargo.lock
+++ /dev/null
@@ -1,3145 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
-dependencies = [
- "anstyle",
- "once_cell_polyfill",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "ascii_plist_derive"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "auto_impl"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
-dependencies = [
- "bitflags 2.9.1",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
-
-[[package]]
-name = "bumpalo"
-version = "3.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-
-[[package]]
-name = "bytemuck"
-version = "1.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "441473f2b4b0459a68628c744bc61d23e730fb00128b841d30fa4bb3972257e4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "bytes"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-
-[[package]]
-name = "camino"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "cc"
-version = "1.2.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-
-[[package]]
-name = "chrono"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-link",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
-
-[[package]]
-name = "close_already"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "750e1d95751350d95c23de2567c1c0810bb2107a3a9f36bb120fcf819c91ea2e"
-dependencies = [
- "mutually_exclusive_features",
- "threadpool",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "crc32fast"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "crunchy"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
-
-[[package]]
-name = "darling"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "dashmap"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if",
- "num_cpus",
-]
-
-[[package]]
-name = "deranged"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "env_filter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "jiff",
- "log",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "errno"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "euclid"
-version = "0.22.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "fea-lsp"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "env_logger",
- "fea-rs",
- "lspower",
- "serde_json",
- "tokio",
-]
-
-[[package]]
-name = "fea-rs"
-version = "0.20.1"
-dependencies = [
- "ansi_term",
- "chrono",
- "clap",
- "criterion",
- "diff",
- "env_logger",
- "fontdrasil",
- "indexmap",
- "log",
- "norad",
- "ordered-float",
- "rayon",
- "serde",
- "serde_json",
- "smol_str",
- "thiserror 1.0.69",
- "write-fonts",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "flate2"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "font-types"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7"
-dependencies = [
- "bytemuck",
- "serde",
-]
-
-[[package]]
-name = "fontbe"
-version = "0.2.1"
-dependencies = [
- "bincode",
- "chrono",
- "diff",
- "env_logger",
- "fea-rs",
- "fontdrasil",
- "fontir",
- "icu_properties",
- "indexmap",
- "kurbo",
- "log",
- "more-asserts",
- "ordered-float",
- "otl-normalizer",
- "parking_lot",
- "pretty_assertions",
- "rstest",
- "serde",
- "smol_str",
- "temp-env",
- "tempfile",
- "thiserror 1.0.69",
- "tinystr",
- "write-fonts",
-]
-
-[[package]]
-name = "fontc"
-version = "0.3.0"
-dependencies = [
- "bincode",
- "bitflags 2.9.1",
- "chrono",
- "clap",
- "crossbeam-channel",
- "diff",
- "env_logger",
- "filetime",
- "fontbe",
- "fontdrasil",
- "fontir",
- "fontra2fontir",
- "glyphs2fontir",
- "indexmap",
- "kurbo",
- "log",
- "ordered-float",
- "pretty_assertions",
- "rayon",
- "regex",
- "rstest",
- "serde",
- "serde_yaml",
- "skrifa",
- "tempfile",
- "thiserror 1.0.69",
- "ufo2fontir",
- "vergen-gitcl",
- "write-fonts",
-]
-
-[[package]]
-name = "fontc_crater"
-version = "0.2.0"
-dependencies = [
- "chrono",
- "clap",
- "env_logger",
- "fontc",
- "google-fonts-sources",
- "log",
- "maud",
- "rayon",
- "serde",
- "serde_json",
- "serde_yaml",
- "tempfile",
- "thiserror 1.0.69",
- "tidier",
- "write-fonts",
-]
-
-[[package]]
-name = "fontdrasil"
-version = "0.2.1"
-dependencies = [
- "diff",
- "ordered-float",
- "serde",
- "smol_str",
- "tempfile",
- "write-fonts",
-]
-
-[[package]]
-name = "fontir"
-version = "0.2.1"
-dependencies = [
- "bincode",
- "bitflags 2.9.1",
- "chrono",
- "diff",
- "env_logger",
- "filetime",
- "fontdrasil",
- "indexmap",
- "kurbo",
- "log",
- "ordered-float",
- "parking_lot",
- "pretty_assertions",
- "serde",
- "serde_yaml",
- "smol_str",
- "tempfile",
- "thiserror 1.0.69",
- "write-fonts",
-]
-
-[[package]]
-name = "fontra2fontir"
-version = "0.2.1"
-dependencies = [
- "diff",
- "env_logger",
- "fontdrasil",
- "fontir",
- "indexmap",
- "kurbo",
- "log",
- "ordered-float",
- "pretty_assertions",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror 1.0.69",
- "write-fonts",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
-]
-
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
-[[package]]
-name = "glob"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
-[[package]]
-name = "glyphs-reader"
-version = "0.2.1"
-dependencies = [
- "ascii_plist_derive",
- "bincode",
- "chrono",
- "env_logger",
- "fontdrasil",
- "icu_properties",
- "indexmap",
- "kurbo",
- "log",
- "ordered-float",
- "pretty_assertions",
- "quick-xml 0.37.5",
- "regex",
- "rstest",
- "serde",
- "smol_str",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "glyphs2fontir"
-version = "0.2.1"
-dependencies = [
- "chrono",
- "diff",
- "env_logger",
- "fontdrasil",
- "fontir",
- "glyphs-reader",
- "indexmap",
- "kurbo",
- "log",
- "ordered-float",
- "pretty_assertions",
- "smol_str",
- "tempfile",
- "thiserror 1.0.69",
- "write-fonts",
-]
-
-[[package]]
-name = "google-fonts-sources"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721a015d2e6701e8d6ac7e4bc1e8ce7a6a70595f70cb2126a385c27109303d5d"
-dependencies = [
- "clap",
- "env_logger",
- "font-types",
- "log",
- "rayon",
- "serde",
- "serde_json",
- "serde_yaml",
- "tempfile",
- "thiserror 2.0.12",
- "ureq",
-]
-
-[[package]]
-name = "half"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
-
-[[package]]
-name = "http"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "httparse"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "icu_collections"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
-dependencies = [
- "displaydoc",
- "potential_utf",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locale_core"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
-
-[[package]]
-name = "icu_properties"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locale_core",
- "icu_properties_data",
- "icu_provider",
- "potential_utf",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
-
-[[package]]
-name = "icu_provider"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
-dependencies = [
- "displaydoc",
- "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
-dependencies = [
- "equivalent",
- "hashbrown",
- "serde",
-]
-
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-
-[[package]]
-name = "jiff"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "kurbo"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
-dependencies = [
- "arrayvec",
- "euclid",
- "serde",
- "smallvec",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.174"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-
-[[package]]
-name = "libloading"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
-dependencies = [
- "cfg-if",
- "windows-targets 0.53.3",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
-dependencies = [
- "bitflags 2.9.1",
- "libc",
- "redox_syscall",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
-
-[[package]]
-name = "litemap"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-
-[[package]]
-name = "lock_api"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
-[[package]]
-name = "lsp-types"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae"
-dependencies = [
- "bitflags 1.3.2",
- "serde",
- "serde_json",
- "serde_repr",
- "url",
-]
-
-[[package]]
-name = "lspower"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2242d4cb4071c7b9ae53001c8c658402b55bb8c3669a70d3ce9565f1144b30"
-dependencies = [
- "anyhow",
- "async-trait",
- "auto_impl",
- "bytes",
- "dashmap",
- "futures",
- "httparse",
- "log",
- "lsp-types",
- "lspower-macros",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "tokio-util",
- "tower-service",
- "twoway",
-]
-
-[[package]]
-name = "lspower-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca1d48da0e4a6100b4afd52fae99f36d47964a209624021280ad9ffdd410e83d"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "maud"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8156733e27020ea5c684db5beac5d1d611e1272ab17901a49466294b84fc217e"
-dependencies = [
- "itoa",
- "maud_macros",
-]
-
-[[package]]
-name = "maud_macros"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7261b00f3952f617899bc012e3dbd56e4f0110a038175929fa5d18e5a19913ca"
-dependencies = [
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
-dependencies = [
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "more-asserts"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
-
-[[package]]
-name = "mutually_exclusive_features"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577"
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "norad"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e914290e267484b1d18e8d9c7bcee24433c264ae42c12240add5c710a4bf042c"
-dependencies = [
- "base64",
- "close_already",
- "indexmap",
- "plist",
- "quick-xml 0.37.5",
- "serde",
- "serde_derive",
- "serde_repr",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
-
-[[package]]
-name = "oorandom"
-version = "11.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
-
-[[package]]
-name = "ordered-float"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
-dependencies = [
- "num-traits",
- "rand",
- "serde",
-]
-
-[[package]]
-name = "otl-normalizer"
-version = "0.0.1"
-dependencies = [
- "clap",
- "fea-rs",
- "fontdrasil",
- "indexmap",
- "smol_str",
- "thiserror 1.0.69",
- "write-fonts",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "plist"
-version = "1.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1"
-dependencies = [
- "base64",
- "indexmap",
- "quick-xml 0.38.0",
- "serde",
- "time",
-]
-
-[[package]]
-name = "plotters"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
-dependencies = [
- "plotters-backend",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "potential_utf"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
-dependencies = [
- "zerovec",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-dependencies = [
- "diff",
- "yansi",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
-dependencies = [
- "proc-macro2",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proc-macro2-diagnostics"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "version_check",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.37.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
-dependencies = [
- "memchr",
- "serde",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core",
- "serde",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "read-fonts"
-version = "0.29.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d"
-dependencies = [
- "bytemuck",
- "font-types",
- "serde",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "relative-path"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
-
-[[package]]
-name = "ring"
-version = "0.17.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom 0.2.16",
- "libc",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rstest"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199"
-dependencies = [
- "futures",
- "futures-timer",
- "rstest_macros",
- "rustc_version",
-]
-
-[[package]]
-name = "rstest_macros"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro2",
- "quote",
- "regex",
- "relative-path",
- "rustc_version",
- "syn 2.0.104",
- "unicode-ident",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
-dependencies = [
- "bitflags 2.9.1",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
-dependencies = [
- "log",
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.103.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-
-[[package]]
-name = "ryu"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "semver"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.142"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "skrifa"
-version = "0.31.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607"
-dependencies = [
- "bytemuck",
- "read-fonts",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "smol_str"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "temp-env"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050"
-dependencies = [
- "parking_lot",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
-dependencies = [
- "fastrand",
- "getrandom 0.3.3",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
-dependencies = [
- "thiserror-impl 2.0.12",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
-[[package]]
-name = "tidier"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2614ebaafedfd01ea44541a834f413f597f5fa44cb04e190a926cd38b2a60c4"
-dependencies = [
- "errno",
- "memchr",
- "tidy-sys",
-]
-
-[[package]]
-name = "tidy-sys"
-version = "0.8.2"
-source = "git+https://github.com/cmyr/tidy-sys.git?branch=cmake-hotfix#405e80dc01df771940cb9795228fa08ce426d5a5"
-dependencies = [
- "bindgen",
- "cmake",
-]
-
-[[package]]
-name = "time"
-version = "0.3.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
-
-[[package]]
-name = "time-macros"
-version = "0.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-dependencies = [
- "displaydoc",
- "serde",
- "zerovec",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tokio"
-version = "1.47.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
-dependencies = [
- "backtrace",
- "bytes",
- "io-uring",
- "libc",
- "mio",
- "pin-project-lite",
- "slab",
- "socket2",
- "tokio-macros",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "twoway"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47"
-dependencies = [
- "memchr",
- "unchecked-index",
-]
-
-[[package]]
-name = "ufo2fontir"
-version = "0.2.1"
-dependencies = [
- "chrono",
- "diff",
- "env_logger",
- "fontdrasil",
- "fontir",
- "indexmap",
- "kurbo",
- "log",
- "norad",
- "ordered-float",
- "plist",
- "pretty_assertions",
- "rstest",
- "serde",
- "serde_yaml",
- "tempfile",
- "thiserror 1.0.69",
- "write-fonts",
-]
-
-[[package]]
-name = "unchecked-index"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "ureq"
-version = "3.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f0fde9bc91026e381155f8c67cb354bcd35260b2f4a29bcc84639f762760c39"
-dependencies = [
- "base64",
- "flate2",
- "log",
- "percent-encoding",
- "rustls",
- "rustls-pemfile",
- "rustls-pki-types",
- "ureq-proto",
- "utf-8",
- "webpki-roots 0.26.11",
-]
-
-[[package]]
-name = "ureq-proto"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59db78ad1923f2b1be62b6da81fe80b173605ca0d57f85da2e005382adf693f7"
-dependencies = [
- "base64",
- "http",
- "httparse",
- "log",
-]
-
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "vergen"
-version = "9.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b2bf58be11fc9414104c6d3a2e464163db5ef74b12296bda593cac37b6e4777"
-dependencies = [
- "anyhow",
- "cargo_metadata",
- "derive_builder",
- "regex",
- "rustc_version",
- "rustversion",
- "time",
- "vergen-lib",
-]
-
-[[package]]
-name = "vergen-gitcl"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9dfc1de6eb2e08a4ddf152f1b179529638bedc0ea95e6d667c014506377aefe"
-dependencies = [
- "anyhow",
- "derive_builder",
- "rustversion",
- "time",
- "vergen",
- "vergen-lib",
-]
-
-[[package]]
-name = "vergen-lib"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166"
-dependencies = [
- "anyhow",
- "derive_builder",
- "rustversion",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-dependencies = [
- "wit-bindgen-rt",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
-dependencies = [
- "webpki-roots 1.0.2",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.3",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "write-fonts"
-version = "0.38.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60491c1d7e5873e721607fa05fd9b9fc66b0f0179b2b5f0f26a2022aafdcc61e"
-dependencies = [
- "font-types",
- "indexmap",
- "kurbo",
- "log",
- "read-fonts",
- "serde",
-]
-
-[[package]]
-name = "writeable"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
-
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
-[[package]]
-name = "yoke"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "synstructure",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "synstructure",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zerotrie"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
diff --git a/pkgs/by-name/fo/fontc/package.nix b/pkgs/by-name/fo/fontc/package.nix
index 8fb77bc0783b..0ce9a14fa52d 100644
--- a/pkgs/by-name/fo/fontc/package.nix
+++ b/pkgs/by-name/fo/fontc/package.nix
@@ -1,35 +1,30 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitHub,
+  fetchCrate,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fontc";
-  version = "0.3.0";
+  version = "0.6.0";
 
-  src = fetchFromGitHub {
-    owner = "googlefonts";
-    repo = "fontc";
-    tag = "fontc-v${finalAttrs.version}";
-    hash = "sha256-Zr2nJRNY1vLGhVOGC3KSWbd4cQReO/F8Wgzx3y/qPFc=";
+  src = fetchCrate {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-TjbhVkhoIoyp6A33v/QVaNLoHxB5whT/gOlehQTUKxM=";
   };
-  buildAndTestSubdir = "fontc";
 
-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-  '';
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "tidy-sys-0.8.2" = "sha256-Okt+mqakdwm0OlD4UXBtQIbO+Wmlk6jTMWi9Q5Y1M2o=";
-    };
-  };
+  cargoHash = "sha256-FLvEgIFgLE++59j5LeCRC4ptgRhAiDF7hani4Yh8kn0=";
+
+  # skip `cargo test` because source code from crates.io doesn't include necessary resources for testing
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Wherein we pursue oxidizing fontmake";
     homepage = "https://github.com/googlefonts/fontc";
-    changelog = "https://github.com/googlefonts/fontc/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/googlefonts/fontc/releases/tag/fontc-v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ shiphan ];
     mainProgram = "fontc";

From 9d1093434e6367cff85a4b6a25756098d89bbab7 Mon Sep 17 00:00:00 2001
From: Arthur Andersen <leoc.git@gmail.com>
Date: Wed, 25 Mar 2026 11:44:22 +0100
Subject: [PATCH 052/389] rapidraw: 1.5.1 -> 1.5.2

---
 pkgs/by-name/ra/rapidraw/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix
index 4e1a973357db..296b7a30c33d 100644
--- a/pkgs/by-name/ra/rapidraw/package.nix
+++ b/pkgs/by-name/ra/rapidraw/package.nix
@@ -42,13 +42,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rapidraw";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "CyberTimon";
     repo = "RapidRAW";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C6U3xU/rL+Og6DgJTnPESf+LPlm+svTNS5bSGhrn7dQ=";
+    hash = "sha256-GCmaPNgPn6xTdvRTkXlrSasULlxWFTwuBlbqmMD4O8s=";
     fetchSubmodules = true;
 
     # darwin/linux hash mismatch in rawler submodule
@@ -58,11 +58,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-cgqNGft6LK5XNGv1CDLw5v+m8a9xmu7albfoGJnkE34=";
+  cargoHash = "sha256-IIl4BSEMpyLiiZQGRlQaIPpXNQKGg6GrGQmnHDzDAdc=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-YpM/EQ4eFqziwEpSXpBNEO8A5fCmjVtCrgr11YxLKxY=";
+    hash = "sha256-PLwefGi6p6rJLvLonHXszA74wqySyoE3xxRPDlrfgUQ=";
   };
 
   nativeBuildInputs = [
@@ -148,8 +148,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Add rpath for onnxruntime so the binary can find libonnxruntime.dylib at runtime
+      # The binary links against @rpath/libonnxruntime.*.dylib but has no LC_RPATH entries
       install_name_tool -add_rpath "${onnxruntime}/lib" "$out/Applications/RapidRAW.app/Contents/MacOS/rapidraw"
+      # The app also dlopen()s libonnxruntime.dylib at a hardcoded path inside the bundle
+      mkdir -p "$out/Applications/RapidRAW.app/Contents/Resources/resources"
+      ln -sf ${onnxruntime}/lib/libonnxruntime.dylib "$out/Applications/RapidRAW.app/Contents/Resources/resources/libonnxruntime.dylib"
     '';
 
   postFixup =

From 71b52df8b3b63e2221a71b0498864cf5e8b3cdd0 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 29 Mar 2026 12:43:53 -0400
Subject: [PATCH 053/389] atlantis: 0.39.0 -> 0.41.0

changelog: https://github.com/runatlantis/atlantis/releases/tag/v0.40.0

changelog: https://github.com/runatlantis/atlantis/releases/tag/v0.41.0
---
 pkgs/by-name/at/atlantis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index 4afe7e63cc1b..ceba14ee99c8 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlantis";
-  version = "0.39.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/p8NfggweRHz8+BBrD/d166HJmDLkDzWloWearfqwVg=";
+    hash = "sha256-OnZ+rygG6TpPkZzU4UBmfnxkRrSyFWEn/rEqwpXhMio=";
   };
 
   ldflags = [
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     "-X=main.date=1970-01-01T00:00:00Z"
   ];
 
-  vendorHash = "sha256-d137hKsd1GrVW2fXZJTUCQmOayolSjNiJNmoOtj3ZkE=";
+  vendorHash = "sha256-aAIiDFiaWRTYfmC4yqVRXtNRLrvdtLbUAV6lC3QYhdc=";
 
   subPackages = [ "." ];
 

From 0e8ad2db2f87cd88d974606f977d07ff2a70b19b Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 29 Mar 2026 20:18:25 -0400
Subject: [PATCH 054/389] nixos/gamemode: remove wantedBy directive

The service will automatically get activated through dbus when needed.

There's no need to start the service before it's used.
---
 nixos/modules/programs/gamemode.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix
index 00ccfc076cef..f2aca3ebee87 100644
--- a/nixos/modules/programs/gamemode.nix
+++ b/nixos/modules/programs/gamemode.nix
@@ -72,10 +72,6 @@ in
     systemd = {
       packages = [ pkgs.gamemode ];
       user.services.gamemoded = {
-        # The upstream service already defines this, but doesn't get applied.
-        # See https://github.com/NixOS/nixpkgs/issues/81138
-        wantedBy = [ "default.target" ];
-
         # Use pkexec from the security wrappers to allow users to
         # run libexec/cpugovctl & libexec/gpuclockctl as root with
         # the the actions defined in share/polkit-1/actions.

From c86edb33231cdf3525eedd1887da86526604f330 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 29 Mar 2026 21:17:40 -0400
Subject: [PATCH 055/389] protontricks: add freetype to steam-run fhs

---
 pkgs/by-name/pr/protontricks/package.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protontricks/package.nix b/pkgs/by-name/pr/protontricks/package.nix
index b2b5cbbb3ddb..81c999efa58f 100644
--- a/pkgs/by-name/pr/protontricks/package.nix
+++ b/pkgs/by-name/pr/protontricks/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   replaceVars,
   writeShellScript,
-  steam-run-free,
+  steam,
   fetchpatch2,
   winetricks,
   yad,
@@ -12,6 +12,17 @@
   extraCompatPaths ? "",
 }:
 
+let
+  steam-run =
+    (steam.override {
+      extraLibraries =
+        p: with p; [
+          # Fixes installing vcrun2022
+          # https://github.com/Matoking/protontricks/issues/461
+          freetype
+        ];
+    }).run-free;
+in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "protontricks";
   version = "1.14.0";
@@ -27,9 +38,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
   patches = [
     # Use steam-run to run Proton binaries
     (replaceVars ./steam-run.patch {
-      steamRun = lib.getExe steam-run-free;
+      steamRun = lib.getExe steam-run;
       bash = writeShellScript "steam-run-bash" ''
-        exec ${lib.getExe steam-run-free} bash "$@"
+        exec ${lib.getExe steam-run} bash "$@"
       '';
     })
 

From 3543789f1d84b5d22a2cf02f5df538e13c00df32 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 29 Mar 2026 19:51:09 -0400
Subject: [PATCH 056/389] protontricks: 1.14.0 -> 1.14.1

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

diff --git a/pkgs/by-name/pr/protontricks/package.nix b/pkgs/by-name/pr/protontricks/package.nix
index b2b5cbbb3ddb..5dc11cc3d67a 100644
--- a/pkgs/by-name/pr/protontricks/package.nix
+++ b/pkgs/by-name/pr/protontricks/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "protontricks";
-  version = "1.14.0";
+  version = "1.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Matoking";
     repo = "protontricks";
     tag = finalAttrs.version;
-    hash = "sha256-36Yst8j5xhXulNp/YGO3pDnvxpyT4ZuEjwSvJIESUSw=";
+    hash = "sha256-pTBpzSBGFUmol3Osb78yhyZup2DogLpNaBg/kF0dVGI=";
   };
 
   patches = [

From 2f81f5cd8408173cf396069263fc37966b79ef29 Mon Sep 17 00:00:00 2001
From: Philip White <philip@0xfff.me>
Date: Mon, 30 Mar 2026 21:53:22 -0700
Subject: [PATCH 057/389] jan: 0.7.5 -> 0.7.9

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 5382c883cea6..027ddfd7cea1 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -12,16 +12,16 @@
 
 let
   pname = "Jan";
-  version = "0.7.5";
+  version = "0.7.9";
 
   darwin-src = fetchzip {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
-    hash = "sha256-stTsLKE+2gUKAVwJ2/gOckoL6Nygwr0rkugD1jGj1w4=";
+    hash = "sha256-3SN/yZr40Zp6Oa3rDUnum1m7dwK8jbe6Bxx9iSHDM9U=";
   };
 
   linux-src = fetchurl {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
-    hash = "sha256-RIEBpeogNIDPMpoY5Gk8q4+t7jxcWJEZLPqJHWyaVk4=";
+    hash = "sha256-SMcjig6J/HCpLthT8dHC6yED6uuHyaTG/xLnUIlZHP8=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 81d2f116a09e85a4a7d12cc0d2aa96181c908e9f Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:54:56 +0200
Subject: [PATCH 058/389] shh: 2026.1.27 -> 2026.3.8

---
 pkgs/by-name/sh/shh/fix_run_checks.patch | 134 +----------------------
 pkgs/by-name/sh/shh/package.nix          |  43 ++------
 2 files changed, 16 insertions(+), 161 deletions(-)

diff --git a/pkgs/by-name/sh/shh/fix_run_checks.patch b/pkgs/by-name/sh/shh/fix_run_checks.patch
index ab62229bfbbe..f82775289f87 100644
--- a/pkgs/by-name/sh/shh/fix_run_checks.patch
+++ b/pkgs/by-name/sh/shh/fix_run_checks.patch
@@ -1,22 +1,18 @@
-commit b13576b678280ebaff56010ceb67b2ca83ddd7e8
+commit ec60c5de54b7d8500e02f78d6d8ade1b26bb2876
 Author: kuflierl <41301536+kuflierl@users.noreply.github.com>
-Date:   Tue Jan 27 12:19:11 2026 +0100
+Date:   Tue Mar 31 20:39:34 2026 +0200
 
     fix(tests): add support for nix-build-system for tests
-    
-    Co-authored-by: 06kellyjac <dev@j-k.io>
 
 diff --git a/src/systemd/resolver.rs b/src/systemd/resolver.rs
-index 901ebf3..aa51708 100644
+index 729dab7..44939d2 100644
 --- a/src/systemd/resolver.rs
 +++ b/src/systemd/resolver.rs
-@@ -651,17 +651,14 @@ mod tests {
+@@ -610,15 +610,12 @@ mod tests {
          let OptionValue::List(opt_list) = &candidates[0].value else {
              panic!();
          };
 -        assert!(opt_list.values.contains(&"/boot".to_owned()));
-+        // information gathering
-+        // eprint!("{}\n", &candidates[0].to_string());
          assert!(opt_list.values.contains(&"/dev".to_owned()));
          assert!(opt_list.values.contains(&"/etc".to_owned()));
 -        assert!(opt_list.values.contains(&"/home".to_owned()));
@@ -28,124 +24,6 @@ index 901ebf3..aa51708 100644
          assert!(opt_list.values.contains(&"/tmp".to_owned()));
 -        assert!(opt_list.values.contains(&"/usr".to_owned()));
 -        assert!(opt_list.values.contains(&"/var".to_owned()));
--        assert!(!opt_list.values.contains(&"/proc".to_owned()));
--        assert!(!opt_list.values.contains(&"/run".to_owned()));
- 
-         let actions = vec![ProgramAction::Read("/var/data".into())];
-         let candidates = resolve(&opts, &actions, &hardening_opts);
-diff --git a/tests/options.rs b/tests/options.rs
-index 815b413..00bf21e 100644
---- a/tests/options.rs
-+++ b/tests/options.rs
-@@ -23,7 +23,7 @@ fn run_true() {
-         .assert()
-         .success()
-         .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1))
--        .stdout(if Uid::effective().is_root() {
-+        .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1))
-         } else {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=").not())
-@@ -49,7 +49,7 @@ fn run_true() {
-         .stdout(predicate::str::contains("LockPersonality=true\n").count(1))
-         .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1))
-         .stdout(predicate::str::contains("ProtectClock=true\n").count(1))
--        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-+        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-         .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1));
- }
- 
-@@ -94,7 +94,7 @@ fn run_ls_dev() {
-         .assert()
-         .success()
-         .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1))
--        .stdout(if Uid::effective().is_root() {
-+        .stdout(if !env::current_exe().unwrap().starts_with("/home") {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1))
-         } else {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=").not())
-@@ -126,12 +126,12 @@ fn run_ls_dev() {
- #[test]
- fn run_ls_proc() {
-     cargo_bin_cmd!("shh")
--        .args(["run", "--", "busybox", "ls", "/proc/1/"])
-+        .args(["run", "--", "ls", "/proc/1/"])
-         .unwrap()
-         .assert()
-         .success()
-         .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1))
--        .stdout(if Uid::effective().is_root() {
-+        .stdout(if !env::current_exe().unwrap().starts_with("/home") {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1))
-         } else {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=").not())
-@@ -161,7 +161,7 @@ fn run_ls_proc() {
-         .assert()
-         .success()
-         .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1))
--        .stdout(if Uid::effective().is_root() {
-+        .stdout(if !env::current_exe().unwrap().starts_with("/home") {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1))
-         } else {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=").not())
-@@ -183,7 +183,7 @@ fn run_ls_proc() {
-         .stdout(predicate::str::contains("LockPersonality=true\n").count(1))
-         .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1))
-         .stdout(predicate::str::contains("ProtectClock=true\n").count(1))
--        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-+        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-         .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1));
- }
- 
-@@ -195,7 +195,7 @@ fn run_read_kallsyms() {
-         .assert()
-         .success()
-         .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1))
--        .stdout(if Uid::effective().is_root() {
-+        .stdout(if !env::current_exe().unwrap().starts_with("/home") {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1))
-         } else {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=").not())
-@@ -221,7 +221,7 @@ fn run_read_kallsyms() {
-         .stdout(predicate::str::contains("LockPersonality=true\n").count(1))
-         .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1))
-         .stdout(predicate::str::contains("ProtectClock=true\n").count(1))
--        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-+        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-         .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1));
- }
- 
-@@ -338,6 +338,7 @@ fn run_systemctl() {
-         .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1));
- }
- 
-+// patched due to nix build isolation
- #[test]
- fn run_ss() {
-     cargo_bin_cmd!("shh")
-@@ -346,7 +347,7 @@ fn run_ss() {
-         .assert()
-         .success()
-         .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1))
--        .stdout(if Uid::effective().is_root() {
-+        .stdout(if !env::current_exe().unwrap().starts_with("/home") {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1))
-         } else {
-             BoxPredicate::new(predicate::str::contains("ProtectHome=").not())
-@@ -362,7 +363,6 @@ fn run_ss() {
-         .stdout(predicate::str::contains("ProtectKernelModules=true\n").count(1))
-         .stdout(predicate::str::contains("ProtectKernelLogs=true\n").count(1))
-         .stdout(predicate::str::contains("ProtectControlGroups=true\n").count(1))
--        .stdout(predicate::str::contains("ProtectProc=").not())
-         .stdout(predicate::str::contains("MemoryDenyWriteExecute=true\n").count(1))
-         .stdout(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK AF_UNIX\n").count(1).or(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK\n").count(1)))
-         .stdout(predicate::str::contains("SocketBindDeny=ipv4:tcp\n").count(1))
-@@ -372,7 +372,7 @@ fn run_ss() {
-         .stdout(predicate::str::contains("LockPersonality=true\n").count(1))
-         .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1))
-         .stdout(predicate::str::contains("ProtectClock=true\n").count(1))
--        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-+        .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1))
-         .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1));
- }
+         assert!(!opt_list.values.contains(&"/proc".to_owned()));
+         assert!(!opt_list.values.contains(&"/run".to_owned()));
  
diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index 429634129b24..896b1c872806 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -4,10 +4,8 @@
   fetchFromGitHub,
   nix-update-script,
   installShellFiles,
-  python3,
   strace,
   systemd,
-  iproute2,
   stdenv,
   enableDocumentationFeature ? true,
   enableDocumentationGeneration ? true,
@@ -18,16 +16,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shh";
-  version = "2026.1.27";
+  version = "2026.3.8";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RGxxpAr8E2KriwheWXcsxRRBhZST27Xp6LSdgzxsuUM=";
+    hash = "sha256-PWbPyhn103eLHelhf+m1iIIaKDCooiIRMzrn9xPTzoA=";
   };
 
-  cargoHash = "sha256-GjUu7QDLMs/E4l3tjMBqmfoGkdQJMzdM/Ovg04pIctU=";
+  cargoHash = "sha256-zE4qRXrQHqppTmZ9rHeqt4mvMgoRIzX73/CPf4IRgYo=";
 
   patches = [
     ./fix_run_checks.patch
@@ -35,35 +33,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env = {
     SHH_STRACE_BIN_PATH = lib.getExe strace;
+    # RUST_BACKTRACE = 1;
   };
 
-  buildFeatures = lib.optional enableDocumentationFeature "generate-extra";
-
-  checkFlags = [
-    # no access to system modules in build env
-    "--skip=run_ls_modules"
-    # missing systemd daemon in build env
-    "--skip=run_systemctl"
-    # no raw socket cap in nix build
-    "--skip=run_ping_4"
-    "--skip=run_ping_6"
-  ];
-
-  buildInputs = [
-    strace
-    systemd
-  ];
+  buildFeatures = lib.optional enableDocumentationFeature "generate-extras";
 
   nativeBuildInputs = [
     installShellFiles
     systemd
-    strace
-  ];
-
-  nativeCheckInputs = [
-    python3
-    iproute2
-  ];
+  ]
+  ++ (lib.optional (!isNativeDocgen) strace);
 
   # todo elvish
   postInstall = lib.optionalString enableDocumentationGeneration ''
@@ -73,13 +52,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
       if isNativeDocgen then
         ''
           $out/bin/shh gen-man-pages target/mangen
-          $out/bin/shh gen-shell-complete target/shellcomplete
+          $out/bin/shh gen-shell-completions target/shellcomplete
         ''
       else
         ''
           unset SHH_STRACE_BIN_PATH
-          cargo run --features generate-extra -- gen-man-pages target/mangen
-          cargo run --features generate-extra -- gen-shell-complete target/shellcomplete
+          cargo run --features generate-extras -- gen-man-pages target/mangen
+          cargo run --features generate-extras -- gen-shell-completions target/shellcomplete
         ''
     }
 
@@ -90,8 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh target/shellcomplete/_${finalAttrs.meta.mainProgram}
   '';
 
-  # RUST_BACKTRACE = 1;
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 74fa42ae539c7af9ee6d22f4e0ccd4c1c16d1d16 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Mon, 30 Mar 2026 00:35:21 +0200
Subject: [PATCH 059/389] python3Packages.obspec: init at 0.1.0

---
 .../python-modules/obspec/default.nix         | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/obspec/default.nix

diff --git a/pkgs/development/python-modules/obspec/default.nix b/pkgs/development/python-modules/obspec/default.nix
new file mode 100644
index 000000000000..a684b0e34537
--- /dev/null
+++ b/pkgs/development/python-modules/obspec/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+
+  # build system
+  hatchling,
+
+  # dependencies
+  typing-extensions,
+
+  # test dependencies
+  pytest,
+  pytest-mypy-plugins,
+  mypy,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "obspec";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "developmentseed";
+    repo = "obspec";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zO2T189WUl1HJkBLrGpArS5NoFNpEchWfjJQJEME5W8=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "obspec" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    mypy
+  ];
+
+  checkInputs = [
+    pytest-mypy-plugins
+  ];
+
+  meta = {
+    description = "Object storage interface definitions for Python";
+    homepage = "http://developmentseed.org/obspec/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ autra ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62f1694ede0a..922331fda58b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11319,6 +11319,8 @@ self: super: with self; {
 
   obsidian-media = callPackage ../development/python-modules/obsidian-media { };
 
+  obspec = callPackage ../development/python-modules/obspec { };
+
   obspy = callPackage ../development/python-modules/obspy { };
 
   obstore = callPackage ../development/python-modules/obstore { };

From dbe04393a8fd50d17837990d911b4fc22a88a689 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Mon, 30 Mar 2026 00:42:27 +0200
Subject: [PATCH 060/389] python3Packages.async-tiff: init at 0.7.1

---
 .../python-modules/async-tiff/default.nix     | 93 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 95 insertions(+)
 create mode 100644 pkgs/development/python-modules/async-tiff/default.nix

diff --git a/pkgs/development/python-modules/async-tiff/default.nix b/pkgs/development/python-modules/async-tiff/default.nix
new file mode 100644
index 000000000000..b1291723dfdf
--- /dev/null
+++ b/pkgs/development/python-modules/async-tiff/default.nix
@@ -0,0 +1,93 @@
+{
+  # utils
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch2,
+  lib,
+  rustPlatform,
+
+  # build and dependencies
+  llvmPackages,
+  maturin,
+  obspec,
+
+  # tests dependencies
+  pytestCheckHook,
+  numpy,
+  obstore,
+  pytest-asyncio,
+  rasterio,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "async-tiff";
+  version = "0.7.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "developmentseed";
+    repo = "async-tiff";
+    tag = "py-v${finalAttrs.version}";
+    hash = "sha256-o77iYqzBCloE5xgn0Sa6SWbrCMgnNuZwQ2MZ0wgtNew=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/developmentseed/async-tiff/commit/c7db2fc693089f3326328cc59863f8a9a6dd1cb9.patch?full_index=1";
+      hash = "sha256-FsOZk8KZ3guqIoECYRsBQMEq8TrAQn9Z01NqUJAQOu8=";
+    })
+  ];
+
+  postPatch = ''
+    cd python
+  '';
+
+  buildSystem = [ maturin ];
+
+  buildInputs = [ llvmPackages.libclang ];
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    pname = finalAttrs.pname;
+    version = finalAttrs.version;
+    src = finalAttrs.src;
+    hash = "sha256-AKa4SsBYBCabMlYJqTcbHv9Z7ouqtiIEK0el/i/fo6I=";
+
+    preBuild = ''
+      cd python
+    '';
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+    rustPlatform.bindgenHook
+  ];
+
+  dependencies = [
+    obspec
+  ];
+
+  pythonImportsCheck = [ "async_tiff" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  checkInputs = [
+    numpy
+    obstore
+    pytest-asyncio
+    rasterio
+  ];
+
+  disabledTests = [
+    # network access
+    "test_cog_s3"
+    "test_raise_typeerror_fetch_tile_striped_tiff"
+  ];
+
+  meta = {
+    description = "Async TIFF reader for Python";
+    homepage = "http://developmentseed.org/async-tiff/";
+    license = lib.licenses.mit;
+    teams = [ lib.teams.geospatial ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 922331fda58b..b0f810a11671 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1122,6 +1122,8 @@ self: super: with self; {
 
   async-stagger = callPackage ../development/python-modules/async-stagger { };
 
+  async-tiff = callPackage ../development/python-modules/async-tiff { };
+
   async-timeout = callPackage ../development/python-modules/async-timeout { };
 
   async-tkinter-loop = callPackage ../development/python-modules/async-tkinter-loop { };

From c0715220056add043f40b31435ec499e702114e3 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Tue, 31 Mar 2026 15:50:40 +0200
Subject: [PATCH 061/389] python3Packages.async-geotiff: init at 0.4.0

---
 .../python-modules/async-geotiff/default.nix  | 76 +++++++++++++++++++
 .../async-geotiff/uv-build-relax-deps.patch   | 49 ++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 127 insertions(+)
 create mode 100644 pkgs/development/python-modules/async-geotiff/default.nix
 create mode 100644 pkgs/development/python-modules/async-geotiff/uv-build-relax-deps.patch

diff --git a/pkgs/development/python-modules/async-geotiff/default.nix b/pkgs/development/python-modules/async-geotiff/default.nix
new file mode 100644
index 000000000000..eb9bd93ef26c
--- /dev/null
+++ b/pkgs/development/python-modules/async-geotiff/default.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch2,
+  pytestCheckHook,
+  uv-build,
+
+  affine,
+  async-tiff,
+  defusedxml,
+  numpy,
+  pyproj,
+
+  # tests
+  pydantic,
+  rasterio,
+  morecantile,
+  jsonschema,
+  pytest-asyncio,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "async-geotiff";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "developmentseed";
+    repo = "async-geotiff";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-J72/VRDAgqGOm7rYmlkURKgWSIa11L260LX447MQWbc=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # see https://github.com/developmentseed/async-geotiff/pull/136
+    ./uv-build-relax-deps.patch
+    # see https://github.com/developmentseed/async-tiff/pull/292
+    (fetchpatch2 {
+      url = "https://github.com/developmentseed/async-geotiff/commit/f8325c0decb2a7e61faf3db5e51ec5a104d3cbdb.patch?full_index=1";
+      hash = "sha256-RLqMWKtjDSmxQkUXz9dXKIIqRXM7BWkuJIbbeHxCPyQ=";
+    })
+  ];
+
+  build-system = [ uv-build ];
+
+  # see https://github.com/developmentseed/async-geotiff/pull/133
+  pythonRemoveDeps = [ "types-defusedxml" ];
+
+  dependencies = [
+    affine
+    async-tiff
+    defusedxml
+    numpy
+    pyproj
+  ];
+
+  pythonImportsCheck = [ "async_geotiff" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  checkInputs = [
+    jsonschema
+    morecantile
+    rasterio
+    pydantic
+    pytest-asyncio
+  ];
+
+  meta = {
+    description = "Fast, async GeoTIFF and COG reader for Python";
+    homepage = "https://developmentseed.org/async-geotiff/latest/";
+    license = lib.licenses.mit;
+    teams = [ lib.teams.geospatial ];
+  };
+})
diff --git a/pkgs/development/python-modules/async-geotiff/uv-build-relax-deps.patch b/pkgs/development/python-modules/async-geotiff/uv-build-relax-deps.patch
new file mode 100644
index 000000000000..68597869ca15
--- /dev/null
+++ b/pkgs/development/python-modules/async-geotiff/uv-build-relax-deps.patch
@@ -0,0 +1,49 @@
+diff --git i/pyproject.toml w/pyproject.toml
+index 601e2e5..cd26339 100644
+--- i/pyproject.toml
++++ w/pyproject.toml
+@@ -69,7 +69,7 @@ docs = [
+ 
+ 
+ [build-system]
+-requires = ["uv_build>=0.8.8,<0.9.0"]
++requires = ["uv_build>=0.8.8,<0.12.0"]
+ build-backend = "uv_build"
+ 
+ [tool.ruff]
+diff --git i/uv.lock w/uv.lock
+index e7cd10f..2a74412 100644
+--- i/uv.lock
++++ w/uv.lock
+@@ -55,7 +55,6 @@ dependencies = [
+     { name = "defusedxml" },
+     { name = "numpy" },
+     { name = "pyproj" },
+-    { name = "types-defusedxml" },
+ ]
+ 
+ [package.optional-dependencies]
+@@ -77,6 +76,7 @@ dev = [
+     { name = "pytest-asyncio" },
+     { name = "rasterio", version = "1.4.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" },
+     { name = "rasterio", version = "1.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" },
++    { name = "types-defusedxml" },
+     { name = "types-jsonschema" },
+ ]
+ docs = [
+@@ -97,7 +97,6 @@ requires-dist = [
+     { name = "morecantile", marker = "extra == 'morecantile'", specifier = ">=7.0,<8.0" },
+     { name = "numpy", specifier = ">=2.0" },
+     { name = "pyproj", specifier = ">=3.3.0" },
+-    { name = "types-defusedxml", specifier = ">=0.7.0.20250822" },
+ ]
+ provides-extras = ["morecantile"]
+ 
+@@ -114,6 +113,7 @@ dev = [
+     { name = "pytest", specifier = ">=9.0.2" },
+     { name = "pytest-asyncio", specifier = ">=1.3.0" },
+     { name = "rasterio", specifier = ">=1.4.4" },
++    { name = "types-defusedxml", specifier = ">=0.7.0.20250822" },
+     { name = "types-jsonschema", specifier = ">=4.26.0.20260109" },
+ ]
+ docs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b0f810a11671..99af1ae3f9bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1114,6 +1114,8 @@ self: super: with self; {
 
   async-generator = callPackage ../development/python-modules/async-generator { };
 
+  async-geotiff = callPackage ../development/python-modules/async-geotiff { };
+
   async-interrupt = callPackage ../development/python-modules/async-interrupt { };
 
   async-lru = callPackage ../development/python-modules/async-lru { };

From 7dd6d4b8d0d51281d09507eb1577f18e41909514 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Tue, 31 Mar 2026 15:56:53 +0200
Subject: [PATCH 062/389] python3Packages.rio-tiler: 8.0.5 -> 9.0.4

---
 .../python-modules/rio-tiler/default.nix          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index 91dc919876ca..eb6672f51bbe 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pytestCheckHook,
 
+  async-geotiff,
   attrs,
   boto3,
   cachetools,
@@ -17,21 +18,23 @@
   obstore,
   pydantic,
   pystac,
+  pytest-asyncio,
   rasterio,
   rioxarray,
+  typing-extensions,
   zarr,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "rio-tiler";
-  version = "8.0.5";
+  version = "9.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cogeotiff";
     repo = "rio-tiler";
     tag = finalAttrs.version;
-    hash = "sha256-FOTwP4iTLfWl81KKarLOQQyp4gpi6Q+pjUXfZrXXsfo=";
+    hash = "sha256-R8vmb33ZfKGqRLkJ55npL031Gnc7HTUDeWiCvtaLsiM=";
   };
 
   build-system = [ hatchling ];
@@ -47,6 +50,7 @@ buildPythonPackage (finalAttrs: {
     pydantic
     pystac
     rasterio
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -64,11 +68,18 @@ buildPythonPackage (finalAttrs: {
   ]
   ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
+  checkInputs = [
+    async-geotiff
+    pytest-asyncio
+  ];
+
   pythonImportsCheck = [ "rio_tiler" ];
 
   disabledTests = [
     # Requires network access
     "test_dataset_reader"
+    # for some reason, str date representation are not the same
+    "test_xarray_reader"
   ];
 
   meta = {

From aba74a9054540570e66cc7ca4a0a399afd80fdf7 Mon Sep 17 00:00:00 2001
From: Jo <jopejoe1@missing.ninja>
Date: Wed, 1 Apr 2026 12:23:24 +0200
Subject: [PATCH 063/389] installFontsHook: install some more font formats

This adds support for installing type1 fonts and their support files, OpenType-collections and x11 specific formats.
---
 pkgs/build-support/setup-hooks/install-fonts.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/install-fonts.sh b/pkgs/build-support/setup-hooks/install-fonts.sh
index 619a11fc6ccb..27f9aeb82cd6 100644
--- a/pkgs/build-support/setup-hooks/install-fonts.sh
+++ b/pkgs/build-support/setup-hooks/install-fonts.sh
@@ -38,7 +38,13 @@ installFonts() {
   installFont 'ttf' "$out/share/fonts/truetype"
   installFont 'ttc' "$out/share/fonts/truetype"
   installFont 'otf' "$out/share/fonts/opentype"
+  installFont 'otc' "$out/share/fonts/opentype"
+  installFont 'pfa' "$out/share/fonts/type1"
+  installFont 'pfb' "$out/share/fonts/type1"
+  installFont 'pfm' "$out/share/fonts/type1"
+  installFont 'afm' "$out/share/fonts/type1"
   installFont 'bdf' "$out/share/fonts/misc"
+  installFont 'pcf' "$out/share/fonts/misc"
   installFont 'otb' "$out/share/fonts/misc"
   installFont 'psf' "$out/share/consolefonts"
   installFont 'psfu' "$out/share/consolefonts"

From 22ea9286c5a2d996557e10bc321fe0283e87a9ac Mon Sep 17 00:00:00 2001
From: kaynetik <aleksandar@nesovic.dev>
Date: Wed, 1 Apr 2026 12:35:32 +0200
Subject: [PATCH 064/389] tfenv: init at 3.0.0

Signed-off-by: kaynetik <aleksandar@nesovic.dev>
---
 pkgs/by-name/tf/tfenv/package.nix | 76 +++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 pkgs/by-name/tf/tfenv/package.nix

diff --git a/pkgs/by-name/tf/tfenv/package.nix b/pkgs/by-name/tf/tfenv/package.nix
new file mode 100644
index 000000000000..735853aacc08
--- /dev/null
+++ b/pkgs/by-name/tf/tfenv/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  makeWrapper,
+  nix-update-script,
+  unzip,
+  curl,
+  gnugrep,
+  gnused,
+  gawk,
+  coreutils,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "tfenv";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "tfutils";
+    repo = "tfenv";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-2Fpaj/UQDE7PNFX9GNr4tygvKmm/X0yWVVerJ+Y6eks=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/lib $out/libexec $out/share
+
+    cp -r lib/* $out/lib/
+    cp -r libexec/* $out/libexec/
+    cp -r share/* $out/share/
+
+    install -m0644 CHANGELOG.md $out/CHANGELOG.md
+
+    install -m0755 bin/tfenv $out/bin/tfenv
+    install -m0755 bin/terraform $out/bin/terraform
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      [ -f "$f" ] || continue
+      wrapProgram "$f" \
+        --prefix PATH : "${
+          lib.makeBinPath [
+            unzip
+            curl
+            gnugrep
+            gnused
+            gawk
+            coreutils
+          ]
+        }"
+    done
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terraform version manager";
+    homepage = "https://github.com/tfutils/tfenv";
+    changelog = "https://github.com/tfutils/tfenv/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kaynetik ];
+    mainProgram = "tfenv";
+    platforms = lib.platforms.unix;
+  };
+})

From ca1a2dfd55d92dfe546248ef08e439426062415f Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Mon, 30 Mar 2026 12:25:54 +0200
Subject: [PATCH 065/389] python3Packages.odfdo: init at 3.22.3

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 .../python-modules/odfdo/default.nix          | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/odfdo/default.nix

diff --git a/pkgs/development/python-modules/odfdo/default.nix b/pkgs/development/python-modules/odfdo/default.nix
new file mode 100644
index 000000000000..288c83a37f63
--- /dev/null
+++ b/pkgs/development/python-modules/odfdo/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  lxml,
+  pillow,
+  uv-build,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "odfdo";
+  version = "3.22.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jdum";
+    repo = "odfdo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1cOi7aAJ8jWjLuQbhd7aK5s2rJ5IvkTLIl9atKmXKMU=";
+  };
+
+  build-system = [ uv-build ];
+
+  dependencies = [ lxml ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pillow
+  ];
+
+  meta = {
+    description = "OpenDocument Format (ODF, ISO/IEC 26300) library for Python";
+    homepage = "https://github.com/jdum/odfdo";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62f1694ede0a..afba0799f594 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11349,6 +11349,8 @@ self: super: with self; {
 
   oddsprout = callPackage ../development/python-modules/oddsprout { };
 
+  odfdo = callPackage ../development/python-modules/odfdo { };
+
   odfpy = callPackage ../development/python-modules/odfpy { };
 
   odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };

From bf4e057ad8409804f460fe7a2446a7460a30de58 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Wed, 1 Apr 2026 14:14:41 +0200
Subject: [PATCH 066/389] python3Packages.odsgenerator: init at 1.12.0

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 .../python-modules/odsgenerator/default.nix   | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/odsgenerator/default.nix

diff --git a/pkgs/development/python-modules/odsgenerator/default.nix b/pkgs/development/python-modules/odsgenerator/default.nix
new file mode 100644
index 000000000000..8642be0be7ce
--- /dev/null
+++ b/pkgs/development/python-modules/odsgenerator/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  odfdo,
+  pyyaml,
+  uv-build,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "odsgenerator";
+  version = "1.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jdum";
+    repo = "odsgenerator";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FfwyqNI5Hz2Muoe/VWgQigea6D042UoRbXDV9GNV4w4=";
+  };
+
+  build-system = [ uv-build ];
+
+  dependencies = [
+    odfdo
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build"
+    substituteInPlace tests/test_cli.py \
+      --replace-fail '"odsgenerator"' "\"$out/bin/odsgenerator\""
+  '';
+
+  meta = {
+    description = "odsgenerator generates an ODF .ods file from json or yaml file";
+    homepage = "https://github.com/jdum/odsgenerator";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index afba0799f594..6d40aa76fcea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11355,6 +11355,8 @@ self: super: with self; {
 
   odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };
 
+  odsgenerator = callPackage ../development/python-modules/odsgenerator { };
+
   oelint-data = callPackage ../development/python-modules/oelint-data { };
 
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };

From 0dd3bfc74f3b8d8a1b2b5963fd758f263421b9a0 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Wed, 1 Apr 2026 14:14:54 +0200
Subject: [PATCH 067/389] python3Packages.odsparsator: init at 1.14.0

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 .../python-modules/odsparsator/default.nix    | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/odsparsator/default.nix

diff --git a/pkgs/development/python-modules/odsparsator/default.nix b/pkgs/development/python-modules/odsparsator/default.nix
new file mode 100644
index 000000000000..e07cf0d6f22f
--- /dev/null
+++ b/pkgs/development/python-modules/odsparsator/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  odfdo,
+  uv-build,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "odsparsator";
+  version = "1.14.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jdum";
+    repo = "odsparsator";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DpVWkspaZYYJHGYOrLte4JevH25xRzu38M2+QdFG22M=";
+  };
+
+  build-system = [ uv-build ];
+
+  dependencies = [ odfdo ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build"
+    substituteInPlace tests/test_cli.py \
+      --replace-fail '"odsparsator"' "\"$out/bin/odsparsator\""
+  '';
+
+  meta = {
+    description = "Generate a json file from an OpenDocument Format .ods file";
+    homepage = "https://github.com/jdum/odsparsator";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d40aa76fcea..d2ecf5c7b249 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11357,6 +11357,8 @@ self: super: with self; {
 
   odsgenerator = callPackage ../development/python-modules/odsgenerator { };
 
+  odsparsator = callPackage ../development/python-modules/odsparsator { };
+
   oelint-data = callPackage ../development/python-modules/oelint-data { };
 
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };

From 2d4cd5a04f51eea41492ca52657e57c6fe2f7611 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Fri, 27 Mar 2026 07:49:30 +0000
Subject: [PATCH 068/389] python3Packages.manifestoo-core: add changelog
 location

---
 pkgs/development/python-modules/manifestoo-core/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index 1235fef6fb30..315af077c71b 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -22,6 +22,7 @@ buildPythonPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/acsone/manifestoo-core/blob/v${version}/HISTORY.rst";
     description = "Library to reason about Odoo addons manifests";
     homepage = "https://github.com/acsone/manifestoo-core";
     license = lib.licenses.lgpl3Only;

From 3d1b1be0efb8c25935eabe26ad075aa9ab7cf45b Mon Sep 17 00:00:00 2001
From: Patrick Chilton <chpatrick@gmail.com>
Date: Wed, 1 Apr 2026 15:21:59 +0200
Subject: [PATCH 069/389] anyk: 3.45.0 -> 3.48.0

---
 pkgs/by-name/an/anyk/version.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anyk/version.json b/pkgs/by-name/an/anyk/version.json
index c0bdfd9940da..cc976fd2b6d5 100644
--- a/pkgs/by-name/an/anyk/version.json
+++ b/pkgs/by-name/an/anyk/version.json
@@ -1,5 +1,5 @@
 {
-  "url": "https://web.archive.org/web/20251201151010/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
-  "sha256": "12l1ghjcaxqi80bpxqwvsy3krz7qkdcg3zcvvif3g3hvqz5wc31s",
-  "version": "3.45.0"
+  "url": "https://web.archive.org/web/20260401131728/https://nav.gov.hu/pfile/programFile?path=%2Fnyomtatvanyok%2Fletoltesek%2Fnyomtatvanykitolto_programok%2Fnyomtatvany_apeh%2Fkeretprogramok%2FAbevJava",
+  "sha256": "1y6p2h7y7a376k2y02sx77gxm1jndfg9ikmz1z5nikk1klp5sdmw",
+  "version": "3.48.0"
 }

From 78d3c7a20d6e6ee77f5462aaa5e5515b168bd6e4 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Wed, 1 Apr 2026 10:07:54 -0400
Subject: [PATCH 070/389] borg-sans-mono: adopt by pancaek

---
 pkgs/by-name/bo/borg-sans-mono/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/borg-sans-mono/package.nix b/pkgs/by-name/bo/borg-sans-mono/package.nix
index 151282cd02e0..00f7b9b3f641 100644
--- a/pkgs/by-name/bo/borg-sans-mono/package.nix
+++ b/pkgs/by-name/bo/borg-sans-mono/package.nix
@@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/marnen/borg-sans-mono";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
   };
 }

From 88d506f72d71d0c488d0e816b854f95284e19347 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Wed, 1 Apr 2026 10:08:35 -0400
Subject: [PATCH 071/389] borg-sans-mono: use installFonts hook

---
 pkgs/by-name/bo/borg-sans-mono/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bo/borg-sans-mono/package.nix b/pkgs/by-name/bo/borg-sans-mono/package.nix
index 00f7b9b3f641..979b9358b4f7 100644
--- a/pkgs/by-name/bo/borg-sans-mono/package.nix
+++ b/pkgs/by-name/bo/borg-sans-mono/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -14,13 +15,7 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-nn7TGeVm45t7QI8+eEREBTFg9aShYYKtdEYEwQwO2fQ=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 *.ttf -t $out/share/fonts/truetype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Droid Sans Mono Slashed + Hasklig-style ligatures";

From f45fba0201743bb2c193f7bfc8d8d1edde3c2982 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Tue, 31 Mar 2026 13:27:44 -0400
Subject: [PATCH 072/389] processing: Remove unused nixpkgs dependencies

These packages, if still necessary, are now fetched from Maven.
---
 pkgs/by-name/pr/processing/deps.json   | 157 ++++++++-----------------
 pkgs/by-name/pr/processing/package.nix |  66 -----------
 2 files changed, 52 insertions(+), 171 deletions(-)

diff --git a/pkgs/by-name/pr/processing/deps.json b/pkgs/by-name/pr/processing/deps.json
index d42591ac99b5..d728db94ded6 100644
--- a/pkgs/by-name/pr/processing/deps.json
+++ b/pkgs/by-name/pr/processing/deps.json
@@ -53,6 +53,11 @@
    "pom": "sha256-zzU+toek04gE0IYSpbxV5aO22ZWWdRC9yypfSH91bPY="
   }
  },
+ "https://dlcdn.apache.org": {
+  "/xmlgraphics/batik/binaries/batik-bin-1.19": {
+   "zip": "sha256-llQTrIM6XE5QPkVCk9L3TpZ8BEKqsgBpk+33LW7b6Oc="
+  }
+ },
  "https://github.com/processing": {
   "processing-examples/archive/b10c9e9a05a0d6c20d233ca7f30d315b5047720e": {
    "zip": "sha256-08ADdtsZ/lkbERbHliM5SSaFcTUnOplJdQx7eYR43qU="
@@ -61,60 +66,6 @@
    "zip": "sha256-MC3Ce5B5bFUA0aCkFQPCMGA5QuUw5vjmSzFnyEfR3Nw="
   }
  },
- "https://jogamp.org/deployment/maven/org/jogamp": {
-  "gluegen#gluegen-rt-main/2.5.0": {
-   "jar": "sha256-zBFPTAspsv5NBqXHkxg4gURSoEzJeJ4nshqwXTVBwQc=",
-   "pom": "sha256-KDtSN+Uh/300IFXZw6Zy0FgglyLQgvPnVPZw3mVtghg="
-  },
-  "gluegen#gluegen-rt/2.5.0": {
-   "jar": "sha256-NiDBhTaoZx/LHFlddEjp0xImuCQRevakxtRcZX9Nq+M=",
-   "pom": "sha256-6S7gyRmGFTV50qfh5QJQaMLCSlNSc3L+Vrqk2ZCwGPM="
-  },
-  "gluegen#gluegen-rt/2.5.0/natives-android-aarch64": {
-   "jar": "sha256-NFx328LbuUpcVwOVNfPp1k0LTqFyVS1lvwiyJKadhKc="
-  },
-  "gluegen#gluegen-rt/2.5.0/natives-linux-aarch64": {
-   "jar": "sha256-GuQH+YQzcknnzZvx8eFjdzvgVSi1Vi7KBhvM9jSxDa8="
-  },
-  "gluegen#gluegen-rt/2.5.0/natives-linux-amd64": {
-   "jar": "sha256-bZmNDB8E8QOJS3aQSQhhJFBQY86oaoKJYZS7U8iLBAo="
-  },
-  "gluegen#gluegen-rt/2.5.0/natives-linux-armv6hf": {
-   "jar": "sha256-STL1+0J/TAal/QOzhUPqAhmVY8QX8HS1gTf6JWSlRN0="
-  },
-  "gluegen#gluegen-rt/2.5.0/natives-macosx-universal": {
-   "jar": "sha256-Pb1dBU8QjD+MDAcoHm40lLhbibDYs/D770v2xByiVOw="
-  },
-  "gluegen#gluegen-rt/2.5.0/natives-windows-amd64": {
-   "jar": "sha256-pPA54vqdYWvp8mKE/9av5fribVIdIfKBJuXqoHP4pDg="
-  },
-  "jogl#jogl-all-main/2.5.0": {
-   "jar": "sha256-zBFPTAspsv5NBqXHkxg4gURSoEzJeJ4nshqwXTVBwQc=",
-   "pom": "sha256-mGNBTE/Rxfbuq3A2Lhs626GUgWl3cZVqMlbtU4nR0kc="
-  },
-  "jogl#jogl-all/2.5.0": {
-   "jar": "sha256-JFcXzOq8omSiEKiZ+IOdR70Sf1D4CJLq0id92Jy80wE=",
-   "pom": "sha256-awhqLkYde3kRocFl/8veKrebAMVMNgzxkcoA9feE22o="
-  },
-  "jogl#jogl-all/2.5.0/natives-android-aarch64": {
-   "jar": "sha256-M4/4m89L/TTDJSOYA9o+BB4ZmPUNuGCYzVSJoXTwk7U="
-  },
-  "jogl#jogl-all/2.5.0/natives-linux-aarch64": {
-   "jar": "sha256-5LngFakf5SKdPVOEjii4ZwCpD6vY5f6FeW9rHUm0Jm4="
-  },
-  "jogl#jogl-all/2.5.0/natives-linux-amd64": {
-   "jar": "sha256-6XhQ8pDY5Eugf6BQDXoHH/REIJCZ8Dct89unB8uj3cE="
-  },
-  "jogl#jogl-all/2.5.0/natives-linux-armv6hf": {
-   "jar": "sha256-tQgMQid574BQpqAk7O+AW8rP1Vp9TU4/b8XXDinY+4s="
-  },
-  "jogl#jogl-all/2.5.0/natives-macosx-universal": {
-   "jar": "sha256-Ay5WFnRDqA+fRHf77vJV5ZmIxs1SN6FRuUi95Ly3yAw="
-  },
-  "jogl#jogl-all/2.5.0/natives-windows-amd64": {
-   "jar": "sha256-zgt1X2vA7u/ThlOectE+TY6W4fCGyiIvigLhEyADIUI="
-  }
- },
  "https://plugins.gradle.org/m2": {
   "com/github/ben-manes#gradle-versions-plugin/0.52.0": {
    "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=",
@@ -387,10 +338,6 @@
   }
  },
  "https://repo.maven.apache.org/maven2": {
-  "antlr#antlr/2.7.7": {
-   "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=",
-   "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc="
-  },
   "bouncycastle#bcmail-jdk14/138": {
    "jar": "sha256-OJ9AXPpmsmAESEczk3oiYkeCpdhkVuDDXgB7YOvI41k=",
    "pom": "sha256-XP2ibQY7MUiu5Lcukc8NXRjGk4CAfGLr/NZXttk/ykw="
@@ -566,17 +513,17 @@
    "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=",
    "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc="
   },
-  "net/java/dev/jna#jna-platform/5.17.0": {
-   "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=",
-   "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ="
+  "net/java/dev/jna#jna-platform/5.18.1": {
+   "jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
+   "pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
   },
   "net/java/dev/jna#jna/5.12.1": {
    "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=",
    "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y="
   },
-  "net/java/dev/jna#jna/5.17.0": {
-   "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
-   "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
+  "net/java/dev/jna#jna/5.18.1": {
+   "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
+   "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
   },
   "net/thauvin/erik/urlencoder#urlencoder-lib-jvm/1.6.0": {
    "jar": "sha256-jQ/SrrSNGdxJxWPrwA8nSUfkX3FsEHU1wS6tY97NaI0=",
@@ -664,84 +611,84 @@
    "jar": "sha256-uukFuFg86nP70Lekel8pCX31l+EYdaRSXQ7rrj1JcqA=",
    "pom": "sha256-w9wJYboDpq7ZqYKYRdYP5zAgW/4i5cQKCPNC5aTbsVE="
   },
-  "org/eclipse/platform#org.eclipse.core.commands/3.12.400": {
-   "jar": "sha256-0IOPxFEzUjcgMUXtXAjnkxI2w1HwuG7gvtQY/ouD+xs=",
-   "pom": "sha256-VvaWUeXjKExahc04hAmgqVZ4ro+teQO7OuCufAJK0GU="
+  "org/eclipse/platform#org.eclipse.core.commands/3.12.500": {
+   "jar": "sha256-RHEzYuVe0o5ttdLDG/Z1JP7wh2RaRNwyOdrGDs4BfLk=",
+   "pom": "sha256-yD+4t0dc62ANfijxwyfGjhzSaFHeyEEKthn/9W17SoI="
   },
-  "org/eclipse/platform#org.eclipse.core.contenttype/3.9.700": {
-   "jar": "sha256-UQnqmnhxhPV/+CljW539Ytc2w5HUgefrKLqj0nj9wAY=",
-   "pom": "sha256-s1ueFPUNcb6ZBakpWBHiBV3dVBAWUwMhKSslFMhcV8c="
+  "org/eclipse/platform#org.eclipse.core.contenttype/3.9.800": {
+   "jar": "sha256-4MLblmANUZzjanX5t8lxr9KHDS0Fnu5L8kNtmzOqC40=",
+   "pom": "sha256-vZ20X3R3JIQpxxz4RlcC2r+xUgzoU0+dwl1BeOu1iXs="
   },
   "org/eclipse/platform#org.eclipse.core.expressions/3.9.500": {
    "jar": "sha256-hES13pDJtKtSjI6lw0HH6HLQ2+gkGreQhVUQhtlufJ4=",
    "pom": "sha256-1Ks7hbJUOHlXRXwfRrcAG1qQqJjFIixQIKB5DlFhalA="
   },
-  "org/eclipse/platform#org.eclipse.core.filesystem/1.11.300": {
-   "jar": "sha256-6zJJS6uuCiEGYuFhq8vE33BXdI4AMyahVupneDyorO4=",
-   "pom": "sha256-riTI0aUrpG3UKlyUP9xfw0Ky9A1Ff4E8N+gs/o/Gdp4="
+  "org/eclipse/platform#org.eclipse.core.filesystem/1.11.400": {
+   "jar": "sha256-b3C5XRS5DsV7lMXj26fh0YlnnPmkvEUm6ckb7tfWoO8=",
+   "pom": "sha256-sQA8+u8BN+YzwThrzFfbCl5Yelm1Fx5We6Uwz6u/jMU="
   },
   "org/eclipse/platform#org.eclipse.core.jobs/3.15.700": {
    "jar": "sha256-NwFReae5uQ0Wy5L0sb5gg6Gm2tJUKPqPa4libwzC2nk=",
    "pom": "sha256-OUVAotjHPjVRHz1f8J2fNkdm4P4steb4V8Tfqwl9Ot8="
   },
-  "org/eclipse/platform#org.eclipse.core.resources/3.23.0": {
-   "jar": "sha256-Llir4A41yZuFqq2Nc4wqh3EDa+L0oitl2QvBRKgGcnA=",
-   "pom": "sha256-AuUbd6oS0LZAFFNvA7dCjFpWF36Ettqb5sDnWm8jGo0="
+  "org/eclipse/platform#org.eclipse.core.resources/3.23.200": {
+   "jar": "sha256-d5PgetR4AfYqqnBPCkbWD4wK6AdeAPAucg1phiv+N7w=",
+   "pom": "sha256-CPZTnfSlOMqg0Hsde2tHJsDpck6GWH6qMXKx0RAH8fg="
   },
-  "org/eclipse/platform#org.eclipse.core.runtime/3.34.0": {
-   "jar": "sha256-B2s7+RXTzgN7eHfIfRfR0kQhNd0+eMXy7mEPXYg3kwE=",
-   "pom": "sha256-b8TJb6EII4AhaatyU943S3qvWnSYO4o+tLok9vELUvk="
+  "org/eclipse/platform#org.eclipse.core.runtime/3.34.200": {
+   "jar": "sha256-tPNqCssI8D0LPbVLIfxWOMggxEdEakELpJalBw+jQ2M=",
+   "pom": "sha256-VUfhQDP4BRrlX0qDhwRsdAk7UgNs3DVu9p6lGOrn5uw="
   },
-  "org/eclipse/platform#org.eclipse.equinox.app/1.7.500": {
-   "jar": "sha256-GfLjYRNH22QzpIpiGHyfa9RohtDVaDZpfa//6YXqk+8=",
-   "pom": "sha256-sKK1z+znfceXeW5uqiwkrBkwVnB9BPVWBe3PdJC0XFY="
+  "org/eclipse/platform#org.eclipse.equinox.app/1.7.600": {
+   "jar": "sha256-/TUzmINRB2CPVUd5pukYkXJe+5Tg9XVZ0Ks86kthVsc=",
+   "pom": "sha256-cZhnUaan5uJyMJs6ZqySGUPplQlqXIgI1C6aDMJR1eg="
   },
-  "org/eclipse/platform#org.eclipse.equinox.common/3.20.200": {
-   "jar": "sha256-m4tcijQuf1vl+VFU6frvrmhvOYfndtzgMPN72EfNfzU=",
-   "pom": "sha256-XYyNb/aVj33ouZDJ/A7Ff3gyf1HgZJc/V5LiA1Sx7m4="
+  "org/eclipse/platform#org.eclipse.equinox.common/3.20.300": {
+   "jar": "sha256-hV0jmvKd2x0iSNN4aXwJW+Yu+5pbPBuybTH3uXqOFq4=",
+   "pom": "sha256-ALs//vT1/wr/lXaIGYlvxY1kxitKkEc60niE6P0viFI="
   },
-  "org/eclipse/platform#org.eclipse.equinox.preferences/3.12.0": {
-   "jar": "sha256-1MnqXEzYCLl/FUkLu9fdj1jHZ8aFttBZGUdX5m1u7zU=",
-   "pom": "sha256-3SwqP9ZklaQTCAvJzkDktSg5SGV37IrnJ9APxoLhUO8="
+  "org/eclipse/platform#org.eclipse.equinox.preferences/3.12.100": {
+   "jar": "sha256-/QToGiirMra7BzKG6yk8RLdgF2/PHjXvFWFNYt+CD4Y=",
+   "pom": "sha256-IYxiWoWw5QQU6dGRKFYUtrL+qf9/0TITKm4PkyQzMZY="
   },
-  "org/eclipse/platform#org.eclipse.equinox.registry/3.12.500": {
-   "jar": "sha256-Tl7/034/bicyoeeIx2n267SdStYOnl2RxXokz/vC+v4=",
-   "pom": "sha256-ddMClkYdU0SA4qK9boylKnDd6+2KKNd8qBb0uVK9SdY="
+  "org/eclipse/platform#org.eclipse.equinox.registry/3.12.600": {
+   "jar": "sha256-T4zXJoFEa1mDkKjCTum5mW9uTF+r7QIrUL0m9vWgv2w=",
+   "pom": "sha256-Kwg3b6gZu5Q3vHDKJM6w8NtE3gE/63F9vmmaKU+2MSc="
   },
-  "org/eclipse/platform#org.eclipse.osgi/3.23.200": {
-   "jar": "sha256-jZQFjq0/RlGQAWaSSmd8O+tumW8HL6vzhf/dcFELxJM=",
-   "pom": "sha256-py2jWv3kgc2hDp2UsxpUwbkKe2hQqt5MmtnpVtdIWtA="
+  "org/eclipse/platform#org.eclipse.osgi/3.24.100": {
+   "jar": "sha256-0g+JIDBZb7wsJdoArNvSdQ93zv1oE2wzo+J5uJSYZ6g=",
+   "pom": "sha256-+U4i9QNmKcxz7AM41+C5wFx2g70TZ4wWa8p/fIfm+oE="
   },
-  "org/eclipse/platform#org.eclipse.text/3.14.400": {
-   "jar": "sha256-BIRcZhMn9wBe2WAzzzOCLU9gsBGJvD6ehk5RL1cJYhM=",
-   "pom": "sha256-e9x89hsAsHEpsEYWo3MrxTUjOnj9phwWBRl7kqCZE1A="
+  "org/eclipse/platform#org.eclipse.text/3.14.600": {
+   "jar": "sha256-1nW4pgPmL0PLqcHyS+ysEYKzKHwDPEL7gQYmjafTLXE=",
+   "pom": "sha256-ej/wQTbv0Vn8pN0QEk2idD+fSFUN7shfR4TTDxZIQx0="
   },
   "org/eclipse/platform/org.eclipse.core.filesystem/maven-metadata": {
    "xml": {
     "groupId": "org.eclipse.platform",
-    "lastUpdated": "20250906152134",
-    "release": "1.11.300"
+    "lastUpdated": "20251208072743",
+    "release": "1.11.400"
    }
   },
   "org/eclipse/platform/org.eclipse.core.resources/maven-metadata": {
    "xml": {
     "groupId": "org.eclipse.platform",
-    "lastUpdated": "20250906152140",
-    "release": "3.23.0"
+    "lastUpdated": "20260309141945",
+    "release": "3.23.200"
    }
   },
   "org/eclipse/platform/org.eclipse.core.runtime/maven-metadata": {
    "xml": {
     "groupId": "org.eclipse.platform",
-    "lastUpdated": "20250906152136",
-    "release": "3.34.0"
+    "lastUpdated": "20260309141943",
+    "release": "3.34.200"
    }
   },
   "org/eclipse/platform/org.eclipse.text/maven-metadata": {
    "xml": {
     "groupId": "org.eclipse.platform",
-    "lastUpdated": "20250906152155",
-    "release": "3.14.400"
+    "lastUpdated": "20260309142023",
+    "release": "3.14.600"
    }
   },
   "org/jetbrains#annotations/13.0": {
diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix
index 0d0b774afaec..c3769639a7f6 100644
--- a/pkgs/by-name/pr/processing/package.nix
+++ b/pkgs/by-name/pr/processing/package.nix
@@ -2,14 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
-  unzip,
   makeWrapper,
   gradle_8,
   jdk17,
   jogl,
   rsync,
-  batik,
   stripJavaArchivesHook,
   wrapGAppsHook3,
   libGL,
@@ -19,41 +16,6 @@ let
   gradle = gradle_8.override { java = jdk17; };
   jdk = jdk17;
   buildNumber = "1310";
-  vaqua = fetchurl {
-    name = "VAqua9.jar";
-    url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
-    sha256 = "cd0b82df8e7434c902ec873364bf3e9a3e6bef8b59cbf42433130d71bf1a779c";
-  };
-
-  jna = fetchurl {
-    name = "jna-5.10.0.zip";
-    url = "https://github.com/java-native-access/jna/archive/5.10.0.zip";
-    sha256 = "B5CakOQ8225xNsk2TMV8CbK3RcsLlb+pHzjaY5JNwg0=";
-  };
-
-  flatlaf = fetchurl {
-    name = "flatlaf-2.4.jar";
-    url = "mirror://maven/com/formdev/flatlaf/2.4/flatlaf-2.4.jar";
-    sha256 = "NVMYiCd+koNCJ6X3EiRx1Aj+T5uAMSJ9juMmB5Os+zc=";
-  };
-
-  lsp4j = fetchurl {
-    name = "org.eclipse.lsp4j-0.19.0.jar";
-    url = "mirror://maven/org/eclipse/lsp4j/org.eclipse.lsp4j/0.19.0/org.eclipse.lsp4j-0.19.0.jar";
-    sha256 = "sha256-1DI5D9KW+GL4gT1qjwVZveOl5KVOEjt6uXDwsFzi8Sg=";
-  };
-
-  lsp4j-jsonrpc = fetchurl {
-    name = "org.eclipse.lsp4j.jsonrpc-0.19.0.jar";
-    url = "mirror://maven/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0/org.eclipse.lsp4j.jsonrpc-0.19.0.jar";
-    sha256 = "sha256-ozYTkvv7k0psCeX/PbSM3/Bl17qT3upX3trt65lmM9I=";
-  };
-
-  gson = fetchurl {
-    name = "gson-2.9.1.jar";
-    url = "mirror://maven/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar";
-    sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
-  };
 in
 stdenv.mkDerivation rec {
   pname = "processing";
@@ -79,7 +41,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gradle
-    unzip
     makeWrapper
     stripJavaArchivesHook
     wrapGAppsHook3
@@ -88,7 +49,6 @@ stdenv.mkDerivation rec {
     jdk
     jogl
     rsync
-    batik
   ];
 
   mitmCache = gradle.fetchDeps {
@@ -107,19 +67,6 @@ stdenv.mkDerivation rec {
     runHook preBuild
     runHook preGradleUpdate
 
-    mkdir -p app/lib
-    ln -s ${vaqua} app/lib/VAqua9.jar
-    ln -s ${flatlaf} app/lib/flatlaf.jar
-    ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
-    ln -s ${lsp4j-jsonrpc} java/mode/org.eclipse.lsp4j.jsonrpc.jar
-    ln -s ${gson} java/mode/gson.jar
-    unzip -qo ${jna} -d app/lib/
-    mv app/lib/{jna-5.10.0/dist/jna.jar,}
-    mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
-
-    ln -sf ${batik}/* java/libraries/svg/library/
-    cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
-
     gradle createDistributable
 
     runHook postGradleUpdate
@@ -139,19 +86,6 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     runHook preBuild
 
-    mkdir -p app/lib
-    ln -s ${vaqua} app/lib/VAqua9.jar
-    ln -s ${flatlaf} app/lib/flatlaf.jar
-    ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
-    ln -s ${lsp4j-jsonrpc} java/mode/org.eclipse.lsp4j.jsonrpc.jar
-    ln -s ${gson} java/mode/gson.jar
-    unzip -qo ${jna} -d app/lib/
-    mv app/lib/{jna-5.10.0/dist/jna.jar,}
-    mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
-
-    ln -sf ${batik}/* java/libraries/svg/library/
-    cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
-
     gradle assemble
 
     runHook postBuild

From bc3ea32f034bdc22eedd2a0daa787b26cd24fd2a Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Wed, 1 Apr 2026 14:49:39 -0400
Subject: [PATCH 073/389] processing: Add libXxf86vm as a dynamically loaded
 runtime dependency

---
 pkgs/by-name/pr/processing/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix
index c3769639a7f6..0bf8d7fa4434 100644
--- a/pkgs/by-name/pr/processing/package.nix
+++ b/pkgs/by-name/pr/processing/package.nix
@@ -10,6 +10,7 @@
   stripJavaArchivesHook,
   wrapGAppsHook3,
   libGL,
+  libxxf86vm,
 }:
 let
   # Force use of JDK 17, see https://github.com/processing/processing4/issues/1043
@@ -49,6 +50,8 @@ stdenv.mkDerivation rec {
     jdk
     jogl
     rsync
+    libGL
+    libxxf86vm
   ];
 
   mitmCache = gradle.fetchDeps {
@@ -108,7 +111,12 @@ stdenv.mkDerivation rec {
 
     makeWrapper $out/unwrapped/Processing $out/bin/Processing \
       ''${gappsWrapperArgs[@]} \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          libGL
+          libxxf86vm
+        ]
+      }" \
       --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
 
     runHook postInstall

From ca60c04e7b0213e04c783bdc91566f7ef77a21fc Mon Sep 17 00:00:00 2001
From: Phillip Susemiehl <psusemiehl@gmail.com>
Date: Thu, 2 Apr 2026 14:06:34 +0200
Subject: [PATCH 074/389] mcrl2: added wrapper

---
 pkgs/by-name/mc/mcrl2/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcrl2/package.nix b/pkgs/by-name/mc/mcrl2/package.nix
index c08219fe7d18..eda177c67e3d 100644
--- a/pkgs/by-name/mc/mcrl2/package.nix
+++ b/pkgs/by-name/mc/mcrl2/package.nix
@@ -8,6 +8,7 @@
   qt6,
   boost,
   ninja,
+  makeWrapper,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +24,8 @@ stdenv.mkDerivation rec {
   postInstall = lib.optional stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
     mv $out/mCRL2.app $out/Applications
+    mkdir $out/bin
+    makeWrapper "$out/Applications/mCRL2.app/Contents/MacOS/mCRL2" "$out/bin/mcrl2ide"
   '';
 
   postFixup = lib.optional stdenv.hostPlatform.isDarwin ''
@@ -52,7 +55,8 @@ stdenv.mkDerivation rec {
     libGL
     qt6.qtbase
     boost
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
   dontWrapQtApps = true;
 

From 2506b044feed0c79def13c444c85e57ba617b933 Mon Sep 17 00:00:00 2001
From: kaynetik <aleksandar@nesovic.dev>
Date: Wed, 1 Apr 2026 12:13:04 +0200
Subject: [PATCH 075/389] zinit: refactor to allow darwin builds

Signed-off-by: kaynetik <aleksandar@nesovic.dev>
---
 pkgs/by-name/zi/zinit/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index 918a6f8c6df7..bd9ec48a7553 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -20,19 +20,23 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "man"
+    "doc"
   ];
 
   strictDeps = true;
 
   nativeBuildInputs = [ installShellFiles ];
 
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
 
     # Source files
     mkdir -p $out/share/zinit
-    install -m0644 zinit{,-side,-install,-autoload}.zsh _zinit $out/share/zinit
+    install -m0644 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
     install -m0755 share/git-process-output.zsh $out/share/zinit
+    install -m0644 share/rpm2cpio.zsh $out/share/zinit
 
     # Autocompletion
     installShellCompletion --zsh _zinit
@@ -41,6 +45,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mkdir -p ${placeholder "man"}/share/man/man{1..9}
     installManPage doc/zinit.1
 
+    mkdir -p $doc/share/doc/zinit
+    install -m0644 doc/zsdoc/*.adoc $doc/share/doc/zinit
+    install -m0644 doc/HACKING.md $doc/share/doc/zinit
+
     runHook postInstall
   '';
 
@@ -51,8 +59,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=${placeholder "man"}/share/man"
   '';
 
-  #TODO: output doc through zshelldoc
-
   passthru = {
     updateScript = nix-update-script { };
   };
@@ -60,11 +66,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/zdharma-continuum/zinit";
     description = "Flexible zsh plugin manager";
+    changelog = "https://github.com/zdharma-continuum/zinit/blob/${finalAttrs.src.rev}/doc/CHANGELOG.md";
     license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       pasqui23
       sei40kr
       moraxyc
+      kaynetik
     ];
   };
 })

From 588b6b4b7c40907ca6a9b74c797da778706eb81c Mon Sep 17 00:00:00 2001
From: nitinbhat972 <nitinbhat972@gmail.com>
Date: Fri, 3 Apr 2026 01:25:21 +0530
Subject: [PATCH 076/389] cwal: 0.8.2 -> v0.8.4

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

diff --git a/pkgs/by-name/cw/cwal/package.nix b/pkgs/by-name/cw/cwal/package.nix
index 75fc2f7b1692..5e553ab7566c 100644
--- a/pkgs/by-name/cw/cwal/package.nix
+++ b/pkgs/by-name/cw/cwal/package.nix
@@ -6,19 +6,19 @@
   pkg-config,
   imagemagick,
   libimagequant,
-  lua,
+  luajit,
   makeBinaryWrapper,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cwal";
-  version = "0.8.2";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "nitinbhat972";
     repo = "cwal";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CvC7I0/Obn/IEXmbr8Hs7YqUk6NPgduJpDCNCHwU8lA=";
+    hash = "sha256-/5l/Wc85ElB0V1j2tCW5CXKJKvhz6vb6V696d8UPM0c=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     imagemagick
     libimagequant
-    lua
+    luajit
   ];
 
   postFixup = ''

From 57cbe42cc2e91853217408168607ac14b16792f2 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 2 Apr 2026 16:50:08 -0400
Subject: [PATCH 077/389] elogind: fixup hardcoded references to /sbin

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

diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix
index b08378bb96a1..c04853ffc773 100644
--- a/pkgs/by-name/el/elogind/package.nix
+++ b/pkgs/by-name/el/elogind/package.nix
@@ -35,6 +35,9 @@
   enableSystemd ? false,
 }:
 
+let
+  system = "/run/current-system/sw";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "elogind";
   version = "255.5";
@@ -148,6 +151,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
     (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
     (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc")
+    (lib.mesonOption "halt-path" "${system}/bin/halt")
+    (lib.mesonOption "poweroff-path" "${system}/bin/poweroff")
+    (lib.mesonOption "reboot-path" "${system}/bin/reboot")
     (lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl))
     (lib.mesonEnable "xenctrl" false)
   ];

From 90187790bc8fbace37b65ef404ed95f7dde1bb70 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 2 Apr 2026 16:52:36 -0400
Subject: [PATCH 078/389] elogind: fixup rules to work with eudev

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

diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix
index c04853ffc773..5861d9926dcf 100644
--- a/pkgs/by-name/el/elogind/package.nix
+++ b/pkgs/by-name/el/elogind/package.nix
@@ -86,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" ""
+  ''
+  + lib.optionalString (!enableSystemd) ''
+    substituteInPlace ./rules.d/71-seat.rules.in --replace-fail "{{BINDIR}}/udevadm" "${eudev}/bin/udevadm"
   '';
 
   patches = [

From 6b4db724eb52eaeb0a78b11f707fbe211e844dc1 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 2 Apr 2026 13:57:54 -0700
Subject: [PATCH 079/389] fastcap: fix build with gcc15

---
 .../fastcap-mulglobal-add-ualloc-declaration.patch  | 12 ++++++++++++
 pkgs/by-name/fa/fastcap/package.nix                 | 13 ++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/fa/fastcap/fastcap-mulglobal-add-ualloc-declaration.patch

diff --git a/pkgs/by-name/fa/fastcap/fastcap-mulglobal-add-ualloc-declaration.patch b/pkgs/by-name/fa/fastcap/fastcap-mulglobal-add-ualloc-declaration.patch
new file mode 100644
index 000000000000..4ca9628bb905
--- /dev/null
+++ b/pkgs/by-name/fa/fastcap/fastcap-mulglobal-add-ualloc-declaration.patch
@@ -0,0 +1,12 @@
+Fix implicit int truncating points in 64 bit systems.
+--- a/src/mulGlobal.h
++++ b/src/mulGlobal.h
+@@ -77,6 +77,8 @@
+ /* #define MALCORE malloc */
+ #define MALCORE ualloc
+ 
++extern char *ualloc(unsigned int);
++
+ /* counts of memory usage by multipole matrix type */
+ extern long memcount;
+ extern long memQ2M;
diff --git a/pkgs/by-name/fa/fastcap/package.nix b/pkgs/by-name/fa/fastcap/package.nix
index cc6cb1a41d38..b0f5b9490943 100644
--- a/pkgs/by-name/fa/fastcap/package.nix
+++ b/pkgs/by-name/fa/fastcap/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./fastcap-mulglobal-drop-conflicting-lib.patch
     ./fastcap-mulsetup-add-forward-declarations.patch
+    ./fastcap-mulglobal-add-ualloc-declaration.patch
   ];
 
   nativeBuildInputs = [
@@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace ./doc/Makefile \
-      --replace '/bin/rm' 'rm'
+      --replace-fail '/bin/rm' 'rm'
 
     for f in "doc/*.tex" ; do
       sed -i -E $f \
@@ -54,8 +55,14 @@ stdenv.mkDerivation (finalAttrs: {
     "all"
   ];
 
-  # GCC 14 makes these errors by default
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=implicit-int";
+  env.NIX_CFLAGS_COMPILE = toString [
+    # gcc14
+    "-Wno-error=implicit-function-declaration"
+    "-Wno-error=return-mismatch"
+    "-Wno-error=implicit-int"
+    # gcc15
+    "-std=gnu17"
+  ];
 
   outputs = [
     "out"

From 7af9d2c8b44ff5b618537afbf6fda93e3a69a50c Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Thu, 2 Apr 2026 18:28:33 -0400
Subject: [PATCH 080/389] openpbs: 23.06.06-unstable-2026-01-29 ->
 23.06.06-unstable-2026-04-02

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 pkgs/by-name/op/openpbs/2709.patch  | 190 ----------------------------
 pkgs/by-name/op/openpbs/2711.patch  |  58 ---------
 pkgs/by-name/op/openpbs/package.nix |  11 +-
 3 files changed, 3 insertions(+), 256 deletions(-)
 delete mode 100644 pkgs/by-name/op/openpbs/2709.patch
 delete mode 100644 pkgs/by-name/op/openpbs/2711.patch

diff --git a/pkgs/by-name/op/openpbs/2709.patch b/pkgs/by-name/op/openpbs/2709.patch
deleted file mode 100644
index 42fa105a6fb1..000000000000
--- a/pkgs/by-name/op/openpbs/2709.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 236aa3fa2f5ee68a8be21a5cc3a729fb90539f1e Mon Sep 17 00:00:00 2001
-From: Eisuke Kawashima <e-kwsm@users.noreply.github.com>
-Date: Sun, 25 May 2025 20:38:53 +0900
-Subject: [PATCH] fix: fix -Wincompatible-pointer-types
-
-fix #2679
----
- src/include/pbs_nodes.h       | 4 ++--
- src/include/svrfunc.h         | 2 +-
- src/include/work_task.h       | 2 +-
- src/lib/Libattr/attr_fn_acl.c | 2 +-
- src/lib/Libnet/net_server.c   | 2 +-
- src/server/hook_func.c        | 2 +-
- src/server/issue_request.c    | 6 +++---
- src/server/node_manager.c     | 2 +-
- src/server/req_jobobit.c      | 2 +-
- src/server/req_manager.c      | 2 +-
- src/server/svr_movejob.c      | 2 +-
- 11 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/src/include/pbs_nodes.h b/src/include/pbs_nodes.h
-index bc206fdb77..5dbf1a3268 100644
---- a/src/include/pbs_nodes.h
-+++ b/src/include/pbs_nodes.h
-@@ -391,7 +391,7 @@ extern void set_vnode_state(struct pbsnode *, unsigned long, enum vnode_state_op
- extern struct resvinfo *find_vnode_in_resvs(struct pbsnode *, enum vnode_degraded_op);
- extern void free_rinf_list(struct resvinfo *);
- extern void degrade_offlined_nodes_reservations(void);
--extern void degrade_downed_nodes_reservations(void);
-+extern void degrade_downed_nodes_reservations(struct work_task *);
- 
- extern int mod_node_ncpus(struct pbsnode *pnode, long ncpus, int actmode);
- extern int initialize_pbsnode(struct pbsnode *, char *, int);
-@@ -461,7 +461,7 @@ struct pbsnode *node_recov_db(char *nd_name, struct pbsnode *pnode);
- extern int add_mom_to_pool(mominfo_t *);
- extern void reset_pool_inventory_mom(mominfo_t *);
- extern vnpool_mom_t *find_vnode_pool(mominfo_t *pmom);
--extern void mcast_msg();
-+extern void mcast_msg(struct work_task *);
- int get_job_share_type(struct job *pjob);
- #endif
- 
-diff --git a/src/include/svrfunc.h b/src/include/svrfunc.h
-index cc555fa88d..34f9958035 100644
---- a/src/include/svrfunc.h
-+++ b/src/include/svrfunc.h
-@@ -311,7 +311,7 @@ extern int svr_connect(pbs_net_t, unsigned int, void (*)(int), enum conn_type, i
- #ifdef _WORK_TASK_H
- extern void release_req(struct work_task *);
- #ifdef _BATCH_REQUEST_H
--extern int issue_Drequest(int, struct batch_request *, void (*)(), struct work_task **, int);
-+extern int issue_Drequest(int, struct batch_request *, void (*)(struct work_task *), struct work_task **, int);
- #endif /* _BATCH_REQUEST_H */
- #endif /* _WORK_TASK_H */
- 
-diff --git a/src/include/work_task.h b/src/include/work_task.h
-index 3cceb659b0..4d81795a41 100644
---- a/src/include/work_task.h
-+++ b/src/include/work_task.h
-@@ -90,7 +90,7 @@ struct work_task {
- 	int wt_aux2;			     /* optional info 2: e.g. *real* child pid (windows), tpp msgid etc */
- };
- 
--extern struct work_task *set_task(enum work_type, long event, void (*func)(), void *param);
-+extern struct work_task *set_task(enum work_type, long event, void (*func)(struct work_task *), void *param);
- extern int convert_work_task(struct work_task *ptask, enum work_type);
- extern void clear_task(struct work_task *ptask);
- extern void dispatch_task(struct work_task *);
-diff --git a/src/lib/Libattr/attr_fn_acl.c b/src/lib/Libattr/attr_fn_acl.c
-index 0ef2d5328e..b0373eafeb 100644
---- a/src/lib/Libattr/attr_fn_acl.c
-+++ b/src/lib/Libattr/attr_fn_acl.c
-@@ -97,7 +97,7 @@ static int user_order(char *old, char *new);
- static int group_order(char *old, char *new);
- static int
- set_allacl(attribute *, attribute *, enum batch_op,
--	   int (*order_func)());
-+	   int (*order_func)(char *, char *));
- 
- /* for all decode_*acl() - use decode_arst() */
- /* for all encode_*acl() - use encode_arst() */
-diff --git a/src/lib/Libnet/net_server.c b/src/lib/Libnet/net_server.c
-index 045acd303d..b9f6470dbd 100644
---- a/src/lib/Libnet/net_server.c
-+++ b/src/lib/Libnet/net_server.c
-@@ -104,7 +104,7 @@ static char logbuf[256];
- /* Private function within this file */
- static int conn_find_usable_index(int);
- static int conn_find_actual_index(int);
--static void accept_conn();
-+static void accept_conn(int);
- static void cleanup_conn(int);
- 
- /**
-diff --git a/src/server/hook_func.c b/src/server/hook_func.c
-index b9534dfb9a..e0d0e52745 100644
---- a/src/server/hook_func.c
-+++ b/src/server/hook_func.c
-@@ -229,7 +229,7 @@ extern pbs_list_head svr_execjob_preresume_hooks;
- extern time_t time_now;
- extern struct python_interpreter_data svr_interp_data;
- extern pbs_list_head task_list_event;
--extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid, void *parm1, void *parm2);
-+extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(struct work_task *), char *msgid, void *parm1, void *parm2);
- 
- extern char *path_rescdef;
- extern char *path_hooks_rescdef;
-diff --git a/src/server/issue_request.c b/src/server/issue_request.c
-index 6bef14553b..6cf28dab76 100644
---- a/src/server/issue_request.c
-+++ b/src/server/issue_request.c
-@@ -201,7 +201,7 @@ reissue_to_svr(struct work_task *pwt)
- 		/* either timed-out or got hard error, tell post-function  */
- 		pwt->wt_aux = -1;   /* seen as error by post function  */
- 		pwt->wt_event = -1; /* seen as connection by post func */
--		((void (*)()) pwt->wt_parm2)(pwt);
-+		((void (*)(struct work_task *)) pwt->wt_parm2)(pwt);
- 	}
- 	return;
- }
-@@ -326,7 +326,7 @@ release_req(struct work_task *pwt)
-  *
-  */
- struct work_task *
--add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid, void *parm1, void *parm2)
-+add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(struct work_task *), char *msgid, void *parm1, void *parm2)
- {
- 	struct work_task *ptask = NULL;
- 
-@@ -394,7 +394,7 @@ add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid,
-  *
-  */
- int
--issue_Drequest(int conn, struct batch_request *request, void (*func)(), struct work_task **ppwt, int prot)
-+issue_Drequest(int conn, struct batch_request *request, void (*func)(struct work_task *), struct work_task **ppwt, int prot)
- {
- 	struct attropl *patrl;
- 	struct work_task *ptask;
-diff --git a/src/server/node_manager.c b/src/server/node_manager.c
-index a6fbf5805e..62661a2361 100644
---- a/src/server/node_manager.c
-+++ b/src/server/node_manager.c
-@@ -7923,7 +7923,7 @@ degrade_offlined_nodes_reservations(void)
-  * @par MT-safe: No
-  */
- void
--degrade_downed_nodes_reservations(void)
-+degrade_downed_nodes_reservations(struct work_task *)
- {
- 	int i;
- 	struct pbsnode *pn;
-diff --git a/src/server/req_jobobit.c b/src/server/req_jobobit.c
-index 37581cead4..034c3c0680 100644
---- a/src/server/req_jobobit.c
-+++ b/src/server/req_jobobit.c
-@@ -1337,7 +1337,7 @@ job_obit(ruu *pruu, int stream)
- 	job *pjob;
- 	svrattrl *patlist;
- 	struct work_task *ptask;
--	void (*eojproc)();
-+	void (*eojproc)(struct work_task *);
- 	char *mailmsg = NULL;
- 	char *msg = NULL;
- 
-diff --git a/src/server/req_manager.c b/src/server/req_manager.c
-index 14a50de62e..ac617d7be8 100644
---- a/src/server/req_manager.c
-+++ b/src/server/req_manager.c
-@@ -3612,7 +3612,7 @@ check_resource_set_on_jobs_or_resvs(struct batch_request *preq, resource_def *pr
-  * 		helper function to send/update resourcedef file.
-  */
- static void
--timed_send_rescdef()
-+timed_send_rescdef(struct work_task *)
- {
- 	send_rescdef(1); /* forcing with 1 to avoid failures due to intermittent file stamp race issues */
- 	rescdef_wt_g = NULL;
-diff --git a/src/server/svr_movejob.c b/src/server/svr_movejob.c
-index c438d5d739..8947dc8c85 100644
---- a/src/server/svr_movejob.c
-+++ b/src/server/svr_movejob.c
-@@ -122,7 +122,7 @@ extern time_t time_now;
- extern int svr_create_tmp_jobscript(job *pj, char *script_name);
- extern int scheduler_jobs_stat;
- extern char *path_hooks_workdir;
--extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid, void *parm1, void *parm2);
-+extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(struct work_task *), char *msgid, void *parm1, void *parm2);
- 
- /**
-  * @brief
diff --git a/pkgs/by-name/op/openpbs/2711.patch b/pkgs/by-name/op/openpbs/2711.patch
deleted file mode 100644
index e122758940d1..000000000000
--- a/pkgs/by-name/op/openpbs/2711.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
-index 440e37cb..cb7fe62c 100644
---- a/src/cmds/qstat.c
-+++ b/src/cmds/qstat.c
-@@ -76,7 +76,6 @@ extern char *tcl_atrsep;
- /* default server */
- char *def_server;
- 
--static void states();
- static char *cvtResvstate(char *);
- static int cmp_est_time(struct batch_status *a, struct batch_status *b);
- char *cnvt_est_start_time(char *start_time, int shortform);
-diff --git a/src/cmds/qsub.c b/src/cmds/qsub.c
-index f02bb5ef..54871a08 100644
---- a/src/cmds/qsub.c
-+++ b/src/cmds/qsub.c
-@@ -89,6 +89,7 @@
- #include <assert.h>
- #include <sys/un.h>
- #include <syslog.h>
-+#include <unistd.h>
- #include "pbs_ifl.h"
- #include "cmds.h"
- #include "libpbs.h"
-@@ -1944,7 +1945,6 @@ job_env_basic(void)
- 	struct utsname uns;
- #endif
- 	int len = 0;
--	char *getcwd();
- 
- 	/* Calculate how big to make the variable string. */
- 	len = 0;
-diff --git a/src/include/qmgr.h b/src/include/qmgr.h
-index eb021c53..17ae6522 100644
---- a/src/include/qmgr.h
-+++ b/src/include/qmgr.h
-@@ -143,7 +143,7 @@ struct objname {
- /* prototypes */
- struct objname *commalist2objname(char *, int);
- struct server *find_server(char *);
--struct server *make_connection();
-+struct server *make_connection(char *);
- struct server *new_server();
- struct objname *new_objname();
- struct objname *strings2objname(char **, int, int);
-diff --git a/src/tools/pbs_tclWrap.c b/src/tools/pbs_tclWrap.c
-index 558528ad..1a9dd1d4 100644
---- a/src/tools/pbs_tclWrap.c
-+++ b/src/tools/pbs_tclWrap.c
-@@ -273,7 +273,7 @@ int
- GetREQ(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
- {
- 	int fd;
--	char *ret, *getreq();
-+	char *ret;
- 	char *cmd;
- 
- 	cmd = Tcl_GetStringFromObj(objv[0], NULL);
diff --git a/pkgs/by-name/op/openpbs/package.nix b/pkgs/by-name/op/openpbs/package.nix
index a50715c7b63c..ed4219ac6344 100644
--- a/pkgs/by-name/op/openpbs/package.nix
+++ b/pkgs/by-name/op/openpbs/package.nix
@@ -39,13 +39,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "openpbs";
-  version = "23.06.06-unstable-2026-01-29";
+  version = "23.06.06-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "openpbs";
     repo = "openpbs";
-    rev = "cfd431b703e8cbe3bc99db6fbbcdd970625ef032";
-    hash = "sha256-NZoSZmcl9a/6YWHO7qRNknB6ii0JBLo5bOpHDRKeuwI=";
+    rev = "e395fe79388d5f77908eeb80e3bb73d848315449";
+    hash = "sha256-FQgps7vdxz4gIAEE333MvELWf+Qx7dhnpoH4hLwOp5Q=";
   };
 
   nativeBuildInputs = [
@@ -75,11 +75,6 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  patches = [
-    ./2709.patch
-    ./2711.patch
-  ];
-
   postPatch = ''
     substituteInPlace src/cmds/scripts/Makefile.am --replace-fail "/etc/profile.d" "$out/etc/profile.d"
     substituteInPlace m4/pbs_systemd_unitdir.m4 --replace-fail "/usr/lib/systemd/system" "$out/lib/systemd/system"

From 4461a27ef34ef2fd69bd94e02bc77281b184d4c1 Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Thu, 2 Apr 2026 18:33:01 -0400
Subject: [PATCH 081/389] openpbs: disable fortify hardening

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 pkgs/by-name/op/openpbs/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/openpbs/package.nix b/pkgs/by-name/op/openpbs/package.nix
index ed4219ac6344..8a40f0213c82 100644
--- a/pkgs/by-name/op/openpbs/package.nix
+++ b/pkgs/by-name/op/openpbs/package.nix
@@ -73,6 +73,9 @@ stdenv.mkDerivation {
     munge
   ];
 
+  # https://github.com/openpbs/openpbs/issues/2713
+  hardeningDisable = [ "fortify" ];
+
   enableParallelBuilding = true;
 
   postPatch = ''

From e3b68c153320103cd7983b3d635cec52042b5c1a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 12 Mar 2026 15:52:01 +0700
Subject: [PATCH 082/389] gitbutler: 0.18.8 -> 0.19.7

---
 .../gi/gitbutler/gix-from-crates-io.patch     | 5781 -----------------
 pkgs/by-name/gi/gitbutler/package.nix         |   15 +-
 2 files changed, 6 insertions(+), 5790 deletions(-)
 delete mode 100644 pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch

diff --git a/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch
deleted file mode 100644
index 4f6d7d92a4d0..000000000000
--- a/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch
+++ /dev/null
@@ -1,5781 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 8d2058cf7..25899ae3b 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -34,7 +34,7 @@ version = "0.7.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
- dependencies = [
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
-  "once_cell",
-  "version_check",
- ]
-@@ -145,9 +145,9 @@ dependencies = [
- 
- [[package]]
- name = "anstyle-svg"
--version = "0.1.11"
-+version = "0.1.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26b9ec8c976eada1b0f9747a3d7cc4eae3bef10613e443746e7487f26c872fde"
-+checksum = "e22d9f3dea8bbda97c75bd0f0203e23f1e190d6d6f27a40e10063946dc4d4362"
- dependencies = [
-  "anstyle",
-  "anstyle-lossy",
-@@ -191,11 +191,11 @@ dependencies = [
-  "clipboard-win",
-  "image",
-  "log",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-  "objc2-core-graphics",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "parking_lot",
-  "percent-encoding",
-  "windows-sys 0.60.2",
-@@ -205,9 +205,9 @@ dependencies = [
- 
- [[package]]
- name = "arc-swap"
--version = "1.8.0"
-+version = "1.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
-+checksum = "9ded5f9a03ac8f24d1b8a25101ee812cd32cdc8c50a4c50237de2c4915850e73"
- dependencies = [
-  "rustversion",
- ]
-@@ -218,27 +218,6 @@ version = "0.7.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
- 
--[[package]]
--name = "ashpd"
--version = "0.11.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
--dependencies = [
-- "enumflags2",
-- "futures-channel",
-- "futures-util",
-- "rand 0.9.2",
-- "raw-window-handle",
-- "serde",
-- "serde_repr",
-- "tokio",
-- "url",
-- "wayland-backend",
-- "wayland-client",
-- "wayland-protocols",
-- "zbus 5.12.0",
--]
--
- [[package]]
- name = "async-broadcast"
- version = "0.7.2"
-@@ -290,16 +269,16 @@ dependencies = [
-  "futures-lite",
-  "parking",
-  "polling",
-- "rustix 1.1.3",
-+ "rustix",
-  "slab",
-  "windows-sys 0.61.2",
- ]
- 
- [[package]]
- name = "async-lock"
--version = "3.4.1"
-+version = "3.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
-+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
- dependencies = [
-  "event-listener",
-  "event-listener-strategy",
-@@ -326,7 +305,7 @@ dependencies = [
-  "serde",
-  "serde_json",
-  "serde_urlencoded",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
-  "tokio-stream",
-  "tokio-util",
-@@ -336,13 +315,13 @@ dependencies = [
- 
- [[package]]
- name = "async-openai-macros"
--version = "0.1.0"
-+version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0289cba6d5143bfe8251d57b4a8cac036adf158525a76533a7082ba65ec76398"
-+checksum = "81872a8e595e8ceceab71c6ba1f9078e313b452a1e31934e6763ef5d308705e4"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -360,7 +339,7 @@ dependencies = [
-  "cfg-if",
-  "event-listener",
-  "futures-lite",
-- "rustix 1.1.3",
-+ "rustix",
- ]
- 
- [[package]]
-@@ -371,7 +350,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -386,7 +365,7 @@ dependencies = [
-  "cfg-if",
-  "futures-core",
-  "futures-io",
-- "rustix 1.1.3",
-+ "rustix",
-  "signal-hook-registry",
-  "slab",
-  "windows-sys 0.61.2",
-@@ -411,7 +390,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -428,7 +407,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -468,9 +447,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
- 
- [[package]]
- name = "aws-lc-rs"
--version = "1.15.2"
-+version = "1.15.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6a88aab2464f1f25453baa7a07c84c5b7684e274054ba06817f382357f77a288"
-+checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256"
- dependencies = [
-  "aws-lc-sys",
-  "zeroize",
-@@ -478,9 +457,9 @@ dependencies = [
- 
- [[package]]
- name = "aws-lc-sys"
--version = "0.35.0"
-+version = "0.37.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b45afffdee1e7c9126814751f88dddc747f41d91da16c9551a0f1e8a11e788a1"
-+checksum = "5c34dda4df7017c8db52132f0f8a2e0f8161649d15723ed63fc00c82d0f2081a"
- dependencies = [
-  "cc",
-  "cmake",
-@@ -526,9 +505,9 @@ dependencies = [
- 
- [[package]]
- name = "axum-core"
--version = "0.5.5"
-+version = "0.5.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
-+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
- dependencies = [
-  "bytes",
-  "futures-core",
-@@ -550,7 +529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
- dependencies = [
-  "futures-core",
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
-  "instant",
-  "pin-project-lite",
-  "rand 0.8.5",
-@@ -635,22 +614,13 @@ dependencies = [
-  "generic-array",
- ]
- 
--[[package]]
--name = "block2"
--version = "0.5.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
--dependencies = [
-- "objc2 0.5.2",
--]
--
- [[package]]
- name = "block2"
- version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
- dependencies = [
-- "objc2 0.6.3",
-+ "objc2",
- ]
- 
- [[package]]
-@@ -695,7 +665,7 @@ dependencies = [
-  "proc-macro-crate 3.4.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -732,9 +702,9 @@ dependencies = [
- 
- [[package]]
- name = "bumpalo"
--version = "3.19.0"
-+version = "3.19.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
- 
- [[package]]
- name = "but"
-@@ -797,7 +767,7 @@ dependencies = [
-  "posthog-rs",
-  "regex",
-  "rmcp",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "self_cell",
-  "serde",
-  "serde_json",
-@@ -840,7 +810,7 @@ dependencies = [
-  "gix",
-  "itertools",
-  "rmcp",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde-error",
-  "serde_json",
-@@ -901,7 +871,7 @@ dependencies = [
-  "insta",
-  "itertools",
-  "open",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde-error",
-  "serde_json",
-@@ -918,7 +888,7 @@ version = "0.0.0"
- dependencies = [
-  "convert_case 0.10.0",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -933,7 +903,7 @@ dependencies = [
-  "chrono",
-  "gitbutler-project",
-  "gix",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde_json",
-  "uuid",
-@@ -1020,7 +990,7 @@ dependencies = [
-  "rand 0.9.2",
-  "serde",
-  "serde_json",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "tracing",
-  "ts-rs",
-  "unicode-segmentation",
-@@ -1134,7 +1104,7 @@ dependencies = [
-  "anyhow",
-  "gix",
-  "serde",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "walkdir",
- ]
- 
-@@ -1259,7 +1229,7 @@ dependencies = [
-  "futures",
-  "gix",
-  "reqwest 0.12.28",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde_json",
-  "strum",
-@@ -1287,7 +1257,7 @@ dependencies = [
-  "md5",
-  "serde",
-  "snapbox",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "tracing",
- ]
- 
-@@ -1338,7 +1308,7 @@ dependencies = [
-  "petgraph",
-  "serde",
-  "tempfile",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "tracing",
- ]
- 
-@@ -1512,7 +1482,7 @@ dependencies = [
-  "gitbutler-stack",
-  "gix",
-  "ollama-rs",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde-error",
-  "serde_json",
-@@ -1601,7 +1571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8c6d47a4e2961fb8721bcfc54feae6455f2f64e7054f9bc67e875f0e77f4c58d"
- dependencies = [
-  "rust_decimal",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "utf8-width",
- ]
-@@ -1630,9 +1600,9 @@ dependencies = [
- 
- [[package]]
- name = "bytemuck"
--version = "1.24.0"
-+version = "1.25.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
-+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
- 
- [[package]]
- name = "byteorder"
-@@ -1648,9 +1618,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
- 
- [[package]]
- name = "bytes"
--version = "1.11.0"
-+version = "1.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
-+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
- dependencies = [
-  "serde",
- ]
-@@ -1691,9 +1661,9 @@ dependencies = [
- 
- [[package]]
- name = "camino"
--version = "1.2.1"
-+version = "1.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
-+checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
- dependencies = [
-  "serde_core",
- ]
-@@ -1718,7 +1688,7 @@ dependencies = [
-  "semver",
-  "serde",
-  "serde_json",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -1728,7 +1698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
- dependencies = [
-  "serde",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
- ]
- 
- [[package]]
-@@ -1742,9 +1712,9 @@ dependencies = [
- 
- [[package]]
- name = "cc"
--version = "1.2.48"
-+version = "1.2.55"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"
-+checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
- dependencies = [
-  "find-msvc-tools",
-  "jobserver",
-@@ -1804,9 +1774,9 @@ dependencies = [
- 
- [[package]]
- name = "chrono"
--version = "0.4.42"
-+version = "0.4.43"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
-+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
- dependencies = [
-  "iana-time-zone",
-  "js-sys",
-@@ -1828,9 +1798,9 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "4.5.54"
-+version = "4.5.56"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
-+checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e"
- dependencies = [
-  "clap_builder",
-  "clap_derive",
-@@ -1838,9 +1808,9 @@ dependencies = [
- 
- [[package]]
- name = "clap_builder"
--version = "4.5.54"
-+version = "4.5.56"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
-+checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0"
- dependencies = [
-  "anstream",
-  "anstyle",
-@@ -1851,32 +1821,32 @@ dependencies = [
- 
- [[package]]
- name = "clap_complete"
--version = "4.5.64"
-+version = "4.5.65"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c0da80818b2d95eca9aa614a30783e42f62bf5fdfee24e68cfb960b071ba8d1"
-+checksum = "430b4dc2b5e3861848de79627b2bedc9f3342c7da5173a14eaa5d0f8dc18ae5d"
- dependencies = [
-  "clap",
- ]
- 
- [[package]]
- name = "clap_derive"
--version = "4.5.49"
-+version = "4.5.55"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
-+checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
- dependencies = [
-  "anstyle",
-  "heck 0.5.0",
-  "proc-macro2",
-  "pulldown-cmark",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "clap_lex"
--version = "0.7.6"
-+version = "0.7.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
-+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
- 
- [[package]]
- name = "cli-prompts"
-@@ -1948,11 +1918,11 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
- 
- [[package]]
- name = "colored"
--version = "3.0.0"
-+version = "3.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
-+checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
- dependencies = [
-- "windows-sys 0.59.0",
-+ "windows-sys 0.61.2",
- ]
- 
- [[package]]
-@@ -2053,7 +2023,7 @@ version = "0.1.16"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
- dependencies = [
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
-  "once_cell",
-  "tiny-keccak",
- ]
-@@ -2318,7 +2288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
- dependencies = [
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2328,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
- dependencies = [
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2340,7 +2310,7 @@ dependencies = [
-  "curl-sys",
-  "libc",
-  "schannel",
-- "socket2 0.6.1",
-+ "socket2 0.6.2",
-  "windows-sys 0.59.0",
- ]
- 
-@@ -2389,7 +2359,7 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "strsim",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2403,7 +2373,7 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "strsim",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2414,7 +2384,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
- dependencies = [
-  "darling_core 0.20.11",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2425,7 +2395,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
- dependencies = [
-  "darling_core 0.21.3",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2456,9 +2426,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
- 
- [[package]]
- name = "dbus"
--version = "0.9.9"
-+version = "0.9.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "190b6255e8ab55a7b568df5a883e9497edc3e4821c06396612048b430e5ad1e9"
-+checksum = "21b3aa68d7e7abee336255bd7248ea965cc393f3e70411135a6f6a4b651345d4"
- dependencies = [
-  "libc",
-  "libdbus-sys",
-@@ -2501,7 +2471,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2522,7 +2492,7 @@ dependencies = [
-  "darling 0.20.11",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2532,7 +2502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
- dependencies = [
-  "derive_builder_core",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2545,14 +2515,14 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "rustc_version",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "deser-hjson"
--version = "2.2.4"
-+version = "2.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d94aac4095c08ded7e4b9ba7fc2b2929f11b94bb96897ca188b0f64e01688e1"
-+checksum = "1fbc1498156ddf9adc2eb251c1697b3a0dea599c94fb8cf1313f986adcc70f6e"
- dependencies = [
-  "serde",
- ]
-@@ -2649,9 +2619,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
- dependencies = [
-  "bitflags 2.10.0",
-- "block2 0.6.2",
-+ "block2",
-  "libc",
-- "objc2 0.6.3",
-+ "objc2",
- ]
- 
- [[package]]
-@@ -2662,23 +2632,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
--]
--
--[[package]]
--name = "dlib"
--version = "0.5.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
--dependencies = [
-- "libloading 0.8.9",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "dlopen2"
--version = "0.8.0"
-+version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b54f373ccf864bf587a89e880fb7610f8d73f3045f13580948ccbcaff26febff"
-+checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
- dependencies = [
-  "dlopen2_derive",
-  "libc",
-@@ -2688,13 +2649,13 @@ dependencies = [
- 
- [[package]]
- name = "dlopen2_derive"
--version = "0.4.1"
-+version = "0.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
-+checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2732,9 +2693,9 @@ dependencies = [
- 
- [[package]]
- name = "dtoa"
--version = "1.0.10"
-+version = "1.0.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
-+checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
- 
- [[package]]
- name = "dtoa-short"
-@@ -2772,7 +2733,7 @@ dependencies = [
-  "cc",
-  "memchr",
-  "rustc_version",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "vswhom",
-  "winreg 0.55.0",
- ]
-@@ -2800,9 +2761,9 @@ dependencies = [
- 
- [[package]]
- name = "endi"
--version = "1.1.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
-+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
- 
- [[package]]
- name = "enumflags2"
-@@ -2822,7 +2783,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2945,7 +2906,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -2985,31 +2946,22 @@ dependencies = [
-  "windows-sys 0.60.2",
- ]
- 
--[[package]]
--name = "file-id"
--version = "0.2.3"
--source = "git+https://github.com/notify-rs/notify?rev=978fe719b066a8ce76b9a9d346546b1569eecfb6#978fe719b066a8ce76b9a9d346546b1569eecfb6"
--dependencies = [
-- "windows-sys 0.60.2",
--]
--
- [[package]]
- name = "filetime"
--version = "0.2.26"
-+version = "0.2.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
-+checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
- dependencies = [
-  "cfg-if",
-  "libc",
-  "libredox",
-- "windows-sys 0.60.2",
- ]
- 
- [[package]]
- name = "find-msvc-tools"
--version = "0.1.5"
-+version = "0.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
-+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
- 
- [[package]]
- name = "fixedbitset"
-@@ -3019,9 +2971,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
- 
- [[package]]
- name = "flate2"
--version = "1.1.5"
-+version = "1.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
-+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
- dependencies = [
-  "crc32fast",
-  "miniz_oxide",
-@@ -3084,7 +3036,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -3218,7 +3170,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -3390,7 +3342,7 @@ version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
- dependencies = [
-- "rustix 1.1.3",
-+ "rustix",
-  "windows-link 0.2.1",
- ]
- 
-@@ -3407,9 +3359,9 @@ dependencies = [
- 
- [[package]]
- name = "getrandom"
--version = "0.2.16"
-+version = "0.2.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -3441,7 +3393,7 @@ dependencies = [
-  "proc-macro-error2",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -3490,21 +3442,21 @@ checksum = "8df306e4dfc91752e89b74c88ee876c8518890600f82255254828f9192dd003c"
- dependencies = [
-  "getset",
-  "nom 8.0.0",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "url",
- ]
- 
- [[package]]
- name = "git2"
--version = "0.20.3"
-+version = "0.20.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3e2b37e2f62729cdada11f0e6b3b6fe383c69c29fc619e391223e12856af308c"
-+checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
- dependencies = [
-  "bitflags 2.10.0",
-  "libc",
-  "libgit2-sys",
-  "log",
-- "openssl-probe",
-+ "openssl-probe 0.1.6",
-  "openssl-sys",
-  "url",
- ]
-@@ -3519,7 +3471,7 @@ dependencies = [
-  "gix-path 0.10.22",
-  "log",
-  "shellexpand",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -3677,7 +3629,7 @@ name = "gitbutler-git"
- version = "0.0.0"
- dependencies = [
-  "anyhow",
-- "file-id 0.2.3 (git+https://github.com/notify-rs/notify?rev=978fe719b066a8ce76b9a9d346546b1569eecfb6)",
-+ "file-id",
-  "futures",
-  "gix",
-  "nix 0.30.1",
-@@ -3685,7 +3637,7 @@ dependencies = [
-  "serde",
-  "snapbox",
-  "sysinfo",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
-  "tracing",
-  "windows 0.62.2",
-@@ -3696,7 +3648,7 @@ name = "gitbutler-notify-debouncer"
- version = "0.0.0"
- dependencies = [
-  "deser-hjson",
-- "file-id 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "file-id",
-  "gitbutler-notify-debouncer",
-  "mock_instant",
-  "notify",
-@@ -3723,7 +3675,7 @@ dependencies = [
-  "gitbutler-stack",
-  "gitbutler-testsupport",
-  "serde",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "tracing",
-  "uuid",
- ]
-@@ -3750,7 +3702,7 @@ dependencies = [
-  "serde",
-  "strum",
-  "tempfile",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "tracing",
- ]
- 
-@@ -3786,7 +3738,7 @@ dependencies = [
-  "git2",
-  "gix",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -3823,8 +3775,8 @@ dependencies = [
-  "serde",
-  "serde_json",
-  "tempfile",
-- "thiserror 2.0.17",
-- "toml 0.9.10+spec-1.1.0",
-+ "thiserror 2.0.18",
-+ "toml 0.9.11+spec-1.1.0",
-  "tracing",
- ]
- 
-@@ -3871,7 +3823,7 @@ dependencies = [
-  "itertools",
-  "serde",
-  "tempfile",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
- ]
- 
- [[package]]
-@@ -3970,7 +3922,7 @@ name = "gitbutler-url"
- version = "0.0.0"
- dependencies = [
-  "bstr",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "url",
- ]
- 
-@@ -4030,58 +3982,59 @@ dependencies = [
- [[package]]
- name = "gix"
- version = "0.78.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3428a03ace494ae40308bd3df0b37e7eb7403e24389f27abdff30abf2b5adf17"
- dependencies = [
-- "gix-actor 0.38.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-attributes 0.30.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-actor",
-+ "gix-attributes",
-  "gix-command",
-- "gix-commitgraph 0.32.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-commitgraph",
-  "gix-config",
-  "gix-credentials",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-date",
-  "gix-diff",
-  "gix-dir",
-- "gix-discover 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-discover",
-+ "gix-error",
-+ "gix-features",
-  "gix-filter",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-ignore 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-lock 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-fs",
-+ "gix-glob",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-ignore",
-+ "gix-index",
-+ "gix-lock",
-  "gix-mailmap",
-  "gix-merge",
-  "gix-negotiate",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-object",
-  "gix-odb",
-  "gix-pack",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-  "gix-pathspec",
-  "gix-prompt",
-  "gix-protocol",
-- "gix-ref 0.58.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-ref",
-  "gix-refspec",
-  "gix-revision",
-- "gix-revwalk 0.26.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-sec 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-revwalk",
-+ "gix-sec",
-  "gix-shallow",
-  "gix-status",
-  "gix-submodule",
-- "gix-tempfile 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-tempfile",
-+ "gix-trace",
-  "gix-transport",
-- "gix-traverse 0.52.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-traverse",
-  "gix-url",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-worktree 0.47.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-utils",
-+ "gix-validate 0.11.0",
-+ "gix-worktree",
-  "gix-worktree-state",
-  "serde",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4091,22 +4044,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b50ce5433eaa46187349e59089eea71b0397caa71991b2fa3e124120426d7d15"
- dependencies = [
-  "bstr",
-- "gix-date 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gix-date",
-+ "gix-utils",
-  "itoa",
-- "thiserror 2.0.17",
-- "winnow 0.7.14",
--]
--
--[[package]]
--name = "gix-actor"
--version = "0.38.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-  "serde",
-+ "thiserror 2.0.18",
-  "winnow 0.7.14",
- ]
- 
-@@ -4117,30 +4059,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f868f013fee0ebb5c85fae848c34a0b9ef7438acfbaec0c82a3cdbd5eac730a0"
- dependencies = [
-  "bstr",
-- "gix-glob 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-quote 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-trace 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "kstring",
-- "smallvec",
-- "thiserror 2.0.17",
-- "unicode-bom",
--]
--
--[[package]]
--name = "gix-attributes"
--version = "0.30.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-quote 0.6.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-glob",
-+ "gix-path 0.11.0",
-+ "gix-quote",
-+ "gix-trace",
-  "kstring",
-  "serde",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "unicode-bom",
- ]
- 
-@@ -4150,15 +4076,7 @@ version = "0.2.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5e150161b8a75b5860521cb876b506879a3376d3adc857ec7a9d35e7c6a5e531"
- dependencies = [
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-bitmap"
--version = "0.2.15"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4167,26 +4085,19 @@ version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "63e516efaac951ed21115b11d5514b120c26ccb493d0c0b9ea6cc10edf4fdf44"
- dependencies = [
-- "gix-error 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "gix-chunk"
--version = "0.5.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-error",
- ]
- 
- [[package]]
- name = "gix-command"
- version = "0.7.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "745bc165b7da500acc26d24888379ae0dfd1ecabe3a47420cdcb92feefb0561d"
- dependencies = [
-  "bstr",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-quote 0.6.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-+ "gix-quote",
-+ "gix-trace",
-  "shell-words",
- ]
- 
-@@ -4197,21 +4108,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d0dda2e4d5a61d4a16a780f61f2b7e9406ad1f8da97c35c09ef501f3fdf74de0"
- dependencies = [
-  "bstr",
-- "gix-chunk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-error 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "memmap2",
--]
--
--[[package]]
--name = "gix-commitgraph"
--version = "0.32.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-chunk 0.5.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-chunk",
-+ "gix-error",
-+ "gix-hash",
-  "memmap2",
-  "serde",
- ]
-@@ -4219,18 +4118,19 @@ dependencies = [
- [[package]]
- name = "gix-config"
- version = "0.51.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9a153dd4f5789fdf242e19e3f7105f2a114df198570225976fe4a108bac9dee4"
- dependencies = [
-  "bstr",
-  "gix-config-value",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-ref 0.58.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-sec 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-+ "gix-glob",
-+ "gix-path 0.11.0",
-+ "gix-ref",
-+ "gix-sec",
-  "memchr",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "unicode-bom",
-  "winnow 0.7.14",
- ]
-@@ -4238,31 +4138,33 @@ dependencies = [
- [[package]]
- name = "gix-config-value"
- version = "0.17.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "563361198101cedc975fe5760c91ac2e4126eec22216e81b659b45289feaf1ea"
- dependencies = [
-  "bitflags 2.10.0",
-  "bstr",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-  "libc",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-credentials"
- version = "0.35.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b6ef04ac6b0b9cb75b02afaab4045eafb7b59be41815fbfaaa184a2280af2146"
- dependencies = [
-  "bstr",
-  "gix-command",
-  "gix-config-value",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-date",
-+ "gix-path 0.11.0",
-  "gix-prompt",
-- "gix-sec 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-sec",
-+ "gix-trace",
-  "gix-url",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4272,19 +4174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "12553b32d1da25671f31c0b084bf1e5cb6d5ef529254d04ec33cdc890bd7f687"
- dependencies = [
-  "bstr",
-- "gix-error 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "itoa",
-- "jiff",
-- "smallvec",
--]
--
--[[package]]
--name = "gix-date"
--version = "0.13.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-error",
-  "itoa",
-  "jiff",
-  "serde",
-@@ -4294,43 +4184,45 @@ dependencies = [
- [[package]]
- name = "gix-diff"
- version = "0.58.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "26bcd367b2c5dbf6bec9ce02ca59eab179fc82cf39f15ec83549ee25c255c99f"
- dependencies = [
-  "bstr",
-- "gix-attributes 0.30.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-attributes",
-  "gix-command",
-  "gix-filter",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-fs",
-+ "gix-hash",
-+ "gix-index",
-+ "gix-object",
-+ "gix-path 0.11.0",
-  "gix-pathspec",
-- "gix-tempfile 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-traverse 0.52.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-worktree 0.47.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-tempfile",
-+ "gix-trace",
-+ "gix-traverse",
-+ "gix-worktree",
-  "imara-diff",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-dir"
- version = "0.20.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "004129e2c93798141d68ff08cb7f1b3d909c0212747fb8b05c8989635ba90a4e"
- dependencies = [
-  "bstr",
-- "gix-discover 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-ignore 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-discover",
-+ "gix-fs",
-+ "gix-ignore",
-+ "gix-index",
-+ "gix-object",
-+ "gix-path 0.11.0",
-  "gix-pathspec",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-worktree 0.47.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-trace",
-+ "gix-utils",
-+ "gix-worktree",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4341,25 +4233,11 @@ checksum = "950b027b861c6863ddf1b075672ec1ef2006b95c4d12284fc1ec4cdb1ab6639e"
- dependencies = [
-  "bstr",
-  "dunce",
-- "gix-fs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-ref 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-sec 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-discover"
--version = "0.46.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "dunce",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-ref 0.58.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-sec 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-fs",
-+ "gix-path 0.11.0",
-+ "gix-ref",
-+ "gix-sec",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4371,44 +4249,23 @@ dependencies = [
-  "bstr",
- ]
- 
--[[package]]
--name = "gix-error"
--version = "0.0.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
--]
--
- [[package]]
- name = "gix-features"
- version = "0.46.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6a407957e21dc5e6c87086e50e5114a2f9240f9cb11699588a6d900d53cb6c70"
--dependencies = [
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-trace 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc",
-- "prodash",
-- "walkdir",
--]
--
--[[package]]
--name = "gix-features"
--version = "0.46.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
- dependencies = [
-  "bytes",
-  "crc32fast",
-  "crossbeam-channel",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-+ "gix-trace",
-+ "gix-utils",
-  "libc",
-  "once_cell",
-  "parking_lot",
-  "prodash",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "walkdir",
-  "zlib-rs",
- ]
-@@ -4416,21 +4273,22 @@ dependencies = [
- [[package]]
- name = "gix-filter"
- version = "0.25.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7240442915cdd74e1f889566695ce0d0c23c7185b13318a1232ce646af0d18ad"
- dependencies = [
-  "bstr",
-  "encoding_rs",
-- "gix-attributes 0.30.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-attributes",
-  "gix-command",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-hash",
-+ "gix-object",
-  "gix-packetline",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-quote 0.6.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-+ "gix-quote",
-+ "gix-trace",
-+ "gix-utils",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4441,23 +4299,10 @@ checksum = "ba74fa163d3b2ba821d5cd207d55fe3daac3d1099613a8559c812d2b15b3c39a"
- dependencies = [
-  "bstr",
-  "fastrand",
-- "gix-features 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-fs"
--version = "0.19.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "fastrand",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-features",
-+ "gix-path 0.11.0",
-+ "gix-utils",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4468,19 +4313,8 @@ checksum = "b03e6cd88cc0dc1eafa1fddac0fb719e4e74b6ea58dd016e71125fde4a326bee"
- dependencies = [
-  "bitflags 2.10.0",
-  "bstr",
-- "gix-features 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "gix-glob"
--version = "0.24.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bitflags 2.10.0",
-- "bstr",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-+ "gix-path 0.11.0",
-  "serde",
- ]
- 
-@@ -4491,21 +4325,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2b8e11ea6bbd0fd4ab4a1c66812dd3cc25921a41315b120f352997725a4c79d6"
- dependencies = [
-  "faster-hex",
-- "gix-features 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "sha1-checked",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-hash"
--version = "0.22.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "faster-hex",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-  "serde",
-  "sha1-checked",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4514,17 +4337,7 @@ version = "0.12.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "52f1eecdd006390cbed81f105417dbf82a6fe40842022006550f2e32484101da"
- dependencies = [
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "hashbrown 0.16.1",
-- "parking_lot",
--]
--
--[[package]]
--name = "gix-hashtable"
--version = "0.12.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-hash",
-  "hashbrown 0.16.1",
-  "parking_lot",
- ]
-@@ -4536,21 +4349,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8953d87c13267e296d547f0fc7eaa8aa8fa5b2a9a34ab1cd5857f25240c7d299"
- dependencies = [
-  "bstr",
-- "gix-glob 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-trace 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "unicode-bom",
--]
--
--[[package]]
--name = "gix-ignore"
--version = "0.19.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-glob",
-+ "gix-path 0.11.0",
-+ "gix-trace",
-  "serde",
-  "unicode-bom",
- ]
-@@ -4565,50 +4366,23 @@ dependencies = [
-  "bstr",
-  "filetime",
-  "fnv",
-- "gix-bitmap 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-features 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-fs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-lock 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-object 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-traverse 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-validate 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "hashbrown 0.16.1",
-- "itoa",
-- "libc",
-- "memmap2",
-- "rustix 1.1.3",
-- "smallvec",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-index"
--version = "0.46.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bitflags 2.10.0",
-- "bstr",
-- "filetime",
-- "fnv",
-- "gix-bitmap 0.2.15 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-lock 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-traverse 0.52.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-bitmap",
-+ "gix-features",
-+ "gix-fs",
-+ "gix-hash",
-+ "gix-lock",
-+ "gix-object",
-+ "gix-traverse",
-+ "gix-utils",
-+ "gix-validate 0.11.0",
-  "hashbrown 0.16.1",
-  "itoa",
-  "libc",
-  "memmap2",
-- "rustix 1.1.3",
-+ "rustix",
-  "serde",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4617,70 +4391,63 @@ version = "21.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e16d406220ef9df105645a9ddcaa42e8c882ba920344ace866d0403570aea599"
- dependencies = [
-- "gix-tempfile 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-lock"
--version = "21.0.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "gix-tempfile 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-tempfile",
-+ "gix-utils",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-mailmap"
- version = "0.30.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2e6fd521cb582620b7066b5b420ace1951cb84fe2241fa239b227e1a94fa25dc"
- dependencies = [
-  "bstr",
-- "gix-actor 0.38.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-actor",
-+ "gix-date",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-merge"
- version = "0.11.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d468c28f6b092626b93e24e6785fc890a87ca26823c37aefb411a40152504c17"
- dependencies = [
-  "bstr",
-  "gix-command",
-  "gix-diff",
-  "gix-filter",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-quote 0.6.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-fs",
-+ "gix-hash",
-+ "gix-index",
-+ "gix-object",
-+ "gix-path 0.11.0",
-+ "gix-quote",
-  "gix-revision",
-- "gix-revwalk 0.26.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-tempfile 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-worktree 0.47.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-revwalk",
-+ "gix-tempfile",
-+ "gix-trace",
-+ "gix-worktree",
-  "imara-diff",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-negotiate"
- version = "0.26.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "00dff6d49869f16b8900da7c27b886a45cbf641b1e45aab355d012afe4266b7f"
- dependencies = [
-  "bitflags 2.10.0",
-- "gix-commitgraph 0.32.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-revwalk 0.26.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-commitgraph",
-+ "gix-date",
-+ "gix-hash",
-+ "gix-object",
-+ "gix-revwalk",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4690,92 +4457,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4d3f705c977d90ace597049252ae1d7fec907edc0fa7616cc91bf5508d0f4006"
- dependencies = [
-  "bstr",
-- "gix-actor 0.38.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-date 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-features 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hashtable 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-validate 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "itoa",
-- "smallvec",
-- "thiserror 2.0.17",
-- "winnow 0.7.14",
--]
--
--[[package]]
--name = "gix-object"
--version = "0.55.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-actor 0.38.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-actor",
-+ "gix-date",
-+ "gix-features",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-path 0.11.0",
-+ "gix-utils",
-+ "gix-validate 0.11.0",
-  "itoa",
-  "serde",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "winnow 0.7.14",
- ]
- 
- [[package]]
- name = "gix-odb"
- version = "0.75.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1d59882d2fdab5e609b0c452a6ef9a3bd12ef6b694be4f82ab8f126ad0969864"
- dependencies = [
-  "arc-swap",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-+ "gix-fs",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-object",
-  "gix-pack",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-quote 0.6.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-+ "gix-quote",
-  "parking_lot",
-  "serde",
-  "tempfile",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-pack"
- version = "0.65.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8c44db57ebbbeaad9972c2a60662142660427a1f0a7529314d53fefb4fedad24"
- dependencies = [
-  "clru",
-- "gix-chunk 0.5.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-tempfile 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-chunk",
-+ "gix-error",
-+ "gix-features",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-object",
-+ "gix-path 0.11.0",
-+ "gix-tempfile",
-  "memmap2",
-  "parking_lot",
-  "serde",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "uluru",
- ]
- 
- [[package]]
- name = "gix-packetline"
- version = "0.21.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c333badf342e9c2392800a96b9f2cf5bcb33906d2577d6ec923756ff4008a3f"
- dependencies = [
-  "bstr",
-  "faster-hex",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-trace",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4785,9 +4535,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7cb06c3e4f8eed6e24fd915fa93145e28a511f4ea0e768bae16673e05ed3f366"
- dependencies = [
-  "bstr",
-- "gix-trace 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gix-trace",
-  "gix-validate 0.10.1",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4797,71 +4547,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "c7c3cd795cad18c7acbc6bafe34bfb34ac7273ee81133793f9d1516dd9faf922"
- dependencies = [
-  "bstr",
-- "gix-trace 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-validate 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-path"
--version = "0.11.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-trace",
-+ "gix-validate 0.11.0",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-pathspec"
- version = "0.15.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3df6fd8e514d8b99ec5042ee17909a17750ccf54d0b8b30c850954209c800322"
- dependencies = [
-  "bitflags 2.10.0",
-  "bstr",
-- "gix-attributes 0.30.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-attributes",
-  "gix-config-value",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-glob",
-+ "gix-path 0.11.0",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-prompt"
- version = "0.13.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6d48536da48fa4ae9d99bf46479f37a19a58427711e1927c80790856d4a490f6"
- dependencies = [
-  "gix-command",
-  "gix-config-value",
-  "parking_lot",
-- "rustix 1.1.3",
-- "thiserror 2.0.17",
-+ "rustix",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-protocol"
- version = "0.56.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "54f20837b0c70b65f6ac77886be033de3b69d5879f99128b47c42665ab0a17c2"
- dependencies = [
-  "bstr",
-  "gix-credentials",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-lock 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-date",
-+ "gix-features",
-+ "gix-hash",
-+ "gix-lock",
-  "gix-negotiate",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-ref 0.58.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-object",
-+ "gix-ref",
-  "gix-refspec",
-- "gix-revwalk 0.26.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-revwalk",
-  "gix-shallow",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-trace",
-  "gix-transport",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-utils",
-  "maybe-async",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "winnow 0.7.14",
- ]
- 
-@@ -4872,18 +4614,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e912ec04b7b1566a85ad486db0cab6b9955e3e32bcd3c3a734542ab3af084c5b"
- dependencies = [
-  "bstr",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-quote"
--version = "0.6.1"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "thiserror 2.0.17",
-+ "gix-utils",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4892,72 +4624,54 @@ version = "0.58.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5cf780dcd9ac99fd3fcfc8523479a0e2ffd55f5e0be63e5e3248fb7e46cff966"
- dependencies = [
-- "gix-actor 0.38.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-features 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-fs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-lock 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-object 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-tempfile 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-validate 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "memmap2",
-- "thiserror 2.0.17",
-- "winnow 0.7.14",
--]
--
--[[package]]
--name = "gix-ref"
--version = "0.58.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "gix-actor 0.38.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-lock 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-tempfile 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-utils 0.3.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-actor",
-+ "gix-features",
-+ "gix-fs",
-+ "gix-hash",
-+ "gix-lock",
-+ "gix-object",
-+ "gix-path 0.11.0",
-+ "gix-tempfile",
-+ "gix-utils",
-+ "gix-validate 0.11.0",
-  "memmap2",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "winnow 0.7.14",
- ]
- 
- [[package]]
- name = "gix-refspec"
- version = "0.36.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "60ce400a770a7952e45267803192cc2d1fe0afa08e2c08dde32e04c7908c6e61"
- dependencies = [
-  "bstr",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-error",
-+ "gix-glob",
-+ "gix-hash",
-  "gix-revision",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-validate 0.11.0",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-revision"
- version = "0.40.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c719cf7d669439e1fca735bd1c4de54d43c5d30e8883fd6063c4924b213d70c9"
- dependencies = [
-  "bitflags 2.10.0",
-  "bstr",
-- "gix-commitgraph 0.32.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-revwalk 0.26.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-trace 0.1.17 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-commitgraph",
-+ "gix-date",
-+ "gix-error",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-object",
-+ "gix-revwalk",
-+ "gix-trace",
-  "serde",
- ]
- 
-@@ -4967,29 +4681,14 @@ version = "0.26.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "194a50b30aa0c6e6de43c723359c5809a96275a3aa92d323ef7f58b1cdd60f16"
- dependencies = [
-- "gix-commitgraph 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-date 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-error 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hashtable 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-object 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "smallvec",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-revwalk"
--version = "0.26.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "gix-commitgraph 0.32.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-error 0.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-commitgraph",
-+ "gix-date",
-+ "gix-error",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-object",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -4999,18 +4698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "beeb3bc63696cf7acb5747a361693ebdbcaf25b5d27d2308f38e9782983e7bce"
- dependencies = [
-  "bitflags 2.10.0",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc",
-- "windows-sys 0.61.2",
--]
--
--[[package]]
--name = "gix-sec"
--version = "0.13.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bitflags 2.10.0",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-  "libc",
-  "serde",
-  "windows-sys 0.61.2",
-@@ -5019,49 +4707,52 @@ dependencies = [
- [[package]]
- name = "gix-shallow"
- version = "0.8.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f4f4660fed3786d28e7e57d31b2de9ab3bf846068e187ccc52ee513de19a0073"
- dependencies = [
-  "bstr",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-lock 21.0.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-hash",
-+ "gix-lock",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-status"
- version = "0.25.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b0c994dbca7f038cfcde6337673523bab6e6b4f544b5046f5120a02bdeafff33"
- dependencies = [
-  "bstr",
-  "filetime",
-  "gix-diff",
-  "gix-dir",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-  "gix-filter",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-fs",
-+ "gix-hash",
-+ "gix-index",
-+ "gix-object",
-+ "gix-path 0.11.0",
-  "gix-pathspec",
-- "gix-worktree 0.47.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-worktree",
-  "portable-atomic",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-submodule"
- version = "0.25.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "db1840fe723c6264ee596e5a179e1b9a2df59351f09bae9cea570a472a790bc0"
- dependencies = [
-  "bstr",
-  "gix-config",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-  "gix-pathspec",
-  "gix-refspec",
-  "gix-url",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -5069,24 +4760,13 @@ name = "gix-tempfile"
- version = "21.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d280bba7c547170e42d5228fc6e76c191fb5a7c88808ff61af06460404d1fd91"
--dependencies = [
-- "gix-fs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc",
-- "parking_lot",
-- "signal-hook 0.4.1",
-- "signal-hook-registry",
-- "tempfile",
--]
--
--[[package]]
--name = "gix-tempfile"
--version = "21.0.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
- dependencies = [
-  "dashmap",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-fs",
-  "libc",
-  "parking_lot",
-+ "signal-hook 0.4.3",
-+ "signal-hook-registry",
-  "tempfile",
- ]
- 
-@@ -5100,11 +4780,11 @@ dependencies = [
-  "crc",
-  "fastrand",
-  "fs_extra",
-- "gix-discover 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-fs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-lock 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-tempfile 21.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-worktree 0.47.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gix-discover",
-+ "gix-fs",
-+ "gix-lock",
-+ "gix-tempfile",
-+ "gix-worktree",
-  "io-close",
-  "is_ci",
-  "parking_lot",
-@@ -5118,32 +4798,28 @@ name = "gix-trace"
- version = "0.1.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6e42a4c2583357721ba2d887916e78df504980f22f1182df06997ce197b89504"
--
--[[package]]
--name = "gix-trace"
--version = "0.1.17"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
- dependencies = [
-- "tracing",
-+ "tracing-core",
- ]
- 
- [[package]]
- name = "gix-transport"
- version = "0.53.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "de1064c7ffa5a915014a6a5b71fbc5299462ae655348bed23e083b4a735076c3"
- dependencies = [
-  "base64 0.22.1",
-  "bstr",
-  "gix-command",
-  "gix-credentials",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-  "gix-packetline",
-- "gix-quote 0.6.1 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-sec 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-quote",
-+ "gix-sec",
-  "gix-url",
-  "reqwest 0.13.1",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -5153,42 +4829,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "37f8b53b4c56b01c43a4491c4edfe2ce66c654eb86232205172ceb1650d21c55"
- dependencies = [
-  "bitflags 2.10.0",
-- "gix-commitgraph 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-date 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hashtable 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-object 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-revwalk 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "smallvec",
-- "thiserror 2.0.17",
--]
--
--[[package]]
--name = "gix-traverse"
--version = "0.52.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bitflags 2.10.0",
-- "gix-commitgraph 0.32.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-date 0.13.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hashtable 0.12.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-revwalk 0.26.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-commitgraph",
-+ "gix-date",
-+ "gix-hash",
-+ "gix-hashtable",
-+ "gix-object",
-+ "gix-revwalk",
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "gix-url"
- version = "0.35.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1ca2e50308a8373069e71970939f43ea4a1b5f422cf807d048ebcf07dcc02b2c"
- dependencies = [
-  "bstr",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-path 0.11.0",
-  "percent-encoding",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -5196,15 +4857,6 @@ name = "gix-utils"
- version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "befcdbdfb1238d2854591f760a48711bed85e72d80a10e8f2f93f656746ef7c5"
--dependencies = [
-- "fastrand",
-- "unicode-normalization",
--]
--
--[[package]]
--name = "gix-utils"
--version = "0.3.1"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
- dependencies = [
-  "bstr",
-  "fastrand",
-@@ -5218,7 +4870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5b1e63a5b516e970a594f870ed4571a8fdcb8a344e7bd407a20db8bd61dbfde4"
- dependencies = [
-  "bstr",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -5230,14 +4882,6 @@ dependencies = [
-  "bstr",
- ]
- 
--[[package]]
--name = "gix-validate"
--version = "0.11.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
--]
--
- [[package]]
- name = "gix-worktree"
- version = "0.47.0"
-@@ -5245,50 +4889,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ef2ad658586ec0039b03e96c664f08b7cb7a2b7cca6947a9c856c9ed59b807b1"
- dependencies = [
-  "bstr",
-- "gix-attributes 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-fs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-glob 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-hash 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-ignore 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-index 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-object 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "gix-validate 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "gix-worktree"
--version = "0.47.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
--dependencies = [
-- "bstr",
-- "gix-attributes 0.30.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-glob 0.24.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-hash 0.22.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-ignore 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-validate 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-attributes",
-+ "gix-fs",
-+ "gix-glob",
-+ "gix-hash",
-+ "gix-ignore",
-+ "gix-index",
-+ "gix-object",
-+ "gix-path 0.11.0",
-+ "gix-validate 0.11.0",
-  "serde",
- ]
- 
- [[package]]
- name = "gix-worktree-state"
- version = "0.25.0"
--source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#75ac1d05b3c97eda9a20f22c6cd7f90554df37ab"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9895abc7654cbd8e102d6a765d3bdfa1567fcd5d2849b8e3d3da6405d64913c9"
- dependencies = [
-  "bstr",
-- "gix-features 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-features",
-  "gix-filter",
-- "gix-fs 0.19.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-index 0.46.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-object 0.55.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-path 0.11.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-- "gix-worktree 0.47.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
-+ "gix-fs",
-+ "gix-index",
-+ "gix-object",
-+ "gix-path 0.11.0",
-+ "gix-worktree",
-  "io-close",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -5325,7 +4953,7 @@ dependencies = [
-  "proc-macro-error",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -5417,7 +5045,7 @@ dependencies = [
-  "proc-macro-error",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -5432,7 +5060,7 @@ dependencies = [
-  "futures-sink",
-  "futures-util",
-  "http 0.2.12",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "slab",
-  "tokio",
-  "tokio-util",
-@@ -5441,9 +5069,9 @@ dependencies = [
- 
- [[package]]
- name = "h2"
--version = "0.4.12"
-+version = "0.4.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
-+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
- dependencies = [
-  "atomic-waker",
-  "bytes",
-@@ -5451,7 +5079,7 @@ dependencies = [
-  "futures-core",
-  "futures-sink",
-  "http 1.4.0",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "slab",
-  "tokio",
-  "tokio-util",
-@@ -5715,7 +5343,7 @@ dependencies = [
-  "bytes",
-  "futures-channel",
-  "futures-core",
-- "h2 0.4.12",
-+ "h2 0.4.13",
-  "http 1.4.0",
-  "http-body 1.0.1",
-  "httparse",
-@@ -5751,13 +5379,13 @@ dependencies = [
-  "http 1.4.0",
-  "hyper 1.8.1",
-  "hyper-util",
-- "rustls 0.23.35",
-+ "rustls 0.23.36",
-  "rustls-native-certs",
-  "rustls-pki-types",
-  "tokio",
-  "tokio-rustls 0.26.4",
-  "tower-service",
-- "webpki-roots 1.0.4",
-+ "webpki-roots 1.0.5",
- ]
- 
- [[package]]
-@@ -5791,14 +5419,13 @@ dependencies = [
- 
- [[package]]
- name = "hyper-util"
--version = "0.1.18"
-+version = "0.1.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56"
-+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
- dependencies = [
-  "base64 0.22.1",
-  "bytes",
-  "futures-channel",
-- "futures-core",
-  "futures-util",
-  "http 1.4.0",
-  "http-body 1.0.1",
-@@ -5807,8 +5434,8 @@ dependencies = [
-  "libc",
-  "percent-encoding",
-  "pin-project-lite",
-- "socket2 0.6.1",
-- "system-configuration",
-+ "socket2 0.6.2",
-+ "system-configuration 0.7.0",
-  "tokio",
-  "tower-service",
-  "tracing",
-@@ -5817,9 +5444,9 @@ dependencies = [
- 
- [[package]]
- name = "iana-time-zone"
--version = "0.1.64"
-+version = "0.1.65"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
-+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
- dependencies = [
-  "android_system_properties",
-  "core-foundation-sys",
-@@ -5841,9 +5468,9 @@ dependencies = [
- 
- [[package]]
- name = "ico"
--version = "0.4.0"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
-+checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
- dependencies = [
-  "byteorder",
-  "png 0.17.16",
-@@ -5897,9 +5524,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
- 
- [[package]]
- name = "icu_properties"
--version = "2.1.1"
-+version = "2.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
-+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
- dependencies = [
-  "icu_collections",
-  "icu_locale_core",
-@@ -5911,9 +5538,9 @@ dependencies = [
- 
- [[package]]
- name = "icu_properties_data"
--version = "2.1.1"
-+version = "2.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
-+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
- 
- [[package]]
- name = "icu_provider"
-@@ -6009,9 +5636,9 @@ dependencies = [
- 
- [[package]]
- name = "indexmap"
--version = "2.12.1"
-+version = "2.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
-+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
- dependencies = [
-  "equivalent",
-  "hashbrown 0.16.1",
-@@ -6060,9 +5687,9 @@ dependencies = [
- 
- [[package]]
- name = "insta"
--version = "1.46.0"
-+version = "1.46.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b66886d14d18d420ab5052cbff544fc5d34d0b2cdd35eb5976aaa10a4a472e5"
-+checksum = "e82db8c87c7f1ccecb34ce0c24399b8a73081427f3c7c50a5d597925356115e4"
- dependencies = [
-  "console",
-  "once_cell",
-@@ -6098,9 +5725,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
- 
- [[package]]
- name = "iri-string"
--version = "0.7.9"
-+version = "0.7.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
-+checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
- dependencies = [
-  "memchr",
-  "serde",
-@@ -6209,14 +5836,14 @@ checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "jiff-tzdb"
--version = "0.1.4"
-+version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"
-+checksum = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2"
- 
- [[package]]
- name = "jiff-tzdb-platform"
-@@ -6261,9 +5888,9 @@ dependencies = [
- 
- [[package]]
- name = "js-sys"
--version = "0.3.82"
-+version = "0.3.85"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
-+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
- dependencies = [
-  "once_cell",
-  "wasm-bindgen",
-@@ -6357,7 +5984,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
- dependencies = [
-  "cssparser",
-  "html5ever",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "selectors",
- ]
- 
-@@ -6387,7 +6014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
- dependencies = [
-  "gtk-sys",
-- "libloading 0.7.4",
-+ "libloading",
-  "once_cell",
- ]
- 
-@@ -6405,9 +6032,9 @@ checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
- 
- [[package]]
- name = "libdbus-sys"
--version = "0.2.6"
-+version = "0.2.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f"
-+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
- dependencies = [
-  "pkg-config",
- ]
-@@ -6436,25 +6063,15 @@ dependencies = [
-  "winapi",
- ]
- 
--[[package]]
--name = "libloading"
--version = "0.8.9"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
--dependencies = [
-- "cfg-if",
-- "windows-link 0.2.1",
--]
--
- [[package]]
- name = "libredox"
--version = "0.1.10"
-+version = "0.1.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
-+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
- dependencies = [
-  "bitflags 2.10.0",
-  "libc",
-- "redox_syscall",
-+ "redox_syscall 0.7.0",
- ]
- 
- [[package]]
-@@ -6504,12 +6121,6 @@ dependencies = [
-  "libc",
- ]
- 
--[[package]]
--name = "linux-raw-sys"
--version = "0.4.15"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
--
- [[package]]
- name = "linux-raw-sys"
- version = "0.11.0"
-@@ -6565,8 +6176,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "65fd3f75411f4725061682ed91f131946e912859d0044d39c4ec0aac818d7621"
- dependencies = [
-  "cc",
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
-  "time",
- ]
- 
-@@ -6612,7 +6223,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -6644,7 +6255,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -6744,9 +6355,9 @@ dependencies = [
- 
- [[package]]
- name = "mio"
--version = "1.1.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
-+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
- dependencies = [
-  "libc",
-  "log",
-@@ -6762,9 +6373,9 @@ checksum = "dce6dd36094cac388f119d2e9dc82dc730ef91c32a6222170d630e5414b956e6"
- 
- [[package]]
- name = "moxcms"
--version = "0.7.10"
-+version = "0.7.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "80986bbbcf925ebd3be54c26613d861255284584501595cf418320c078945608"
-+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
- dependencies = [
-  "num-traits",
-  "pxfm",
-@@ -6780,14 +6391,14 @@ dependencies = [
-  "dpi",
-  "gtk",
-  "keyboard-types",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "once_cell",
-  "png 0.17.16",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "windows-sys 0.60.2",
- ]
- 
-@@ -6797,7 +6408,7 @@ version = "0.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
- dependencies = [
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
- ]
- 
- [[package]]
-@@ -6809,7 +6420,7 @@ dependencies = [
-  "libc",
-  "log",
-  "openssl",
-- "openssl-probe",
-+ "openssl-probe 0.1.6",
-  "openssl-sys",
-  "schannel",
-  "security-framework 2.11.1",
-@@ -6948,7 +6559,7 @@ dependencies = [
-  "kqueue",
-  "libc",
-  "log",
-- "mio 1.1.0",
-+ "mio 1.1.1",
-  "notify-types",
-  "walkdir",
-  "windows-sys 0.60.2",
-@@ -6956,29 +6567,32 @@ dependencies = [
- 
- [[package]]
- name = "notify-rust"
--version = "4.11.7"
-+version = "4.12.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6442248665a5aa2514e794af3b39661a8e73033b1cc5e59899e1276117ee4400"
-+checksum = "21af20a1b50be5ac5861f74af1a863da53a11c38684d9818d82f1c42f7fdc6c2"
- dependencies = [
-  "futures-lite",
-  "log",
-  "mac-notification-sys",
-  "serde",
-  "tauri-winrt-notification",
-- "zbus 5.12.0",
-+ "zbus 5.13.2",
- ]
- 
- [[package]]
- name = "notify-types"
--version = "2.0.0"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
-+checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
-+dependencies = [
-+ "bitflags 2.10.0",
-+]
- 
- [[package]]
- name = "ntapi"
--version = "0.4.1"
-+version = "0.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-+checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
- dependencies = [
-  "winapi",
- ]
-@@ -7027,9 +6641,9 @@ dependencies = [
- 
- [[package]]
- name = "num-conv"
--version = "0.1.0"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
- 
- [[package]]
- name = "num-integer"
-@@ -7090,7 +6704,7 @@ dependencies = [
-  "proc-macro-crate 3.4.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -7111,22 +6725,6 @@ dependencies = [
-  "malloc_buf",
- ]
- 
--[[package]]
--name = "objc-sys"
--version = "0.3.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
--
--[[package]]
--name = "objc2"
--version = "0.5.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
--dependencies = [
-- "objc-sys",
-- "objc2-encode",
--]
--
- [[package]]
- name = "objc2"
- version = "0.6.3"
-@@ -7144,9 +6742,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
- dependencies = [
-  "bitflags 2.10.0",
-- "block2 0.6.2",
-+ "block2",
-  "libc",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-cloud-kit",
-  "objc2-core-data",
-  "objc2-core-foundation",
-@@ -7154,8 +6752,8 @@ dependencies = [
-  "objc2-core-image",
-  "objc2-core-text",
-  "objc2-core-video",
-- "objc2-foundation 0.3.2",
-- "objc2-quartz-core 0.3.2",
-+ "objc2-foundation",
-+ "objc2-quartz-core",
- ]
- 
- [[package]]
-@@ -7165,8 +6763,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7176,8 +6774,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7188,7 +6786,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
- dependencies = [
-  "bitflags 2.10.0",
-  "dispatch2",
-- "objc2 0.6.3",
-+ "objc2",
- ]
- 
- [[package]]
-@@ -7199,7 +6797,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
- dependencies = [
-  "bitflags 2.10.0",
-  "dispatch2",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
-  "objc2-io-surface",
- ]
-@@ -7210,8 +6808,8 @@ version = "0.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
- dependencies = [
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7220,8 +6818,8 @@ version = "0.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
- dependencies = [
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7231,7 +6829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
-  "objc2-core-graphics",
- ]
-@@ -7243,7 +6841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
-  "objc2-core-graphics",
-  "objc2-io-surface",
-@@ -7264,18 +6862,6 @@ dependencies = [
-  "cc",
- ]
- 
--[[package]]
--name = "objc2-foundation"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
--dependencies = [
-- "bitflags 2.10.0",
-- "block2 0.5.1",
-- "libc",
-- "objc2 0.5.2",
--]
--
- [[package]]
- name = "objc2-foundation"
- version = "0.3.2"
-@@ -7283,9 +6869,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
- dependencies = [
-  "bitflags 2.10.0",
-- "block2 0.6.2",
-+ "block2",
-  "libc",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
- ]
- 
-@@ -7306,7 +6892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
- ]
- 
-@@ -7316,22 +6902,10 @@ version = "0.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586"
- dependencies = [
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
- ]
- 
--[[package]]
--name = "objc2-metal"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
--dependencies = [
-- "bitflags 2.10.0",
-- "block2 0.5.1",
-- "objc2 0.5.2",
-- "objc2-foundation 0.2.2",
--]
--
- [[package]]
- name = "objc2-osa-kit"
- version = "0.3.2"
-@@ -7339,22 +6913,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f112d1746737b0da274ef79a23aac283376f335f4095a083a267a082f21db0c0"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-- "objc2-foundation 0.3.2",
--]
--
--[[package]]
--name = "objc2-quartz-core"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
--dependencies = [
-- "bitflags 2.10.0",
-- "block2 0.5.1",
-- "objc2 0.5.2",
-- "objc2-foundation 0.2.2",
-- "objc2-metal",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7364,9 +6925,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7376,7 +6937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a"
- dependencies = [
-  "bitflags 2.10.0",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-core-foundation",
- ]
- 
-@@ -7387,8 +6948,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
- dependencies = [
-  "bitflags 2.10.0",
-- "block2 0.6.2",
-- "objc2 0.6.3",
-+ "block2",
-+ "objc2",
-  "objc2-cloud-kit",
-  "objc2-core-data",
-  "objc2-core-foundation",
-@@ -7396,8 +6957,8 @@ dependencies = [
-  "objc2-core-image",
-  "objc2-core-location",
-  "objc2-core-text",
-- "objc2-foundation 0.3.2",
-- "objc2-quartz-core 0.3.2",
-+ "objc2-foundation",
-+ "objc2-quartz-core",
-  "objc2-user-notifications",
- ]
- 
-@@ -7407,8 +6968,8 @@ version = "0.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
- dependencies = [
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
- ]
- 
- [[package]]
-@@ -7418,11 +6979,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
- dependencies = [
-  "bitflags 2.10.0",
-- "block2 0.6.2",
-- "objc2 0.6.3",
-+ "block2",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "objc2-javascript-core",
-  "objc2-security",
- ]
-@@ -7445,11 +7006,11 @@ dependencies = [
-  "async-stream",
-  "log",
-  "reqwest 0.12.28",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde_json",
-  "static_assertions",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "url",
- ]
- 
-@@ -7482,15 +7043,15 @@ dependencies = [
- 
- [[package]]
- name = "opener"
--version = "0.8.3"
-+version = "0.8.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cb9024962ab91e00c89d2a14352a8d0fc1a64346bf96f1839b45c09149564e47"
-+checksum = "a2fa337e0cf13357c13ef1dc108df1333eb192f75fc170bea03fcf1fd404c2ee"
- dependencies = [
-  "bstr",
-  "normpath",
-  "url",
-- "windows-sys 0.60.2",
-- "zbus 5.12.0",
-+ "windows-sys 0.61.2",
-+ "zbus 5.13.2",
- ]
- 
- [[package]]
-@@ -7516,7 +7077,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -7525,11 +7086,17 @@ version = "0.1.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
- 
-+[[package]]
-+name = "openssl-probe"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
-+
- [[package]]
- name = "openssl-src"
--version = "300.5.4+3.5.4"
-+version = "300.5.5+3.5.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72"
-+checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709"
- dependencies = [
-  "cc",
- ]
-@@ -7575,15 +7142,15 @@ dependencies = [
- 
- [[package]]
- name = "os_info"
--version = "3.13.0"
-+version = "3.14.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7c39b5918402d564846d5aba164c09a66cc88d232179dfd3e3c619a25a268392"
-+checksum = "e4022a17595a00d6a369236fdae483f0de7f0a339960a53118b818238e132224"
- dependencies = [
-  "android_system_properties",
-  "log",
-  "nix 0.30.1",
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
-  "objc2-ui-kit",
-  "serde",
-  "windows-sys 0.61.2",
-@@ -7605,12 +7172,12 @@ version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "732c71caeaa72c065bb69d7ea08717bd3f4863a4f451402fc9513e29dbd5261b"
- dependencies = [
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
-  "objc2-osa-kit",
-  "serde",
-  "serde_json",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -7672,7 +7239,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
- dependencies = [
-  "cfg-if",
-  "libc",
-- "redox_syscall",
-+ "redox_syscall 0.5.18",
-  "smallvec",
-  "windows-link 0.2.1",
- ]
-@@ -7703,7 +7270,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
- dependencies = [
-  "fixedbitset",
-  "hashbrown 0.15.5",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "serde",
- ]
- 
-@@ -7811,7 +7378,7 @@ dependencies = [
-  "phf_shared 0.11.3",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -7838,7 +7405,7 @@ version = "0.11.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
- dependencies = [
-- "siphasher 1.0.1",
-+ "siphasher 1.0.2",
- ]
- 
- [[package]]
-@@ -7858,7 +7425,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -7897,7 +7464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
- dependencies = [
-  "base64 0.22.1",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "quick-xml 0.38.4",
-  "serde",
-  "time",
-@@ -7939,21 +7506,21 @@ dependencies = [
-  "concurrent-queue",
-  "hermit-abi",
-  "pin-project-lite",
-- "rustix 1.1.3",
-+ "rustix",
-  "windows-sys 0.61.2",
- ]
- 
- [[package]]
- name = "portable-atomic"
--version = "1.11.1"
-+version = "1.13.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
- 
- [[package]]
- name = "portable-atomic-util"
--version = "0.2.4"
-+version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-+checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
- dependencies = [
-  "portable-atomic",
- ]
-@@ -8039,7 +7606,7 @@ version = "3.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
- dependencies = [
-- "toml_edit 0.23.7",
-+ "toml_edit 0.23.10+spec-1.0.0",
- ]
- 
- [[package]]
-@@ -8085,7 +7652,7 @@ dependencies = [
-  "proc-macro-error-attr2",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -8096,9 +7663,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
- 
- [[package]]
- name = "proc-macro2"
--version = "1.0.103"
-+version = "1.0.106"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
-+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
- dependencies = [
-  "unicode-ident",
- ]
-@@ -8114,9 +7681,9 @@ dependencies = [
- 
- [[package]]
- name = "prost"
--version = "0.14.1"
-+version = "0.14.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
-+checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
- dependencies = [
-  "bytes",
-  "prost-derive",
-@@ -8124,22 +7691,22 @@ dependencies = [
- 
- [[package]]
- name = "prost-derive"
--version = "0.14.1"
-+version = "0.14.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
-+checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
- dependencies = [
-  "anyhow",
-  "itertools",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "prost-types"
--version = "0.14.1"
-+version = "0.14.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72"
-+checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
- dependencies = [
-  "prost",
- ]
-@@ -8193,9 +7760,9 @@ dependencies = [
- 
- [[package]]
- name = "pxfm"
--version = "0.1.26"
-+version = "0.1.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b3502d6155304a4173a5f2c34b52b7ed0dd085890326cb50fd625fdf39e86b3b"
-+checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
- dependencies = [
-  "num-traits",
- ]
-@@ -8236,9 +7803,9 @@ dependencies = [
-  "quinn-proto",
-  "quinn-udp",
-  "rustc-hash",
-- "rustls 0.23.35",
-- "socket2 0.6.1",
-- "thiserror 2.0.17",
-+ "rustls 0.23.36",
-+ "socket2 0.6.2",
-+ "thiserror 2.0.18",
-  "tokio",
-  "tracing",
-  "web-time",
-@@ -8257,10 +7824,10 @@ dependencies = [
-  "rand 0.9.2",
-  "ring",
-  "rustc-hash",
-- "rustls 0.23.35",
-+ "rustls 0.23.36",
-  "rustls-pki-types",
-  "slab",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tinyvec",
-  "tracing",
-  "web-time",
-@@ -8275,16 +7842,16 @@ dependencies = [
-  "cfg_aliases",
-  "libc",
-  "once_cell",
-- "socket2 0.6.1",
-+ "socket2 0.6.2",
-  "tracing",
-  "windows-sys 0.60.2",
- ]
- 
- [[package]]
- name = "quote"
--version = "1.0.42"
-+version = "1.0.44"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
-+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
- dependencies = [
-  "proc-macro2",
- ]
-@@ -8333,7 +7900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
- dependencies = [
-  "rand_chacha 0.9.0",
-- "rand_core 0.9.3",
-+ "rand_core 0.9.5",
- ]
- 
- [[package]]
-@@ -8363,7 +7930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
- dependencies = [
-  "ppv-lite86",
-- "rand_core 0.9.3",
-+ "rand_core 0.9.5",
- ]
- 
- [[package]]
-@@ -8381,14 +7948,14 @@ version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
- dependencies = [
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
- ]
- 
- [[package]]
- name = "rand_core"
--version = "0.9.3"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
-+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
- dependencies = [
-  "getrandom 0.3.4",
- ]
-@@ -8426,13 +7993,22 @@ dependencies = [
-  "bitflags 2.10.0",
- ]
- 
-+[[package]]
-+name = "redox_syscall"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
-+dependencies = [
-+ "bitflags 2.10.0",
-+]
-+
- [[package]]
- name = "redox_users"
- version = "0.4.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
- dependencies = [
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
-  "libredox",
-  "thiserror 1.0.69",
- ]
-@@ -8443,9 +8019,9 @@ version = "0.5.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
- dependencies = [
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
-  "libredox",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -8465,14 +8041,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "regex"
--version = "1.12.2"
-+version = "1.12.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
-+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-@@ -8482,9 +8058,9 @@ dependencies = [
- 
- [[package]]
- name = "regex-automata"
--version = "0.4.13"
-+version = "0.4.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
-+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-@@ -8493,9 +8069,9 @@ dependencies = [
- 
- [[package]]
- name = "regex-syntax"
--version = "0.8.8"
-+version = "0.8.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
-+checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
- 
- [[package]]
- name = "relative-path"
-@@ -8541,7 +8117,7 @@ dependencies = [
-  "serde_json",
-  "serde_urlencoded",
-  "sync_wrapper 0.1.2",
-- "system-configuration",
-+ "system-configuration 0.5.1",
-  "tokio",
-  "tokio-rustls 0.24.1",
-  "tower-service",
-@@ -8567,7 +8143,7 @@ dependencies = [
-  "futures-channel",
-  "futures-core",
-  "futures-util",
-- "h2 0.4.12",
-+ "h2 0.4.13",
-  "http 1.4.0",
-  "http-body 1.0.1",
-  "http-body-util",
-@@ -8583,7 +8159,7 @@ dependencies = [
-  "percent-encoding",
-  "pin-project-lite",
-  "quinn",
-- "rustls 0.23.35",
-+ "rustls 0.23.36",
-  "rustls-native-certs",
-  "rustls-pki-types",
-  "serde",
-@@ -8602,7 +8178,7 @@ dependencies = [
-  "wasm-bindgen-futures",
-  "wasm-streams",
-  "web-sys",
-- "webpki-roots 1.0.4",
-+ "webpki-roots 1.0.5",
- ]
- 
- [[package]]
-@@ -8617,7 +8193,7 @@ dependencies = [
-  "futures-channel",
-  "futures-core",
-  "futures-util",
-- "h2 0.4.12",
-+ "h2 0.4.13",
-  "http 1.4.0",
-  "http-body 1.0.1",
-  "http-body-util",
-@@ -8630,18 +8206,22 @@ dependencies = [
-  "percent-encoding",
-  "pin-project-lite",
-  "quinn",
-- "rustls 0.23.35",
-+ "rustls 0.23.36",
-  "rustls-pki-types",
-  "rustls-platform-verifier",
-+ "serde",
-+ "serde_json",
-  "sync_wrapper 1.0.2",
-  "tokio",
-  "tokio-rustls 0.26.4",
-+ "tokio-util",
-  "tower",
-  "tower-http",
-  "tower-service",
-  "url",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-+ "wasm-streams",
-  "web-sys",
- ]
- 
-@@ -8672,27 +8252,26 @@ dependencies = [
- 
- [[package]]
- name = "rfd"
--version = "0.15.4"
-+version = "0.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
-+checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
- dependencies = [
-- "ashpd",
-- "block2 0.6.2",
-+ "block2",
-  "dispatch2",
-  "glib-sys",
-  "gobject-sys",
-  "gtk-sys",
-  "js-sys",
-  "log",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "raw-window-handle",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-  "web-sys",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.60.2",
- ]
- 
- [[package]]
-@@ -8703,7 +8282,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
- dependencies = [
-  "cc",
-  "cfg-if",
-- "getrandom 0.2.16",
-+ "getrandom 0.2.17",
-  "libc",
-  "untrusted",
-  "windows-sys 0.52.0",
-@@ -8711,9 +8290,9 @@ dependencies = [
- 
- [[package]]
- name = "rkyv"
--version = "0.7.45"
-+version = "0.7.46"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-+checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1"
- dependencies = [
-  "bitvec",
-  "bytecheck",
-@@ -8729,9 +8308,9 @@ dependencies = [
- 
- [[package]]
- name = "rkyv_derive"
--version = "0.7.45"
-+version = "0.7.46"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-+checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -8751,10 +8330,10 @@ dependencies = [
-  "paste",
-  "pin-project-lite",
-  "rmcp-macros",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde",
-  "serde_json",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
-  "tokio-util",
-  "tracing",
-@@ -8770,7 +8349,17 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "serde_json",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-+]
-+
-+[[package]]
-+name = "rsqlite-vfs"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8a1f2315036ef6b1fbacd1972e8ee7688030b0a2121edfc2a6550febd41574d"
-+dependencies = [
-+ "hashbrown 0.16.1",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -8798,7 +8387,7 @@ dependencies = [
-  "regex",
-  "relative-path",
-  "rustc_version",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "unicode-ident",
- ]
- 
-@@ -8830,9 +8419,9 @@ dependencies = [
- 
- [[package]]
- name = "rust_decimal"
--version = "1.39.0"
-+version = "1.40.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
-+checksum = "61f703d19852dbf87cbc513643fa81428361eb6940f1ac14fd58155d295a3eb0"
- dependencies = [
-  "arrayvec",
-  "borsh",
-@@ -8846,9 +8435,9 @@ dependencies = [
- 
- [[package]]
- name = "rustc-demangle"
--version = "0.1.26"
-+version = "0.1.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
-+checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
- 
- [[package]]
- name = "rustc-hash"
-@@ -8865,19 +8454,6 @@ dependencies = [
-  "semver",
- ]
- 
--[[package]]
--name = "rustix"
--version = "0.38.44"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
--dependencies = [
-- "bitflags 2.10.0",
-- "errno",
-- "libc",
-- "linux-raw-sys 0.4.15",
-- "windows-sys 0.59.0",
--]
--
- [[package]]
- name = "rustix"
- version = "1.1.3"
-@@ -8887,7 +8463,7 @@ dependencies = [
-  "bitflags 2.10.0",
-  "errno",
-  "libc",
-- "linux-raw-sys 0.11.0",
-+ "linux-raw-sys",
-  "windows-sys 0.61.2",
- ]
- 
-@@ -8905,26 +8481,26 @@ dependencies = [
- 
- [[package]]
- name = "rustls"
--version = "0.23.35"
-+version = "0.23.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
-+checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
- dependencies = [
-  "aws-lc-rs",
-  "once_cell",
-  "ring",
-  "rustls-pki-types",
-- "rustls-webpki 0.103.8",
-+ "rustls-webpki 0.103.9",
-  "subtle",
-  "zeroize",
- ]
- 
- [[package]]
- name = "rustls-native-certs"
--version = "0.8.2"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923"
-+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
- dependencies = [
-- "openssl-probe",
-+ "openssl-probe 0.2.1",
-  "rustls-pki-types",
-  "schannel",
-  "security-framework 3.5.1",
-@@ -8941,9 +8517,9 @@ dependencies = [
- 
- [[package]]
- name = "rustls-pki-types"
--version = "1.13.1"
-+version = "1.14.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
-+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
- dependencies = [
-  "web-time",
-  "zeroize",
-@@ -8960,10 +8536,10 @@ dependencies = [
-  "jni",
-  "log",
-  "once_cell",
-- "rustls 0.23.35",
-+ "rustls 0.23.36",
-  "rustls-native-certs",
-  "rustls-platform-verifier-android",
-- "rustls-webpki 0.103.8",
-+ "rustls-webpki 0.103.9",
-  "security-framework 3.5.1",
-  "security-framework-sys",
-  "webpki-root-certs",
-@@ -8988,9 +8564,9 @@ dependencies = [
- 
- [[package]]
- name = "rustls-webpki"
--version = "0.103.8"
-+version = "0.103.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
-+checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
- dependencies = [
-  "aws-lc-rs",
-  "ring",
-@@ -9006,9 +8582,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
- 
- [[package]]
- name = "ryu"
--version = "1.0.20"
-+version = "1.0.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
- 
- [[package]]
- name = "same-file"
-@@ -9066,14 +8642,14 @@ dependencies = [
- 
- [[package]]
- name = "schemars"
--version = "1.2.0"
-+version = "1.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
-+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
- dependencies = [
-  "chrono",
-  "dyn-clone",
-  "ref-cast",
-- "schemars_derive 1.2.0",
-+ "schemars_derive 1.2.1",
-  "serde",
-  "serde_json",
- ]
-@@ -9087,27 +8663,21 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "serde_derive_internals",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "schemars_derive"
--version = "1.2.0"
-+version = "1.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4908ad288c5035a8eb12cfdf0d49270def0a268ee162b75eeee0f85d155a7c45"
-+checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f"
- dependencies = [
-  "proc-macro2",
-  "quote",
-  "serde_derive_internals",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
--[[package]]
--name = "scoped-tls"
--version = "1.0.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
--
- [[package]]
- name = "scopeguard"
- version = "1.2.0"
-@@ -9283,7 +8853,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -9294,16 +8864,16 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "serde_json"
--version = "1.0.148"
-+version = "1.0.149"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
-+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
- dependencies = [
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "itoa",
-  "memchr",
-  "serde",
-@@ -9352,7 +8922,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -9395,9 +8965,9 @@ dependencies = [
-  "chrono",
-  "hex",
-  "indexmap 1.9.3",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "schemars 0.9.0",
-- "schemars 1.2.0",
-+ "schemars 1.2.1",
-  "serde_core",
-  "serde_json",
-  "serde_with_macros",
-@@ -9413,16 +8983,17 @@ dependencies = [
-  "darling 0.21.3",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "serial_test"
--version = "3.2.0"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
-+checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555"
- dependencies = [
-- "futures",
-+ "futures-executor",
-+ "futures-util",
-  "log",
-  "once_cell",
-  "parking_lot",
-@@ -9432,13 +9003,13 @@ dependencies = [
- 
- [[package]]
- name = "serial_test_derive"
--version = "3.2.0"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
-+checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -9460,7 +9031,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -9569,9 +9140,9 @@ dependencies = [
- 
- [[package]]
- name = "signal-hook"
--version = "0.4.1"
-+version = "0.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2a37d01603c37b5466f808de79f845c7116049b0579adb70a6b7d47c1fa3a952"
-+checksum = "3b57709da74f9ff9f4a27dce9526eec25ca8407c45a7887243b031a58935fb8e"
- dependencies = [
-  "libc",
-  "signal-hook-registry",
-@@ -9600,9 +9171,9 @@ dependencies = [
- 
- [[package]]
- name = "simd-adler32"
--version = "0.3.7"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
- 
- [[package]]
- name = "simdutf8"
-@@ -9624,15 +9195,15 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
- 
- [[package]]
- name = "siphasher"
--version = "1.0.1"
-+version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
- 
- [[package]]
- name = "slab"
--version = "0.4.11"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
-+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
- 
- [[package]]
- name = "smallvec"
-@@ -9645,9 +9216,9 @@ dependencies = [
- 
- [[package]]
- name = "snapbox"
--version = "0.6.23"
-+version = "0.6.24"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "96fa1ce81be900d083b30ec2d481e6658c2acfaa2cfc7be45ccc2cc1b820edb3"
-+checksum = "6c1abc378119f77310836665f8523018532cf7e3faeb3b10b01da5a7321bf8e1"
- dependencies = [
-  "anstream",
-  "anstyle",
-@@ -9680,9 +9251,9 @@ dependencies = [
- 
- [[package]]
- name = "socket2"
--version = "0.6.1"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
-+checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
- dependencies = [
-  "libc",
-  "windows-sys 0.60.2",
-@@ -9690,24 +9261,24 @@ dependencies = [
- 
- [[package]]
- name = "softbuffer"
--version = "0.4.6"
-+version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
-+checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3"
- dependencies = [
-  "bytemuck",
-- "cfg_aliases",
-- "core-graphics",
-- "foreign-types 0.5.0",
-  "js-sys",
-- "log",
-- "objc2 0.5.2",
-- "objc2-foundation 0.2.2",
-- "objc2-quartz-core 0.2.2",
-+ "ndk",
-+ "objc2",
-+ "objc2-core-foundation",
-+ "objc2-core-graphics",
-+ "objc2-foundation",
-+ "objc2-quartz-core",
-  "raw-window-handle",
-- "redox_syscall",
-+ "redox_syscall 0.5.18",
-+ "tracing",
-  "wasm-bindgen",
-  "web-sys",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.61.2",
- ]
- 
- [[package]]
-@@ -9747,14 +9318,13 @@ dependencies = [
- 
- [[package]]
- name = "sqlite-wasm-rs"
--version = "0.5.1"
-+version = "0.5.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "05e98301bf8b0540c7de45ecd760539b9c62f5772aed172f08efba597c11cd5d"
-+checksum = "2f4206ed3a67690b9c29b77d728f6acc3ce78f16bf846d83c94f76400320181b"
- dependencies = [
-  "cc",
-- "hashbrown 0.16.1",
-  "js-sys",
-- "thiserror 2.0.17",
-+ "rsqlite-vfs",
-  "wasm-bindgen",
- ]
- 
-@@ -9819,7 +9389,7 @@ dependencies = [
-  "heck 0.5.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -9871,9 +9441,9 @@ dependencies = [
- 
- [[package]]
- name = "syn"
--version = "2.0.112"
-+version = "2.0.114"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4"
-+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -9903,7 +9473,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -9937,7 +9507,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
- dependencies = [
-  "bitflags 1.3.2",
-  "core-foundation 0.9.4",
-- "system-configuration-sys",
-+ "system-configuration-sys 0.5.0",
-+]
-+
-+[[package]]
-+name = "system-configuration"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
-+dependencies = [
-+ "bitflags 2.10.0",
-+ "core-foundation 0.9.4",
-+ "system-configuration-sys 0.6.0",
- ]
- 
- [[package]]
-@@ -9950,6 +9531,16 @@ dependencies = [
-  "libc",
- ]
- 
-+[[package]]
-+name = "system-configuration-sys"
-+version = "0.6.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-+dependencies = [
-+ "core-foundation-sys",
-+ "libc",
-+]
-+
- [[package]]
- name = "system-deps"
- version = "6.2.2"
-@@ -9970,7 +9561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7"
- dependencies = [
-  "bitflags 2.10.0",
-- "block2 0.6.2",
-+ "block2",
-  "core-foundation 0.10.1",
-  "core-graphics",
-  "crossbeam-channel",
-@@ -9987,9 +9578,9 @@ dependencies = [
-  "ndk",
-  "ndk-context",
-  "ndk-sys",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "once_cell",
-  "parking_lot",
-  "raw-window-handle",
-@@ -10011,7 +9602,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -10039,9 +9630,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
- 
- [[package]]
- name = "tauri"
--version = "2.9.5"
-+version = "2.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033"
-+checksum = "1025aa560c1eaa14ef96de5540cbe13ed6be1933ebe4398338c96bc370b807c6"
- dependencies = [
-  "anyhow",
-  "bytes",
-@@ -10059,15 +9650,15 @@ dependencies = [
-  "log",
-  "mime",
-  "muda",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "objc2-ui-kit",
-  "objc2-web-kit",
-  "percent-encoding",
-  "plist",
-  "raw-window-handle",
-- "reqwest 0.12.28",
-+ "reqwest 0.13.1",
-  "serde",
-  "serde_json",
-  "serde_repr",
-@@ -10078,7 +9669,7 @@ dependencies = [
-  "tauri-runtime",
-  "tauri-runtime-wry",
-  "tauri-utils",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
-  "tray-icon",
-  "url",
-@@ -10090,9 +9681,9 @@ dependencies = [
- 
- [[package]]
- name = "tauri-build"
--version = "2.5.3"
-+version = "2.5.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08"
-+checksum = "76809f63061c8b25537b87f46b8733b31397cf419706dc874e1602be6479ba90"
- dependencies = [
-  "anyhow",
-  "cargo_toml",
-@@ -10106,15 +9697,15 @@ dependencies = [
-  "serde_json",
-  "tauri-utils",
-  "tauri-winres",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "walkdir",
- ]
- 
- [[package]]
- name = "tauri-codegen"
--version = "2.5.2"
-+version = "2.5.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf"
-+checksum = "8b2ebe49d690ccaea93aa81fff99277d4f445968f085ba13be67859151e9e4b8"
- dependencies = [
-  "base64 0.22.1",
-  "brotli",
-@@ -10128,9 +9719,9 @@ dependencies = [
-  "serde",
-  "serde_json",
-  "sha2",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "tauri-utils",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "time",
-  "url",
-  "uuid",
-@@ -10139,23 +9730,23 @@ dependencies = [
- 
- [[package]]
- name = "tauri-macros"
--version = "2.5.2"
-+version = "2.5.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde"
-+checksum = "1119f651b0187c686c0fc72c66bba311e560e1b5f61869086ce788d43be6cf41"
- dependencies = [
-  "heck 0.5.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "tauri-codegen",
-  "tauri-utils",
- ]
- 
- [[package]]
- name = "tauri-plugin"
--version = "2.5.2"
-+version = "2.5.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377"
-+checksum = "692a77abd8b8773e107a42ec0e05b767b8d2b7ece76ab36c6c3947e34df9f53f"
- dependencies = [
-  "anyhow",
-  "glob",
-@@ -10164,7 +9755,7 @@ dependencies = [
-  "serde",
-  "serde_json",
-  "tauri-utils",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
-  "walkdir",
- ]
- 
-@@ -10180,14 +9771,14 @@ dependencies = [
-  "serde_json",
-  "tauri",
-  "tauri-plugin",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "tauri-plugin-deep-link"
--version = "2.4.5"
-+version = "2.4.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6e82759f7c7d51de3cbde51c04b3f2332de52436ed84541182cd8944b04e9e73"
-+checksum = "444b091f24f2f6bdb4a305b54d3961f629c11861c685aceeea9a1972f89e43d5"
- dependencies = [
-  "dunce",
-  "plist",
-@@ -10197,7 +9788,7 @@ dependencies = [
-  "tauri",
-  "tauri-plugin",
-  "tauri-utils",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tracing",
-  "url",
-  "windows-registry 0.5.3",
-@@ -10206,9 +9797,9 @@ dependencies = [
- 
- [[package]]
- name = "tauri-plugin-dialog"
--version = "2.4.2"
-+version = "2.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "313f8138692ddc4a2127c4c9607d616a46f5c042e77b3722450866da0aad2f19"
-+checksum = "9204b425d9be8d12aa60c2a83a289cf7d1caae40f57f336ed1155b3a5c0e359b"
- dependencies = [
-  "log",
-  "raw-window-handle",
-@@ -10218,15 +9809,15 @@ dependencies = [
-  "tauri",
-  "tauri-plugin",
-  "tauri-plugin-fs",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "url",
- ]
- 
- [[package]]
- name = "tauri-plugin-fs"
--version = "2.4.4"
-+version = "2.4.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "47df422695255ecbe7bac7012440eddaeefd026656171eac9559f5243d3230d9"
-+checksum = "ed390cc669f937afeb8b28032ce837bac8ea023d975a2e207375ec05afaf1804"
- dependencies = [
-  "anyhow",
-  "dunce",
-@@ -10239,16 +9830,16 @@ dependencies = [
-  "tauri",
-  "tauri-plugin",
-  "tauri-utils",
-- "thiserror 2.0.17",
-- "toml 0.9.10+spec-1.1.0",
-+ "thiserror 2.0.18",
-+ "toml 0.9.11+spec-1.1.0",
-  "url",
- ]
- 
- [[package]]
- name = "tauri-plugin-http"
--version = "2.5.4"
-+version = "2.5.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c00685aceab12643cf024f712ab0448ba8fcadf86f2391d49d2e5aa732aacc70"
-+checksum = "d8f069451c4e87e7e2636b7f065a4c52866c4ce5e60e2d53fa1038edb6d184dc"
- dependencies = [
-  "bytes",
-  "cookie_store 0.21.1",
-@@ -10262,7 +9853,7 @@ dependencies = [
-  "tauri",
-  "tauri-plugin",
-  "tauri-plugin-fs",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
-  "url",
-  "urlpattern",
-@@ -10270,23 +9861,23 @@ dependencies = [
- 
- [[package]]
- name = "tauri-plugin-log"
--version = "2.7.1"
-+version = "2.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d5709c792b8630290b5d9811a1f8fe983dd925fc87c7fc7f4923616458cd00b6"
-+checksum = "7545bd67f070a4500432c826e2e0682146a1d6712aee22a2786490156b574d93"
- dependencies = [
-  "android_logger",
-  "byte-unit",
-  "fern",
-  "log",
-- "objc2 0.6.3",
-- "objc2-foundation 0.3.2",
-+ "objc2",
-+ "objc2-foundation",
-  "serde",
-  "serde_json",
-  "serde_repr",
-  "swift-rs",
-  "tauri",
-  "tauri-plugin",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "time",
- ]
- 
-@@ -10305,7 +9896,7 @@ dependencies = [
-  "sys-locale",
-  "tauri",
-  "tauri-plugin",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
-@@ -10320,9 +9911,9 @@ dependencies = [
- 
- [[package]]
- name = "tauri-plugin-shell"
--version = "2.3.3"
-+version = "2.3.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c374b6db45f2a8a304f0273a15080d98c70cde86178855fc24653ba657a1144c"
-+checksum = "8457dbf9e2bab1edd8df22bb2c20857a59a9868e79cb3eac5ed639eec4d0c73b"
- dependencies = [
-  "encoding_rs",
-  "log",
-@@ -10335,38 +9926,38 @@ dependencies = [
-  "shared_child",
-  "tauri",
-  "tauri-plugin",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
- ]
- 
- [[package]]
- name = "tauri-plugin-single-instance"
--version = "2.3.6"
-+version = "2.3.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd707f8c86b4e3004e2c141fa24351f1909ba40ce1b8437e30d5ed5277dd3710"
-+checksum = "acba6b5ca527a96cdfcc96ae09b09ccb91ddff5e33978ca6873b96ea16bb404c"
- dependencies = [
-  "serde",
-  "serde_json",
-  "tauri",
-  "tauri-plugin-deep-link",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tracing",
-  "windows-sys 0.60.2",
-- "zbus 5.12.0",
-+ "zbus 5.13.2",
- ]
- 
- [[package]]
- name = "tauri-plugin-store"
--version = "2.4.1"
-+version = "2.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59a77036340a97eb5bbe1b3209c31e5f27f75e6f92a52fd9dd4b211ef08bf310"
-+checksum = "5ca1a8ff83c269b115e98726ffc13f9e548a10161544a92ad121d6d0a96e16ea"
- dependencies = [
-  "dunce",
-  "serde",
-  "serde_json",
-  "tauri",
-  "tauri-plugin",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tokio",
-  "tracing",
- ]
-@@ -10384,9 +9975,9 @@ dependencies = [
- 
- [[package]]
- name = "tauri-plugin-updater"
--version = "2.9.0"
-+version = "2.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "27cbc31740f4d507712550694749572ec0e43bdd66992db7599b89fbfd6b167b"
-+checksum = "3fe8e9bebd88fc222938ffdfbdcfa0307081423bd01e3252fc337d8bde81fc61"
- dependencies = [
-  "base64 0.22.1",
-  "dirs 6.0.0",
-@@ -10398,7 +9989,8 @@ dependencies = [
-  "minisign-verify",
-  "osakit",
-  "percent-encoding",
-- "reqwest 0.12.28",
-+ "reqwest 0.13.1",
-+ "rustls 0.23.36",
-  "semver",
-  "serde",
-  "serde_json",
-@@ -10406,7 +9998,7 @@ dependencies = [
-  "tauri",
-  "tauri-plugin",
-  "tempfile",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "time",
-  "tokio",
-  "url",
-@@ -10426,28 +10018,28 @@ dependencies = [
-  "serde_json",
-  "tauri",
-  "tauri-plugin",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
- ]
- 
- [[package]]
- name = "tauri-runtime"
--version = "2.9.2"
-+version = "2.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892"
-+checksum = "b885ffeac82b00f1f6fd292b6e5aabfa7435d537cef57d11e38a489956535651"
- dependencies = [
-  "cookie",
-  "dpi",
-  "gtk",
-  "http 1.4.0",
-  "jni",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-ui-kit",
-  "objc2-web-kit",
-  "raw-window-handle",
-  "serde",
-  "serde_json",
-  "tauri-utils",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "url",
-  "webkit2gtk",
-  "webview2-com",
-@@ -10456,17 +10048,17 @@ dependencies = [
- 
- [[package]]
- name = "tauri-runtime-wry"
--version = "2.9.3"
-+version = "2.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065"
-+checksum = "5204682391625e867d16584fedc83fc292fb998814c9f7918605c789cd876314"
- dependencies = [
-  "gtk",
-  "http 1.4.0",
-  "jni",
-  "log",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "once_cell",
-  "percent-encoding",
-  "raw-window-handle",
-@@ -10483,9 +10075,9 @@ dependencies = [
- 
- [[package]]
- name = "tauri-utils"
--version = "2.8.1"
-+version = "2.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490"
-+checksum = "fcd169fccdff05eff2c1033210b9b94acd07a47e6fa9a3431cf09cfd4f01c87e"
- dependencies = [
-  "anyhow",
-  "brotli",
-@@ -10511,8 +10103,8 @@ dependencies = [
-  "serde_json",
-  "serde_with",
-  "swift-rs",
-- "thiserror 2.0.17",
-- "toml 0.9.10+spec-1.1.0",
-+ "thiserror 2.0.18",
-+ "toml 0.9.11+spec-1.1.0",
-  "url",
-  "urlpattern",
-  "uuid",
-@@ -10527,7 +10119,7 @@ checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0"
- dependencies = [
-  "dunce",
-  "embed-resource",
-- "toml 0.9.10+spec-1.1.0",
-+ "toml 0.9.11+spec-1.1.0",
- ]
- 
- [[package]]
-@@ -10537,7 +10129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9"
- dependencies = [
-  "quick-xml 0.37.5",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "windows 0.61.3",
-  "windows-version",
- ]
-@@ -10551,7 +10143,7 @@ dependencies = [
-  "fastrand",
-  "getrandom 0.3.4",
-  "once_cell",
-- "rustix 1.1.3",
-+ "rustix",
-  "windows-sys 0.61.2",
- ]
- 
-@@ -10581,7 +10173,7 @@ version = "0.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
- dependencies = [
-- "rustix 1.1.3",
-+ "rustix",
-  "windows-sys 0.60.2",
- ]
- 
-@@ -10611,11 +10203,11 @@ dependencies = [
- 
- [[package]]
- name = "thiserror"
--version = "2.0.17"
-+version = "2.0.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
-+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
- dependencies = [
-- "thiserror-impl 2.0.17",
-+ "thiserror-impl 2.0.18",
- ]
- 
- [[package]]
-@@ -10626,18 +10218,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "thiserror-impl"
--version = "2.0.17"
-+version = "2.0.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
-+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -10665,9 +10257,9 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.44"
-+version = "0.3.46"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
-+checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -10675,22 +10267,22 @@ dependencies = [
-  "num-conv",
-  "num_threads",
-  "powerfmt",
-- "serde",
-+ "serde_core",
-  "time-core",
-  "time-macros",
- ]
- 
- [[package]]
- name = "time-core"
--version = "0.1.6"
-+version = "0.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
-+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.24"
-+version = "0.2.26"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
-+checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
- dependencies = [
-  "num-conv",
-  "time-core",
-@@ -10738,11 +10330,11 @@ checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
- dependencies = [
-  "bytes",
-  "libc",
-- "mio 1.1.0",
-+ "mio 1.1.1",
-  "parking_lot",
-  "pin-project-lite",
-  "signal-hook-registry",
-- "socket2 0.6.1",
-+ "socket2 0.6.2",
-  "tokio-macros",
-  "tracing",
-  "windows-sys 0.61.2",
-@@ -10756,7 +10348,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -10785,15 +10377,15 @@ version = "0.26.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
- dependencies = [
-- "rustls 0.23.35",
-+ "rustls 0.23.36",
-  "tokio",
- ]
- 
- [[package]]
- name = "tokio-stream"
--version = "0.1.17"
-+version = "0.1.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
-+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
- dependencies = [
-  "futures-core",
-  "pin-project-lite",
-@@ -10814,9 +10406,9 @@ dependencies = [
- 
- [[package]]
- name = "tokio-util"
--version = "0.7.17"
-+version = "0.7.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
-+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
- dependencies = [
-  "bytes",
-  "futures-core",
-@@ -10839,11 +10431,11 @@ dependencies = [
- 
- [[package]]
- name = "toml"
--version = "0.9.10+spec-1.1.0"
-+version = "0.9.11+spec-1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
-+checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
- dependencies = [
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "serde_core",
-  "serde_spanned 1.0.4",
-  "toml_datetime 0.7.5+spec-1.1.0",
-@@ -10876,7 +10468,7 @@ version = "0.19.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
- dependencies = [
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "toml_datetime 0.6.3",
-  "winnow 0.5.40",
- ]
-@@ -10887,7 +10479,7 @@ version = "0.20.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
- dependencies = [
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "serde",
-  "serde_spanned 0.6.9",
-  "toml_datetime 0.6.3",
-@@ -10896,11 +10488,11 @@ dependencies = [
- 
- [[package]]
- name = "toml_edit"
--version = "0.23.7"
-+version = "0.23.10+spec-1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
-+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
- dependencies = [
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "toml_datetime 0.7.5+spec-1.1.0",
-  "toml_parser",
-  "winnow 0.7.14",
-@@ -10923,15 +10515,15 @@ checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
- 
- [[package]]
- name = "tonic"
--version = "0.14.2"
-+version = "0.14.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
-+checksum = "a286e33f82f8a1ee2df63f4fa35c0becf4a85a0cb03091a15fd7bf0b402dc94a"
- dependencies = [
-  "async-trait",
-  "axum",
-  "base64 0.22.1",
-  "bytes",
-- "h2 0.4.12",
-+ "h2 0.4.13",
-  "http 1.4.0",
-  "http-body 1.0.1",
-  "http-body-util",
-@@ -10940,7 +10532,7 @@ dependencies = [
-  "hyper-util",
-  "percent-encoding",
-  "pin-project",
-- "socket2 0.6.1",
-+ "socket2 0.6.2",
-  "sync_wrapper 1.0.2",
-  "tokio",
-  "tokio-stream",
-@@ -10952,9 +10544,9 @@ dependencies = [
- 
- [[package]]
- name = "tonic-prost"
--version = "0.14.2"
-+version = "0.14.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67"
-+checksum = "d6c55a2d6a14174563de34409c9f92ff981d006f56da9c6ecd40d9d4a31500b0"
- dependencies = [
-  "bytes",
-  "prost",
-@@ -10963,13 +10555,13 @@ dependencies = [
- 
- [[package]]
- name = "tower"
--version = "0.5.2"
-+version = "0.5.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
-+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
- dependencies = [
-  "futures-core",
-  "futures-util",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "pin-project-lite",
-  "slab",
-  "sync_wrapper 1.0.2",
-@@ -11029,7 +10621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf"
- dependencies = [
-  "crossbeam-channel",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "time",
-  "tracing-subscriber",
- ]
-@@ -11042,7 +10634,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -11057,12 +10649,12 @@ dependencies = [
- 
- [[package]]
- name = "tracing-forest"
--version = "0.3.0"
-+version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "92bdb3c949c9e81b71f78ba782f956b896019d82cc2f31025d21e04adab4d695"
-+checksum = "f09cb459317a3811f76644334473239d696cd8efc606963ae7d1c308cead3b74"
- dependencies = [
-  "smallvec",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "tracing",
-  "tracing-subscriber",
- ]
-@@ -11098,23 +10690,23 @@ dependencies = [
- 
- [[package]]
- name = "tray-icon"
--version = "0.21.2"
-+version = "0.21.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b"
-+checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
- dependencies = [
-  "crossbeam-channel",
-  "dirs 6.0.0",
-  "libappindicator",
-  "muda",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-  "objc2-core-graphics",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "once_cell",
-  "png 0.17.16",
-  "serde",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "windows-sys 0.60.2",
- ]
- 
-@@ -11141,7 +10733,7 @@ version = "11.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4994acea2522cd2b3b85c1d9529a55991e3ad5e25cdcd3de9d505972c4379424"
- dependencies = [
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "ts-rs-macros",
- ]
- 
-@@ -11153,7 +10745,7 @@ checksum = "ee6ff59666c9cbaec3533964505d39154dc4e0a56151fdea30a09ed0301f62e2"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "termcolor",
- ]
- 
-@@ -11170,7 +10762,7 @@ dependencies = [
-  "log",
-  "rand 0.9.2",
-  "sha1",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "utf-8",
- ]
- 
-@@ -11249,9 +10841,9 @@ dependencies = [
- 
- [[package]]
- name = "unicase"
--version = "2.8.1"
-+version = "2.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
-+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
- 
- [[package]]
- name = "unicode-bom"
-@@ -11294,14 +10886,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
- 
- [[package]]
- name = "url"
--version = "2.5.7"
-+version = "2.5.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
-+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
- dependencies = [
-  "form_urlencoded",
-  "idna",
-  "percent-encoding",
-  "serde",
-+ "serde_derive",
- ]
- 
- [[package]]
-@@ -11342,9 +10935,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
- 
- [[package]]
- name = "uuid"
--version = "1.19.0"
-+version = "1.20.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
-+checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
- dependencies = [
-  "getrandom 0.3.4",
-  "js-sys",
-@@ -11435,18 +11028,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
- 
- [[package]]
- name = "wasip2"
--version = "1.0.1+wasi-0.2.4"
-+version = "1.0.2+wasi-0.2.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
-+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
- dependencies = [
-  "wit-bindgen",
- ]
- 
- [[package]]
- name = "wasm-bindgen"
--version = "0.2.105"
-+version = "0.2.108"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
-+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
- dependencies = [
-  "cfg-if",
-  "once_cell",
-@@ -11457,11 +11050,12 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-futures"
--version = "0.4.55"
-+version = "0.4.58"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
-+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
- dependencies = [
-  "cfg-if",
-+ "futures-util",
-  "js-sys",
-  "once_cell",
-  "wasm-bindgen",
-@@ -11470,9 +11064,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro"
--version = "0.2.105"
-+version = "0.2.108"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
-+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
- dependencies = [
-  "quote",
-  "wasm-bindgen-macro-support",
-@@ -11480,22 +11074,22 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro-support"
--version = "0.2.105"
-+version = "0.2.108"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
-+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
- dependencies = [
-  "bumpalo",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-shared"
--version = "0.2.105"
-+version = "0.2.108"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
-+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
- dependencies = [
-  "unicode-ident",
- ]
-@@ -11515,35 +11109,34 @@ dependencies = [
- 
- [[package]]
- name = "wayland-backend"
--version = "0.3.11"
-+version = "0.3.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
-+checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
- dependencies = [
-  "cc",
-  "downcast-rs",
-- "rustix 1.1.3",
-- "scoped-tls",
-+ "rustix",
-  "smallvec",
-  "wayland-sys",
- ]
- 
- [[package]]
- name = "wayland-client"
--version = "0.31.11"
-+version = "0.31.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
-+checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
- dependencies = [
-  "bitflags 2.10.0",
-- "rustix 1.1.3",
-+ "rustix",
-  "wayland-backend",
-  "wayland-scanner",
- ]
- 
- [[package]]
- name = "wayland-protocols"
--version = "0.32.9"
-+version = "0.32.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
-+checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
- dependencies = [
-  "bitflags 2.10.0",
-  "wayland-backend",
-@@ -11553,9 +11146,9 @@ dependencies = [
- 
- [[package]]
- name = "wayland-protocols-wlr"
--version = "0.3.9"
-+version = "0.3.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
-+checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
- dependencies = [
-  "bitflags 2.10.0",
-  "wayland-backend",
-@@ -11566,31 +11159,29 @@ dependencies = [
- 
- [[package]]
- name = "wayland-scanner"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
-+checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
- dependencies = [
-  "proc-macro2",
-- "quick-xml 0.37.5",
-+ "quick-xml 0.38.4",
-  "quote",
- ]
- 
- [[package]]
- name = "wayland-sys"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
-+checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
- dependencies = [
-- "dlib",
-- "log",
-  "pkg-config",
- ]
- 
- [[package]]
- name = "web-sys"
--version = "0.3.82"
-+version = "0.3.85"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
-+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
- dependencies = [
-  "js-sys",
-  "wasm-bindgen",
-@@ -11608,9 +11199,9 @@ dependencies = [
- 
- [[package]]
- name = "webkit2gtk"
--version = "2.0.1"
-+version = "2.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
-+checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793"
- dependencies = [
-  "bitflags 1.3.2",
-  "cairo-rs",
-@@ -11632,9 +11223,9 @@ dependencies = [
- 
- [[package]]
- name = "webkit2gtk-sys"
--version = "2.0.1"
-+version = "2.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
-+checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5"
- dependencies = [
-  "bitflags 1.3.2",
-  "cairo-sys-rs",
-@@ -11667,18 +11258,18 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
- 
- [[package]]
- name = "webpki-roots"
--version = "1.0.4"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
-+checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c"
- dependencies = [
-  "rustls-pki-types",
- ]
- 
- [[package]]
- name = "webview2-com"
--version = "0.38.0"
-+version = "0.38.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4"
-+checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
- dependencies = [
-  "webview2-com-macros",
-  "webview2-com-sys",
-@@ -11690,22 +11281,22 @@ dependencies = [
- 
- [[package]]
- name = "webview2-com-macros"
--version = "0.8.0"
-+version = "0.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
-+checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "webview2-com-sys"
--version = "0.38.0"
-+version = "0.38.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c"
-+checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
- dependencies = [
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "windows 0.61.3",
-  "windows-core 0.61.2",
- ]
-@@ -11753,10 +11344,10 @@ version = "0.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
- dependencies = [
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "raw-window-handle",
-  "windows-sys 0.59.0",
-  "windows-version",
-@@ -11861,7 +11452,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -11872,7 +11463,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -12329,22 +11920,21 @@ dependencies = [
- 
- [[package]]
- name = "wit-bindgen"
--version = "0.46.0"
-+version = "0.51.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
- 
- [[package]]
- name = "wl-clipboard-rs"
--version = "0.9.2"
-+version = "0.9.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8e5ff8d0e60065f549fafd9d6cb626203ea64a798186c80d8e7df4f8af56baeb"
-+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
- dependencies = [
-  "libc",
-  "log",
-  "os_pipe",
-- "rustix 0.38.44",
-- "tempfile",
-- "thiserror 2.0.17",
-+ "rustix",
-+ "thiserror 2.0.18",
-  "tree_magic_mini",
-  "wayland-backend",
-  "wayland-client",
-@@ -12360,12 +11950,12 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
- 
- [[package]]
- name = "wry"
--version = "0.53.5"
-+version = "0.54.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2"
-+checksum = "5ed1a195b0375491dd15a7066a10251be217ce743cf4bbbbdcf5391d6473bee0"
- dependencies = [
-  "base64 0.22.1",
-- "block2 0.6.2",
-+ "block2",
-  "cookie",
-  "crossbeam-channel",
-  "dirs 6.0.0",
-@@ -12380,10 +11970,10 @@ dependencies = [
-  "kuchikiki",
-  "libc",
-  "ndk",
-- "objc2 0.6.3",
-+ "objc2",
-  "objc2-app-kit",
-  "objc2-core-foundation",
-- "objc2-foundation 0.3.2",
-+ "objc2-foundation",
-  "objc2-ui-kit",
-  "objc2-web-kit",
-  "once_cell",
-@@ -12392,7 +11982,7 @@ dependencies = [
-  "sha2",
-  "soup3",
-  "tao-macros",
-- "thiserror 2.0.17",
-+ "thiserror 2.0.18",
-  "url",
-  "webkit2gtk",
-  "webkit2gtk-sys",
-@@ -12440,7 +12030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
- dependencies = [
-  "gethostname",
-- "rustix 1.1.3",
-+ "rustix",
-  "x11rb-protocol",
- ]
- 
-@@ -12457,7 +12047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
- dependencies = [
-  "libc",
-- "rustix 1.1.3",
-+ "rustix",
- ]
- 
- [[package]]
-@@ -12495,7 +12085,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "synstructure",
- ]
- 
-@@ -12533,9 +12123,9 @@ dependencies = [
- 
- [[package]]
- name = "zbus"
--version = "5.12.0"
-+version = "5.13.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91"
-+checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1"
- dependencies = [
-  "async-broadcast",
-  "async-executor",
-@@ -12551,19 +12141,19 @@ dependencies = [
-  "futures-core",
-  "futures-lite",
-  "hex",
-- "nix 0.30.1",
-+ "libc",
-  "ordered-stream",
-+ "rustix",
-  "serde",
-  "serde_repr",
-- "tokio",
-  "tracing",
-  "uds_windows",
-  "uuid",
-  "windows-sys 0.61.2",
-  "winnow 0.7.14",
-- "zbus_macros 5.12.0",
-- "zbus_names 4.2.0",
-- "zvariant 5.8.0",
-+ "zbus_macros 5.13.2",
-+ "zbus_names 4.3.1",
-+ "zvariant 5.9.2",
- ]
- 
- [[package]]
-@@ -12575,23 +12165,23 @@ dependencies = [
-  "proc-macro-crate 3.4.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "zvariant_utils 2.1.0",
- ]
- 
- [[package]]
- name = "zbus_macros"
--version = "5.12.0"
-+version = "5.13.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314"
-+checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
- dependencies = [
-  "proc-macro-crate 3.4.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-- "zbus_names 4.2.0",
-- "zvariant 5.8.0",
-- "zvariant_utils 3.2.1",
-+ "syn 2.0.114",
-+ "zbus_names 4.3.1",
-+ "zvariant 5.9.2",
-+ "zvariant_utils 3.3.0",
- ]
- 
- [[package]]
-@@ -12607,34 +12197,33 @@ dependencies = [
- 
- [[package]]
- name = "zbus_names"
--version = "4.2.0"
-+version = "4.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
-+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
- dependencies = [
-  "serde",
-- "static_assertions",
-  "winnow 0.7.14",
-- "zvariant 5.8.0",
-+ "zvariant 5.9.2",
- ]
- 
- [[package]]
- name = "zerocopy"
--version = "0.8.31"
-+version = "0.8.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
-+checksum = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac"
- dependencies = [
-  "zerocopy-derive",
- ]
- 
- [[package]]
- name = "zerocopy-derive"
--version = "0.8.31"
-+version = "0.8.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
-+checksum = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -12654,7 +12243,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "synstructure",
- ]
- 
-@@ -12669,13 +12258,13 @@ dependencies = [
- 
- [[package]]
- name = "zeroize_derive"
--version = "1.4.2"
-+version = "1.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -12708,7 +12297,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
-@@ -12720,21 +12309,21 @@ dependencies = [
-  "arbitrary",
-  "bzip2",
-  "crc32fast",
-- "indexmap 2.12.1",
-+ "indexmap 2.13.0",
-  "memchr",
- ]
- 
- [[package]]
- name = "zlib-rs"
--version = "0.6.0"
-+version = "0.5.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a7948af682ccbc3342b6e9420e8c51c1fe5d7bf7756002b4a3c6cabfe96a7e3c"
-+checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3"
- 
- [[package]]
- name = "zmij"
--version = "1.0.6"
-+version = "1.0.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "aac060176f7020d62c3bcc1cdbcec619d54f48b07ad1963a3f80ce7a0c17755f"
-+checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
- 
- [[package]]
- name = "zune-core"
-@@ -12766,17 +12355,17 @@ dependencies = [
- 
- [[package]]
- name = "zvariant"
--version = "5.8.0"
-+version = "5.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c"
-+checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
- dependencies = [
-  "endi",
-  "enumflags2",
-  "serde",
-  "url",
-  "winnow 0.7.14",
-- "zvariant_derive 5.8.0",
-- "zvariant_utils 3.2.1",
-+ "zvariant_derive 5.9.2",
-+ "zvariant_utils 3.3.0",
- ]
- 
- [[package]]
-@@ -12788,21 +12377,21 @@ dependencies = [
-  "proc-macro-crate 3.4.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "zvariant_utils 2.1.0",
- ]
- 
- [[package]]
- name = "zvariant_derive"
--version = "5.8.0"
-+version = "5.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006"
-+checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
- dependencies = [
-  "proc-macro-crate 3.4.0",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-- "zvariant_utils 3.2.1",
-+ "syn 2.0.114",
-+ "zvariant_utils 3.3.0",
- ]
- 
- [[package]]
-@@ -12813,18 +12402,18 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.112",
-+ "syn 2.0.114",
- ]
- 
- [[package]]
- name = "zvariant_utils"
--version = "3.2.1"
-+version = "3.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599"
-+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
- dependencies = [
-  "proc-macro2",
-  "quote",
-  "serde",
-- "syn 2.0.112",
-+ "syn 2.0.114",
-  "winnow 0.7.14",
- ]
-diff --git a/Cargo.toml b/Cargo.toml
-index 66d3fa1b0..c2eef79a2 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -191,7 +191,7 @@ rusqlite = { version = "0.38.0", features = ["bundled"] }
- backoff = "0.4.0"
- bstr = "1.12.1"
- # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
--gix = { version = "0.78.0", git = "https://github.com/GitoxideLabs/gitoxide", branch = "main", default-features = false, features = [
-+gix = { version = "0.78.0", default-features = false, features = [
- ] }
- ts-rs = { version = "11.1.0", features = ["serde-compat", "no-serde-warnings"] }
- gix-testtools = "0.18.0"
-diff --git a/crates/gitbutler-git/Cargo.toml b/crates/gitbutler-git/Cargo.toml
-index ab08487cf..91b2734a6 100644
---- a/crates/gitbutler-git/Cargo.toml
-+++ b/crates/gitbutler-git/Cargo.toml
-@@ -59,7 +59,7 @@ windows = { version = "0.62.0", features = [
- ] }
- tokio = { workspace = true, optional = true, features = ["sync", "rt"] }
- # TODO: use released version once published.
--file-id = { git = "https://github.com/notify-rs/notify", rev = "978fe719b066a8ce76b9a9d346546b1569eecfb6", version = "0.2.3" }
-+file-id = { version = "0.2.3" }
- 
- [dev-dependencies]
- snapbox.workspace = true
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index 5f093ec3b44b..c3421e433870 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -30,20 +30,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitbutler";
-  version = "0.18.8";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "gitbutlerapp";
     repo = "gitbutler";
     tag = "release/${finalAttrs.version}";
-    hash = "sha256-OSM2yjiz3I5+SVpcJSWCDyS4y4w9JJ/8CAP2BK0sL7o=";
+    hash = "sha256-ppl1noikPwTvG/XT7iYG41+9ZZO8i0x2L+odeEzRP1s=";
   };
 
-  # Workaround for https://github.com/NixOS/nixpkgs/issues/359340
-  cargoPatches = [
-    ./gix-from-crates-io.patch
-  ];
-
   # Let Tauri know what version we're building and deactivate the built-in updater
   # Note: .bundle.externalBin doesn't include `"but"` at the moment
   #       as that'd require more build adjustments
@@ -59,12 +54,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail 'checkUpdate = tauriCheck;' 'checkUpdate = () => null;'
   '';
 
-  cargoHash = "sha256-L53iIVxv3KtmXiqITad1enIMX3Iu/mWSJJPZk7KAWuM=";
+  cargoHash = "sha256-xW/eO+AQQUBN2MrixNx3LKhwMookkKuX5LF4DSWQKKY=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-IAsEzM9kmZWnh390CV7mOyOshVlESsyoNT0ZvdY03KY=";
+    hash = "sha256-0WLgtidG8hqTkXY3heu+m3VoqQD/kGMlTmLb0qAS8sQ=";
   };
 
   nativeBuildInputs = [
@@ -140,6 +135,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "merge_first_branch_into_gb_local_and_verify_rebase"
     "json_output_with_dangling_commits"
     "two_dangling_commits_different_branches"
+    "new_from_project_handle_uses_repo_gitdir"
+    "new_from_project_handle_keeps_repo_cached"
     # darwin: Error: timeout waiting for matching event
     "track_directory_changes_after_rename"
   ];

From 3f672122e2c4b2db121cfd32fdab8766f61c64c4 Mon Sep 17 00:00:00 2001
From: SystematicError <systematicerror@users.noreply.github.com>
Date: Fri, 3 Apr 2026 17:04:48 +0100
Subject: [PATCH 083/389] times-newer-roman: use installFonts

---
 pkgs/by-name/ti/times-newer-roman/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ti/times-newer-roman/package.nix b/pkgs/by-name/ti/times-newer-roman/package.nix
index 6424001b4a81..42016783e89b 100644
--- a/pkgs/by-name/ti/times-newer-roman/package.nix
+++ b/pkgs/by-name/ti/times-newer-roman/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-wO4rxyJNQyhRLpswCYKXdeiXy5G+iWyxulYCHZb60QM=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/fonts/opentype
-    cp *.otf $out/share/fonts/opentype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Font that looks just like Times New Roman, except each character is 5-10% wider";

From 3d5375321ea4f0114467db6fa05cfcd37df787ec Mon Sep 17 00:00:00 2001
From: SystematicError <systematicerror@users.noreply.github.com>
Date: Fri, 3 Apr 2026 17:07:14 +0100
Subject: [PATCH 084/389] times-newer-roman: add maintainer

---
 pkgs/by-name/ti/times-newer-roman/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/times-newer-roman/package.nix b/pkgs/by-name/ti/times-newer-roman/package.nix
index 42016783e89b..22501cca0dca 100644
--- a/pkgs/by-name/ti/times-newer-roman/package.nix
+++ b/pkgs/by-name/ti/times-newer-roman/package.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation {
     description = "Font that looks just like Times New Roman, except each character is 5-10% wider";
     homepage = "https://timesnewerroman.com/";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
     platforms = lib.platforms.all;
   };
 }

From 1c58afac2754de2085935d7f973a9247c7f35b62 Mon Sep 17 00:00:00 2001
From: Jademalo <386846+Jademalo@users.noreply.github.com>
Date: Fri, 3 Apr 2026 17:10:11 +0100
Subject: [PATCH 085/389] openrct2: add overrides for rct1/2 installation paths

---
 pkgs/by-name/op/openrct2/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index 485fe8258b63..a50dcec94865 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -25,12 +25,16 @@
   libpthread-stubs,
   libvorbis,
   libzip,
+  makeWrapper,
   nlohmann_json,
   openssl,
   pkg-config,
   speexdsp,
   zlib,
   withDiscordRpc ? false,
+  # Paths to RCT1 and RCT2 installs can be specified to have them added as a wrapped argument
+  rct1Path ? null,
+  rct2Path ? null,
 }:
 
 let
@@ -75,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     unzip
+    makeWrapper
   ];
 
   buildInputs = [
@@ -140,6 +145,12 @@ stdenv.mkDerivation (finalAttrs: {
       + (versionCheck "TITLE_SEQUENCE" title-sequences-version)
     );
 
+  postInstall = ''
+    wrapProgram $out/bin/openrct2 \
+      ${lib.optionalString (rct1Path != null) "--add-flags '--rct1-data-path=\"${rct1Path}\"'"} \
+      ${lib.optionalString (rct2Path != null) "--add-flags '--rct2-data-path=\"${rct2Path}\"'"}
+  '';
+
   meta = {
     description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
     homepage = "https://openrct2.io/";

From 6b157b57dbe1ce639dac75db6601556805e3dd2f Mon Sep 17 00:00:00 2001
From: r4v3n6101 <raven6107@gmail.com>
Date: Fri, 3 Apr 2026 23:49:23 +0300
Subject: [PATCH 086/389] xash: 0-unstable-2026-02-25 -> 0-unstable-2026-04-03

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

diff --git a/pkgs/by-name/xa/xash3d-fwgs/package.nix b/pkgs/by-name/xa/xash3d-fwgs/package.nix
index b317e9a375f6..1a2854c84a25 100644
--- a/pkgs/by-name/xa/xash3d-fwgs/package.nix
+++ b/pkgs/by-name/xa/xash3d-fwgs/package.nix
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "xash3d-fwgs";
-  version = "0-unstable-2026-02-25";
+  version = "0-unstable-2026-04-03";
 
   src = fetchFromGitHub {
     owner = "FWGS";
     repo = "xash3d-fwgs";
-    rev = "2c004e6cb78f0b435f2923a5105c9df43130e337";
-    hash = "sha256-Bh0JaeDO/RrMSQKvqJGbmrQoG1aR7Q+5YnBEedARliU=";
+    rev = "255c9bcaed1cf02bc4c22276c8e39d5cdbfc0fb5";
+    hash = "sha256-xYlGy/JG0LdQbdJ3zU5Eqbl7kVtabDuS6bfUi8C/Bug=";
     postCheckout = ''
       cd $out/3rdparty
       git submodule update --init --recursive \

From 9a2e28f58b937b0d78ec877f67d33ed231cd7556 Mon Sep 17 00:00:00 2001
From: Mateusz Wykurz <wykurz@gmail.com>
Date: Fri, 20 Feb 2026 08:55:34 -0700
Subject: [PATCH 087/389] rcp: 0.21.1 -> 0.31.0

---
 pkgs/by-name/rc/rcp/package.nix | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index 9441b2db1db7..bc337dce02df 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -1,22 +1,21 @@
 {
   lib,
-  stdenv,
+  pkgsStatic,
   fetchFromGitHub,
-  rustPlatform,
 }:
 
-rustPlatform.buildRustPackage (finalAttrs: {
+pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rcp";
-  version = "0.21.1";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "wykurz";
     repo = "rcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ayT8lp8XqkvtUaff2Iy+5IVyJ/ukKl0qruEWjBlgAvo=";
+    hash = "sha256-ghFVGbud3aKJPvjNchsgPUSioNAxg4TJlUIYMp9+cJo=";
   };
 
-  cargoHash = "sha256-AcH5V5hapVQgGrwWAEN6Xpj00RRNqZiCSn+/onpmd50=";
+  cargoHash = "sha256-eyIO8lxmGdZKEDW+GSVARm5u3X0vx1RJLG8Ljbk0Zb8=";
 
   env.RUSTFLAGS = "--cfg tokio_unstable";
 
@@ -25,8 +24,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=copy::copy_tests::check_default_mode"
     "--skip=test_weird_permissions"
     "--skip=test_edge_case_special_permissions"
+    "--skip=test_default_strips_special_bits_on_directories"
+    "--skip=test_default_strips_special_bits_on_files"
+    "--skip=test_default_preserves_special_bits_on_directories"
+    "--skip=test_preserve_all_preserves_special_bits_on_directories"
+    "--skip=test_preserve_all_preserves_special_bits_on_files"
+    "--skip=test_preserve_settings_dir_gid_time_7777"
+    "--skip=test_preserve_settings_dir_7777_preserves_special_bits"
+    "--skip=test_preserve_settings_file_7777_preserves_special_bits"
+    "--skip=test_preserve_settings_none_strips_special_bits_on_directories"
+    # this test expects overwrite behavior that doesn't work in a sandbox
+    "--skip=test_overwrite_behavior"
     # these tests require network access to determine local IP address
     "--skip=test_remote"
+    # these tests expect to find version/git info from Cargo.toml, which isn't available in the sandbox
+    "--skip=version::tests::test_current_version"
+    "--skip=test_protocol_version_has_git_info"
+    "--skip=test_rcpd_protocol_version_has_git_info"
   ];
 
   meta = {
@@ -36,8 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = with lib.licenses; [ mit ];
     mainProgram = "rcp";
     maintainers = with lib.maintainers; [ wykurz ];
-    # Building procfs on an for a unsupported platform. Currently only linux and android are supported
-    # (Your current target_os is macos)
-    broken = stdenv.hostPlatform.isDarwin;
+    # procfs only supports Linux and Android
+    broken = pkgsStatic.stdenv.hostPlatform.isDarwin;
   };
 })

From ce246cd37193f7038b6805a67241bae4d381141f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 06:10:02 +0000
Subject: [PATCH 088/389] sogo: 5.12.4 -> 5.12.7

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

diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix
index 747b54b52412..0c3a45ba5c00 100644
--- a/pkgs/by-name/so/sogo/package.nix
+++ b/pkgs/by-name/so/sogo/package.nix
@@ -25,14 +25,14 @@
 
 clangStdenv.mkDerivation rec {
   pname = "sogo";
-  version = "5.12.4";
+  version = "5.12.7";
 
   # always update the sope package as well, when updating sogo
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = "sogo";
     rev = "SOGo-${version}";
-    hash = "sha256-L79ABIABaVrO5Y3a3a30ZPyrhI/Nx+Bb5WjOvL0PI7s=";
+    hash = "sha256-HMnJQTC9P6gOVP1hViRtshIS0oWj0AKoRkeNr/udlso=";
   };
 
   nativeBuildInputs = [

From e0507a0d770d620d0165d1f8e050d57de668f3c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 10:37:17 +0000
Subject: [PATCH 089/389] python3Packages.web3: 7.14.1 -> 7.15.0

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

diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix
index 8cd901612dc5..70221aee96e4 100644
--- a/pkgs/development/python-modules/web3/default.nix
+++ b/pkgs/development/python-modules/web3/default.nix
@@ -39,14 +39,14 @@
 
 buildPythonPackage rec {
   pname = "web3";
-  version = "7.14.1";
+  version = "7.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "web3.py";
     tag = "v${version}";
-    hash = "sha256-1p98lza2nCyeY8JLq2EtSxblNf2OSABMHMrp6Bzh4Ao=";
+    hash = "sha256-BStkLH7lCnhVs2Fc3c0EBXzyZtEgI8ywA01OEBYLUeQ=";
   };
 
   build-system = [ setuptools ];

From f905bf667f3421c3241d28c86733cc04076bb197 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 5 Apr 2026 08:13:38 +0200
Subject: [PATCH 090/389] komikku: 50.0.1 -> 50.1.0

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

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 69eb8357bb90..5ba08cd49b25 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -24,14 +24,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "komikku";
-  version = "50.0.1";
+  version = "50.1.0";
   pyproject = false;
 
   src = fetchFromCodeberg {
     owner = "valos";
     repo = "Komikku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9OxksblhdgGZYgr+lKEt0Kwpoa360ODgdbZrYpiOwkI=";
+    hash = "sha256-F98wvRMpDJSeI6OQYe40hKrnzAzetU7FsmJ4fPdHBWE=";
   };
 
   nativeBuildInputs = [

From 92ae83d92148548adf1d68c39f513fd6a2450287 Mon Sep 17 00:00:00 2001
From: Ture Bentzin <ture.bentzin@alumni.fh-aachen.de>
Date: Sun, 5 Apr 2026 09:32:09 +0000
Subject: [PATCH 091/389] maintainers: add turebentzin

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cdcb7f59fffc..7bc113d12dc9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27921,6 +27921,13 @@
     githubId = 2130305;
     name = "Marek Fajkus";
   };
+  turebentzin = {
+    name = "Ture Bentzin";
+    email = "ture.bentzin@alumni.fh-aachen.de";
+    github = "turebentzin";
+    githubId = 38729194;
+    keys = [ { fingerprint = "4868 4B0F D531 473E C82A  641E F1E6 70A1 ED8E 92CE"; } ];
+  };
   turion = {
     email = "programming@manuelbaerenz.de";
     github = "turion";

From 087ba5bfea298323360c75e480934a01413e462f Mon Sep 17 00:00:00 2001
From: Ture Bentzin <ture.bentzin@alumni.fh-aachen.de>
Date: Sun, 5 Apr 2026 09:32:28 +0000
Subject: [PATCH 092/389] scala-next: 3.8.2 -> 3.8.3

---
 pkgs/by-name/sc/scala-next/package.nix    | 4 ++--
 pkgs/development/compilers/scala/bare.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix
index 513edd6d4922..f3e754caf68b 100644
--- a/pkgs/by-name/sc/scala-next/package.nix
+++ b/pkgs/by-name/sc/scala-next/package.nix
@@ -1,10 +1,10 @@
 { scala, fetchurl }:
 
 scala.bare.overrideAttrs (oldAttrs: {
-  version = "3.8.2";
+  version = "3.8.3";
   pname = "scala-next";
   src = fetchurl {
     inherit (oldAttrs.src) url;
-    hash = "sha256-gnNWp4pw09eS8ad+EJzD+j6pRrjSaEi7JF8nW+Uv144=";
+    hash = "sha256-/2LoJ+seoXgT2X5f1eDSaQEQeHFz/h4eQ9na3MNUL6c=";
   };
 })
diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix
index ea09ea8340e3..ac8ac8723079 100644
--- a/pkgs/development/compilers/scala/bare.nix
+++ b/pkgs/development/compilers/scala/bare.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       natsukagami
       hamzaremmal
       dottybot
+      turebentzin
     ];
   };
 })

From 37bb196f05a5d4c89c2082e081112873387f9b51 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 5 Apr 2026 08:11:26 -0500
Subject: [PATCH 093/389] rsyslog: migrate to by-name

---
 .../rsyslog/default.nix => by-name/rs/rsyslog/package.nix}   | 4 ++--
 pkgs/top-level/all-packages.nix                              | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)
 rename pkgs/{tools/system/rsyslog/default.nix => by-name/rs/rsyslog/package.nix} (98%)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/by-name/rs/rsyslog/package.nix
similarity index 98%
rename from pkgs/tools/system/rsyslog/default.nix
rename to pkgs/by-name/rs/rsyslog/package.nix
index d7b4b16ad734..63d385b09431 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/by-name/rs/rsyslog/package.nix
@@ -39,13 +39,13 @@
   openssl,
   withRelp ? true,
   librelp,
-  withKsi ? true,
+  withKsi ? false, # Currently Broken
   libksi,
   withLogging ? true,
   liblogging,
   withNet ? true,
   libnet,
-  withHadoop ? true,
+  withHadoop ? false, # Currently Broken
   hadoop,
   withRdkafka ? true,
   rdkafka,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b74acf1f8d7..3b21df77052b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1935,11 +1935,6 @@ with pkgs;
 
   roundcubePlugins = recurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
 
-  rsyslog = callPackage ../tools/system/rsyslog {
-    withHadoop = false; # Currently Broken
-    withKsi = false; # Currently Broken
-  };
-
   rsyslog-light = rsyslog.override {
     withKrb5 = false;
     withSystemd = false;

From 7f6a95f08d364c1155d124f74306131fcdcf9265 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 5 Apr 2026 08:14:12 -0500
Subject: [PATCH 094/389] rsyslog: hardcode pname to a string

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

diff --git a/pkgs/by-name/rs/rsyslog/package.nix b/pkgs/by-name/rs/rsyslog/package.nix
index 63d385b09431..7019ed63e8e2 100644
--- a/pkgs/by-name/rs/rsyslog/package.nix
+++ b/pkgs/by-name/rs/rsyslog/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "8.2512.0";
 
   src = fetchurl {
-    url = "https://www.rsyslog.com/files/download/rsyslog/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    url = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-${finalAttrs.version}.tar.gz";
     hash = "sha256-k8UAJdkLbHlfo1DVaj2DK/zkUEPqm9aCQNnCqTlLxik=";
   };
 

From 687fe3c6346172edb78fa0116860c4af1109b5fc Mon Sep 17 00:00:00 2001
From: FlameFlag <github@flameflag.dev>
Date: Sun, 5 Apr 2026 16:16:24 +0300
Subject: [PATCH 095/389] dorion: add darwin support

---
 pkgs/by-name/do/dorion/no-cargo-patch.patch |  31 ------
 pkgs/by-name/do/dorion/package.nix          | 104 +++++++++++---------
 2 files changed, 58 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/by-name/do/dorion/no-cargo-patch.patch

diff --git a/pkgs/by-name/do/dorion/no-cargo-patch.patch b/pkgs/by-name/do/dorion/no-cargo-patch.patch
deleted file mode 100644
index 1906d417b517..000000000000
--- a/pkgs/by-name/do/dorion/no-cargo-patch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
-index 13a6b54..f6bd9d6 100644
---- a/src-tauri/Cargo.lock
-+++ b/src-tauri/Cargo.lock
-@@ -5049,6 +5049,8 @@ dependencies = [
- [[package]]
- name = "tauri-plugin-shell"
- version = "2.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d"
- dependencies = [
-  "encoding_rs",
-  "log",
-diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
-index 4dcaa86..daef086 100644
---- a/src-tauri/Cargo.toml
-+++ b/src-tauri/Cargo.toml
-@@ -12,13 +12,6 @@ rust-version = "1.84.1"
- strip = "debuginfo"
- lto = false
- 
--# Patches
--[package.metadata.patch]
--crates = ["tauri-plugin-shell"]
--
--[patch.crates-io]
--tauri-plugin-shell = { path="./target/patch/tauri-plugin-shell-2.2.1" }
--
- [build-dependencies]
- tauri-build = { version = "2.0.0", features = [] }
- 
diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix
index 55bb2b97e1bb..c184d89ca1fc 100644
--- a/pkgs/by-name/do/dorion/package.nix
+++ b/pkgs/by-name/do/dorion/package.nix
@@ -1,10 +1,12 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchurl,
   rustPlatform,
   cmake,
   ninja,
+  makeBinaryWrapper,
   wrapGAppsHook4,
   glib-networking,
   gst_all_1,
@@ -20,8 +22,9 @@
   webkitgtk_4_1,
   cargo-tauri,
   desktop-file-utils,
-  fetchpatch,
   pipewire,
+  apple-sdk_15,
+  darwin,
 }:
 
 let
@@ -39,52 +42,36 @@ let
     };
   };
 in
-
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dorion";
-  version = "6.12.0";
+  version = "6.12.2";
 
   src = fetchFromGitHub {
     owner = "SpikeHD";
     repo = "Dorion";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pykmoSiV3iSaD/V/Sd5GSV/BZWhk9XVg8io1j8wZv5k=";
+    hash = "sha256-aPYQOec4D0I4N/6nmSwodXsh3pvcHnlD37fUIw5kMjo=";
   };
 
-  patches = [
-    # https://github.com/SpikeHD/Dorion/issues/419
-    (fetchpatch {
-      url = "https://github.com/SpikeHD/Dorion/commit/98d50dadd1a7fb018698a3fe61ac104cbe89b5d4.patch";
-      hash = "sha256-1VbB2CVMUWw18lWC4EL83VS4SdC03AxDUKRq/hQNAAg=";
-    })
-  ];
-
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoHash = "sha256-FJ4gQKgZkYqvjcqcRapJ8IQWP52kIg4uOTxifKG8zyo=";
+  cargoHash = "sha256-3FS8w9K3Wx7KbT7iy+0pAMdmreZnL+ZFMSAnwesnS7Y=";
 
   pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs)
-      pname
-      version
-      src
-      patches
-      ;
+    inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-qSmIyLv8A+JDbTVG+Qcvq3gqBXBGtfbH4/tN+CvEmd8=";
+    hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o=";
   };
 
-  # CMake (webkit extension)
+  # CMake (webkit extension, Linux only)
   cmakeDir = ".";
   cmakeBuildDir = "src-tauri/extension_webkit";
   dontUseCmakeConfigure = true;
   dontUseNinjaBuild = true;
   dontUseNinjaCheck = true;
   dontUseNinjaInstall = true;
-  # cmake's supposed to set this automatically
-  # ... but the detection is based on the presence of ninja build hook
   cmakeFlags = [
     "-GNinja"
   ];
@@ -95,15 +82,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cargo-tauri.hook
     nodejs
     pkg-config
-    wrapGAppsHook4
     yq-go
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
     desktop-file-utils
     cmake
     ninja
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+    darwin.autoSignDarwinBinariesHook
   ];
 
   buildInputs = [
     openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     webkitgtk_4_1'
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
@@ -114,51 +109,65 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libsysprof-capture
     libayatana-appindicator
     pipewire
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
   ];
 
   postPatch = ''
     # remove updater
     rm -rf updater
 
-    substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \
-      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-
     # disable pre-build script and disable auto-updater
     yq -iPo=json '
       .bundle.resources = (.bundle.resources | map(select(. != "updater*")))
     ' src-tauri/tauri.conf.json
 
     # link shelter injection
-    ln -s ${shelter} src-tauri/injection/shelter.js
+    ln -s "${shelter}" src-tauri/injection/shelter.js
 
     # link html/frontend data
-    ln -s $(pwd)/src src-tauri/html
+    ln -s "$(pwd)/src" src-tauri/html
+  ''
+  # disable Tauri's built-in codesigning
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    yq -iPo=json '
+      .bundle.macOS.signingIdentity = null
+    ' src-tauri/tauri.conf.json
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace "$cargoDepsCopy"/*/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
   '';
 
   configurePhase = ''
     runHook preConfigure
-
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     cmakeConfigurePhase
+  ''
+  + ''
     pnpmConfigHook
-
     runHook postConfigure
   '';
 
-  buildPhase = ''
-    ninjaBuildPhase
-    cd ../..
-    tauriBuildHook
-  '';
+  buildPhase =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      ninjaBuildPhase
+      cd ../..
+    ''
+    + ''
+      tauriBuildHook
+    '';
 
   postInstall = ''
-    # Set up the resource directories
-    mkdir -p $out/lib/Dorion
-    ln -s $out/lib/Dorion $out/lib/dorion
-    rm -rf $out/lib/Dorion/injection
-    cp -r src-tauri/injection $out/lib/Dorion
-    cp -r src $out/lib/Dorion
-
-    # Modify the desktop file
+    mkdir -p "$out/lib/Dorion"
+    ln -s "$out/lib/Dorion" "$out/lib/dorion"
+    rm -rf "$out/lib/Dorion/injection"
+    cp -r src-tauri/injection "$out/lib/Dorion"
+    cp -r src "$out/lib/Dorion"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     desktop-file-edit \
       --set-comment "Tiny alternative Discord client" \
       --set-key="Exec" --set-value="Dorion %U" \
@@ -169,7 +178,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --set-key="Keywords" --set-value="dorion;discord;vencord;chat;im;vc;ds;dc;dsc;tauri;" \
       --set-key="Terminal" --set-value="false" \
       --set-key="MimeType" --set-value="x-scheme-handler/discord" \
-      $out/share/applications/Dorion.desktop
+      "$out/share/applications/Dorion.desktop"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeBinaryWrapper "$out/Applications/Dorion.app/Contents/MacOS/Dorion" "$out/bin/Dorion"
   '';
 
   # error: failed to run custom build command for `Dorion v6.5.3 (/build/source/src-tauri)`
@@ -200,7 +212,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       griffi-gh
       getchoo
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     sourceProvenance = [
       lib.sourceTypes.binaryBytecode # actually, minified JS
       lib.sourceTypes.fromSource

From c25e46f7ff003dc4a50ed55ed1573a520dbaee0e Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <github@jackr.eu>
Date: Sat, 4 Apr 2026 10:13:37 +0200
Subject: [PATCH 096/389] fosrl-pangolin: 1.16.2 -> 1.17.0

---
 pkgs/by-name/fo/fosrl-pangolin/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix
index 7a83fd859dea..1e76907960a3 100644
--- a/pkgs/by-name/fo/fosrl-pangolin/package.nix
+++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix
@@ -29,22 +29,25 @@ in
 
 buildNpmPackage (finalAttrs: {
   pname = "pangolin";
-  version = "1.16.2";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "pangolin";
     tag = finalAttrs.version;
-    hash = "sha256-pWD2VinfkCiSSP6/einXgduKQ8lzWdHlrj2eqUU/x6Y=";
+    hash = "sha256-E0GfYznHj4CKsRWQm6zHTAJ8hJw9ieFoKIOT9tcumYQ=";
   };
 
-  npmDepsHash = "sha256-CwS26eRAIuxJ2fekRRapDWYAOHXPV0mIX/by4uW2ZOM=";
+  npmDepsHash = "sha256-DyPfylne9Ku7sEUNN0LLlN0EOnCjcklsh+F6YP+rXv4=";
 
   nativeBuildInputs = [
     esbuild
     makeWrapper
   ];
 
+  # dependency resolution is borked
+  npmFlags = [ "--legacy-peer-deps" ];
+
   # Replace the googleapis.com Inter font with a local copy from Nixpkgs.
   # Based on pkgs.nextjs-ollama-llm-ui.
   postPatch = ''
@@ -57,7 +60,7 @@ buildNpmPackage (finalAttrs: {
       "const inter = localFont({ src: './Inter.ttf' });"
 
     substituteInPlace server/lib/consts.ts --replace-fail \
-      'export const APP_VERSION = "1.16.0";' \
+      'export const APP_VERSION = "1.17.0";' \
       'export const APP_VERSION = "${finalAttrs.version}";'
 
     cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf

From 24773d4f5542e8600df67ca47eec1e354895685d Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 5 Apr 2026 19:06:01 -0700
Subject: [PATCH 097/389] mattermost: fix override for mattermostLatest

---
 pkgs/by-name/ma/mattermost/package.nix       |  1 +
 pkgs/by-name/ma/mattermostLatest/package.nix | 44 +++++++++++---------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index e836dfdfdedd..9eea16f3504a 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -28,6 +28,7 @@
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';
   },
+  ...
 }:
 
 let
diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 33facbda2518..138b7df0cfdf 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -1,23 +1,27 @@
 {
   mattermost,
-}:
+  ...
+}@args:
 
-mattermost.override {
-  versionInfo = {
-    # Latest, non-RC releases only.
-    # If the latest is an ESR (Extended Support Release),
-    # duplicate it here to facilitate the update script.
-    # See https://docs.mattermost.com/about/mattermost-server-releases.html
-    # and make sure the version regex is up to date here.
-    # Ensure you also check ../mattermost/package.nix for ESR releases.
-    regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
-    version = "11.5.1";
-    srcHash = "sha256-3ij6JYGectkAYc2z6caD3L0NUP1UJJ6QaR2qLcTWXoI=";
-    vendorHash = "sha256-ao8jWfrzMTs9JJokaGH0kuoZ0d3VnIDGc5uDN2hCrhk=";
-    npmDepsHash = "sha256-r7iq1pCAJjFyspZBdeNWe00W7A3l73PGC6rrsZ7O6Uw=";
-    lockfileOverlay = ''
-      unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
-    '';
-    autoUpdate = ./package.nix;
-  };
-}
+mattermost.override (
+  {
+    versionInfo = {
+      # Latest, non-RC releases only.
+      # If the latest is an ESR (Extended Support Release),
+      # duplicate it here to facilitate the update script.
+      # See https://docs.mattermost.com/about/mattermost-server-releases.html
+      # and make sure the version regex is up to date here.
+      # Ensure you also check ../mattermost/package.nix for ESR releases.
+      regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
+      version = "11.5.1";
+      srcHash = "sha256-3ij6JYGectkAYc2z6caD3L0NUP1UJJ6QaR2qLcTWXoI=";
+      vendorHash = "sha256-ao8jWfrzMTs9JJokaGH0kuoZ0d3VnIDGc5uDN2hCrhk=";
+      npmDepsHash = "sha256-r7iq1pCAJjFyspZBdeNWe00W7A3l73PGC6rrsZ7O6Uw=";
+      lockfileOverlay = ''
+        unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
+      '';
+      autoUpdate = ./package.nix;
+    };
+  }
+  // args
+)

From e35c1c8a60b636a4233e1143390d415a2fe204c6 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 5 Apr 2026 18:39:02 -0700
Subject: [PATCH 098/389] mattermost: use GH releases for updates

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

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 9eea16f3504a..14c84a120070 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -195,6 +195,7 @@ buildMattermost rec {
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [
+        "--use-github-releases"
         "--version-regex"
         versionInfo.regex
       ]

From 98a974ecb0bf146e065e4098c30ec8c9e7b56f3a Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 24 Nov 2025 10:54:25 -0800
Subject: [PATCH 099/389] mmctl: don't add an update script

The `mattermost` or `mattermostLatest` update scripts handle this.
---
 pkgs/by-name/mm/mmctl/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mm/mmctl/package.nix b/pkgs/by-name/mm/mmctl/package.nix
index 555f8e99f573..eafb9c7fa0ed 100644
--- a/pkgs/by-name/mm/mmctl/package.nix
+++ b/pkgs/by-name/mm/mmctl/package.nix
@@ -1,12 +1,16 @@
 {
+  lib,
   mattermost,
 }:
 
-mattermost.withoutTests.server.overrideAttrs (o: {
+mattermost.withoutTests.server.overrideAttrs (prev: {
   pname = "mmctl";
   subPackages = [ "cmd/mmctl" ];
 
-  meta = o.meta // {
+  # `mattermost` or `mattermostLatest` handle it
+  passthru = lib.removeAttrs prev.passthru [ "updateScript" ];
+
+  meta = prev.meta // {
     description = "Remote CLI tool for Mattermost";
     mainProgram = "mmctl";
   };

From 9d738d4092e56e7413105a7f2844af39abe12a41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Apr 2026 02:36:02 +0000
Subject: [PATCH 100/389] firefox-beta-unwrapped: 150.0b2 -> 150.0b5

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 5c4f5d692e5f..48920c478bff 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "150.0b2";
+  version = "150.0b5";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "eb9ad8fe2cc763e9b45b602156b86328ea6a679824318023759813ce42c4dc961bea92cac9e3d230fe1346114d7f4fd43bcffbfc6307d6a6d18b4cc9629b0651";
+    sha512 = "6ae09ae8a73865a4d9cdfd389f0cfec667fc717e13127ae9927b6fc3bd5e7cf49a83dd5dbbed8bae9b72dddd24e6156bdc483fcb3ccb726b46070d25fd02f86f";
   };
 
   meta = {

From 42896025103d74246d7505ff0f6a0c9fcba25910 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Apr 2026 04:59:31 +0000
Subject: [PATCH 101/389] noto-fonts: 2026.03.01 -> 2026.04.01

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

diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix
index c23b92ab4fa7..1fb53f8b6dd4 100644
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "noto-fonts${suffix}";
-  version = "2026.03.01";
+  version = "2026.04.01";
 
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "notofonts.github.io";
     tag = "noto-monthly-release-${finalAttrs.version}";
-    hash = "sha256-WWLNBT+Su8cKxmkJIUBZykhFQIAyhG3DV2r8ksqikL0=";
+    hash = "sha256-f5A9vFTO+TgZTarN0cDmRZfBQxeqedzJp3KdCnua4Yw=";
   };
 
   nativeBuildInputs = [

From 2bf6b7b4f5a9f0eb0e20ddccf22f180c1621f74b Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 1 Apr 2026 15:51:38 +0200
Subject: [PATCH 102/389] python3Packages.xyzservices: 2025.11.0 -> 2026.3.0

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

diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix
index 38ee26580511..bbde76714a97 100644
--- a/pkgs/development/python-modules/xyzservices/default.nix
+++ b/pkgs/development/python-modules/xyzservices/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "xyzservices";
-  version = "2025.11.0";
+  version = "2026.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-L8crSVArJQI/1x6PUy+0vt278KoSTZDqJdukT1ReF84=";
+    hash = "sha256-0iaGal2On+8zcDTY2jeoKY8KHZ0UibQBjmlXnrMh/qQ=";
   };
 
   nativeBuildInputs = [

From e42601bc581c0ddc17a0a1c1ac8dd209ef84a804 Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Mon, 6 Apr 2026 11:14:31 +0200
Subject: [PATCH 103/389] kstars: add pkg-config, switch to latest eigen

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

diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix
index 299572ec0504..cd721406c6f7 100644
--- a/pkgs/by-name/ks/kstars/package.nix
+++ b/pkgs/by-name/ks/kstars/package.nix
@@ -5,8 +5,9 @@
   fetchpatch2,
   cfitsio,
   cmake,
+  pkg-config,
   curl,
-  eigen_3_4_0,
+  eigen,
   gsl,
   indi-full,
   kdePackages,
@@ -35,13 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
     kdoctools
     wrapQtAppsHook
     cmake
+    pkg-config
   ];
 
   buildInputs = with kdePackages; [
     breeze-icons
     cfitsio
     curl
-    eigen_3_4_0
+    eigen
     gsl
     indi-full
     kconfig

From 037b216134c64f4110da74c7412ba9f69c263aec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Apr 2026 10:02:41 +0000
Subject: [PATCH 104/389] i-pi: 3.1.11 -> 3.1.12

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

diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 583d5f327724..b9ab457bd884 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "i-pi";
-  version = "3.1.11";
+  version = "3.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "i-pi";
     repo = "i-pi";
     tag = "v${version}";
-    hash = "sha256-9APlG1P+4G5GRZ7LG2Vvfr0l9ZcIxWkHW1M7wT7W1sk=";
+    hash = "sha256-FXDinbsM5sznXNn6lR85dLqy3p0YJESGCgvjkYoPCDc=";
   };
 
   build-system = [

From ba9fa8db5c64eb9cb8674f57d44f09995edac568 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 5 Apr 2026 18:35:55 +0200
Subject: [PATCH 105/389] vscode-extensions.yoshi47.selection-path-copier: init
 at 1.5.0

---
 .../editors/vscode/extensions/default.nix     |  2 ++
 .../yoshi47.selection-path-copier/default.nix | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f09e11478cce..9cf32d16341b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5374,6 +5374,8 @@ let
         };
       };
 
+      yoshi47.selection-path-copier = callPackage ./yoshi47.selection-path-copier { };
+
       yy0931.vscode-sqlite3-editor = callPackage ./yy0931.vscode-sqlite3-editor { };
 
       yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { };
diff --git a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
new file mode 100644
index 000000000000..bef7f62efedc
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  vscode-utils,
+  nix-update-script,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
+  mktplcRef = {
+    publisher = "yoshi47";
+    name = "selection-path-copier";
+    version = "1.5.0";
+    hash = "sha256-ip8dsU8B2vghINPSftvfC5OtM0bjIP0V3JAMt5skmdg=";
+  };
+  meta = {
+    description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoshi47.selection-path-copier";
+    homepage = "https://github.com/yoshi47/selection-path-copier";
+    changelog = "https://github.com/yoshi47/selection-path-copier/releases/tag/release/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+  };
+})

From dd290297bc73555bed03658296f3bf76efbbd51c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Apr 2026 10:57:50 +0000
Subject: [PATCH 106/389] kicad-testing: 9.0-2026-03-19 -> 10.0-2026-04-06

---
 pkgs/by-name/ki/kicad/versions.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix
index f0bdb1890f67..e5fd6afad828 100644
--- a/pkgs/by-name/ki/kicad/versions.nix
+++ b/pkgs/by-name/ki/kicad/versions.nix
@@ -25,23 +25,23 @@
   };
   "kicad-testing" = {
     kicadVersion = {
-      version = "9.0-2026-03-19";
+      version = "10.0-2026-04-06";
       src = {
-        rev = "ca86c82f9b4787c37626225f0b847be5ad3b4763";
-        sha256 = "10bsfnyspvgnffvy3yfm6f3bsd34lm0bk17bwkdm1bnjg2bndv1s";
+        rev = "d9de30af310c4fd84257b48ae6808ef5e3cfe70f";
+        sha256 = "0bxiyhvpncmrakfmx6kdx7jdlssbm90v5li3km558yas5pkzppgx";
       };
     };
     libVersion = {
-      version = "9.0-2026-03-19";
+      version = "10.0-2026-04-06";
       libSources = {
-        symbols.rev = "83b87ce54ef7c17da4cefe45ad99a5f8d375abe6";
-        symbols.sha256 = "08qb4rqxsyhrcvj1k200m2c06jjy7jwjmf9n1qkcm0biqqc5dba4";
-        templates.rev = "319c71222af4205673e0cab9d772a02bbb34c597";
+        symbols.rev = "dc72a484664c0470407113a174f2b5435debbcaf";
+        symbols.sha256 = "0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2";
+        templates.rev = "e703d1e2ab3eb98a209ff402d2b6bf6d02dc1930";
         templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
-        footprints.rev = "384ecd066fcaef6aacdd099ca0bb7c47499a9a4b";
-        footprints.sha256 = "1w7dkb93s84ymi1syxpzacbmkxlnlh0k4z1c62nabspb901nn524";
-        packages3d.rev = "6b3a47da075011b33b6de17aa499690f8c5be4a7";
-        packages3d.sha256 = "1j26dmgz7xfixlqrzclb1wpc6zkd10n1fq7rmdrgwwx083p3c7a8";
+        footprints.rev = "4899503b69ff037ed102ab0fe5a0564ef3d61726";
+        footprints.sha256 = "0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm";
+        packages3d.rev = "bc82151111e9edddf4295228e6ceb5e0584c9c3e";
+        packages3d.sha256 = "0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5";
       };
     };
   };

From 8f4891f69a82cacfa51a79891ad5507d4250998a Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Mon, 6 Apr 2026 15:11:37 +0200
Subject: [PATCH 107/389] stac-validator: 3.11.0 -> 4.1.0

---
 .../stac-validator/default.nix}               | 23 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 20 insertions(+), 7 deletions(-)
 rename pkgs/{by-name/st/stac-validator/package.nix => development/python-modules/stac-validator/default.nix} (66%)

diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/development/python-modules/stac-validator/default.nix
similarity index 66%
rename from pkgs/by-name/st/stac-validator/package.nix
rename to pkgs/development/python-modules/stac-validator/default.nix
index 505c789eff0e..1af6890b0e3e 100644
--- a/pkgs/by-name/st/stac-validator/package.nix
+++ b/pkgs/development/python-modules/stac-validator/default.nix
@@ -1,32 +1,41 @@
 {
   lib,
   fetchFromGitHub,
-  python3Packages,
-}:
+  buildPythonPackage,
 
-python3Packages.buildPythonPackage rec {
+  # build systems
+  setuptools,
+  # runtime deps
+  click,
+  jsonschema,
+  pyyaml,
+  requests,
+  tqdm,
+}:
+buildPythonPackage rec {
   pname = "stac-validator";
-  version = "3.11.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stac-utils";
     repo = "stac-validator";
     tag = "v${version}";
-    hash = "sha256-5wcnEdk8+/stdJVQ97Me/+H3GrS7DA+Nd0OQtPEXDl4=";
+    hash = "sha256-qO1DRYpPn+zarHTj2mZQ2LJ2uhmS1bax6Yxy035ZEUA=";
   };
 
-  build-system = [ python3Packages.setuptools ];
+  build-system = [ setuptools ];
 
   pythonRelaxDeps = [
     "click"
   ];
 
-  dependencies = with python3Packages; [
+  dependencies = [
     click
     jsonschema
     pyyaml
     requests
+    tqdm
   ];
 
   pythonImportsCheck = [ "stac_validator" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c6306892b86..17c98ce43265 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1636,6 +1636,8 @@ with pkgs;
     haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix
   );
 
+  stac-validator = with python3Packages; toPythonApplication stac-validator;
+
   stack2nix =
     with haskell.lib;
     overrideCabal (justStaticExecutables haskellPackages.stack2nix) (_: {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f8c149f03c9..eaf96e4fdd3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18468,6 +18468,8 @@ self: super: with self; {
 
   stable-baselines3 = callPackage ../development/python-modules/stable-baselines3 { };
 
+  stac-validator = callPackage ../development/python-modules/stac-validator { };
+
   stack-data = callPackage ../development/python-modules/stack-data { };
 
   stackprinter = callPackage ../development/python-modules/stackprinter { };

From f6b1d85f72c969a18df3637091d1658b48706d9a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 22:42:43 +0200
Subject: [PATCH 108/389] libosmocore: 1.11.3 -> 1.13.1

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

diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix
index 454ecea1d58d..53b75ca5fd3f 100644
--- a/pkgs/by-name/li/libosmocore/package.nix
+++ b/pkgs/by-name/li/libosmocore/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libosmocore";
-  version = "1.11.3";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmocore";
     rev = finalAttrs.version;
-    hash = "sha256-4fb7vmA3iQuQZ+T2Gp0B7bc5+CYE1cTR3IoFwOde7SE=";
+    hash = "sha256-lHPpV3wmsJFzanMUF6dhhmKTVCIz5MOfqr8U23sm6eI=";
   };
 
   postPatch = ''

From 37a64478b3787112d53186dfd2c3a575289daee0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 22:44:16 +0200
Subject: [PATCH 109/389] libosmoabis:  2.0.1 -> 2.1.0

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

diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix
index 3e3bfc36174f..25ab6fd4d1ce 100644
--- a/pkgs/by-name/li/libosmoabis/package.nix
+++ b/pkgs/by-name/li/libosmoabis/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libosmoabis";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-abis";
     rev = finalAttrs.version;
-    hash = "sha256-OdmegQXdbpwNBepY+7MeUjaEguVo2q9b8lSkRmlXHEc=";
+    hash = "sha256-jJD7XvwOBisN6womVSrY+V78KpFZ7WBvvh757dAS8y0=";
   };
 
   configureFlags = [ "enable_dahdi=false" ];

From 8f0f32cc29a9b1d3dcb158ccff4925776fdbb7db Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 22:45:03 +0200
Subject: [PATCH 110/389] libosmo-netif: 1.6.1 -> 1.7.0

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

diff --git a/pkgs/by-name/li/libosmo-netif/package.nix b/pkgs/by-name/li/libosmo-netif/package.nix
index 55a192ed0b5b..a503f3c6cdc8 100644
--- a/pkgs/by-name/li/libosmo-netif/package.nix
+++ b/pkgs/by-name/li/libosmo-netif/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libosmo-netif";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-netif";
     rev = finalAttrs.version;
-    hash = "sha256-0INgJV5fS6VdMsJqjlVc3lGMBdLP7cI+Ghc4WEh6AuU=";
+    hash = "sha256-4VDXqi5tK3zaCDQgsWlN34m/odgE6xWXgNaKpG0SpnU=";
   };
 
   postPatch = ''

From 3d21962d2b8bdbe9bcaea54d9f4468285c57f52c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 22:46:10 +0200
Subject: [PATCH 111/389] libosmo-sigtran: 2.1.2 -> 2.2.1

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

diff --git a/pkgs/by-name/li/libosmo-sigtran/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix
index 116ccc5f7211..505de3c1bd41 100644
--- a/pkgs/by-name/li/libosmo-sigtran/package.nix
+++ b/pkgs/by-name/li/libosmo-sigtran/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libosmo-sigtran";
-  version = "2.1.2";
+  version = "2.2.1";
 
   # fetchFromGitea hangs
   src = fetchgit {
     url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
     rev = finalAttrs.version;
-    hash = "sha256-/TxD7lc/htm1c24rKfnlYxGsVpxawi3nh7m34mRRhUA=";
+    hash = "sha256-EBBSoSX5tImTLRP7Klhjj/YM8+4RyyJClymIXQK8DgE=";
   };
 
   configureFlags = [ "--with-systemdsystemunitdir=$out" ];

From e745a073cc373583e7a8cc11568b3a566fcd918b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 22:47:01 +0200
Subject: [PATCH 112/389] osmo-mgw: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix
index 166b97605bf7..82133ff1e545 100644
--- a/pkgs/by-name/os/osmo-mgw/package.nix
+++ b/pkgs/by-name/os/osmo-mgw/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-mgw";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-mgw";
     rev = finalAttrs.version;
-    hash = "sha256-Y/98K81US6McNu+JEJtMluJTvsv0DHJiyjMPJz8/35o=";
+    hash = "sha256-rRjr3Mw3ELp1o7QYDuU7mqZEeL2seo0xEONXpkP14SQ=";
   };
 
   postPatch = ''

From fac9784e0f07f0097e9db94ec0ad33a2b99adcb3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 22:59:37 +0200
Subject: [PATCH 113/389] osmo-bsc: 1.13.3 -> 1.14.1

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

diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 8b418a7bd2d4..46f110f49c56 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-bsc";
-  version = "1.13.3";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
     rev = finalAttrs.version;
-    hash = "sha256-2Go+93h1Z4FV9sESfjwCaee1m4jUq2eO8fxlZAwZVfM=";
+    hash = "sha256-8Fli6LGzOt6/0xQTRQ5X9I+0UkIAb1pAtX1xYSxOE2U=";
   };
 
   postPatch = ''

From 897065515d1e45509a0fd610ae2866229b7151e3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 23:00:08 +0200
Subject: [PATCH 114/389] osmo-bts: 1.9.0 -> 1.11.0

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

diff --git a/pkgs/by-name/os/osmo-bts/package.nix b/pkgs/by-name/os/osmo-bts/package.nix
index 66b17182a06a..185c91626cb3 100644
--- a/pkgs/by-name/os/osmo-bts/package.nix
+++ b/pkgs/by-name/os/osmo-bts/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-bts";
-  version = "1.9.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bts";
     rev = finalAttrs.version;
-    hash = "sha256-SvlkIvdyrXlaSJl+LbHovhIlnxsxpufJCy1wVCZbjWM=";
+    hash = "sha256-eqra1dh84c3mv4ISqrwe7dbhlawWNGvuYd1CDLAfwNk=";
   };
 
   postPatch = ''

From ba839426c192f33ace261aee1dc035ec731f047b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 23:00:56 +0200
Subject: [PATCH 115/389] osmo-hlr: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix
index a2fdb8b074be..ccde871dae95 100644
--- a/pkgs/by-name/os/osmo-hlr/package.nix
+++ b/pkgs/by-name/os/osmo-hlr/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-hlr";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hlr";
     rev = finalAttrs.version;
-    hash = "sha256-yi4sgcX8WOWz7qw/jGvVCtIYe867uBzLps8gdG6ziOA=";
+    hash = "sha256-SYyL7evxxmXGwv2TLr8ZuIrbu+GliAyuz/sKTIveQvc=";
   };
 
   postPatch = ''

From 960de30b366a50184b784a0b0a0b3f09a81cf4cf Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 23:01:51 +0200
Subject: [PATCH 116/389] osmo-msc: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix
index 19537c9917e5..9e5e14d7bf87 100644
--- a/pkgs/by-name/os/osmo-msc/package.nix
+++ b/pkgs/by-name/os/osmo-msc/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-msc";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-msc";
     rev = finalAttrs.version;
-    hash = "sha256-+Z49TqXLEeCy7Yj0qVg1hPFOD/x+4HnwDZxZoxoUjqI=";
+    hash = "sha256-kRPGtMVNODh03oCqqo/AbApWasxiLYo/A9GrD3ECfaE=";
   };
 
   postPatch = ''

From e28b6bab7f79d3b459bc52d613ad9142e505cc47 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 23:02:32 +0200
Subject: [PATCH 117/389] osmo-sip-connector: 1.7.1 -> 1.7.2

---
 pkgs/by-name/os/osmo-sip-connector/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix
index 13d7d5a40393..cf289dc3d859 100644
--- a/pkgs/by-name/os/osmo-sip-connector/package.nix
+++ b/pkgs/by-name/os/osmo-sip-connector/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-sip-connector";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-sip-connector";
     rev = finalAttrs.version;
-    hash = "sha256-NmjaN28NnAIpMwUHCUS+7LJBwvCp48kyhmHRf6cU5WE=";
+    hash = "sha256-JOTUa1buj9qR8dnMZMLaxjSIrsLnr9g1yylkTgPcL4k=";
   };
 
   postPatch = ''

From 8a7cce878b1ba3c1ba2edb77b111ba5313aa1122 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 23:03:02 +0200
Subject: [PATCH 118/389] osmo-ggsn: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix
index e1cc5ce37c73..626f691decab 100644
--- a/pkgs/by-name/os/osmo-ggsn/package.nix
+++ b/pkgs/by-name/os/osmo-ggsn/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-ggsn";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-ggsn";
     rev = finalAttrs.version;
-    hash = "sha256-qsBjoLyMlRgUjhX1tyI/MoHGmww1XUT3OMH4dVZzLU4=";
+    hash = "sha256-/t5BqZYbeQb2Aea7fSJSJ4ZY2kG/6BtqHeCfFdfo4VA=";
   };
 
   postPatch = ''

From a85386bd59956feb9589d8e9d1c2ce2072f7cd40 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 6 Apr 2026 23:03:22 +0200
Subject: [PATCH 119/389] osmo-sgsn: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix
index 3abbc3a01490..0b6f6065dcf9 100644
--- a/pkgs/by-name/os/osmo-sgsn/package.nix
+++ b/pkgs/by-name/os/osmo-sgsn/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmo-sgsn";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-sgsn";
     rev = finalAttrs.version;
-    hash = "sha256-ht8ejeD2whV0Ww5G3coUntLrIp2S0gZBRS6kF7w9KZY=";
+    hash = "sha256-POitmYZNSGlnIm65VmqneDOyoN+OaB69Fk3iG7L1UXQ=";
   };
 
   postPatch = ''

From 1cbb45d4539c790da33f593c4dade6577ab22e7c Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Tue, 7 Apr 2026 00:15:28 +0200
Subject: [PATCH 120/389] buildVcode: disable update checks and add missing
 tools

---
 pkgs/applications/editors/vscode/generic.nix | 20 ++++++++++++++++++--
 pkgs/by-name/an/antigravity/package.nix      | 16 ++--------------
 pkgs/by-name/co/code-cursor/package.nix      |  4 +---
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 91479c2c95f3..b2686a9df4e6 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -2,7 +2,11 @@
   stdenv,
   lib,
   coreutils,
+  gawk,
   gnugrep,
+  gnused,
+  glibc,
+  jq,
   copyDesktopItems,
   makeDesktopItem,
   unzip,
@@ -33,6 +37,7 @@
   openssl,
   webkitgtk_4_1,
   ripgrep,
+  which,
 
   # needed to fix "Save as Root"
   asar,
@@ -269,6 +274,7 @@ stdenv.mkDerivation (
       autoPatchelfHook
       asar
       copyDesktopItems
+      jq
       # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
       # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
       (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
@@ -352,9 +358,13 @@ stdenv.mkDerivation (
             # for moving files to trash
             glib
 
-            # for launcher script
+            # for launcher and bundled helper scripts
+            gawk
+            glibc.bin
             gnugrep
+            gnused
             coreutils
+            which
           ]
         }
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}"
@@ -365,9 +375,15 @@ stdenv.mkDerivation (
     # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897
     # linux only because of https://github.com/NixOS/nixpkgs/issues/138729
     postPatch =
-      # this is a fix for "save as root" functionality
       lib.optionalString stdenv.hostPlatform.isLinux (
+        # disable update checks
         ''
+          tmpProductJson="$(mktemp)"
+          jq 'del(.updateUrl, .backupUpdateUrl)' resources/app/product.json > "$tmpProductJson"
+          mv "$tmpProductJson" resources/app/product.json
+        ''
+        # this is a fix for "save as root" functionality
+        + ''
           packed="resources/app/node_modules.asar"
           unpacked="resources/app/node_modules"
           asar extract "$packed" "$unpacked"
diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix
index 1c6b5427ea99..a0d5cd05a137 100644
--- a/pkgs/by-name/an/antigravity/package.nix
+++ b/pkgs/by-name/an/antigravity/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildVscode,
   fetchurl,
-  jq,
   writeShellScript,
   coreutils,
   commandLineArgs ? "",
@@ -17,7 +16,7 @@ let
     information.sources."${hostPlatform.system}"
       or (throw "antigravity: unsupported system ${hostPlatform.system}");
 in
-(buildVscode {
+buildVscode {
   inherit commandLineArgs useVSCodeRipgrep;
   inherit (information) version vscodeVersion;
   pname = "antigravity";
@@ -75,15 +74,4 @@ in
       Zaczero
     ];
   };
-}).overrideAttrs
-  (oldAttrs: {
-    # Disable update checks
-    nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ jq ];
-    postPatch = (oldAttrs.postPatch or "") + ''
-      productJson="${
-        if stdenv.hostPlatform.isDarwin then "Contents/Resources" else "resources"
-      }/app/product.json"
-      data=$(jq 'del(.updateUrl)' "$productJson")
-      echo "$data" > "$productJson"
-    '';
-  })
+}
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index edff54ed1988..502a8765c5f7 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -11,7 +11,6 @@
 
 let
   inherit (stdenv) hostPlatform;
-  finalCommandLineArgs = "--update=false " + commandLineArgs;
 
   sourcesJson = lib.importJSON ./sources.json;
   sources = lib.mapAttrs (
@@ -24,9 +23,8 @@ let
   source = sources.${hostPlatform.system};
 in
 buildVscode rec {
-  inherit useVSCodeRipgrep;
+  inherit commandLineArgs useVSCodeRipgrep;
   inherit (sourcesJson) version vscodeVersion;
-  commandLineArgs = finalCommandLineArgs;
 
   pname = "cursor";
 

From 2dfa67b58ace0ba7fb6fbe4dc0d5ee25d252694e Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Mon, 6 Apr 2026 16:48:38 -0700
Subject: [PATCH 121/389] frawk: fix build

---
 pkgs/by-name/fr/frawk/fix-prefetch-read-data.patch | 13 +++++++++++++
 pkgs/by-name/fr/frawk/package.nix                  |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/fr/frawk/fix-prefetch-read-data.patch

diff --git a/pkgs/by-name/fr/frawk/fix-prefetch-read-data.patch b/pkgs/by-name/fr/frawk/fix-prefetch-read-data.patch
new file mode 100644
index 000000000000..6413fe62c4f9
--- /dev/null
+++ b/pkgs/by-name/fr/frawk/fix-prefetch-read-data.patch
@@ -0,0 +1,13 @@
+diff --git a/src/runtime/splitter/batch.rs b/src/runtime/splitter/batch.rs
+index 9b1bc21..d7eeaa0 100644
+--- a/src/runtime/splitter/batch.rs
++++ b/src/runtime/splitter/batch.rs
+@@ -1137,7 +1137,7 @@ mod generic {
+         macro_rules! iterate {
+             ($buf:expr) => {{
+                 #[cfg(feature = "unstable")]
+-                std::intrinsics::prefetch_read_data($buf.offset(128), 3);
++                std::intrinsics::prefetch_read_data::<_, 3>($buf.offset(128));
+                 let (s, mask, nl) = f(state, $buf);
+                 state = s;
+                 (mask, nl)
diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix
index dda9b3554be1..26a849e95420 100644
--- a/pkgs/by-name/fr/frawk/package.nix
+++ b/pkgs/by-name/fr/frawk/package.nix
@@ -27,8 +27,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-VraFR3Mp4mPh+39hw88R0q1p5iNkcQzvhRVNPwSxzU0=";
 
   patches = [
-    # This patch comes from https://github.com/ezrosent/frawk/pull/120, which was squash-merged.
+    # Remove these two patches after frawk is updated to a version including this fix
+    # This patch comes from https://github.com/ezrosent/frawk/pull/120
     ./fix-some-compiler-warnings-errors.patch
+    # From https://github.com/ezrosent/frawk/commit/35a79dc04933f38f98a7c8f6fc89ca09724702ab
+    ./fix-prefetch-read-data.patch
   ];
 
   buildInputs = [

From 4614562e259b9812d9825fa69bf380a37d033462 Mon Sep 17 00:00:00 2001
From: "Renna Z." <is@renna.dev>
Date: Wed, 25 Mar 2026 10:42:29 +0800
Subject: [PATCH 122/389] dwproton-bin: init at dwproton-10.0-22

---
 pkgs/by-name/dw/dwproton-bin/package.nix | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/dw/dwproton-bin/package.nix

diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
new file mode 100644
index 000000000000..d1095082c312
--- /dev/null
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchzip,
+  writeScript,
+  proton-ge-bin,
+
+  steamDisplayName ? "dwproton",
+}:
+proton-ge-bin.overrideAttrs (
+  finalAttrs: _: {
+    inherit steamDisplayName;
+
+    pname = "dwproton-bin";
+    version = "dwproton-10.0-22";
+
+    src = fetchzip {
+      url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
+      hash = "sha256-U/lLAF/WUxHInBgAt7YuDUM/eGGSv7mkjAACr15iW/0=";
+    };
+
+    passthru.updateScript = writeScript "update-dwproton" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl jq common-updater-scripts
+      version=$(curl -sL "https://dawn.wine/api/v1/repos/dawn-winery/dwproton/tags?page=1\&limit=1" | jq -r .[0].name)
+      update-source-version dwproton-bin "$version"
+    '';
+
+    meta = {
+      description = ''
+        Dawn Winery's custom Proton fork with fixes for various games.
+
+        (This is intended for use in the `programs.steam.extraCompatPackages` option only.)
+      '';
+      homepage = "https://dawn.wine/dawn-winery/dwproton";
+      license = lib.licenses.bsd3;
+      maintainers = with lib.maintainers; [
+        Renna42
+      ];
+      platforms = [ "x86_64-linux" ];
+      sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    };
+  }
+)

From 996cce221e20aab80b0162c01b05cd57175bde95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 05:53:23 +0000
Subject: [PATCH 123/389] warp-terminal: 0.2026.03.25.08.24.stable_05 ->
 0.2026.03.25.08.24.stable_09

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 1affbddbbeac..77eb058c4197 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-GNDoWxD0Xqph+JyUj64YcMaIJu5y3mlLAhYcVrprDUc=",
-    "version": "0.2026.03.25.08.24.stable_05"
+    "hash": "sha256-+vr4OINeprn3dqarB6ZotK4oA1h09WT6wIuKyxPtAeQ=",
+    "version": "0.2026.03.25.08.24.stable_09"
   },
   "linux_x86_64": {
-    "hash": "sha256-rUKSVE6cCZT1M1cTZ4S1C2ox3T9yacBpnl23J4CvKz8=",
-    "version": "0.2026.03.25.08.24.stable_05"
+    "hash": "sha256-FceMF9fAz4XMBwL/iAaQdz/elSnS5DNV1uaBy5BEwSc=",
+    "version": "0.2026.03.25.08.24.stable_09"
   },
   "linux_aarch64": {
-    "hash": "sha256-ADTNNsRq7DmYlxrl2xLxBZkHlDHxbM08ywZPJDla0lk=",
-    "version": "0.2026.03.25.08.24.stable_05"
+    "hash": "sha256-9x3mNKT8PaFaZouMN7iXPfCv2U1SsbkI4BcpzfhCODw=",
+    "version": "0.2026.03.25.08.24.stable_09"
   }
 }

From 85d0721c8b7886d743f4205286c984ff8d6a15df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 7 Apr 2026 11:55:25 +0200
Subject: [PATCH 124/389] openapi-generator-cli: fix stale patch url

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

diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix
index ae3b81ad5d8b..29a09a397d65 100644
--- a/pkgs/by-name/op/openapi-generator-cli/package.nix
+++ b/pkgs/by-name/op/openapi-generator-cli/package.nix
@@ -28,8 +28,8 @@ let
     patches = [
       # Achieve reproducible mvnHash by pinning develocity plugin.
       (fetchpatch {
-        url = "https://github.com/OpenAPITools/openapi-generator/pull/23326.patch";
-        hash = "sha256-s68VoIXSFGvGCaFtCUYkeoq+CgC+2gIdDIIsmn8uqyk=";
+        url = "https://github.com/OpenAPITools/openapi-generator/commit/ff66e1bc7fe33dcee89de7296eb7bcd5e2a11cc6.patch";
+        hash = "sha256-E1VgtaIW1V+8ch2RpW850fVNl5Iqitjog+0b8DKFgZw=";
       })
     ];
 

From 9d7d88ee0a2346a47af1e57d08d65a816b4632cf Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Tue, 7 Apr 2026 13:59:24 +0200
Subject: [PATCH 125/389] wealthfolio: 2.1.0 -> 3.2.1

https://github.com/afadil/wealthfolio/releases/tag/v3.2.1
---
 pkgs/by-name/we/wealthfolio/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index 7297f4baea45..c7ad96f655ff 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -19,23 +19,23 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wealthfolio";
-  version = "2.1.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "afadil";
     repo = "wealthfolio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pLiSidcuRTcykHDgW2pw+h0t/42g6u3LlioSEDA0lIo=";
+    hash = "sha256-flXuskAzrDFBMcAtOe++QpFRIXvbbx5eqXxrymC4MMM=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) src pname version;
     pnpm = pnpm_9;
     fetcherVersion = 1;
-    hash = "sha256-TcoyNIVb/aDgXIsNDvzTMfsewmefU9ck+uSHv/tbH/k=";
+    hash = "sha256-feM1jQsUDKVX4+x4Otdwx6AEM+FO7fiaJjmMbU6GDf8=";
   };
 
-  cargoRoot = "src-tauri";
+  cargoRoot = ".";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       cargoRoot
       ;
-    hash = "sha256-R6lU4BPFlFxQqxmP5EWQsYwe1QGIlKVhp/iNiD9pKQo=";
+    hash = "sha256-Zo3EVWxuJ//EtqUZ1l2/B1MGlmpoBcWQksY/IpCb5N4";
   };
 
   nativeBuildInputs = [
@@ -70,8 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
     jq \
       '.plugins.updater.endpoints = [ ]
       | .bundle.createUpdaterArtifacts = false' \
-      src-tauri/tauri.conf.json \
-      | sponge src-tauri/tauri.conf.json
+      apps/tauri/tauri.conf.json \
+      | sponge apps/tauri/tauri.conf.json
   '';
 
   passthru.updateScript = nix-update-script { };

From 47ff526f50d4e16be0f219ecff3a359f55189c8c Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 7 Apr 2026 21:36:32 +0800
Subject: [PATCH 126/389] amberol: 2025.1 -> 2026.1

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

diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix
index ba04b95eeb82..14ce60286c2d 100644
--- a/pkgs/by-name/am/amberol/package.nix
+++ b/pkgs/by-name/am/amberol/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitLab,
   rustPlatform,
+  blueprint-compiler,
   cargo,
   desktop-file-utils,
   appstream-glib,
@@ -23,20 +24,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amberol";
-  version = "2025.1";
+  version = "2026.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "amberol";
     tag = finalAttrs.version;
-    hash = "sha256-vF6O7+cQFoYpO4MHHHuacwjP7AUqFQCVUivCSZO7v3o=";
+    hash = "sha256-d4lhfWqg6EZeXGL1kHGS7oWrqI3c9bpDCKUdGp31OpI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "amberol-${finalAttrs.version}";
-    hash = "sha256-j/xkdLcmu02e+b8skx5U3uG2R2rIxwSJsYzyJ5tn5uU=";
+    hash = "sha256-OFZd9nKRqXJMHSIIP8tlSNtFAQzk/f/6SBeEvbdPVK0=";
   };
 
   postPatch = ''
@@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     appstream-glib
+    blueprint-compiler
     cargo
     desktop-file-utils
     m4

From 2e1ee510ad0d50452055909880263f279567c83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 03:05:28 +0100
Subject: [PATCH 127/389] python3Packages.django-vcache: init at 1.0.0

---
 .../python-modules/django-vcache/default.nix  | 60 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-vcache/default.nix

diff --git a/pkgs/development/python-modules/django-vcache/default.nix b/pkgs/development/python-modules/django-vcache/default.nix
new file mode 100644
index 000000000000..a2cad50a356f
--- /dev/null
+++ b/pkgs/development/python-modules/django-vcache/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  croniter,
+  django,
+  fetchFromGitLab,
+  hatchling,
+  ormsgpack,
+  prometheus-client,
+  pythonOlder,
+  valkey,
+  zstd,
+}:
+
+buildPythonPackage rec {
+  pname = "django-vcache";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "glitchtip";
+    repo = "django-vcache";
+    tag = "v${version}";
+    hash = "sha256-bOHEw4nl82tFjHiJdmyW0LleKMpjUh8uu4crGp6IsWY=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    django
+    ormsgpack
+    croniter
+    valkey
+  ]
+  ++ valkey.optional-dependencies.libvalkey
+  ++ lib.optional (pythonOlder "3.14") zstd;
+
+  optional-dependencies = {
+    metrics = [ prometheus-client ];
+    valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey;
+  };
+
+  pythonImportsCheck = [ "django_vcache" ];
+
+  # requires valkey sentinel cluster
+  doCheck = false;
+
+  meta = {
+    description = "Specialized, lightweight Django cache backend for Valkey";
+    homepage = "https://gitlab.com/glitchtip/django-vcache/";
+    changelog = "https://gitlab.com/glitchtip/django-vcache/-/blob/main/CHANGELOG.md#${
+      lib.replaceString "." "" version
+    }";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      defelo
+      felbinger
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a21ae262dab..3ce449e87b64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4426,6 +4426,8 @@ self: super: with self; {
 
   django-valkey = callPackage ../development/python-modules/django-valkey { };
 
+  django-vcache = callPackage ../development/python-modules/django-vcache { };
+
   django-versatileimagefield =
     callPackage ../development/python-modules/django-versatileimagefield
       { };

From c17f09a1ce38179a554d8512d098c2ed6f339e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 01:50:12 +0100
Subject: [PATCH 128/389] python314Packages.django-vtasks: init at 1.0.3

---
 .../python-modules/django-vtasks/default.nix  | 90 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 92 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-vtasks/default.nix

diff --git a/pkgs/development/python-modules/django-vtasks/default.nix b/pkgs/development/python-modules/django-vtasks/default.nix
new file mode 100644
index 000000000000..ca0c1ec7e30e
--- /dev/null
+++ b/pkgs/development/python-modules/django-vtasks/default.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  buildPythonPackage,
+  croniter,
+  dj-database-url,
+  django-valkey,
+  django,
+  fetchFromGitLab,
+  hatchling,
+  orjson,
+  postgresql,
+  postgresqlTestHook,
+  prometheus-client,
+  psycopg,
+  pytest-asyncio,
+  pytest-django,
+  pytestCheckHook,
+  pythonOlder,
+  redisTestHook,
+  valkey,
+  zstandard,
+}:
+
+buildPythonPackage rec {
+  pname = "django-vtasks";
+  version = "1.0.3";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "glitchtip";
+    repo = "django-vtasks";
+    tag = "v${version}";
+    hash = "sha256-75W63HsLBT4EPQCiAXjd9qr6n07/2e5GCUNWeDzXUq0=";
+  };
+
+  postPatch = ''
+    # upstream does not use pytest to run the tests, but we just need to patch one async test to do so
+    substituteInPlace scripts/test_stale_conn.py \
+      --replace-fail "import asyncio" "import asyncio; import pytest" \
+      --replace-fail "async def test_async_stale_connection():" "@pytest.mark.asyncio
+    async def test_async_stale_connection():"
+  '';
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    django
+    orjson
+    croniter
+  ]
+  ++ lib.optional (pythonOlder "3.14") zstandard;
+
+  optional-dependencies = {
+    metrics = [ prometheus-client ];
+    valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey;
+  };
+
+  pythonImportsCheck = [ "django_vtasks" ];
+
+  env = {
+    DATABASE_URL = "postgresql://postgres@%2Fbuild%2Frun%2Fpostgresql";
+    VALKEY_URL = "redis://127.0.0.1:6379";
+  };
+
+  nativeCheckInputs = [
+    django # must come first as vtasks only works with django 6
+
+    dj-database-url
+    django-valkey
+    postgresql
+    postgresqlTestHook
+    psycopg
+    pytest-asyncio
+    pytest-django
+    pytestCheckHook
+    redisTestHook # contains valkey
+  ];
+
+  meta = {
+    description = "Very fast valkey/postgres django tasks backend";
+    homepage = "https://gitlab.com/glitchtip/django-vtasks";
+    changelog = "https://gitlab.com/glitchtip/django-vtasks/-/releases/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      defelo
+      felbinger
+    ];
+    broken = lib.versionOlder (lib.versions.major django.version) "6";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ce449e87b64..a6c74019826e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4434,6 +4434,8 @@ self: super: with self; {
 
   django-vite = callPackage ../development/python-modules/django-vite { };
 
+  django-vtasks = callPackage ../development/python-modules/django-vtasks { };
+
   django-waffle = callPackage ../development/python-modules/django-waffle { };
 
   django-weasyprint = callPackage ../development/python-modules/django-weasyprint { };

From 32a285ba8cb931b886fafae86f2e2f32e3ce20ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 16:58:42 +0100
Subject: [PATCH 129/389] python313Packages.django-autoslug: fix tests with
 django_6

---
 .../python-modules/django-autoslug/default.nix           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-autoslug/default.nix b/pkgs/development/python-modules/django-autoslug/default.nix
index c9749a1c90da..119851f3b34a 100644
--- a/pkgs/development/python-modules/django-autoslug/default.nix
+++ b/pkgs/development/python-modules/django-autoslug/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  wheel,
   django,
   django-modeltranslation,
 }:
@@ -20,9 +19,15 @@ buildPythonPackage rec {
     hash = "sha256-IRLY4VaKYXVkSgU/zdY+PSmGrcFB2FlE5L7j0FqisRM=";
   };
 
+  postPatch = lib.optionalString (lib.versionAtLeast django.version "6.0") ''
+    # sadly upstream does not use pytest, so we must patch the one failing test or we could not run any tests at all
+    # see https://github.com/justinmayer/django-autoslug/issues/87
+    substituteInPlace autoslug/tests/tests.py \
+      --replace-fail "assert b.slug == 'hello_world-2'" "assert b.slug == 'hello_world_2'"
+  '';
+
   build-system = [
     setuptools
-    wheel
   ];
 
   dependencies = [ django ];

From 36ea75a27788fa3dece40dacbadc17590104af33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 03:58:39 +0100
Subject: [PATCH 130/389] python313Packages.django-extensions: fix tests with
 django_6

---
 .../django-extensions/default.nix             |   6 +
 .../django-extensions/django_6-compat.diff    | 111 ++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-extensions/django_6-compat.diff

diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index b2295131331e..257f500afd4f 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -36,6 +36,12 @@ buildPythonPackage rec {
     hash = "sha256-WgO/bDe4anQCc1q2Gdq3W70yDqDgmsvn39Qf9ZNVXuE=";
   };
 
+  patches = lib.optionals (lib.versionAtLeast django.version "6.0") [
+    # Fix some tests when run with Django 6
+    # see https://github.com/django-extensions/django-extensions/pull/1979
+    ./django_6-compat.diff
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/django-extensions/django_6-compat.diff b/pkgs/development/python-modules/django-extensions/django_6-compat.diff
new file mode 100644
index 000000000000..6996a24a8a46
--- /dev/null
+++ b/pkgs/development/python-modules/django-extensions/django_6-compat.diff
@@ -0,0 +1,111 @@
+From 5c096ad7a59a3e9edee66e27fbae46c30e4abd6b Mon Sep 17 00:00:00 2001
+From: asherzod1 <sh.abdumutalov1@gmail.com>
+Date: Wed, 11 Mar 2026 00:53:19 +0500
+Subject: [PATCH] fix: add Django 6 compatibility for signals, constraints, and
+ random char field
+
+---
+ django_extensions/db/fields/__init__.py        | 18 +++++++++++++-----
+ .../management/commands/list_signals.py        |  4 +++-
+ tests/test_management_command.py               |  6 +++++-
+ tests/testapp/models.py                        |  7 ++++++-
+ 4 files changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/django_extensions/db/fields/__init__.py b/django_extensions/db/fields/__init__.py
+index 938254e1f..c233cee84 100644
+--- a/django_extensions/db/fields/__init__.py
++++ b/django_extensions/db/fields/__init__.py
+@@ -86,7 +86,11 @@ def find_unique(self, model_instance, field, iterator, *args):
+ 
+         new = next(iterator)
+         kwargs[self.attname] = new
+-        while not new or queryset.filter(query, **kwargs):
++        while True:
++            matching = queryset.filter(query, **kwargs)
++            has_match = matching.exists() if hasattr(matching, "exists") else bool(matching)
++            if new and not has_match:
++                break
+             new = next(iterator)
+             kwargs[self.attname] = new
+         setattr(model_instance, self.attname, new)
+@@ -388,10 +392,14 @@ def in_unique_together(self, model_instance):
+         return False
+ 
+     def pre_save(self, model_instance, add):
+-        if (not add or self.keep_default) and getattr(
+-            model_instance, self.attname
+-        ) != "":
+-            return getattr(model_instance, self.attname)
++        current_value = getattr(model_instance, self.attname)
++        # Django 6 may call pre_save multiple times for inserts; if we've already
++        # populated the field value, reuse it instead of regenerating.
++        if current_value not in ("", None):
++            return current_value
++
++        if (not add or self.keep_default) and current_value != "":
++            return current_value
+ 
+         population = ""
+         if self.include_alpha:
+diff --git a/django_extensions/management/commands/list_signals.py b/django_extensions/management/commands/list_signals.py
+index 9cadc4f85..e7bc9d7f6 100644
+--- a/django_extensions/management/commands/list_signals.py
++++ b/django_extensions/management/commands/list_signals.py
+@@ -52,7 +52,9 @@ def handle(self, *args, **options):
+         for signal in signals:
+             signal_name = SIGNAL_NAMES.get(signal, "unknown")
+             for receiver in signal.receivers:
+-                if django.VERSION >= (5, 0):
++                if django.VERSION >= (6, 0):
++                    lookup, receiver, _sender, is_async = receiver
++                elif django.VERSION >= (5, 0):
+                     lookup, receiver, is_async = receiver
+                 else:
+                     lookup, receiver = receiver
+diff --git a/tests/test_management_command.py b/tests/test_management_command.py
+index ea205ed72..0fb9dc27b 100644
+--- a/tests/test_management_command.py
++++ b/tests/test_management_command.py
+@@ -3,6 +3,7 @@
+ import logging
+ import importlib
+ 
++import django
+ from django.core.management import (
+     call_command,
+     find_commands,
+@@ -421,7 +422,10 @@ def test_field_class(self):
+             stdout=out,
+         )
+         self.output = out.getvalue()
+-        self.assertIn("id - AutoField", self.output)
++        if django.VERSION >= (6, 0):
++            self.assertIn("id - BigAutoField", self.output)
++        else:
++            self.assertIn("id - AutoField", self.output)
+         self.assertIn("char_field - CharField", self.output)
+         self.assertIn("integer_field - IntegerField", self.output)
+         self.assertIn("foreign_key_field - ForeignKey", self.output)
+diff --git a/tests/testapp/models.py b/tests/testapp/models.py
+index 278402f51..3f31efcda 100644
+--- a/tests/testapp/models.py
++++ b/tests/testapp/models.py
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
++import django
+ from django.db import models
+ from django.contrib.auth import get_user_model
+ from django.db.models import UniqueConstraint
+@@ -178,7 +179,11 @@ class Meta:
+                 fields=("common_field", "uniq_field"), name="unique_common_uniq_pair"
+             ),
+             models.CheckConstraint(
+-                check=~models.Q(common_field=models.F("another_common_field")),
++                **(
++                    {"condition": ~models.Q(common_field=models.F("another_common_field"))}
++                    if django.VERSION >= (5, 2)
++                    else {"check": ~models.Q(common_field=models.F("another_common_field"))}
++                ),
+                 name="common_and_another_common_differ",
+             ),
+         ]

From 0303aabc1a138501aee7add36c67bb0d55ae5509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 16:59:26 +0100
Subject: [PATCH 131/389] python313Packages.django-prometheus: allow newer
 django versions

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

diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix
index ff97896101d6..b2526d41c4ad 100644
--- a/pkgs/development/python-modules/django-prometheus/default.nix
+++ b/pkgs/development/python-modules/django-prometheus/default.nix
@@ -28,6 +28,10 @@ buildPythonPackage rec {
       --replace-fail '"pytest-runner"' ""
   '';
 
+  pythonRelaxDeps = [
+    "django"
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ prometheus-client ];

From bfaa1478a8cf2e905db18e3d265ceac433f2d449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 21:12:24 +0100
Subject: [PATCH 132/389] python313Packages.django-guardian: add pytest-xdist
 to decrease test time from 120s to ~30s

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

diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix
index 820bd1077652..b6e00c831edf 100644
--- a/pkgs/development/python-modules/django-guardian/default.nix
+++ b/pkgs/development/python-modules/django-guardian/default.nix
@@ -6,6 +6,7 @@
   django,
   pytestCheckHook,
   pytest-django,
+  pytest-xdist,
   setuptools,
 }:
 
@@ -29,6 +30,7 @@ buildPythonPackage rec {
     django-environ
     pytestCheckHook
     pytest-django
+    pytest-xdist
   ];
 
   pythonImportsCheck = [ "guardian" ];

From b28a56e55f771006c00879d0224ef3454cbe3b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 6 Mar 2026 00:50:57 +0100
Subject: [PATCH 133/389] glitchtip: 5.2.1 -> 6.0.9

Diff: https://gitlab.com/glitchtip/glitchtip-backend/-/compare/v5.2.1...v6.0.9

Changelog: https://gitlab.com/glitchtip/glitchtip-backend/-/blob/v6.0.9/CHANGELOG
---
 nixos/modules/services/web-apps/glitchtip.nix | 134 ++++++++++--------
 nixos/tests/glitchtip.nix                     |   4 +-
 pkgs/by-name/gl/glitchtip/frontend.nix        |  11 +-
 pkgs/by-name/gl/glitchtip/package.nix         |  35 ++---
 4 files changed, 99 insertions(+), 85 deletions(-)

diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index 6a74cda886a1..e32af666bc06 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -45,19 +45,6 @@ in
         default = "glitchtip";
       };
 
-      listenAddress = lib.mkOption {
-        type = lib.types.str;
-        description = "The address to listen on.";
-        default = "127.0.0.1";
-        example = "0.0.0.0";
-      };
-
-      port = lib.mkOption {
-        type = lib.types.port;
-        description = "The port to listen on.";
-        default = 8000;
-      };
-
       stateDir = lib.mkOption {
         type = lib.types.path;
         description = "State directory of glitchtip.";
@@ -74,12 +61,16 @@ in
             DEBUG = 0;
             DEBUG_TOOLBAR = 0;
             DATABASE_URL = lib.mkIf config.services.glitchtip.database.createLocally "postgresql://@/glitchtip";
+            GLITCHTIP_VERSION = config.services.glitchtip.package.version;
+            GRANIAN_HOST = "127.0.0.1";
+            GRANIAN_PORT = 8000;
+            GRANIAN_STATIC_PATH_MOUNT = "''${config.services.glitchtip.package}/lib/glitchtip/static";
+            GRANIAN_WORKERS = 1;
+            PYTHONUNBUFFERED = 1;
             REDIS_URL = lib.mkIf config.services.glitchtip.redis.createLocally "unix://''${config.services.redis.servers.glitchtip.unixSocket}";
-            CELERY_BROKER_URL = lib.mkIf config.services.glitchtip.redis.createLocally "redis+socket://''${config.services.redis.servers.glitchtip.unixSocket}";
           }
         '';
         example = {
-          GLITCHTIP_DOMAIN = "https://glitchtip.example.com";
           DATABASE_URL = "postgres://postgres:postgres@postgres/postgres";
         };
 
@@ -93,10 +84,22 @@ in
             ]);
 
           options = {
-            GLITCHTIP_DOMAIN = lib.mkOption {
-              type = lib.types.str;
-              description = "The URL under which GlitchTip is externally reachable.";
-              example = "https://glitchtip.example.com";
+            GLITCHTIP_ENABLE_MCP = lib.mkOption {
+              type = lib.types.bool;
+              description = "Whether to enable the MCP api.";
+              default = false;
+            };
+
+            GRANIAN_WORKERS = lib.mkOption {
+              type = lib.types.ints.positive;
+              description = "Number of granian workers to start";
+              default = 1;
+            };
+
+            ENABLE_OBSERVABILITY_API = lib.mkOption {
+              type = lib.types.bool;
+              description = "Whether to enable the Prometheus metrics endpoint.";
+              default = false;
             };
 
             ENABLE_USER_REGISTRATION = lib.mkOption {
@@ -144,37 +147,47 @@ in
           Whether to enable and configure a local Redis instance.
         '';
       };
-
-      gunicorn.extraArgs = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-        description = "Extra arguments for gunicorn.";
-      };
-
-      celery.extraArgs = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-        description = "Extra arguments for celery.";
-      };
     };
   };
 
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "glitchtip" "listenAddress" ]
+      [ "services" "glitchtip" "settings" "GRANIAN_HOST" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "glitchtip" "port" ]
+      [ "services" "glitchtip" "settings" "GRANIAN_PORT" ]
+    )
+    (lib.mkRemovedOptionModule [ "services" "glitchtip" "celery" "extraArgs" ]
+      "GlitchTip 6 migrated away from celery. Please check the upstream docs how to handle your usecase now."
+    )
+    (lib.mkRemovedOptionModule [ "services" "glitchtip" "gunicorn" "extraArgs" ]
+      "GlitchTip 6 migrated away from gunicorn. Please check the upstream docs how to handle your usecase now."
+    )
+  ];
+
   config = lib.mkIf cfg.enable {
     services.glitchtip.settings = {
       DEBUG = lib.mkDefault 0;
       DEBUG_TOOLBAR = lib.mkDefault 0;
-      PYTHONPATH = "${python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/glitchtip";
-      DATABASE_URL = lib.mkIf cfg.database.createLocally "postgresql://@/glitchtip";
-      REDIS_URL = lib.mkIf cfg.redis.createLocally "unix://${config.services.redis.servers.glitchtip.unixSocket}";
-      CELERY_BROKER_URL = lib.mkIf cfg.redis.createLocally "redis+socket://${config.services.redis.servers.glitchtip.unixSocket}";
       GLITCHTIP_VERSION = pkg.version;
+      GRANIAN_HOST = lib.mkDefault "127.0.0.1";
+      GRANIAN_PORT = lib.mkDefault 8000;
+      GRANIAN_STATIC_PATH_MOUNT = "${pkg}/lib/glitchtip/static";
+      GRANIAN_WORKERS = lib.mkDefault 1;
+      PYTHONPATH = "${python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/glitchtip";
+      PYTHONUNBUFFERED = lib.mkDefault 1;
+    }
+    // lib.optionalAttrs cfg.database.createLocally { DATABASE_URL = "postgresql://@/glitchtip"; }
+    // lib.optionalAttrs cfg.redis.createLocally {
+      REDIS_URL = "unix://${config.services.redis.servers.glitchtip.unixSocket}";
     };
 
     systemd.services =
       let
         commonService = {
           wantedBy = [ "multi-user.target" ];
-
           wants = [ "network-online.target" ];
           requires =
             lib.optional cfg.database.createLocally "postgresql.target"
@@ -235,31 +248,40 @@ in
       {
         glitchtip = commonService // {
           description = "GlitchTip";
+          environment =
+            environment
+            // lib.optionalAttrs (cfg.settings.ENABLE_OBSERVABILITY_API && cfg.settings.WORKERS > 1) {
+              PROMETHEUS_MULTIPROC_DIR = "/tmp/prometheus_multiproc";
+            };
+          bindsTo = [ "glitchtip-worker.service" ];
+          before = [ "glitchtip-worker.service" ];
 
           preStart = ''
             ${lib.getExe pkg} migrate
+            ${lib.getExe pkg} createcachetable
+            ${lib.getExe pkg} maintain_partitions
           '';
 
           serviceConfig = commonServiceConfig // {
             ExecStart = ''
-              ${lib.getExe python.pkgs.gunicorn} \
-                --bind=${cfg.listenAddress}:${toString cfg.port} \
-                ${lib.concatStringsSep " " cfg.gunicorn.extraArgs} \
-                glitchtip.wsgi
+              ${lib.getExe python.pkgs.granian} \
+                --interface ${if cfg.settings.GLITCHTIP_ENABLE_MCP then "asgi" else "asginl"} \
+                glitchtip.asgi:application \
+                --host ${cfg.settings.GRANIAN_HOST} \
+                --port ${toString cfg.settings.GRANIAN_PORT} \
+                --workers ${toString cfg.settings.GRANIAN_WORKERS} \
+                --no-ws
             '';
           };
         };
 
         glitchtip-worker = commonService // {
           description = "GlitchTip Job Runner";
-
+          environment = environment // {
+            IS_WORKER = "1";
+          };
           serviceConfig = commonServiceConfig // {
-            ExecStart = ''
-              ${lib.getExe python.pkgs.celery} \
-                -A glitchtip worker \
-                -B -s /run/glitchtip/celerybeat-schedule \
-                ${lib.concatStringsSep " " cfg.celery.extraArgs}
-            '';
+            ExecStart = "${lib.getExe pkg} runworker --scheduler";
           };
         };
       };
@@ -289,15 +311,13 @@ in
 
     systemd.tmpfiles.settings.glitchtip."${cfg.stateDir}/uploads".d = { inherit (cfg) user group; };
 
-    environment.systemPackages =
-      let
-        glitchtip-manage = pkgs.writeShellScriptBin "glitchtip-manage" ''
-          set -o allexport
-          ${lib.toShellVars environment}
-          ${lib.concatMapStringsSep "\n" (f: "source ${f}") cfg.environmentFiles}
-          ${config.security.wrapperDir}/sudo -E -u ${cfg.user} ${lib.getExe pkg} "$@"
-        '';
-      in
-      [ glitchtip-manage ];
+    environment.systemPackages = [
+      (pkgs.writeShellScriptBin "glitchtip-manage" ''
+        set -o allexport
+        ${lib.toShellVars environment}
+        ${lib.concatMapStringsSep "\n" (f: "source ${f}") cfg.environmentFiles}
+        ${config.security.wrapperDir}/sudo -E -u ${cfg.user} ${lib.getExe pkg} "$@"
+      '')
+    ];
   };
 }
diff --git a/nixos/tests/glitchtip.nix b/nixos/tests/glitchtip.nix
index 21b3a0197c48..d409562c904a 100644
--- a/nixos/tests/glitchtip.nix
+++ b/nixos/tests/glitchtip.nix
@@ -16,7 +16,7 @@ in
     {
       services.glitchtip = {
         enable = true;
-        port = 8000;
+        settings.GRANIAN_PORT = 8000;
         settings.GLITCHTIP_DOMAIN = domain;
         environmentFiles = [
           (builtins.toFile "glitchtip.env" ''
@@ -31,7 +31,7 @@ in
     };
 
   interactive.nodes.machine = {
-    services.glitchtip.listenAddress = "0.0.0.0";
+    services.glitchtip.settings.GRANIAN_HOST = "0.0.0.0";
     networking.firewall.allowedTCPPorts = [ 8000 ];
     virtualisation.forwardPorts = [
       {
diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index 07f14a72c636..2642e460075c 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -5,22 +5,27 @@
   fetchNpmDeps,
   jq,
   moreutils,
+  nodejs_22,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "5.2.1";
+  version = "6.0.9";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aqGgaVjJogG3mDooQVpR59SR0HDuMPfKuB1i0Z/AMs8=";
+    hash = "sha256-NbAsiyX1nJLqhqEmkSHc2IlVdgKDqximhAQSJPEM2QM=";
   };
 
+  nodejs = nodejs_22;
+
   npmDeps = fetchNpmDeps {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-urho5XwUJL7m8/xxv9EvH0MxQIW5TG7nOBSIa77RhJc=";
+    npmDepsFetcherVersion = 3;
+    hash = "sha256-CH8fGLppFp+uivhx3gpo8vNAYHtCv0EBTLKGUAhrvSw=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 1c420539e06b..a1e6925ef369 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -2,7 +2,6 @@
   lib,
   python313,
   fetchFromGitLab,
-  fetchPypi,
   callPackage,
   stdenv,
   makeWrapper,
@@ -13,19 +12,7 @@ let
   python = python313.override {
     self = python;
     packageOverrides = final: prev: {
-      django = final.django_5;
-      django-csp = prev.django-csp.overridePythonAttrs rec {
-        version = "4.0";
-        src = fetchPypi {
-          inherit version;
-          pname = "django_csp";
-          hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM=";
-        };
-      };
-      django-ninja-cursor-pagination = prev.django-ninja-cursor-pagination.overridePythonAttrs {
-        # checks are failing with django 5
-        doCheck = false;
-      };
+      django = final.django_6;
     };
   };
 
@@ -36,14 +23,11 @@ let
       anonymizeip
       boto3
       brotli
-      celery
-      celery-batches
       cxxfilt
       django
       django-allauth
       django-anymail
       django-cors-headers
-      django-csp
       django-environ
       django-extensions
       django-import-export
@@ -55,21 +39,24 @@ let
       django-prometheus
       django-storages
       django-valkey
+      django-vcache
+      django-vtasks
+      duckdb
       google-cloud-logging
       granian
-      gunicorn
+      mcp
+      minidump
       orjson
       psycopg
       pydantic
       sentry-sdk
       symbolic
       user-agents
-      uvicorn
+      uuid6
       uwsgi-chunked
       whitenoise
     ]
-    ++ celery.optional-dependencies.redis
-    ++ celery.optional-dependencies.sqlalchemy
+    ++ lib.optional (pythonOlder "3.14") zstandard
     ++ django-allauth.optional-dependencies.headless-spec
     ++ django-allauth.optional-dependencies.mfa
     ++ django-allauth.optional-dependencies.socialaccount
@@ -78,8 +65,10 @@ let
     ++ django-storages.optional-dependencies.google
     ++ django-valkey.optional-dependencies.libvalkey
     ++ django-valkey.optional-dependencies.lz4
+    ++ django-vtasks.optional-dependencies.valkey
     ++ granian.optional-dependencies.reload
     ++ granian.optional-dependencies.uvloop
+    ++ mcp.optional-dependencies.cli
     ++ psycopg.optional-dependencies.c
     ++ psycopg.optional-dependencies.pool
     ++ pydantic.optional-dependencies.email;
@@ -89,14 +78,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "5.2.1";
+  version = "6.0.9";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FxkIbSrIyvLnD9n/Cb2udOhsnoC/bwGAfCRB1L/fhwo=";
+    hash = "sha256-cv83nqoJob8rvBOFDUIr8kVSZQesG/ml+6n7yuZqP90=";
   };
 
   propagatedBuildInputs = pythonPackages;

From 7bfe8919ea506c42ba0cc0c9513a7e523eb92eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 5 Mar 2025 01:21:49 +0100
Subject: [PATCH 134/389] nixos/glitchtip: add nginx.createLocally option

---
 nixos/modules/services/web-apps/glitchtip.nix | 49 ++++++++++++++++---
 nixos/tests/glitchtip.nix                     | 25 ++++++----
 pkgs/by-name/gl/glitchtip/package.nix         |  8 +++
 3 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index e32af666bc06..3660b83807bd 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -53,7 +53,7 @@ in
 
       settings = lib.mkOption {
         description = ''
-          Configuration of GlitchTip. See <https://glitchtip.com/documentation/install#configuration> for more information.
+          Configuration of GlitchTip. See <https://glitchtip.com/documentation/install#configuration> for more information and required settings.
         '';
         default = { };
         defaultText = lib.literalExpression ''
@@ -61,6 +61,7 @@ in
             DEBUG = 0;
             DEBUG_TOOLBAR = 0;
             DATABASE_URL = lib.mkIf config.services.glitchtip.database.createLocally "postgresql://@/glitchtip";
+            GLITCHTIP_DOMAIN = lib.mkIf config.services.glitchtip.nginx.createLocally "https://''${config.services.glitchtip.nginx.domain}";
             GLITCHTIP_VERSION = config.services.glitchtip.package.version;
             GRANIAN_HOST = "127.0.0.1";
             GRANIAN_PORT = 8000;
@@ -71,6 +72,7 @@ in
           }
         '';
         example = {
+          GLITCHTIP_DOMAIN = "https://glitchtip.example.com";
           DATABASE_URL = "postgres://postgres:postgres@postgres/postgres";
         };
 
@@ -84,6 +86,13 @@ in
             ]);
 
           options = {
+            GLITCHTIP_DOMAIN = lib.mkOption {
+              type = lib.types.nullOr lib.types.str;
+              description = "The URL under which GlitchTip is externally reachable.";
+              example = "https://glitchtip.example.com";
+              default = null;
+            };
+
             GLITCHTIP_ENABLE_MCP = lib.mkOption {
               type = lib.types.bool;
               description = "Whether to enable the MCP api.";
@@ -135,17 +144,31 @@ in
       database.createLocally = lib.mkOption {
         type = lib.types.bool;
         default = true;
-        description = ''
-          Whether to enable and configure a local PostgreSQL database server.
-        '';
+        description = "Whether to enable and configure a local PostgreSQL database server.";
+      };
+
+      nginx = {
+        createLocally = lib.mkOption {
+          type = lib.types.bool;
+          default = false;
+          description = "Whether to enable and configure a local Nginx server.";
+        };
+
+        domain = lib.mkOption {
+          type = lib.types.str;
+          example = "glitchtip.example.com";
+          description = ''
+            Domain under which GlitchTip will be reachable.
+            In contrast to `settings.GLITCHTIP_DOMAIN` this option has no protocol.
+            It will also set `settings.GLITCHTIP_DOMAIN` with the `https://` protocol.
+          '';
+        };
       };
 
       redis.createLocally = lib.mkOption {
         type = lib.types.bool;
         default = true;
-        description = ''
-          Whether to enable and configure a local Redis instance.
-        '';
+        description = "Whether to enable and configure a local Redis instance.";
       };
     };
   };
@@ -180,6 +203,7 @@ in
       PYTHONUNBUFFERED = lib.mkDefault 1;
     }
     // lib.optionalAttrs cfg.database.createLocally { DATABASE_URL = "postgresql://@/glitchtip"; }
+    // lib.optionalAttrs cfg.nginx.createLocally { GLITCHTIP_DOMAIN = "https://${cfg.nginx.domain}"; }
     // lib.optionalAttrs cfg.redis.createLocally {
       REDIS_URL = "unix://${config.services.redis.servers.glitchtip.unixSocket}";
     };
@@ -286,6 +310,17 @@ in
         };
       };
 
+    services.nginx = lib.mkIf cfg.nginx.createLocally {
+      enable = true;
+      virtualHosts.${cfg.nginx.domain} = {
+        forceSSL = lib.mkDefault true;
+        locations = {
+          "/".proxyPass = "http://${cfg.settings.GRANIAN_HOST}:${toString cfg.settings.GRANIAN_PORT}";
+          "/static/".root = "${pkg}/lib/glitchtip";
+        };
+      };
+    };
+
     services.postgresql = lib.mkIf cfg.database.createLocally {
       enable = true;
       ensureDatabases = [ "glitchtip" ];
diff --git a/nixos/tests/glitchtip.nix b/nixos/tests/glitchtip.nix
index d409562c904a..149873726bef 100644
--- a/nixos/tests/glitchtip.nix
+++ b/nixos/tests/glitchtip.nix
@@ -1,7 +1,8 @@
 { lib, ... }:
 
 let
-  domain = "http://glitchtip.local:8000";
+  domain = "glitchtip.local";
+  url = "http://${domain}";
 in
 
 {
@@ -16,8 +17,10 @@ in
     {
       services.glitchtip = {
         enable = true;
-        settings.GRANIAN_PORT = 8000;
-        settings.GLITCHTIP_DOMAIN = domain;
+        nginx.createLocally = true;
+        nginx.domain = domain;
+        settings.GLITCHTIP_DOMAIN = lib.mkForce url;
+        settings.CSRF_TRUSTED_ORIGINS = "${url},http://localhost:8000";
         environmentFiles = [
           (builtins.toFile "glitchtip.env" ''
             SECRET_KEY=8Hz7YCGzo7fiicHb8Qr22ZqwoIB7lSRx
@@ -25,19 +28,23 @@ in
         ];
       };
 
+      services.nginx.virtualHosts.${domain}.forceSSL = false;
+
       environment.systemPackages = [ pkgs.sentry-cli ];
 
-      networking.hosts."127.0.0.1" = [ "glitchtip.local" ];
+      networking.hosts."127.0.0.1" = [ domain ];
     };
 
+  interactive.sshBackdoor.enable = true;
+  interactive.defaults.virtualisation.graphics = false;
+
   interactive.nodes.machine = {
-    services.glitchtip.settings.GRANIAN_HOST = "0.0.0.0";
-    networking.firewall.allowedTCPPorts = [ 8000 ];
+    networking.firewall.allowedTCPPorts = [ 80 ];
     virtualisation.forwardPorts = [
       {
         from = "host";
         host.port = 8000;
-        guest.port = 8000;
+        guest.port = 80;
       }
     ];
   };
@@ -53,7 +60,7 @@ in
       machine.wait_for_unit("glitchtip-worker.service")
       machine.wait_for_open_port(8000)
 
-      origin_url = "${domain}"
+      origin_url = "${url}"
       cookie_jar_path = "/tmp/cookies.txt"
       curl = f"curl -b {cookie_jar_path} -c {cookie_jar_path} -fS -H 'Origin: {origin_url}'"
 
@@ -89,7 +96,7 @@ in
       # fetch dsn
       resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/projects/main/test/keys/"))
       assert len(resp) == 1
-      assert re.match(r"^http://[\da-f]+@glitchtip\.local:8000/\d+$", dsn := resp[0]["dsn"]["public"])
+      assert re.match(r"^http://[\da-f]+@glitchtip\.local/\d+$", dsn := resp[0]["dsn"]["public"])
 
       # send event
       machine.succeed(f"SENTRY_DSN={dsn} sentry-cli send-event -m 'hello world'")
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index a1e6925ef369..56ba28f73bc0 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -88,6 +88,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cv83nqoJob8rvBOFDUIr8kVSZQesG/ml+6n7yuZqP90=";
   };
 
+  postPatch = ''
+    echo 'import os
+    ALLAUTH_TRUSTED_CLIENT_IP_HEADER = os.getenv(
+        "ALLAUTH_TRUSTED_CLIENT_IP_HEADER",
+        None
+    )' >> glitchtip/settings.py
+  '';
+
   propagatedBuildInputs = pythonPackages;
 
   nativeBuildInputs = [

From c56016bab787ca577550d1cd8df42728a2d4c667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 7 Apr 2026 17:16:24 +0200
Subject: [PATCH 135/389] glitchtip: 6.0.9 -> 6.1.4; glitchtip.frontend: 6.0.9
 -> 6.1.5

Diff: https://gitlab.com/glitchtip/glitchtip-backend/-/compare/v6.0.9...v6.1.4
Changelog: https://gitlab.com/glitchtip/glitchtip-backend/-/blob/v6.1.4/CHANGELOG

Diff: https://gitlab.com/glitchtip/glitchtip-frontend/-/compare/v6.0.9...6.1.5
Changelog: https://gitlab.com/glitchtip/glitchtip-frontend/-/releases/v6.1.5
---
 pkgs/by-name/gl/glitchtip/frontend.nix |  6 +++---
 pkgs/by-name/gl/glitchtip/package.nix  | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index 2642e460075c..23e6504dd076 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -10,13 +10,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "6.0.9";
+  version = "6.1.5";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NbAsiyX1nJLqhqEmkSHc2IlVdgKDqximhAQSJPEM2QM=";
+    hash = "sha256-YngWs12wJLi3NgRT3RhGYy38dhOqBATYPMsXEbeoycU=";
   };
 
   nodejs = nodejs_22;
@@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     npmDepsFetcherVersion = 3;
-    hash = "sha256-CH8fGLppFp+uivhx3gpo8vNAYHtCv0EBTLKGUAhrvSw=";
+    hash = "sha256-8T2Ci8S0YHyzY1jjgcNXt5mxUy/4toJrD2edUxtJz3M=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 56ba28f73bc0..0f02c9d83c0f 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  python313,
+  python314,
   fetchFromGitLab,
   callPackage,
   stdenv,
@@ -9,7 +9,7 @@
 }:
 
 let
-  python = python313.override {
+  python = python314.override {
     self = python;
     packageOverrides = final: prev: {
       django = final.django_6;
@@ -21,6 +21,8 @@ let
     [
       aiohttp
       anonymizeip
+      arro3-core
+      arro3-io
       boto3
       brotli
       cxxfilt
@@ -38,7 +40,6 @@ let
       django-postgres-partition
       django-prometheus
       django-storages
-      django-valkey
       django-vcache
       django-vtasks
       duckdb
@@ -56,15 +57,12 @@ let
       uwsgi-chunked
       whitenoise
     ]
-    ++ lib.optional (pythonOlder "3.14") zstandard
     ++ django-allauth.optional-dependencies.headless-spec
     ++ django-allauth.optional-dependencies.mfa
     ++ django-allauth.optional-dependencies.socialaccount
     ++ django-storages.optional-dependencies.boto3
     ++ django-storages.optional-dependencies.azure
     ++ django-storages.optional-dependencies.google
-    ++ django-valkey.optional-dependencies.libvalkey
-    ++ django-valkey.optional-dependencies.lz4
     ++ django-vtasks.optional-dependencies.valkey
     ++ granian.optional-dependencies.reload
     ++ granian.optional-dependencies.uvloop
@@ -78,14 +76,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "6.0.9";
+  version = "6.1.4";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cv83nqoJob8rvBOFDUIr8kVSZQesG/ml+6n7yuZqP90=";
+    hash = "sha256-wju/QbIwdtNYQmRppCfjoaqb++spFZbqAsvBwwZyeUM=";
   };
 
   postPatch = ''

From 40ff0f1e7411b6af4f8384bcabc8f6b873477036 Mon Sep 17 00:00:00 2001
From: Ruben de Schipper <rubendeschipper@gmail.com>
Date: Tue, 7 Apr 2026 20:38:26 +0200
Subject: [PATCH 136/389] c2000-cgt: 22.6.1.LTS -> 25.11.0.LTS

https://software-dl.ti.com/codegen/esd/cgt_public_sw/C2000/25.11.0.LTS/README.html
---
 pkgs/by-name/c2/c2000-cgt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/c2/c2000-cgt/package.nix b/pkgs/by-name/c2/c2000-cgt/package.nix
index d322b8d7a283..fa3fe50188b4 100644
--- a/pkgs/by-name/c2/c2000-cgt/package.nix
+++ b/pkgs/by-name/c2/c2000-cgt/package.nix
@@ -12,11 +12,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "c2000-cgt";
-  version = "22.6.1.LTS";
+  version = "25.11.0.LTS";
 
   src = fetchurl {
     url = "https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-xqxJ05PLfM/${finalAttrs.version}/ti_cgt_c2000_${finalAttrs.version}_linux-x64_installer.bin";
-    hash = "sha256-h+exdlyD7Bj3LZTDVME8jHesInaUUUUmFiIKJR+rM9o=";
+    hash = "sha256-vkxV7/D3I4Uf7q3KBwdjEq9rn4DTPNMUm1NSuMYQEbM=";
   };
 
   dontUnpack = true;

From b95570397e1417272da4bedaa42331596434850e Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 8 Apr 2026 02:17:30 +0700
Subject: [PATCH 137/389] papra: 26.2.2 -> 26.4.0

---
 pkgs/by-name/pa/papra/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/papra/package.nix b/pkgs/by-name/pa/papra/package.nix
index 2853e4f2cf82..ed13e14bebda 100644
--- a/pkgs/by-name/pa/papra/package.nix
+++ b/pkgs/by-name/pa/papra/package.nix
@@ -17,12 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "papra";
-  version = "26.2.2";
+  version = "26.4.0";
+
   src = fetchFromGitHub {
     owner = "papra-hq";
     repo = "papra";
     tag = "@papra/app@${finalAttrs.version}";
-    hash = "sha256-0MIar+fBwXRE8LlVLZDx/C0GOYVpobDTqFwkMs2k06Y=";
+    hash = "sha256-wQdDBS+QRarZhEIRmLQ4VRtq73I5YFIN2P3ZtAZWvxw=";
   };
 
   nativeBuildInputs = [
@@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm;
     fetcherVersion = 3;
-    hash = "sha256-NQakyRlL6deG13yt+FlmVcVvEkNWHW0Lhf/3NecfwaE=";
+    hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU=";
     pnpmWorkspaces = [
       "@papra/app-client..."
       "@papra/app-server..."

From b7b0fa04ab2267a1a2c93b8b1b7a3263daaed89b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 8 Apr 2026 02:18:19 +0700
Subject: [PATCH 138/389] papra: Minor refactor

---
 pkgs/by-name/pa/papra/package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/pa/papra/package.nix b/pkgs/by-name/pa/papra/package.nix
index ed13e14bebda..8db20eac2306 100644
--- a/pkgs/by-name/pa/papra/package.nix
+++ b/pkgs/by-name/pa/papra/package.nix
@@ -26,6 +26,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-wQdDBS+QRarZhEIRmLQ4VRtq73I5YFIN2P3ZtAZWvxw=";
   };
 
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU=";
+    pnpmWorkspaces = [
+      "@papra/app-client..."
+      "@papra/app-server..."
+    ];
+  };
+
   nativeBuildInputs = [
     makeBinaryWrapper
     nodejs
@@ -81,17 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    pnpm = pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU=";
-    pnpmWorkspaces = [
-      "@papra/app-client..."
-      "@papra/app-server..."
-    ];
-  };
-
   meta = {
     description = "Open-source document management platform designed to help you organize, secure, and archive your files effortlessly.";
     homepage = "https://papra.app/";

From a5f1fae77b9560e1b49879ead359e59c7ab9f204 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 8 Apr 2026 02:19:36 +0700
Subject: [PATCH 139/389] papra: add miniharinn as a maintainer

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

diff --git a/pkgs/by-name/pa/papra/package.nix b/pkgs/by-name/pa/papra/package.nix
index 8db20eac2306..267178a7f302 100644
--- a/pkgs/by-name/pa/papra/package.nix
+++ b/pkgs/by-name/pa/papra/package.nix
@@ -97,6 +97,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://papra.app/";
     changelog = "https://github.com/papra-hq/papra/releases";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ wariuccio ];
+    maintainers = with lib.maintainers; [
+      wariuccio
+      miniharinn
+    ];
   };
 })

From acf557b1f888248ad8b377787e7c3c8027511b6b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 8 Apr 2026 02:22:27 +0700
Subject: [PATCH 140/389] papra: add nix-update-script

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

diff --git a/pkgs/by-name/pa/papra/package.nix b/pkgs/by-name/pa/papra/package.nix
index 267178a7f302..a533cf5bf351 100644
--- a/pkgs/by-name/pa/papra/package.nix
+++ b/pkgs/by-name/pa/papra/package.nix
@@ -11,6 +11,7 @@
   vips,
   pkg-config,
   python3,
+  nix-update-script,
 }:
 let
   pnpm = pnpm_10;
@@ -92,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Open-source document management platform designed to help you organize, secure, and archive your files effortlessly.";
     homepage = "https://papra.app/";

From 46c1e9560b3e19f9e2797f0538f04a0f8e4e37e4 Mon Sep 17 00:00:00 2001
From: nuexq <nuexqq@gmail.com>
Date: Wed, 11 Mar 2026 23:01:12 +0000
Subject: [PATCH 141/389] ioskeley-mono: init at v2.0.0-beta.1

---
 pkgs/data/fonts/ioskeley-mono/default.nix | 95 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 97 insertions(+)
 create mode 100644 pkgs/data/fonts/ioskeley-mono/default.nix

diff --git a/pkgs/data/fonts/ioskeley-mono/default.nix b/pkgs/data/fonts/ioskeley-mono/default.nix
new file mode 100644
index 000000000000..f2b43e69e84c
--- /dev/null
+++ b/pkgs/data/fonts/ioskeley-mono/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  installFonts,
+}:
+
+let
+  version = "v2.0.0-beta.1";
+
+  mkFont =
+    {
+      width,
+      hash,
+      isNF ? false,
+      variant ? "Hinted",
+    }:
+    let
+      variantName = lib.toLower width;
+      pkgSuffix = if isNF then "${variantName}-NF" else variantName;
+      fileName = "IoskeleyMono-${if isNF then "NerdFont-" else ""}${width}.zip";
+    in
+    stdenvNoCC.mkDerivation {
+      pname = "ioskeley-mono-${pkgSuffix}";
+      inherit version;
+
+      src = fetchzip {
+        url = "https://github.com/ahatem/IoskeleyMono/releases/download/${version}/${fileName}";
+        stripRoot = false;
+        inherit hash;
+      };
+      sourceRoot = if isNF then "." else "source/${variant}";
+
+      nativeBuildInputs = [ installFonts ];
+
+      fontDirectories = [
+        "."
+        "Hinted"
+      ];
+
+      meta = {
+        homepage = "https://github.com/ahatem/IoskeleyMono";
+        description = "Iosevka configuration mimicking Berkeley Mono (${width}${
+          if isNF then ", Nerd Font" else ""
+        })";
+        license = lib.licenses.ofl;
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [ nuexq ];
+      };
+    };
+in
+{
+  normal = mkFont {
+    width = "Normal";
+    hash = "sha256-ZuV4yg6H0SayGo3LB2Naqn4axR0Lnmw95u/jiRk5B/U=";
+  };
+  normal-unhinted = mkFont {
+    width = "Normal";
+    hash = "sha256-ZuV4yg6H0SayGo3LB2Naqn4axR0Lnmw95u/jiRk5B/U=";
+    variant = "Unhinted";
+  };
+  semiCondensed = mkFont {
+    width = "SemiCondensed";
+    hash = "sha256-fOuQmf+ANuKy3kaLRbAu9RIsL3rORGJUlR/BerDg60U=";
+  };
+  semiCondensed-unhinted = mkFont {
+    width = "SemiCondensed";
+    hash = "sha256-fOuQmf+ANuKy3kaLRbAu9RIsL3rORGJUlR/BerDg60U=";
+    variant = "Unhinted";
+  };
+  condensed = mkFont {
+    width = "Condensed";
+    hash = "sha256-bzEh9YvbERZrIvXZPopHwhkSe87y3MdHhLaRGWLvTQU=";
+  };
+  condensed-unhinted = mkFont {
+    width = "Condensed";
+    hash = "sha256-bzEh9YvbERZrIvXZPopHwhkSe87y3MdHhLaRGWLvTQU=";
+    variant = "Unhinted";
+  };
+  normal-NF = mkFont {
+    width = "Normal";
+    hash = "sha256-rhSU4Md6D7hLT6EeH3TMetPgQGuiYowpYVaZqewGgh8=";
+    isNF = true;
+  };
+  semiCondensed-NF = mkFont {
+    width = "SemiCondensed";
+    hash = "sha256-W1ykPzdsoXfRBJ5YuxrjOc/J7uzwLQRjZTc9G2cj06Y=";
+    isNF = true;
+  };
+  condensed-NF = mkFont {
+    width = "Condensed";
+    hash = "sha256-TAneNRImlRNsvTr6xDCG+VKFycttbTxkP6hfh9Kr+X4=";
+    isNF = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 258346a41025..2717e9dea625 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3002,6 +3002,8 @@ with pkgs;
     hdf5 = hdf5-mpi.override { usev110Api = true; };
   };
 
+  ioskeley-mono = recurseIntoAttrs (callPackage ../data/fonts/ioskeley-mono { });
+
   # Not in aliases because it wouldn't get picked up by callPackage
   netbox = netbox_4_4;
 

From 2105d00c3414f882e238f2a50ceace4f0a209a92 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Tue, 7 Apr 2026 12:51:37 +0200
Subject: [PATCH 142/389] nodePackages: print helpful error message

---
 pkgs/top-level/aliases.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 76007cb15d3c..36708c204366 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1476,8 +1476,8 @@ mapAliases {
   nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
   node2nix = throw "node2nix has been removed because it was only used to maintain the now-removed nodePackages set. Use the newer builders in nixpkgs instead, such as buildNpmPackage"; # Added 2026-03-03
-  nodePackages = throw "nodePackages has been removed because it was unmaintainable within nixpkgs"; # Added 2026-03-03
-  nodePackages_latest = throw "nodePackages has been removed because it was unmaintainable within nixpkgs"; # Added 2026-03-03
+  nodePackages = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
+  nodePackages_latest = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
   nofi = throw "'nofi' has been removed due to being archived upstream."; # Added 2026-01-16
   nomacs-qt6 = nomacs; # Added 2025-08-30
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29

From e765057e363dd3812a79f1acb4ed680e83ddfcbd Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 8 Apr 2026 10:29:36 +0200
Subject: [PATCH 143/389] tix: init at 0-unstable-2026-04-07

---
 pkgs/by-name/ti/tix/package.nix | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix      |  1 -
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ti/tix/package.nix

diff --git a/pkgs/by-name/ti/tix/package.nix b/pkgs/by-name/ti/tix/package.nix
new file mode 100644
index 000000000000..040b48e45f14
--- /dev/null
+++ b/pkgs/by-name/ti/tix/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tix";
+  version = "0-unstable-2026-04-07";
+
+  src = fetchFromGitHub {
+    owner = "JRMurr";
+    repo = "tix";
+    rev = "6088dff2cc837ebf5e8c99494d7af8cc87150859";
+    hash = "sha256-Zt0gSt/C1M4ue7K+CjcEyXk4+ox8m+AD3pDArOP2GAs=";
+  };
+
+  cargoHash = "sha256-6fPg5hvbBLDMnIHalJL1oTkKFrTCB4IDnCRYGa94J9E=";
+
+  # Disabling failing tests:
+  # - thread 'generate_module_stub_from_evalmodules_and_use_it' (12980) panicked at crates/cli/tests/custom_stubs.rs:39:10:
+  # - thread 'formatting_returns_edits' (14384) panicked at crates/lsp/tests/e2e_formatting.rs:23:23:
+  checkFlags = [
+    "--skip=generate_module_stub_from_evalmodules_and_use_it"
+    "--skip=formatting_returns_edits"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A nix type checker/lsp";
+    homepage = "https://github.com/JRMurr/tix";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "tix";
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 76007cb15d3c..2e1f2ced6343 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1980,7 +1980,6 @@ mapAliases {
   ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10
   timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
   tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
-  tix = throw "'tix' has been renamed to/replaced by 'tclPackages.tix'"; # Converted to throw 2025-10-27
   tkcvs = throw "'tkcvs' has been renamed to/replaced by 'tkrev'"; # Converted to throw 2025-10-27
   tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
   tkimg = throw "'tkimg' has been renamed to/replaced by 'tclPackages.tkimg'"; # Converted to throw 2025-10-27

From 6d954779b0008c582b21e309675084aa96aa9be8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 10:55:08 +0000
Subject: [PATCH 144/389] assemblyscript: 0.28.2 -> 0.28.13

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

diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix
index cfde0ada2247..0d1b3c310c5d 100644
--- a/pkgs/by-name/as/assemblyscript/package.nix
+++ b/pkgs/by-name/as/assemblyscript/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "assemblyscript";
-  version = "0.28.2";
+  version = "0.28.13";
 
   src = fetchFromGitHub {
     owner = "AssemblyScript";
     repo = "assemblyscript";
     rev = "v${version}";
-    hash = "sha256-8nY3Rst6i+RGW+kfjn/QSbYkaZf67k/KwuyIp40fCSM=";
+    hash = "sha256-AN9W6IYmMFFiD1Au3uW+7jr2xOwVcOGd5e61cqVNnbs=";
   };
 
-  npmDepsHash = "sha256-wj/PMoqUBjXqz8/KOFAH5P5eFty3pztpQ8inGIy+ve4=";
+  npmDepsHash = "sha256-5s420YWTc4bZ5oZRBjinw4lAfMTPrnrIWx4IM3Ysuqo=";
 
   meta = {
     homepage = "https://github.com/AssemblyScript/assemblyscript";

From a8c9c955c4473cba05f9f6f6ac8596ad9e20d7d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 11:49:01 +0000
Subject: [PATCH 145/389] docker: 29.3.1 -> 29.4.0

---
 pkgs/applications/virtualization/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 4b2cdc73968d..807e35cabb65 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -438,16 +438,16 @@ in
 
   docker_29 =
     let
-      version = "29.3.1";
+      version = "29.4.0";
     in
     callPackage dockerGen {
       inherit version;
       cliRev = "v${version}";
-      cliHash = "sha256-K6aUHPprl5U99610UVHpLH8poWfTNF+FvQZbcPg6/E0=";
+      cliHash = "sha256-ObuRuiC1+2E7PMMgoXC6SEi6zsdRqVvGCDvP7J/Ws28=";
       mobyRev = "docker-v${version}";
-      mobyHash = "sha256-DPWb8kg5GUv2qDyEBfvBH4LBOVCUl0//oEYzLwv2l1I=";
-      runcRev = "v1.3.4";
-      runcHash = "sha256-1IfY08sBoDpbLrwz1AKBRSTuCZyOgQzYPHTDUI6fOZ8=";
+      mobyHash = "sha256-Pot3N+AvxIYG5Vg3AQK3I0jegCW4bmC0OimsGnVCiuQ=";
+      runcRev = "v1.3.5";
+      runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
       containerdRev = "v2.2.2";
       containerdHash = "sha256-1jYiyNHR1sXBwXdS33KWE+IB1tOZbiJyUxhsVeXwSrc=";
       tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";

From 481f6ef36a001e3fedb471781c6b6415373c1c14 Mon Sep 17 00:00:00 2001
From: i-do-cpp <62053234+i-do-cpp@users.noreply.github.com>
Date: Wed, 8 Apr 2026 16:00:00 +0200
Subject: [PATCH 146/389] versatiles: 3.8.1 -> 3.9.0

---
 pkgs/by-name/ve/versatiles/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index 4aaabf78ae42..fa93ebf8a8ef 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -1,22 +1,35 @@
 {
   lib,
   fetchFromGitHub,
+  openssl,
+  pkg-config,
   rustPlatform,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "versatiles";
-  version = "3.8.1";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P1r+UzqMiu1BqXv+ORhUojKzjcl0kb9gBTBi6PseP0s=";
+    hash = "sha256-Ea72mCqwXs5lwqIk5W1JfCxsRLYsodzaFGoCEExejCc=";
   };
 
-  cargoHash = "sha256-fju6aWh6HfVnVN60M0+LmGDBxdgDSaLl+iQ358vmYm8=";
+  cargoHash = "sha256-K75b/mYQ+YijUmQ+1VZv97nCZ3xCO67f0QcuFDI9atU=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  # Needed to get openssl-sys to use pkg-config.
+  env.OPENSSL_NO_VENDOR = 1;
 
   __darwinAllowLocalNetworking = true;
 

From 4c64686afa2e63ad9450414521bca04cc7b57639 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 15:07:53 +0000
Subject: [PATCH 147/389] python3Packages.django-allauth: 65.15.0 -> 65.15.1

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

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 72fbe2e260df..dcbde3056040 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.15.0";
+  version = "65.15.1";
   pyproject = true;
 
   src = fetchFromCodeberg {
     owner = "allauth";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-SInfSvo1/EyvOf28hYxO0WcBC+c5hfjjSStCaTcV+io=";
+    hash = "sha256-F36Grbyk5jyvEvK+wQtB8rrq9LMSVJCQjdHkRfdKLlM=";
   };
 
   nativeBuildInputs = [ gettext ];

From b24b8e21e2ca365a323d7915d5764b65ee3275f2 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 8 Apr 2026 09:23:41 -0500
Subject: [PATCH 148/389] podman-desktop: 1.23.1 -> 1.26.2

This includes fix for:
https://nvd.nist.gov/vuln/detail/CVE-2026-34045

Fixes #507930
---
 pkgs/by-name/po/podman-desktop/package.nix    | 15 +++++++-----
 .../podman-desktop/system-defaults-dir.patch  | 23 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index ae7c66d7e09a..92b1651bbded 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeBinaryWrapper,
   copyDesktopItems,
-  electron_39,
+  electron_41,
   nodejs,
   pnpm_10_29_2,
   fetchPnpmDeps,
@@ -21,12 +21,12 @@
 }:
 
 let
-  electron = electron_39;
+  electron = electron_41;
   appName = "Podman Desktop";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
-  version = "1.23.1";
+  version = "1.26.2";
 
   passthru.updateScript = _experimental-update-script-combinators.sequence [
     (nix-update-script { })
@@ -59,14 +59,14 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "containers";
     repo = "podman-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-08boCPsuT09OileZUWhB8awXWHrlJzoER2Bx0WXeOHU=";
+    hash = "sha256-VVyKC1z7YECZlbTaFaq2OwGg0k22qBbn/HEOYiJ8fcw=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10_29_2;
     fetcherVersion = 2;
-    hash = "sha256-nBjAmXzjR0qGCM91UAonQKP0NG7+DXImueSbhbnMK/k=";
+    hash = "sha256-tCp5qLZVo93H8VIToU3mkmwNsVXOAd1IEsL6RlazPXo=";
   };
 
   patches = [
@@ -75,7 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
     ./system-defaults-dir.patch
   ];
 
-  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    ELECTRON_OVERRIDE_DIST_PATH = electron.dist;
+  };
 
   nativeBuildInputs = [
     makeBinaryWrapper
diff --git a/pkgs/by-name/po/podman-desktop/system-defaults-dir.patch b/pkgs/by-name/po/podman-desktop/system-defaults-dir.patch
index f5d0df8d3677..0c5e8df002b1 100644
--- a/pkgs/by-name/po/podman-desktop/system-defaults-dir.patch
+++ b/pkgs/by-name/po/podman-desktop/system-defaults-dir.patch
@@ -1,10 +1,13 @@
-diff --git a/packages/main/src/plugin/managed-by-constants.ts b/packages/main/src/plugin/managed-by-constants.ts
-index 5a20d2de29e..9fea8a17165 100644
---- a/packages/main/src/plugin/managed-by-constants.ts
-+++ b/packages/main/src/plugin/managed-by-constants.ts
-@@ -29,4 +29,4 @@ export const SYSTEM_LOCKED_FILENAME = 'locked.json';
- // Folders for managed defaults on different platforms
- export const SYSTEM_DEFAULTS_FOLDER_MACOS = '/Library/Application Support/io.podman_desktop.PodmanDesktop';
- export const SYSTEM_DEFAULTS_FOLDER_WINDOWS = 'Podman Desktop';
--export const SYSTEM_DEFAULTS_FOLDER_LINUX = '/usr/share/podman-desktop';
-+export const SYSTEM_DEFAULTS_FOLDER_LINUX = '/etc/podman-desktop';
+diff --git a/product.json b/product.json
+index 74b7299ee93..a80fe7373bc 100644
+--- a/product.json
++++ b/product.json
+@@ -8,7 +8,7 @@
+     "managed": {
+       "macOS": "/Library/Application Support/io.podman_desktop.PodmanDesktop",
+       "windows": "%PROGRAMDATA%\\Podman Desktop",
+-      "linux": "/usr/share/podman-desktop",
++      "linux": "/etc/podman-desktop",
+       "flatpak": "/run/host/usr/share/podman-desktop"
+     }
+   },

From b3617563339a07b8c6b107598e71a30d83eaf295 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 8 Apr 2026 09:14:19 -0700
Subject: [PATCH 149/389] rocmPackages.rocprof-compute-viewer: init at 0.1.6

---
 pkgs/development/rocm-modules/default.nix     |  2 +
 .../rocprof-compute-viewer/default.nix        | 53 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/rocprof-compute-viewer/default.nix

diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix
index 01077ced8012..b850135a33ff 100644
--- a/pkgs/development/rocm-modules/default.nix
+++ b/pkgs/development/rocm-modules/default.nix
@@ -88,6 +88,8 @@ let
         inherit (llvm) clang;
       };
 
+      rocprof-compute-viewer = self.callPackage ./rocprof-compute-viewer { };
+
       rocprof-trace-decoder = self.callPackage ./rocprof-trace-decoder { };
 
       roctracer = self.callPackage ./roctracer { };
diff --git a/pkgs/development/rocm-modules/rocprof-compute-viewer/default.nix b/pkgs/development/rocm-modules/rocprof-compute-viewer/default.nix
new file mode 100644
index 000000000000..c14f0966840f
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocprof-compute-viewer/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  nix-update-script,
+  qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocprof-compute-viewer";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "rocprof-compute-viewer";
+    rev = finalAttrs.version;
+    hash = "sha256-hjwqU5TxV4p2EjGy5haQfQqItVtYMI7i/VIfrKZvqhE=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  # tries to use qt_deploy_runtime_dependencies, but wrapQtAppsHook
+  # handles that instead
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'install(SCRIPT ''${deploy_script})' ""
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeFeature "QT_VERSION_MAJOR" "6")
+    (lib.cmakeBool "RCV_DISABLE_OPENGL" true)
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Visualization tool for AMD GPU thread traces from rocprofv3 --att";
+    homepage = "https://github.com/ROCm/rocprof-compute-viewer";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "rocprof-compute-viewer";
+  };
+})

From 3e5a8d1a8c56395e362febf1d6b4c5e1146b572c Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 8 Apr 2026 18:40:37 +0200
Subject: [PATCH 150/389] pkgsStatic.ghc: fix attr pointing to package set
 sometimes

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d494812635f2..b960bde7ed80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4259,7 +4259,7 @@ with pkgs;
       # Prefer native-bignum to avoid linking issues with gmp;
       # GHC 9.10 doesn't work too well with iserv-proxy.
       if stdenv.hostPlatform.isStatic then
-        haskell.packages.native-bignum.ghc912
+        haskell.compiler.native-bignum.ghc912
       # JS backend can't use GMP
       else if stdenv.targetPlatform.isGhcjs then
         haskell.compiler.native-bignum.ghc910

From 36f83f0931305282096de6a6cb5bd11dba10def8 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Wed, 8 Apr 2026 10:48:22 -0700
Subject: [PATCH 151/389] jupp: fix build with gcc15

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

diff --git a/pkgs/by-name/ju/jupp/package.nix b/pkgs/by-name/ju/jupp/package.nix
index e72539894175..0f838bf6420f 100644
--- a/pkgs/by-name/ju/jupp/package.nix
+++ b/pkgs/by-name/ju/jupp/package.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
     "--enable-termidx"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   meta = {
     homepage = "http://www.mirbsd.org/jupp.htm";
     downloadPage = "https://www.mirbsd.org/MirOS/dist/jupp/";

From cda5f482c2665b2c835f3ad2c25b5fe6a6d6cc35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 20:25:25 +0000
Subject: [PATCH 152/389] thunderbird-esr-bin-unwrapped: 140.9.0esr ->
 140.9.1esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index 576fac8f59fc..d5e7cc48d25e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.9.0esr";
+  version = "140.9.1esr";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/af/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/af/thunderbird-140.9.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "5eb9a9ef1ec665446b1bcc8c0901d531c5bad67ae63f5ce81a517d04c4a56ce2";
+      sha256 = "e4849ac86a43a16767466c359d76e01a4205293b91b33bc97533fd4d0dd7fccd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ar/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ar/thunderbird-140.9.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "c13827632f7993dc86ee623bc3d3485ff769dcf237ee04b747b621fc3c2f23c7";
+      sha256 = "59e398ced89144ad747884410e4e87c960edd0d4f87322aec6448167cfc559e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ast/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ast/thunderbird-140.9.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "fbbb6510cae937593b185f8689f03da3c1d93edf824cfb2c598c88656aa74410";
+      sha256 = "845e4c6f6b38fcf5e85fb4a892eb116cc21c9850c4b1d73305e46a2338529eb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/be/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/be/thunderbird-140.9.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "ad27d566272d90eff2f650945826c5a71e943ad0f7059057cb8bd8ae1d9a30eb";
+      sha256 = "82f4471a430bf2e417917140fb8d0df72a0c48e6a6b709371d15f9ca50740279";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/bg/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/bg/thunderbird-140.9.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7510e22126e1e59104f4b6f4aa0c4b27de029e95d530ea1312fd8a419c0eab97";
+      sha256 = "d58fd52a1bee8215b18dcd7179d9e347643676b76c4cd20158c9a26e54417f3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/br/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/br/thunderbird-140.9.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "b99a25b00d0ec92ce74fb172e957a011e1d8076b80700d3219ab3c1b52d18c81";
+      sha256 = "fc482fa9cd23d192ce4df45b058b7a4ebe0543f79840f873953648754a98ce16";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ca/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ca/thunderbird-140.9.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "fb66167fa3c186d81333b46f6af40f95a02030a031caf845295955654f2a2951";
+      sha256 = "bdfc1d79d23c3517896f72b2450775c5f62f00998d6261ad55feec400c93a1ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/cak/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/cak/thunderbird-140.9.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "ccd60ea654ab4182223e74a3cc03ee82c275a0362e37f4e446a11b97b525077a";
+      sha256 = "9736e0490adf9f10641dfae095e965590b4a972ea4721ef53a7bc89be6080f9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/cs/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/cs/thunderbird-140.9.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "97d116d5712b02607e19cf65acc90ab9e4845b9596729d141f48a9a8dc6798d0";
+      sha256 = "a0fcd0dca794bf55adc29d13c4d27aa6e84b16a1a20ce4a7c09d953fcafae7d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/cy/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/cy/thunderbird-140.9.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "cd8ac250616e4f31407a1c30f30bf8132731bf934e011b623bf512d32d4c0e52";
+      sha256 = "d128f64c0aa9dd14233b17061cbbb6ad51eb9aee94768036fa2394659f3c5fe8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/da/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/da/thunderbird-140.9.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "02dad1cd08244571b8d1c609665cecacc16fe8c37f79b7189c8334bb9ac4231f";
+      sha256 = "d835fb9ba5e754a90e593141d386009d4edffc08f5539ea574546a913642c37b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/de/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/de/thunderbird-140.9.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "c624bf5d8696cfa224439d739d5eac2f80ed29be309a52b027c7d73eb9cb8ec4";
+      sha256 = "a04ef2eabeb6bd0a75f6ffa1ee05358558def1d7fb7ac5f6ab4b042a544e7403";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/dsb/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/dsb/thunderbird-140.9.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "c199014f070402516b1106b32e1a2094384ab55205fa533d66fae90adea571b2";
+      sha256 = "1258e80190db4df8cb1ce33160ca3e36833ca8529781186742dafd4bd9685567";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/el/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/el/thunderbird-140.9.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "ddd4d8cda3c7d8d8c79436a57cd457c35e0707275b429d703c4a106f1851fca3";
+      sha256 = "feee2a84265a9062d2777665058e1771997af807e1ac9b418006eca38052d879";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/en-CA/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/en-CA/thunderbird-140.9.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "a342e46b35116136e2c58f40a065a8292da045726ef078d19bb3f416d98fc22c";
+      sha256 = "98d5a6ebfba12c196f7ee206e4057f27053105a435b332987079562bae69d31e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/en-GB/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/en-GB/thunderbird-140.9.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "de2f8596d903d3f2fdbcf358810080618350979e987e9fd83272b80ea56cf9be";
+      sha256 = "fac99db3d90ddee69b55582707d419a2f799179253a9974a44d0742e936690c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/en-US/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/en-US/thunderbird-140.9.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "69832e7c311bff97b2b83a393d4c8ac15a0b0823aeb838a510e510a2ddeb6c45";
+      sha256 = "9144a38830c47b61fe17e5941ccc148eaae90addc51ecab37ae3ed8834c4bc99";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/es-AR/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/es-AR/thunderbird-140.9.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "f01f5ba14f11f9418ec368ecc3b9cc6b03e5afee67d50eab03428d55a76724f4";
+      sha256 = "44e6dc9267d08a805a2a88a4f82d8a5aebc7c67f8c6921e986d819c4e5d0bfff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/es-ES/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/es-ES/thunderbird-140.9.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "a6613d38c0e1092fd545b02875cfe2e0189da2e9cbc9d045f228f0546cd70fc4";
+      sha256 = "28e40431d43eb33397a651e267ecd367812a1d0c6914ae51ef74ead93884c359";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/es-MX/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/es-MX/thunderbird-140.9.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "7acae9583b32a97297a8a9c5dba7244725d1e8035bac7d3c9410e361c1b5b748";
+      sha256 = "358ce98091e872953634fc107b10feab1d86c3d9b2d796dbe82ecea8bf1aa8c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/et/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/et/thunderbird-140.9.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "7113cf91c0cae1d30413b19e4320460aac226d14b1777b879024d2d9b0fb8fde";
+      sha256 = "f0f8cb93abf6b71d75bfa14e709e45808e150edc02799ab9c7a95d4071d67264";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/eu/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/eu/thunderbird-140.9.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "62403e8fd44872903b1cfea829f011ecee667da09bc211618a49df8a536c626a";
+      sha256 = "2127a975d84709a47d69db3a3ad134aca4dd99e0c7465a281e9fbcc83e51771b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/fi/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/fi/thunderbird-140.9.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "521675713083958b93e3a5dea6e73d94f3ef49354748df1d05e7c0e3fb120c0c";
+      sha256 = "aa4b86f3bf0185b1c63364b07915e3d35a7e85f640ca1a1f384d4ba3bef09d44";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/fr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/fr/thunderbird-140.9.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5ed6df6c32b8beaa221150a970f584ae6a627a5a56f4c871d06562a20e6ff2da";
+      sha256 = "7b4d887d0bcb636a2923805786a77d2f57b853c507f58177bcfaabbad6e6002f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/fy-NL/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/fy-NL/thunderbird-140.9.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "cb488ddbc7a4638b49900be4a87d36390f1464080bad56f79c9bdf165368e5ed";
+      sha256 = "e685adc1eae1078a27e5d18da833c8991ed7ab97a3946a70296639ec37495202";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ga-IE/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ga-IE/thunderbird-140.9.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "5883b06e99066b3b772fadfef3db017a0a2db05b69e4c4565845f1ce08db850b";
+      sha256 = "0c62d4827a09f44a4dcefafde53347058bf5995d22042209551f83b12b4cd31a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/gd/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/gd/thunderbird-140.9.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "c50b06e7fbb61e8242f396473b8ccbcb10b4c093beb03769da95a1bff75a1ca1";
+      sha256 = "773220488cd7eb0f47d938448e573aee9028443cf08cb0282f50b9a48fbc5d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/gl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/gl/thunderbird-140.9.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "257ef806883b90be3ce4fc3097a6668c1683b013b35beeb51ec28add8efd62e9";
+      sha256 = "600908cc4f4d5f0e4e6efc70991e3270f9eb145ff2a5fd1fa25322ad63329509";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/he/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/he/thunderbird-140.9.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9306cac21b22223bcc0545bcd6b60d3d7b9da396ff0775b0aecf723b54916383";
+      sha256 = "8ba11fb997a12e640ccf1287ac9ad233bd0383351acb29a948f7967baf1f9109";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/hr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hr/thunderbird-140.9.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "bb753ecd3ec91790a654d846f0abec7065df0c036b5d5e6ebcd4ecf3dec46c96";
+      sha256 = "ba5b4affeb1b7a82295c39534e7edc29eed6313ebbad459d2c7c4084fcf48aff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/hsb/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hsb/thunderbird-140.9.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "0a11a947085be1a865f7192c84ddbb3315a307545338e5b42f852cd553367999";
+      sha256 = "36ad544efb25e1d94206393fff6d28a4266911ed29bbba2383b36f206a6579f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/hu/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hu/thunderbird-140.9.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "c903657c3dda7e437cff9ecc8374e02209fdca298dbbd7afe842bf57a18747cb";
+      sha256 = "1bcad12704a4c4f390e46e22749f7cc165b91cfeee945a2df1456d8c6ea7317e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/hy-AM/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hy-AM/thunderbird-140.9.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "19fcd176d832ee44c217100e34f49299070d3abf276700bbc75e49e44627205f";
+      sha256 = "b5f6ad9910cb06c84c615584362267170ab92eda40f0162571d0387d60a5ea16";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/id/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/id/thunderbird-140.9.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "c48e5c940363555c5ddc062fcbfd622891ab5b6a22a0693e8be048719aeb950b";
+      sha256 = "ec30f2b220ff56c69cf5efd4d9cd7dd8256203929ba079ef28aae7267eb671a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/is/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/is/thunderbird-140.9.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "9fe9f07be88091fbbe9aedaf0da2d82b8b2e73bdd487b0f826170a64efd56406";
+      sha256 = "9dc9f6af0106ef0e00f14ad0f09c1a8c6a40b881d598040b232a8eb69dfd9848";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/it/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/it/thunderbird-140.9.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "a72bbcddf5306f6282f885e63cb76fe6638926f365f4abeed18d506ca28e7b05";
+      sha256 = "184e86f13550244367362b2a97af513a7285731f74cd89193c1bbfcde682cf56";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ja/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ja/thunderbird-140.9.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "7d9992eb16abdf035470fa6f6c7cbfcef52ff37ff0e94b491358dbd968b65330";
+      sha256 = "e16db5482ad846ee8b9ebe093deb524b3aaef1e9ecfc914963ad7fb8047eb2e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ka/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ka/thunderbird-140.9.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "219acab4927417d4ebd0b6a0dfda9a19b91ebb6b71b8de77c2d86855dbdb652a";
+      sha256 = "62e75fb1c05b6f05f694ce1ff4f54118fb07a808ddd86224f8eea666cb363581";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/kab/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/kab/thunderbird-140.9.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "e087724d93e70498cfca0b167e6407db1890b29eb62f9543faf42525a3085ad2";
+      sha256 = "13581ed0b4d36b0f71c86081f55c1fec08d9c48f02f43a93153968fa4d796feb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/kk/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/kk/thunderbird-140.9.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "26f78fde3493db4e8fc7f1f9d0f1d901de984176f684dd3e1405198b1d581297";
+      sha256 = "60a30a9eaf5a3683c3f060ab6b1542967da5e4de723de5b9ac1ee938f2b05975";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ko/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ko/thunderbird-140.9.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "05ea218a524485aec96ae6488732e4c8b850066f1f1030d99d51b9c3d0e55eeb";
+      sha256 = "15b5f5db7cb1109d9ea06018a37f671d88dea55f6f507f7556cb2c4c35b728fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/lt/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/lt/thunderbird-140.9.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "3d09f4ef2e889bc114452388325fe62376cf5c97e856d96a2696d7cdc30f70a2";
+      sha256 = "17c226dd9236c9a49154a69ce5c81dca948ce7ee9ddf630c779828b1e3e8dfb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/lv/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/lv/thunderbird-140.9.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "c78182d9b437c5b070f6ba9abfcc0ec0d6e0214d18772c24d9703138fb2f75f1";
+      sha256 = "d82839f17d3f18bba308245a6b76199967815e9d12a6ea3e8787f06d2d6e61c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ms/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ms/thunderbird-140.9.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "531845ad39645363799db90331faf612c5ae3313e2418544dce6bd6e0da47cbc";
+      sha256 = "3df582cc29016b5b2d42bdc2dc467e37b666012428b8d7e30710eb36fdce447f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/nb-NO/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/nb-NO/thunderbird-140.9.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "4a0a76f5cac2757ea9429c57d18d77bfa006d35d160938a7d998107d3bf2066f";
+      sha256 = "d3ed3172a064ff8080b027b2f53ade618e793286eb1b5e0d0bc94b9ba11c9886";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/nl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/nl/thunderbird-140.9.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "b9b408baa807dc5315d0a244a59fb928004de0993feac8ee6b2b4b5e02cc1c48";
+      sha256 = "9338d00796ce8a4c920f5bc0bc53170a31be285cb9ea0f83acac797410aa081e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/nn-NO/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/nn-NO/thunderbird-140.9.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "9269a973bb9235f7a67dc35c102ef19d3b76c4eb21e6b971f6f9835dba5c29ac";
+      sha256 = "786683efd1b81e498a295ebc0c08a1bb33a89f2af73d08b18a077fcb1ce228cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/pa-IN/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pa-IN/thunderbird-140.9.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "bb42a8d2a127f50e09ec7ababf0344fb40e8185418ef6bd90880cfb802f8e349";
+      sha256 = "2f6dddcc1c5c2098faec9f49d1e41529e788c48e632e3d8882c36864d6888fb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/pl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pl/thunderbird-140.9.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "1b9a3c5cda2dd31df0b84eae6666bb19cd2f47485844339359ff62affb196ced";
+      sha256 = "309d0c2040db6fd39a4f67996e1962bda9b551ad895051e200f5ad0208ad6383";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/pt-BR/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pt-BR/thunderbird-140.9.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "e8464db805b335e931da3dec07e88ba82c8dd6c97ae3a8337c91301e2560542e";
+      sha256 = "98a7e8a2b7602988df602532f4bfa65d9d9ddcd229668e023597bf8dfd2c1482";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/pt-PT/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pt-PT/thunderbird-140.9.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "150ddd7fa40fb40f86ff5a5605ded4839584c70b936431a275d1f9ea3c688269";
+      sha256 = "cbf82cdfd3e9469bd3f76de0782fe95dc29207ece8c1d25d95893d2cff30b63b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/rm/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/rm/thunderbird-140.9.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "fc3e463a5fd106b398bb4a3f15e408cabc265c0b57359053e0c21d375af2b6c9";
+      sha256 = "407fdbc55d53c570d54a9ecf06722747411a1e9b60f8802b51f9415cb910e5eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ro/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ro/thunderbird-140.9.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "643977c984fa718c8f1455d70909fecf73b35a53ac049e2985c0f60ebc556aa8";
+      sha256 = "c926efd2c65768b57858007ad4e69decf29fcd38c3f9c6a6e464bf9f2e809815";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/ru/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ru/thunderbird-140.9.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "448ff79983f1711bccd406e8528335b8329edd2beed98272da410cf71dc8c8e5";
+      sha256 = "8c21387a6b9fb8c51e0899560c4e57762f117211920c39a0c8dcbaca48de4d26";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/sk/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sk/thunderbird-140.9.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "84d8a2165f1ceb970fe49f8b0fef833abf340b9fdd000dbcdd74ac3a37cc0298";
+      sha256 = "b6b114891f5479cf803eef5328e650129d8a7a35182379f0504346c8d39d4659";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/sl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sl/thunderbird-140.9.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "8b8832af203d40f59d68382af7bae5be6b9f870d59a1490af1fc1c39b3d34a1c";
+      sha256 = "5e893f5d3e24e0003d3b88c1a149bbb421c1c8103df99d5cb215a51b5a12888b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/sq/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sq/thunderbird-140.9.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "fef3ec0ebe13508802740809d4c3fe38be476868e19ae795a93ee5cf08053cb9";
+      sha256 = "4ac4daeaa2a6e3c530cf4f32d097f7612351c0322c5d8564b862ca0d4ff18f82";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/sr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sr/thunderbird-140.9.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d5af15cd4c34ff9b8a0036a8a8091650113de39941b44a7421aac1e5e3789f20";
+      sha256 = "c53ea2e65e527353b7758379bebd7f29016291abc74099ca4add6076e10e036b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/sv-SE/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sv-SE/thunderbird-140.9.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "75a4514e052b0caa4e0a2ae648230a7477574e30f1b11da7b78cfb2af73e0184";
+      sha256 = "b67626622a69f102f5dc20bfd1a8cd3a9cea46b0ed6128b330997715865a2db4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/th/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/th/thunderbird-140.9.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "db591da8a158734556a05037add7a7c3a8897d8762646fff283da240cae27429";
+      sha256 = "b96e37789071cf4801536a01f437b60abf2b4e6032ada81ec4f14405ac6ed8f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/tr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/tr/thunderbird-140.9.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "d580688b7b3a1c41c45c739612ec358d29c512611f907096100cedd0711a6a99";
+      sha256 = "628eba4bd9ec27ad4911abfdba809ee5303bccc5d646b4a0a5695e42966fba12";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/uk/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/uk/thunderbird-140.9.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "3367186b517ea330337dabfc89506d34e39da97db8c1e2ce8c0ecb31edda1cba";
+      sha256 = "a56690796b615d930686989c93eed1dacbc732006e6d1b401a1daf9bb2e4fb91";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/uz/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/uz/thunderbird-140.9.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "e68776e9d92d13a65b1c333d47f173499a3c851a2a0fe01f5b6b4a0119077350";
+      sha256 = "e06d1b4c3194820e35600150ae36d4f1457612ed1815d53280b6ad01f255a809";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/vi/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/vi/thunderbird-140.9.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "91f00d33556d7317d70be4f2f565531a9359aa7ae761c7f3a396442c47d16025";
+      sha256 = "9a2dc59ec3694b9c61c85185bec29fafd4fe5fdfeecad8029ab2a0ef69aa1105";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/zh-CN/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/zh-CN/thunderbird-140.9.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c9fef874672569ce32f05a852122ed32bd89f834eda1a9b344380e0c77cdae05";
+      sha256 = "a4ae4e445bc6cba3d88f4dcbabb72dc746c6c6c047996c5bf0f43c471b798731";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-x86_64/zh-TW/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/zh-TW/thunderbird-140.9.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "656118b3777f805edf38d9b71c4e056543bf0f7d8f80918456fbc98df356b6e5";
+      sha256 = "0c0a37ed4765326777536ab524b92f4ce029501f02e64aebbd390d28d4545e64";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/af/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/af/thunderbird-140.9.1esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "6f325a9cf3b98c1ca78d77aec635e91a4502756857edc6fa61a19825da6e5af1";
+      sha256 = "577eb56fec1f61907852fc21944edd9538505bcf05e3799e8275305d0f44283a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ar/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ar/thunderbird-140.9.1esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "73981c7aacb840d4a491ea9d7058b64dc0c3169e40098858a5af22dfa47b1e91";
+      sha256 = "26d5bd6bb052ecbc333501c24bd30f9f2c5cfe9583c1910be7fc4046ba123a0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ast/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ast/thunderbird-140.9.1esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "119ac734bf984560296d4fc61e9c144fa1effed7830e47fcb93e3814646b2cef";
+      sha256 = "2a657397840b5279171b97806699d048463dd888ab715e225a644e59f415c190";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/be/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/be/thunderbird-140.9.1esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "a3ac94df2520a79eeb9bae624a8a6156a6dada079e9a39ddc98f10abf5439de0";
+      sha256 = "8ea87e89d47c58ddaf14cbe9886f70dcc163ab6739051ee04786e7f59b8fd615";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/bg/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/bg/thunderbird-140.9.1esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "b2d4016eb85c4f9705cc766502972ae18f1a75c82b3bf3f47c720e26a11c8241";
+      sha256 = "ee37cd7d5684013f9c23dca7ac3266425801d9edb5262e44c28f547cbc644383";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/br/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/br/thunderbird-140.9.1esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "da6f483ed3cfcd70d213e3e9ae2e9e2dc0076a438251f6ced9de4a3611449840";
+      sha256 = "36e156bf9230faafc0f6b5040d50eb10fe021ec713222504cf0caf1b6c9be3bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ca/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ca/thunderbird-140.9.1esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "7dab9f207fdd9ddc98b54bf6e35d0999a9367b495ea81e895aecf81b20ea4af9";
+      sha256 = "9cdd54c7e281ded940acdd6261e2434297c270d98d4ed2d4c83fb95da7f900c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/cak/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/cak/thunderbird-140.9.1esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "4288d9f9d71bf1b4a455aba39a3f98ba50f84e656a7fc5df08a2b76248722449";
+      sha256 = "0e89b2b9bf6ecd27d976a00f28023b42a7e6c5a90045c2e7485a3d7be66da2f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/cs/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/cs/thunderbird-140.9.1esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "46abfededf97d68521f71c513008a2f560ed084b41e68932df2966250ac33074";
+      sha256 = "4c872fdb475bb55967ac0bc23cdea0f72a9eac9539c7e41772a5f623fb7027fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/cy/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/cy/thunderbird-140.9.1esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "9e6a7e534dec3b6d85e51f65d01435023ac74fb42ddb8c8eea845a603728e3d7";
+      sha256 = "214b7287d770931badbdd9941ca615fa2bee67e2fbc31d667d0005575603055e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/da/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/da/thunderbird-140.9.1esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "f46505566bf62826efb87fb383e2131231293a5cd9963ba53cd1e0210ec74e97";
+      sha256 = "082cac81edd750ba01156f0896b06cadcb8e457bc005466bc6430d44b64d037c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/de/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/de/thunderbird-140.9.1esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "588d6404fdc9133006c261b9e65a983b40135d4b95b11ea933076913bcc66913";
+      sha256 = "b78d029f2e1f5f75eb56f7487ec13b3e70b961b58372ee8de57e3927f67750e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/dsb/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/dsb/thunderbird-140.9.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "cc28fbc37298809171576b2fc147270d9eb53d936aa13075ffb2156d164fd3ba";
+      sha256 = "06c226f5b1ae9b73a2f5171169123d0713e3829925af6d21af334b9df33bf6b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/el/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/el/thunderbird-140.9.1esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "82b41b0e01a1e719a09fe278b03f542408f14ae67059a06456614baf5dd6a4b9";
+      sha256 = "9a74121011f572dfa1ccd364ebc2e0c362a544d458d8064e0ef047b03197ff18";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/en-CA/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/en-CA/thunderbird-140.9.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "2c7311960aea490919d5623caf615a320119610f44a0d7c6f8c03add99d7ade5";
+      sha256 = "75f62e7331511bd9bd775953b68caa09bcfff0b74e1f8602049a99981ee50111";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/en-GB/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/en-GB/thunderbird-140.9.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "aaf25d7d55dbc2ccb8f533c8d004c1665745ea8f1a447736dd41e9bdae0c9fad";
+      sha256 = "a9b1b64054cdf68daa63160470b782e1b60f156fa20dab9e5812996275fb3e54";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/en-US/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/en-US/thunderbird-140.9.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "00a7d103fde65a1116916a6e0d96f958546e8f22757888c250a0ade91948f956";
+      sha256 = "4ec13bfb184caaf6fa015d8b1b3a49ab08d440e9c5d088a8c953cda5e7c4085d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/es-AR/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/es-AR/thunderbird-140.9.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "6d015123ccc6474ff31d5d28560126c212da322a4886fe548f57a364b307d9de";
+      sha256 = "9a97f2cb85b56932276a1fce4b4923bbf4a0344fb2fd229d5b7335e48eb28f88";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/es-ES/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/es-ES/thunderbird-140.9.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "05e5ba6aeca6d208c8b1f541dffc50433239c911290baa745de45877ed7710a4";
+      sha256 = "ba9eb540eb1018e9e652c20c516d07127690d5ab3ec7d748fe9a78865a707a83";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/es-MX/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/es-MX/thunderbird-140.9.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "09908059585acd6497df10c480fa0e9bb87ee40c1f02310de6f7ec274a97a3b2";
+      sha256 = "53da6633307506781be2f519a98c9382cc77050307cb79adc767a6895ee356eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/et/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/et/thunderbird-140.9.1esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "6f97c18d98b810f7d59787a9651c1bb4f17af8de44d77ca779d9c808092ec15e";
+      sha256 = "af425915b6b5475d21e04321634acfbbe16dc752e6c5737dd954098ca5349469";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/eu/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/eu/thunderbird-140.9.1esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "3f8edbe0c6337e0ddfb081a40b0b55ea6b62c798a343e0209f7a8a835c59da96";
+      sha256 = "21ea08478da94eef6d63eeb08d7ebb53030e6ed22a1baa4f2f7ed8e70c96d387";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/fi/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/fi/thunderbird-140.9.1esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "f58200c0d092b799964dac0422cde055315efc08dc1c68407b7c9e918ef8421b";
+      sha256 = "ddae7c234ee6f76ac40eccabcf42f980b1e1fe3324b114bab095e829a7891e83";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/fr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/fr/thunderbird-140.9.1esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "3ef718ff981091c5ba110545d8fd0e0ba48b526daa9ab4390696fa6d8a936894";
+      sha256 = "373faaa0879b125158267721c86586cd30d681722ea5a1b8ffe76d6026a12d32";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/fy-NL/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/fy-NL/thunderbird-140.9.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "08a44970105487b61df5025e02f0c3d5c860af0b3dc12dfbeb79fe3fd6763378";
+      sha256 = "4a9e13e75d6494614343498cbf61db161e80e1cfd2992ca62166574dd5170354";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ga-IE/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ga-IE/thunderbird-140.9.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "575b98f3e2bec65bfdc1581870bfc404ec60512cd5755072d86f06b845f39a17";
+      sha256 = "2d20d1c004e9cafeb1c1ba0ccef757b1d37edaa27b47455e3b9d6cac6d4c297c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/gd/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/gd/thunderbird-140.9.1esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "6a41919c2b1c90376e62d5f50385de64f311607893c096b332c5c4125f1458b3";
+      sha256 = "8ab435dad604d633a42974ba9b3de9639c59d54d9c27d01aefa89458eecdbd00";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/gl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/gl/thunderbird-140.9.1esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "7781512b491dbb7d3a75e5bf87da486013be909a77c45b79cf14661add24b9d6";
+      sha256 = "71c06bf79d9c71d87aacfdb5b45780bc6f9d257466b8e6245f506b422bc4a3f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/he/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/he/thunderbird-140.9.1esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "fd377ac4d1a33a5e96ca696ef19ad54594e930fb279554b65d82900f70f546c6";
+      sha256 = "3274b08391f11764dc874dd74b5e7713201bac72ab17d1f4e27e1da535c252b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/hr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hr/thunderbird-140.9.1esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "c8f3c66c5acddd3f463e0832d786be22ffc6967270befd56d8bf4773363defe9";
+      sha256 = "181510b1747899b7537fa2265a153a20a37f6bae251075af5bf6c52d66130ddc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/hsb/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hsb/thunderbird-140.9.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "06db9fdcc5ba660bcad54faf5c4396ef2819e2335f707aeed3e848ef94041c7d";
+      sha256 = "cb8619020aee7dcbed61dc43aebdbb315837a79de6c426cb8ad5abcf7db14a28";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/hu/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hu/thunderbird-140.9.1esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "2c79ef974f81d3d7fb0ff91effe65a6a50310b1164f911dd33bc6da454fb022b";
+      sha256 = "679fbe63c07e4ce14604e073c780a5e4a2be91e60a6ef5f48bca8ec1efbf1ba0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/hy-AM/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hy-AM/thunderbird-140.9.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "aa363fb9a2e488002bb4dd10016d4776f536de29fd12a664af562285ceba01b6";
+      sha256 = "b26bef096054ac16fa5bed40bf51914f5451603fb59dfb8e46b205487d915967";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/id/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/id/thunderbird-140.9.1esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "5ac4733f419c1629feef0ff1bdc2a0d0940a704258b04b9dcebe20e1d8d069c4";
+      sha256 = "a88357be5a1ec32161ea5534cb8bb1b006ad3ea77e1e55e566534cd82abb3359";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/is/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/is/thunderbird-140.9.1esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "b5f4fbce1982c79248a7c6c65ead3684c7da1534b987f27c33ab8bea1fb3ba4e";
+      sha256 = "b26ed38575dc2541e92a98f2d7ce5652412ea2eda9d8aace5011f77bf413fcab";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/it/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/it/thunderbird-140.9.1esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "16c1232f30de7c5763c44e64b0e90b5d8c93ee97a0a27c5e78c81bfc6eb222c3";
+      sha256 = "6e2951b63ceffffcc1a183f5c3993f96fd71bbdda8b41ed0d193a54a296d7864";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ja/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ja/thunderbird-140.9.1esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "d15c2cf2d0b4678e6c78ac6116226d0be705d6e5c520144ef6dae4e3b9208572";
+      sha256 = "4933711300e7ed212b885179a552e13639cbfebb35286cc302d6e8eb74fd7683";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ka/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ka/thunderbird-140.9.1esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "683d72343ebd8635d36b1264eeceb6b3de6e1dfcf9013804084b1b56658c0a9e";
+      sha256 = "52bc201748049510e5021cc2db552738b7ac289cc1733e74732e8ffab2b9c579";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/kab/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/kab/thunderbird-140.9.1esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "d60cc3f324a494f8815c2765266b0512b03f893aff9a8ed2c6f9ca0227c3711f";
+      sha256 = "f7026a548b96ea977270a62163654c1e94bd12e10d923072bad9075f821ddf9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/kk/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/kk/thunderbird-140.9.1esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "2e7377d940521a87d8ed102d6a4d6ccf435df9328aea1c98bb4cc0bb1521702e";
+      sha256 = "df6774cd0869e7c042381660cacb397ffe48f86f177b40971b45aef940b6f953";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ko/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ko/thunderbird-140.9.1esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "27fff0b61c881740042fba9ef27cd840bbc42a0c4820db5a1d88bae7d4b7b72a";
+      sha256 = "f28e67abf1b09d65ca313ccbe0f7f0c5f2d8ae3785daa92fc1a50889285889ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/lt/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/lt/thunderbird-140.9.1esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "823aa56a87470dc3062f031311d4c3dfd2ae096e088c1276bf139fed3dff643b";
+      sha256 = "7daa7b36f9884c3c3089fbf526d631f3f753f1fca4684c792e5616cdc05fdce8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/lv/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/lv/thunderbird-140.9.1esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "9c54d57f9b85ab6c0f223e7a586872eb6eff91340d2227c681a6ff216032cbfb";
+      sha256 = "0d9bf7087ef692140d2af8db630b7d9c34b3ec616f81055fc89ff883f11fd4c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ms/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ms/thunderbird-140.9.1esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "58377c64a6ca61999bbec8f88946ae95430e7c9502a9386635f57d3879913616";
+      sha256 = "2e5ada0943fb767c9edff3937d000c8d686304eebc9f41101584e666ed4089f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/nb-NO/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/nb-NO/thunderbird-140.9.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "184be65c63676008c72ea483ab890c6439b17ee788df7167fa46d13babdbec7e";
+      sha256 = "2d744fe27b57cf5d88337bc9e8966b2fca31ca4df9873cdec5219a511c065d57";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/nl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/nl/thunderbird-140.9.1esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ecd7fa3b24de74c8d9da7a9c3514a5457c9a5b011d324bdd4791239a63790e0b";
+      sha256 = "b7c3c1544990f7d29d342d547206fab067b6c0d25767eb3df6127e9a94a0c637";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/nn-NO/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/nn-NO/thunderbird-140.9.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "ddbc7de98ae02237e95387daebac814e2cdf6c013dd398ffdb6b3923af4a0f73";
+      sha256 = "9063810ac5e8754ade82442884f5c1fce79c9c7605b19c19a164a8a5624cbb04";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/pa-IN/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pa-IN/thunderbird-140.9.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "244a4cedf25d0a5ed7fbb61e907751296e38f52e4a7a375d607cad89ea00695b";
+      sha256 = "d30cf02ecd5148251512ceae6e78c096faf46166beb35ce5fd81d61a2ebf25af";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/pl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pl/thunderbird-140.9.1esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "58e4cca14e79266a9b6cda09a3915fc0085dd696882306613e1997bf4660d3c3";
+      sha256 = "9f108070c4ff90e3127ae5a3955262240f05c118998aae5671313c8cefb090f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/pt-BR/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pt-BR/thunderbird-140.9.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "63d962bcca2b6d97db0be992fb29e803191b947343e0b07f56a04401355f61c6";
+      sha256 = "e63fa1a6847725fb27013311e8e2c6bd494a00244b47a111f6eae4fb108f1bbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/pt-PT/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pt-PT/thunderbird-140.9.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "0c21d300a72564aecab41ba6ad18af0692ea14467a2e148b0d66572c0c2fdaaa";
+      sha256 = "c02818baa7ca5e76ee72802dda6e195cf6c688fd40fec7181035b1513ea49595";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/rm/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/rm/thunderbird-140.9.1esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ed8ee13a1e2a5060906b9d4b68e4576916e5c0a97229bac2acfc33badbeb4563";
+      sha256 = "4e672884c4a0590dcfdf27b771d654442cce2f1c7ad825d942ce2ce5e865e197";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ro/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ro/thunderbird-140.9.1esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "2681b757a0f04a0b90943a8cca0e04fd3912ce18eede828c87a3e09564e6b585";
+      sha256 = "c215a2cd40f7a824d0d4bbcac7d90d3aeca05e4a7635de14a73a1540bea6e6cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/ru/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ru/thunderbird-140.9.1esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "85ac3904e14e385c3dbc39a8a3164172e4d2363c7896bd0f6bf7d56cd06ffea0";
+      sha256 = "2d14606a7619537f7c4daec4757ad59ba647843d229e55f79536734afbe3491a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/sk/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sk/thunderbird-140.9.1esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "3868d5319e126a11e60c5974eed9e909e61e4eafff5ae86385b7dc18116c0311";
+      sha256 = "1687c082d6827b4c6257d77fe1c5675fb020c9d1bdd977a670b5f1deecd3c7b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/sl/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sl/thunderbird-140.9.1esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "63333ebe861b7f227a31b4ab4a42a828adabcc3f199369a9c8009af990635629";
+      sha256 = "459d9c963f383e86b2113445b69634ae221dfa0070088cfcd83fa16a947feb5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/sq/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sq/thunderbird-140.9.1esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "c3d1cb9ad892ac374ef13ea092e212bac05da7fda0c87b6cd97d9cbd1a799988";
+      sha256 = "64ae22f34e726e291f40c63288f2e75fd6bc40ba36c81fec8c0750dea0d32afe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/sr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sr/thunderbird-140.9.1esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "e656b140085c7727806f728ed71631fa040e4132db9635d8cf3d150c3f88bb36";
+      sha256 = "5c3879655e1b8db94c9c8cc7decd58cb1cf078d79877adb79da34931a4739d36";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/sv-SE/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sv-SE/thunderbird-140.9.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "4b1d12a4c824bde251009c8af8d34bff0d6dde8d586442bc2d2086484a498bd5";
+      sha256 = "9ec50094f4364c510187d9a71b58141ab82b715ce4752ceda8ffdbe21a5a72af";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/th/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/th/thunderbird-140.9.1esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f7e1431d783ef5a8c77d1b7b4ccd17f967ba49d5389be442ea152980efafb7c3";
+      sha256 = "f595743b0533f6f12d8d1effbbd4c9abce6727c9ca92e9a247ec62e96227f5ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/tr/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/tr/thunderbird-140.9.1esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "685f5fcae25b69929314391fbcd734d3df6a8d1f7ab7d0c1e01d4224c6a1a8a8";
+      sha256 = "de3b9bfc94f6da7e27abb50b6949659bff827a3b42fbf9dddc8e37b59915a513";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/uk/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/uk/thunderbird-140.9.1esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "8eb825197956b6a50c044daf1381db33b867c3ede87d9adfcfe7bf6415c67a86";
+      sha256 = "77ea1b1f7bd1c95b4223090e453770c25fc184d38a88b2c7f86c250d95c06305";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/uz/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/uz/thunderbird-140.9.1esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "04dec68b7bd780cb7a2cca74ba746034aeba49fc19e67f83f25a7d22f267340f";
+      sha256 = "6bd6fddb49f0238003f3b13cd790a1ddbb294bdbbe0d9f850c1b4136b59fa7b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/vi/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/vi/thunderbird-140.9.1esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "a97661547ec1064af40cae6fd8aeac59445ac4c814eb76713b7d736eae501120";
+      sha256 = "3ba0e0b5510b920bfc851ba7d64820b2f48744c95188aa5a6ce62c980bcf19fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/zh-CN/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/zh-CN/thunderbird-140.9.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "6fcc181be58a6979413635d157bfe72048f40f552bb257378ac6c80b80a16866";
+      sha256 = "2c0903e124298f455406ad9f26e5d78a70ed6489513914a52a87ceb31f578ad7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/linux-i686/zh-TW/thunderbird-140.9.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/zh-TW/thunderbird-140.9.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "60f1cc1a25e90f6631e37861bebbe28731518b136888686ada861868bb9c0dcb";
+      sha256 = "995755cecf0ab7151e078d91179d60210e9d4f8eb670189a1a8fcc5826a7e180";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/af/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/af/Thunderbird%20140.9.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "f0004aa0a807219e21019f6069ad3e4e66cdf4698e495489d70791e8420ce864";
+      sha256 = "0031b06e6cf4d9f5b312ab58526e52c7b5418b54839196e8fd33f414facf5151";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ar/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ar/Thunderbird%20140.9.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "be3d111107c917c536e21808ac45aa9968907b819c6617996fac2a46e42dfee0";
+      sha256 = "56390ce018b751d613f809590363436c4d49f2efac3e8cd483d5b060ef2fad38";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ast/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ast/Thunderbird%20140.9.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "50f58767fa89f1b08377ff5205ca7f9e97965abbc938f2b1a55eac0f7a26711c";
+      sha256 = "2d9e0eaab3e2295f2afb630b814878db040531ae1c172418d673b10582734d58";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/be/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/be/Thunderbird%20140.9.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "36cc81c97fa1ebb7741a11842b4f6e536314762ba9bf7d1095830f64595f3400";
+      sha256 = "f98ca6d4c67764c3b112ced0abe5d809fedcbb72997d0fec9c5d295d9832cd53";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/bg/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/bg/Thunderbird%20140.9.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "13513e4c776ad721fe7b5204ba7aa6c27376dbd91e0b9919fbeb6e97cebf0b3a";
+      sha256 = "e640a1bf90f74c9103ddb1d736e6c494f4c325614effd396fb60c3e9867562c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/br/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/br/Thunderbird%20140.9.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "2775f182124d6be0fe70f64dec72b203b030f74b535b320cc14cf1d943579811";
+      sha256 = "11a7c414f0f00848d5f99a7d94e36cd48f72470df043ac4b32d48fa31f18a358";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ca/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ca/Thunderbird%20140.9.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "91c1db6abb94c01d85986dabb0a7a6891110fe77be9509634f7e22ce4d31eb3c";
+      sha256 = "e24105a6fc4f632b6de40b1b5ccdfa70fc6612a615a92664890dbc5bd07db673";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/cak/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/cak/Thunderbird%20140.9.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "67bdf6139cbf9491a96f7a90d4f24536968f6e46b4a963065781e99f0475d813";
+      sha256 = "93ad24570866316eb6c2261131c8e2ecaf32bd36b28d76a539d9e04424a9997d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/cs/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/cs/Thunderbird%20140.9.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "e7463a16aea636937a72a83ee8cf92a7e7588ddca5732591aeb4cbce395f06dc";
+      sha256 = "4b43f63d00c865fc59690c22dc5a65c2b46281df81f07811418b3b25fd1c2937";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/cy/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/cy/Thunderbird%20140.9.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "ebb796b00dfa4cc0a04e72dd08ee64fc74c33ebf0496a1b2fd7dd839118e54e6";
+      sha256 = "cace907d8d8461b12fc6e5d8710e8968737a0bb2ca79aa6b3291cfdb7f64bc45";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/da/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/da/Thunderbird%20140.9.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "4b00a56583dc4fc1c34d6b4afdae17e22c3d36a0b6d7e8ff76ee9fae7bfc4098";
+      sha256 = "7a44b0fe636e0f4c93321a7d7f819da462e318dfde665eb5261ad9173df45699";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/de/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/de/Thunderbird%20140.9.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "506688a60636fecaf11d2513fe466a9e9ccf703ca3cfeef8c0b490dc02d66057";
+      sha256 = "0654bb905ba205c6ab6e9097a05818191074d61971dbd69be9bd08234a33597a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/dsb/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/dsb/Thunderbird%20140.9.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "f1c93f9af36e2825a34d97d64fcac400f80b8d3165009c339348609706ef1f47";
+      sha256 = "03c03283fd29ae2f33ba39e98cabec200371b78f25be74b9352b5e9db9ca83ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/el/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/el/Thunderbird%20140.9.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "cb1d5949301699f7ad642a1ef40202c106d8648428b1891a29d47f4255cbd4ad";
+      sha256 = "eb308e58d2a0624fcb4094b1f213ad6ec791f1188773ce9516c643da401b8762";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/en-CA/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/en-CA/Thunderbird%20140.9.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "677d31cf97706b6c38c84a212bd9c2540a0a2f86596e1f57aa5b24dce5bac104";
+      sha256 = "2f84bb86f7a36e90670523b9594553bfd8ada1d94c1c0b296a17819a38814a58";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/en-GB/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/en-GB/Thunderbird%20140.9.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "1fea91956744ae218e4acbe36c336528dc3aee503f3e93b56bcff8d72e79cf43";
+      sha256 = "876ac3332c4b446f6a14f6147a2124becc75baf20e515a2bbcd8c84ede22649f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/en-US/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/en-US/Thunderbird%20140.9.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "b4bbf6c578dcec9e06f2f70267eb80167ed71442d71150751d04551201484df0";
+      sha256 = "50296531d845a2aead184d90ab63c1fb57a0ab598acded88a8c7fa07add32ffa";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/es-AR/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/es-AR/Thunderbird%20140.9.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "6b2edd16da211c7c5c0f4dd54a7d031c021abb1e283ac630626c70048a6aa97d";
+      sha256 = "a2247a5b5656a08e83ffa062f0cb5808e23a17248c1729f495b5f5619863ed46";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/es-ES/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/es-ES/Thunderbird%20140.9.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "0c4a539036a30e4ad636025e4e0249f31b54772cd572e1e639c5be7339f8da63";
+      sha256 = "d3d1e5308d5870eab9f0d38f0b982e4405b6ba151a6efe91a94e2f8ab83ed496";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/es-MX/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/es-MX/Thunderbird%20140.9.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "af94ad2e280cc875ed211d9d3143dbcd59529f4e70e081e0c1c019bc4031a763";
+      sha256 = "1aa4763d2a5eb429f2cc56e8f82395045263d6be180525539297d2e0f23d7ca6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/et/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/et/Thunderbird%20140.9.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "f30a0a48a7f3abb76c020d276da0dd929fef43b5e707079efa2cc1e38cd51851";
+      sha256 = "37856f64e2504fbc774549332acc97a2c0723188f3549772edbb583042a0647d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/eu/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/eu/Thunderbird%20140.9.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "0b61c6b290a29e9f8abdba00b7831465e4e84ae86548e9120d8412d70a6e2a9a";
+      sha256 = "91c48c1527189daa146059253e6674d41e836e1d61ec4c9c8029e1c5b21a2fd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/fi/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/fi/Thunderbird%20140.9.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "0599e4834b2506133af0dccf005e7dad52f319c4a265c10265eacb236643e289";
+      sha256 = "60a7c6465f8b524fe393ee09c3fe217fc1d7acd2e72d19e6f70c1e38cf33bd27";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/fr/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/fr/Thunderbird%20140.9.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "aaff870e57c22974325bafb1f085bc5bb105c37734a1464136b77224a47f2032";
+      sha256 = "e17458d0f37f1698aec78b382772535942df06949686d33fa51b221bae846284";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/fy-NL/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/fy-NL/Thunderbird%20140.9.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "9fe0b6de90341ed4545495d1938f69e87ba1b052e6c389b437cae40baf14c49c";
+      sha256 = "e03a88a40bf86d10e335c4be43a36b2c48b56223b3adf6032f815d7afca19272";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ga-IE/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ga-IE/Thunderbird%20140.9.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "1aeb435f85f19e071adec3c435a2d8ccd84c5e8ccd186526289fc0e842014104";
+      sha256 = "4d9c7a53b6fb9a9396eee0f52b0dc660ae51db420e569381b7d759e0640336e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/gd/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/gd/Thunderbird%20140.9.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "2631b994f7777758c9a217f63eb20cad9977ebaa26634aaf6a59b598746ed0ef";
+      sha256 = "e97855d13f1a37c6a73feecdaa6d2c63d9edc61431f078d06d4c54f4118531fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/gl/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/gl/Thunderbird%20140.9.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "2fb2e540c9a8f895b608ad5d5e2b27ab8e2c1137753e976d40907c22fd5f59a7";
+      sha256 = "b3940c048b0c00fd813738e937028037d092e8acf31f8ee0992a33ea53ddc39d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/he/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/he/Thunderbird%20140.9.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "181b527a9e13486a4347638363b762916b04d7332de11806101bd93d9d59907e";
+      sha256 = "29c63eda8f06862323f6706f5846d7b7f90c7a4fc473f2acba8995e3d9425a82";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/hr/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hr/Thunderbird%20140.9.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "6cb415ec2409c99c4dcc49c9e62c5116cbe6dfc942b812b4c6f279b8c1314f14";
+      sha256 = "6c481eb7f746b1976b56560dd0666db8023006fe2ae06dd5ace7b29858876592";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/hsb/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hsb/Thunderbird%20140.9.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "1c4327c78269d1962030976e1c1f40c5b8ca70845a30cf2001c980c8765c2511";
+      sha256 = "513eacc874f411665cb7a9a6ed9a97064e228c17fe80f3015b18c6f92e300712";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/hu/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hu/Thunderbird%20140.9.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "0ab305f0900b7b80a727de02d31ca4c8de0d429c3b0dbff6ed2c740ac006e06f";
+      sha256 = "bc3183ee3032bc7342d9a345ebf60f4ed40e85d4ca55c693a401c18bd25438f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/hy-AM/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hy-AM/Thunderbird%20140.9.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "d3cf3d8d988a3d38925365236f62c2e341689f05dc597ce1bdf42f5cc381c2c7";
+      sha256 = "0daf98bc3abe2444f97d1427471a902436103b53fcd18400a2ff2abc8ff4097b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/id/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/id/Thunderbird%20140.9.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "4e14f7ffd00d684daf37d0fad3a0fdefdba57b2f16c29e8493379ac4e02ca1ff";
+      sha256 = "8b9da9fdd953f0ae740fffb4b13fac78b238162118e480328b108aaa24c202e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/is/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/is/Thunderbird%20140.9.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "46a49595ef17517f2bfa213d84e2e6e0f71121e99f6bfdc58fd40303220d9f0e";
+      sha256 = "ff37126bb4fef8588cf350b28269c74b82cda2f2bc579c7a6e0276afd6879d75";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/it/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/it/Thunderbird%20140.9.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "0c1a1b4742198f70bad5f06b36128d168f093675fdc55e519983bbb0ada21563";
+      sha256 = "c78e3247d89e7c52744c640b70b1ec6964ad98a78a985e2da71b1b3e42750323";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ja-JP-mac/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ja-JP-mac/Thunderbird%20140.9.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "daad3c5cd8b170b1c81e18451a5c824e04933635781696dc611e9f2b34688aeb";
+      sha256 = "3f770b520be282cd6f0ab3308df9d2a8e2547b05137d0d7518f6a53b23d7092d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ka/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ka/Thunderbird%20140.9.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "0cd0bd3195d5a50c1f89dc264f9ed9950a5186c13e4aeff7b3fbda3f871def93";
+      sha256 = "67e8b923ded639aae11d1503ff62ccff16297cb17e96001e89fe59837c30eb2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/kab/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/kab/Thunderbird%20140.9.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "94d482bd397f207c4d43544b41198a00e15c4a458d6c38e37bb6913415788259";
+      sha256 = "912b87b4695bef57669779b544c14c79cd0deedfdcef447d1813ecc892f651ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/kk/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/kk/Thunderbird%20140.9.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "b7a16499c976ee02eacade8d5f0729231fa9ed0ea07c5c1d4bdf2a4c8615243b";
+      sha256 = "2a64c01bcffecd8b93c7e7d4bcb3b332f0d26417cf11aab2a3474314afcaf811";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ko/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ko/Thunderbird%20140.9.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "74aed9b76f4ea924ee489d8c988644372621a15e9c003739ace0c79a9ee73afd";
+      sha256 = "e330b31e230ea85349ae2afa1525479cdbf5108d58023b9ecbf492ef45ca8ad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/lt/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/lt/Thunderbird%20140.9.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "2763bf1e55eae72e1677f6adcdc4eddd6393df2bd9712bbccaeaaa142f4bbd76";
+      sha256 = "95e0995e430dc478f9ebf617c9c47c38da22354c180acd13b4656a5a3c75d5d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/lv/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/lv/Thunderbird%20140.9.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "418aa2f935cb3e3ffc9f00ebd47d6d7d78f716b3185abc98a42cfa48ee2ce004";
+      sha256 = "143a7469f85b838a5838bc6ea9bba0c15d1f282c496bd6854879a024edd10b04";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ms/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ms/Thunderbird%20140.9.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "3b443332c6c685a57fec139c388dec9c5ca5b37f17f76d823a51964615337b1a";
+      sha256 = "cf3be810ca1345db4c6af0c53ee49ed5b478fe6c618ab62fb9483104d0259602";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/nb-NO/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/nb-NO/Thunderbird%20140.9.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "c2b956faa3f6900069b0159012e97f4ab840593cb08628aa77d7029f69a50fe0";
+      sha256 = "114fbdccf07616e27de36e743e2e88251f9863f98343175c5c9fbc398eba1151";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/nl/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/nl/Thunderbird%20140.9.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "1d3f0ca741abb899cc05a503698959f0764bad151848dc0abc71b12e3911a557";
+      sha256 = "a70fbc0216a3ec9e5d7fa40b54fa93e450c5086e9bd6469ff500a251cdd5951a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/nn-NO/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/nn-NO/Thunderbird%20140.9.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "5541737c316aea93a0859604daf66e5dd1f4cf15a160a354148978108feb2e86";
+      sha256 = "c8866b3b6326f835ab393b7040445664dc349fb901e810b83c285c6bd70ba644";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/pa-IN/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pa-IN/Thunderbird%20140.9.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "46bab8449da19ee293d435fba5f45568f55c5f288645f8a6c50dc7a974ca542a";
+      sha256 = "b7a384afbbe07c1ed3b1bd3651682fd621985a0c4251069dc4134b28be44636a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/pl/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pl/Thunderbird%20140.9.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "1e904b2ec245e8522a85daca37b5d6f521cdcbfecaceb7d36b69fe53d4c1976c";
+      sha256 = "fc582345330c689f1f5408cda1a562cb3308ef51556dc9b104226b9b7532d508";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/pt-BR/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pt-BR/Thunderbird%20140.9.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "efedd2423a32a9b852351a89c1f61b0777d15fa3acdb4e45c89d5247b7391974";
+      sha256 = "0a97cf0c6948c242d2d787ed1018145a216bc5262f288d268be17a9d6fde5c73";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/pt-PT/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pt-PT/Thunderbird%20140.9.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "18f9f2a0f62421e12bdf2ddc58655242f781870046fd243bfbf342a1303fc690";
+      sha256 = "2d6b36fe3b086b5ba868e17475aa3b2f9c063f72fb4e56515fb52e482005b509";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/rm/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/rm/Thunderbird%20140.9.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "53ed3c639631ad41f8fecbcc25ce029e36ee3206261e5963ce4c7293704f69a2";
+      sha256 = "bb576c73f934e8b7684337346dc1b7dfc618b46586a3c03d027c179bf711c05c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ro/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ro/Thunderbird%20140.9.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "d8e512148a3bdbf1c1c6213ed189dd9323e882fd69814afe042672958a4132aa";
+      sha256 = "dfaabb24533f94cd8433b9c9a547608a3b0e6ab4a9c861441c4aac675521e738";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/ru/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ru/Thunderbird%20140.9.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "1615b96d8e430604ce72ddbb3e3698c864a9fd8bb6d86fe1b7315f4ff9841e62";
+      sha256 = "57ce17ecddadd2a2dd997cfc918a10462f59af11715c47007e0a09d2a33568bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/sk/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sk/Thunderbird%20140.9.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "3a2c344f7fe47b4a107fbc4d91453e32888b2f1cd19bbeb10edbf269e11f16a3";
+      sha256 = "ba4d947ec2ce9364ff683ab050fe0985c55372d07696f51c6791b7eb5f496892";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/sl/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sl/Thunderbird%20140.9.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "343b3f3083d90e3af69b868cdeb2838f253eb15620391bcbfd056f1cc8e4abea";
+      sha256 = "6a319e796363c5f48af54eddc2980368f5913fa673461b887b827521f24ec958";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/sq/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sq/Thunderbird%20140.9.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "a5bdf5c95daf295a69efc5d10712dfe415fa1789600e8ce5e40293808f0f125b";
+      sha256 = "d804cf5b8cc7cd0fa9c1141c3bac5d6c43fddf904ab19254949ebe4d88387137";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/sr/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sr/Thunderbird%20140.9.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "d55fe916c462d53a487f18e678081a93dae399aee6287e0a71626cbdf63c9830";
+      sha256 = "6e3a819892859332f945cecc0b485fcd52692377e4ca2b9db070da58c0187688";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/sv-SE/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sv-SE/Thunderbird%20140.9.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "a3d27f1adc9dd669fcb3d3b723f19a345af724d58313f673909c3f10c15b7dc3";
+      sha256 = "053c7911b00d4ef30c60d6a96a422022fdc9163c879e6e8e0e0677f6090b3ba0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/th/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/th/Thunderbird%20140.9.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "6fa301645d35cad9005c89e382cf835ce14e4e16b21a14975ca5ee8bcd5fef7f";
+      sha256 = "8327c7ec56f2e99bd0b5d1cd3ffafc8e387a69029de27ad954405e0c982b3102";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/tr/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/tr/Thunderbird%20140.9.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "f1e25d069a0abc2739d840e55dedc21381c336f2b33eb79a79162c279535a666";
+      sha256 = "1e0ee12b2de52cb8831a84c64e804e7d06e89c62e5996c738139702b238b17e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/uk/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/uk/Thunderbird%20140.9.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "64f0437ddaf063b212326f940114ae5c5a93af24126fbf1a85edf9f0c9f81dd5";
+      sha256 = "988431461775f8bdcb3ae496600054efa6abe90f53648f393457cf10da404cea";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/uz/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/uz/Thunderbird%20140.9.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "884bfbc9fbf55943ae5756e11eb735a98332f10029eafeb45f569fe16d166217";
+      sha256 = "f8a37dee62c05f2c72d79eebd19cc2cf7a1e43960eda48008f6e7b996af4dfc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/vi/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/vi/Thunderbird%20140.9.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "4584b4388ae2030ea59646e65bc5bc622d6184c8ba0276b1e9805cf52f4e56a7";
+      sha256 = "fef0773954ebc81b7084f4829f258fff05e55cd3891b54375a78d2a55cd288dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/zh-CN/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/zh-CN/Thunderbird%20140.9.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "174172e128bf4bd67e5d01e5e9f6a264f6f4c5bb8b5edb50cc8ccca23629f29e";
+      sha256 = "8b26c96c41146252189cbf810ecdc2896e987ac29e1a309ec2dd7a5dd6422b01";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.0esr/mac/zh-TW/Thunderbird%20140.9.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/zh-TW/Thunderbird%20140.9.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "230780e756d59f2c1b7244d374f83f5f724a77750d1b7edf9c67236a7644003d";
+      sha256 = "76d87c322e1e0723c02f41b9e9db24ccdf01b87b1d18e4065dc6379fe65096dc";
     }
   ];
 }

From b138923ccb4355e1847e744f311b0e1a78ddaee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 23:09:18 +0000
Subject: [PATCH 153/389] python3Packages.awswrangler: 3.15.1 -> 3.16.0

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

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index 4aab5866b834..c0fc53356a78 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "awswrangler";
-  version = "3.15.1";
+  version = "3.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-pandas";
     tag = version;
-    hash = "sha256-fwiYuT3ICk5PAeCVAGiBj4eyVgLOFvbzkYWUPVX+YtE=";
+    hash = "sha256-utxSM8S3uelwrLHrXx5NglOmqjS7YKnAPujNS7UhWf8=";
   };
 
   pythonRelaxDeps = [

From a0531f9ecf50ebac6a1fee7377dbf28ffd9ca819 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 00:04:25 +0000
Subject: [PATCH 154/389] palemoon-bin: 34.1.0 -> 34.2.0

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

diff --git a/pkgs/by-name/pa/palemoon-bin/package.nix b/pkgs/by-name/pa/palemoon-bin/package.nix
index 4968f6d18046..799e16b1c5b2 100644
--- a/pkgs/by-name/pa/palemoon-bin/package.nix
+++ b/pkgs/by-name/pa/palemoon-bin/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "34.1.0";
+  version = "34.2.0";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-TMqk3XsNMAKfKvV1R/O2R+9bd2vnTM1qDhkVoohVCUU=";
+          hash = "sha256-FZSPpU1L2vIJ4nn7IFBJZTxz/grjBosKgA0IivnqWxU=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-IDIJNQ3jAI0PW03mqXU9vc8xUBbNn+zCIQlJGEJp+Mk=";
+          hash = "sha256-ESdPzyEinGv1LKO/6TF8s7IumxhOwUrgdnl4JnA8/PY=";
         };
       };
 

From da66efbfc556a64f129cd6f7844c8ec720064a9a Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 8 Apr 2026 18:24:37 -0500
Subject: [PATCH 155/389] lightning-loop: 0.32.1-beta -> 0.33.0-beta

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

diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index 953148101a7f..de703a7f968b 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lightning-loop";
-  version = "0.32.1-beta";
+  version = "0.33.0-beta";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "loop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gITl33H7fxF1YbJZJJBQk/V4wgbV5BtzBkLRvzVelmU=";
+    hash = "sha256-LfVC/s7VNc3LvypjdSFo0s2Ssmhk1Lzm9ojWGqaNCmI=";
   };
 
-  vendorHash = "sha256-ZFh21v8X/Bdrumpt2+u8lJgbQgNSX+PWRRsjr++C4/U=";
+  vendorHash = "sha256-pzcOKYw2kXfGUOBZmuUYuEfRUY8f1PSj30tvhttEwAk=";
 
   subPackages = [
     "cmd/loop"

From 767282563a400677872e64c874cc400a9ed8afca Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 8 Apr 2026 20:28:57 -0400
Subject: [PATCH 156/389] prismlauncher: 10.0.5 -> 11.0.0

Diff: https://github.com/PrismLauncher/PrismLauncher/compare/10.0.5...11.0.0
Changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/11.0.0
---
 pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 10 ++++++----
 pkgs/by-name/pr/prismlauncher/package.nix           |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index 668201afc545..ab133a3fa319 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -14,6 +14,7 @@
   qrencode,
   stripJavaArchivesHook,
   tomlplusplus,
+  vulkan-headers,
   zlib,
   msaClientID ? null,
 }:
@@ -21,19 +22,19 @@ let
   libnbtplusplus = fetchFromGitHub {
     owner = "PrismLauncher";
     repo = "libnbtplusplus";
-    rev = "531449ba1c930c98e0bcf5d332b237a8566f9d78";
-    hash = "sha256-qhmjaRkt+O7A+gu6HjUkl7QzOEb4r8y8vWZMG2R/C6o=";
+    rev = "3538933614059f0f44388a2b16f3db25ce42285b";
+    hash = "sha256-6/8clF2yNhfonV16cfIkxVIzuB9i9ThxoLMxAo/fDuY=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prismlauncher-unwrapped";
-  version = "10.0.5";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "PrismLauncher";
     repo = "PrismLauncher";
     tag = finalAttrs.version;
-    hash = "sha256-cQBOdF3HP4CFOSfWyVXGQBs42V/A4w6R2UwelQTE3dQ=";
+    hash = "sha256-hjl0GUmAwcxqGMhvrHux4kWfOZWJvDV+SqOhyYwsO6o=";
   };
 
   postUnpack = ''
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libarchive
     qrencode
     tomlplusplus
+    vulkan-headers
     zlib
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux gamemode;
diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
index c841c5dfa867..16790a473abb 100644
--- a/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -19,7 +19,6 @@
   libjack2,
   libpulseaudio,
   libusb1,
-  mesa-demos,
   openal,
   pciutils,
   pipewire,
@@ -107,7 +106,6 @@ symlinkJoin {
       ++ additionalLibs;
 
       runtimePrograms = [
-        mesa-demos
         pciutils # need lspci
         xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
       ]

From 04752f7a59c4eac25b20b42d69a73f74a0a9adc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 9 Apr 2026 02:17:32 +0200
Subject: [PATCH 157/389] esphome: fix dashboard erroring with: No module named
 esphome

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

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 99dc2e99f781..1d7fb10189f6 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -117,7 +117,9 @@ python.pkgs.buildPythonApplication rec {
         git
       ]
     }"
-    "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages
+    # The dashboard requires esphome to be importable
+    # dependencies are added to show better error messages
+    "--prefix PYTHONPATH : $out/${python.sitePackages}:${python.pkgs.makePythonPath dependencies}"
     "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}"
     "--set ESPHOME_USE_SUBPROCESS ''"
     # https://github.com/NixOS/nixpkgs/issues/362193

From 634df7328e3d83e5b61d36199a27b4316f77112f Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 16 Feb 2026 10:42:05 +0900
Subject: [PATCH 158/389] typescript-go: sync buildGoModule in updateScript

---
 pkgs/by-name/ty/typescript-go/package.nix | 35 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 69fff12763fa..33dd77e56d72 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -2,7 +2,12 @@
   lib,
   buildGo125Module,
   fetchFromGitHub,
+  _experimental-update-script-combinators,
   nix-update-script,
+  writeShellApplication,
+  nix,
+  gnugrep,
+  gnused,
 }:
 
 let
@@ -44,9 +49,33 @@ buildGoModule {
   '';
 
   passthru = {
-    updateScript = nix-update-script {
-      extraArgs = [ "--version=branch" ];
-    };
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script {
+        extraArgs = [
+          "--version=branch"
+          "--src-only"
+        ];
+      })
+
+      (lib.getExe (writeShellApplication {
+        name = "typescript-go-go-version-updater";
+        runtimeInputs = [
+          nix
+          gnugrep
+          gnused
+        ];
+        text = ''
+          new_src="$(nix-build --attr 'pkgs.typescript-go.src' --no-out-link)"
+          new_go_major_minor="$(grep --only-matching --perl-regexp '^go \K([0-9]+\.[0-9]+)' "$new_src/go.mod")"
+          sed -i -E "s/buildGo[0-9]+Module/buildGo''${new_go_major_minor//./}Module/g" '${toString ./package.nix}'
+        '';
+      }))
+
+      # Update vendorHash
+      (nix-update-script {
+        extraArgs = [ "--version=skip" ];
+      })
+    ];
   };
 
   meta = {

From 76f3bd52c27aa61b149e694b527dbb91eb1e8872 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 16 Feb 2026 12:56:23 +0900
Subject: [PATCH 159/389] typescript-go: 0-unstable-2026-02-11 ->
 0-unstable-2026-02-15

Diff: https://github.com/microsoft/typescript-go/compare/08cb84c68ae83b9def5e0132e05362e5061342ab...4b301b2d3a6c626d0c932b6db182c63d9a98505e

Required go version has been updated in:
https://github.com/microsoft/typescript-go/commit/cbceeeca5b7e348f43369309f9f03a2e99669d0e
---
 pkgs/by-name/ty/typescript-go/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 33dd77e56d72..9ff474562a92 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo125Module,
+  buildGo126Module,
   fetchFromGitHub,
   _experimental-update-script-combinators,
   nix-update-script,
@@ -11,17 +11,17 @@
 }:
 
 let
-  buildGoModule = buildGo125Module;
+  buildGoModule = buildGo126Module;
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2026-02-11";
+  version = "0-unstable-2026-02-15";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "08cb84c68ae83b9def5e0132e05362e5061342ab";
-    hash = "sha256-IvR7zHSl7kUmamQkGGrzdKJrdypnQe2a0X1YUyRYYTU=";
+    rev = "4b301b2d3a6c626d0c932b6db182c63d9a98505e";
+    hash = "sha256-IhK12tLjm2eTDcqsrX37lGssSieZgPNGao0w1DfduZ4=";
     fetchSubmodules = false;
   };
 

From d8a6246679c8d9dd1f5c3ab5d7fbe66da7df952a Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 9 Apr 2026 11:27:22 +0900
Subject: [PATCH 160/389] typescript-go: 0-unstable-2026-02-15 ->
 0-unstable-2026-04-08

Diff: https://github.com/microsoft/typescript-go/compare/4b301b2d3a6c626d0c932b6db182c63d9a98505e...2a5e1cf9fe2261f2ad56871a6d2ed12d6ac34083
---
 pkgs/by-name/ty/typescript-go/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 9ff474562a92..510084be1b3f 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -15,17 +15,17 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2026-02-15";
+  version = "0-unstable-2026-04-08";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "4b301b2d3a6c626d0c932b6db182c63d9a98505e";
-    hash = "sha256-IhK12tLjm2eTDcqsrX37lGssSieZgPNGao0w1DfduZ4=";
+    rev = "2a5e1cf9fe2261f2ad56871a6d2ed12d6ac34083";
+    hash = "sha256-vG53leoltVF7jXnf7AJRUIkbytqsqheoKG7bt7oB/h4=";
     fetchSubmodules = false;
   };
 
-  vendorHash = "sha256-QNKXJ9HA8WlLlTxflLt0a/Y2Lt8NG1AnNmBOESYFyRI=";
+  vendorHash = "sha256-YmKVn9fc7dKMBiXnutI15mg/BFCyvyXntr7QaxJ7qU8=";
 
   ldflags = [
     "-s"

From cf7ad36410ab9bba1442037659508e1fdaf5336c Mon Sep 17 00:00:00 2001
From: VZstless <i@vzstless.moe>
Date: Thu, 9 Apr 2026 10:44:44 +0800
Subject: [PATCH 161/389] freac: add VZstless as maintainer

---
 pkgs/by-name/fr/freac/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/freac/package.nix b/pkgs/by-name/fr/freac/package.nix
index ce322a272121..c323a26a836c 100644
--- a/pkgs/by-name/fr/freac/package.nix
+++ b/pkgs/by-name/fr/freac/package.nix
@@ -7,6 +7,7 @@
   smooth,
   systemd,
   wrapGAppsHook3,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "freac";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-bHoRxxhSM7ipRkiBG7hEa1Iw8Z3tOHQ/atngC/3X1a4=";
   };
 
@@ -31,10 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
     "prefix=$(out)"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Audio converter and CD ripper with support for various popular formats and encoders";
     license = lib.licenses.gpl2Plus;
     homepage = "https://www.freac.org/";
+    downloadPage = "https://www.freac.org/downloads-mainmenu-33";
+    changelog = "https://github.com/enzo1982/freac/releases/tag/${finalAttrs.src.tag}";
     platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ VZstless ];
+    mainProgram = "freac";
   };
 })

From e834f6a35a95d25af74b13499b49fd976168374a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 03:41:34 +0000
Subject: [PATCH 162/389] powershell-editor-services: 4.4.0 -> 4.5.0

---
 pkgs/by-name/po/powershell-editor-services/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix
index e6ebf028dc20..6782f302a82c 100644
--- a/pkgs/by-name/po/powershell-editor-services/package.nix
+++ b/pkgs/by-name/po/powershell-editor-services/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "powershell-editor-services";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchzip {
     url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip";
-    hash = "sha256-tmz6xkcF44xnG5VwSeHNWzjRQK6wxQ7Ii6mDNisCMb8=";
+    hash = "sha256-25nKcJ0Q9Kk2LEVutqxPPQvG+/hmeHsmUG01vmOsFqg=";
     stripRoot = false;
   };
 

From e1657ef4f29576148fd2ba0c77e765a9832a6413 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 8 Apr 2026 21:22:43 -0700
Subject: [PATCH 163/389] mmctl: allow overrides

---
 pkgs/by-name/mm/mmctl/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mm/mmctl/package.nix b/pkgs/by-name/mm/mmctl/package.nix
index eafb9c7fa0ed..a15df91be1af 100644
--- a/pkgs/by-name/mm/mmctl/package.nix
+++ b/pkgs/by-name/mm/mmctl/package.nix
@@ -1,9 +1,10 @@
 {
   lib,
   mattermost,
-}:
+  ...
+}@args:
 
-mattermost.withoutTests.server.overrideAttrs (prev: {
+(mattermost.override args).withoutTests.server.overrideAttrs (prev: {
   pname = "mmctl";
   subPackages = [ "cmd/mmctl" ];
 

From db29e69666ba0dec7d711fea504b6bbcac0f9e16 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Mon, 6 Apr 2026 21:40:06 +0200
Subject: [PATCH 164/389] rgx: 0.9.0 -> 0.10.1

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

diff --git a/pkgs/by-name/rg/rgx/package.nix b/pkgs/by-name/rg/rgx/package.nix
index f5bd66d7d370..fbb0df0aee7f 100644
--- a/pkgs/by-name/rg/rgx/package.nix
+++ b/pkgs/by-name/rg/rgx/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgx";
-  version = "0.9.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "brevity1swos";
     repo = "rgx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-04bnNHpIRMyqvRmXDjzGpeEHgwVDSoBtyunlt03nB5Q=";
+    hash = "sha256-H566bgnf4bNPXS7rPtOFTlqmkwoXKbB1fBmFDZQUjac=";
   };
 
-  cargoHash = "sha256-v7dO2TSCKb+E/jLYPw8Q499qFXmSnbv3/WoS+dZhyBM=";
+  cargoHash = "sha256-hTR4eZKUOxvib5lAV/l76GZQPQ6s+Hgl3DT2kaGlaGg=";
 
   meta = {
     homepage = "https://github.com/brevity1swos/rgx";

From 5de195f1878f51ba475d4f2ee2ab868a6410d354 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Mon, 6 Apr 2026 21:41:10 +0200
Subject: [PATCH 165/389] rgx: enable PCRE2 engine

---
 pkgs/by-name/rg/rgx/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/rg/rgx/package.nix b/pkgs/by-name/rg/rgx/package.nix
index fbb0df0aee7f..d8802bd82d9b 100644
--- a/pkgs/by-name/rg/rgx/package.nix
+++ b/pkgs/by-name/rg/rgx/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  pcre2,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-hTR4eZKUOxvib5lAV/l76GZQPQ6s+Hgl3DT2kaGlaGg=";
 
+  buildInputs = [ pcre2 ];
+
+  buildFeatures = [ "pcre2-engine" ];
+
   meta = {
     homepage = "https://github.com/brevity1swos/rgx";
     description = "Terminal regex tester with real-time matching and multi-engine support";

From 7bf6c93f184725b0b2ee26d3d724930f8fe91688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Thu, 9 Apr 2026 08:56:13 +0200
Subject: [PATCH 166/389] wasm-tools: 1.245.1 -> 1.246.2

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

diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index 124a474ab3ab..18ac20c863ff 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-tools";
-  version = "1.245.1";
+  version = "1.246.2";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0x3RcGd8OB/XNvKnHihvc0DOnCqB3gxTQAxLK7HIWMI=";
+    hash = "sha256-8HY11HNUm3GACNEr1OA438GSv9rVlgj4lsKiJVI31Dw=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-5CIKmfa/hqR1Ge7reiTzyx0D4JMjBsxg2xqxzzZxl4s=";
+  cargoHash = "sha256-DcIwKKzwzQvjToOTw9vQMuJbNCo9I7BwUigpJOa3Dm0=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

From c582c8f892db79bfb83d32aad657116bf6117524 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 07:03:09 +0000
Subject: [PATCH 167/389] hmcl: 3.12.2 -> 3.12.4

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

diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix
index 3e605a1959df..1192c1935d42 100644
--- a/pkgs/by-name/hm/hmcl/package.nix
+++ b/pkgs/by-name/hm/hmcl/package.nix
@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hmcl";
-  version = "3.12.2";
+  version = "3.12.4";
 
   src = fetchurl {
     # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
     # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
     url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
-    hash = "sha256-CuWueXEq77Nr6aVbXo3BJVsYU+UWwBZRz//zBToLwN0=";
+    hash = "sha256-CxLs3rMW++FGF7WV9EMIb+69ZrnV2MadEHD/NMyXBIw=";
   };
 
   # - HMCL prompts users to download prebuilt Terracotta binary for

From ef4d271c5adefdcf0cefb40cecbb3e473f868498 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 07:22:21 +0000
Subject: [PATCH 168/389] wayland-bongocat: 1.4.0 -> 2.0.0

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

diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix
index a3ffa7b998a6..f6b45b795b6c 100644
--- a/pkgs/by-name/wa/wayland-bongocat/package.nix
+++ b/pkgs/by-name/wa/wayland-bongocat/package.nix
@@ -12,12 +12,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland-bongocat";
-  version = "1.4.0";
+  version = "2.0.0";
   src = fetchFromGitHub {
     owner = "saatvik333";
     repo = "wayland-bongocat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sQnEu1i4WzHvpWnIXSzE0//t640QldQpH2C/ZuT8AJc=";
+    hash = "sha256-kmwC3PQQL2saPj2QihxHbbNDO1IvhVGbrECFvCqirrM=";
   };
 
   # Package dependencies

From 224ac92e9aec4debd0f8ecb9ec3d9f4cb5eeda3d Mon Sep 17 00:00:00 2001
From: Leonardo <noreply@leoflo.me>
Date: Tue, 17 Mar 2026 11:34:41 +0100
Subject: [PATCH 169/389] obdautodoctor: init at 5.1.8

---
 pkgs/by-name/ob/obdautodoctor/package.nix | 70 +++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/ob/obdautodoctor/package.nix

diff --git a/pkgs/by-name/ob/obdautodoctor/package.nix b/pkgs/by-name/ob/obdautodoctor/package.nix
new file mode 100644
index 000000000000..3a08b0141651
--- /dev/null
+++ b/pkgs/by-name/ob/obdautodoctor/package.nix
@@ -0,0 +1,70 @@
+{
+  stdenv,
+  lib,
+  fetchzip,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
+  kdePackages,
+  bluez,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "obdautodoctor";
+  version = "5.1.8";
+
+  src = fetchzip {
+    url = "https://cdn2.obdautodoctor.com/release/obd-auto-doctor_${finalAttrs.version}_amd64.tar.gz";
+    hash = "sha256-3qht1G2Qi+IhL/x9MMEAwM0exCav5iKtnZXTl6cwx3E=";
+  };
+
+  buildInputs = [
+    stdenv.cc.cc.lib
+    kdePackages.qtbase
+    bluez
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    kdePackages.wrapQtAppsHook
+    copyDesktopItems
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D obdautodoctor $out/bin/obdautodoctor
+    install -D obdautodoctor.png $out/share/icons/hicolor/128x128/apps/obdautodoctor.png
+
+    install -D license.txt $out/share/licenses/obdautodoctor/license.txt
+    install -D lgpl-3.0.txt $out/share/licenses/obdautodoctor/lgpl-3.0.txt
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "obdautodoctor";
+      desktopName = "OBD Auto Doctor";
+      comment = "OBD Car Diagnostics Software";
+      icon = "obdautodoctor";
+      exec = "obdautodoctor";
+      terminal = false;
+      categories = [
+        "Qt"
+        "Utility"
+      ];
+    })
+  ];
+
+  meta = {
+    description = "Diagnose problems, reset the Check Engine Light, and monitor your car's performance with ease";
+    homepage = "https://www.obdautodoctor.com/";
+    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ leoflo ];
+  };
+})

From 6527832e8746d981f7d47563f5c8d734679165ad Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 9 Apr 2026 15:38:00 +0700
Subject: [PATCH 170/389] crush: 0.55.0 -> 0.56.0

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

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 16dda53bbc41..fda66e8d6f9b 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -11,16 +11,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "crush";
-  version = "0.55.0";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7rndFGEeRiCd9wSu/TSjbvMVSIb2JMmLEqaIFdR0av4=";
+    hash = "sha256-JtqgEI09kRg/uW/2fxMQL5+cmODO2y6aW1e5OXTH2LY=";
   };
 
-  vendorHash = "sha256-leQHNLt3WebIvV/2nY+Lo+SVOV2SQ8EL9Mopu4lro9s=";
+  vendorHash = "sha256-n5pqIxN2TwiEWd3ZzFHqYSIKYPsMYAip3kDRx4ajuck=";
 
   ldflags = [
     "-s"

From 4fe29ad6b6fc011218892847d0a1001027e0e227 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:36:30 +0200
Subject: [PATCH 171/389] electron_39-bin: 39.8.2 -> 39.8.7

- Changelog: https://github.com/electron/electron/releases/tag/v39.8.7
- Diff: https://github.com/electron/electron/compare/refs/tags/v39.8.2...v39.8.7
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 2d50db1693a7..cac5a8501f0c 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "39": {
         "hashes": {
-            "aarch64-darwin": "1910b2b857e0ee6d2ebd57ead75c3ace7d367a6bb9ccd6a48f8d2b23d93ffe67",
-            "aarch64-linux": "856848216c549a783b39f8d84dd93668d71da0d804e3bba709265804e5b4ba94",
-            "armv7l-linux": "56602fe1579eec07d810389ccf3d10c3d50e994f0319048f4f3057f8b24aa97b",
-            "headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",
-            "x86_64-darwin": "9d80221dd2621a9526047be09379e32bbfc9dd57331e41bc0826aadbb69f632a",
-            "x86_64-linux": "3977017548b5dfdf78e1342cbe251c7ee7a127e52514903e181fa92143b0fa3a"
+            "aarch64-darwin": "86fa117ba10e36149ca33d7c22de2cfc3fb7490ca88b07ce953d2efe1f2a41cd",
+            "aarch64-linux": "fd721650a0e25829b76d307e944383be828533cdddd53e44a0b772e96e3e019b",
+            "armv7l-linux": "5d0a75a53cdba1ecfc678910084802fe500f13f470310ae1d2c66840d3c7390b",
+            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
+            "x86_64-darwin": "5dfe5559fd283c3962221c674b30a5b986895b644b1b4bc179e0c7673a14f1cf",
+            "x86_64-linux": "233b2775f1c46e5ebd5afeb4fb95ce9fda61229bad20aef1031468eb54b3656e"
         },
-        "version": "39.8.2"
+        "version": "39.8.7"
     },
     "40": {
         "hashes": {

From 3d8536ef9a74fdc9bc91f13055f3927432d3f56e Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:36:32 +0200
Subject: [PATCH 172/389] electron-chromedriver_39: 39.8.2 -> 39.8.7

- Changelog: https://github.com/electron/electron/releases/tag/v39.8.7
- Diff: https://github.com/electron/electron/compare/refs/tags/v39.8.2...v39.8.7
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 3d921583e874..98d698bab006 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "39": {
         "hashes": {
-            "aarch64-darwin": "0f8398b79fb1d6a0036be18c24caef2d48dab9e8980ff6a7f0f658e11df86ca0",
-            "aarch64-linux": "45083a530bd03781dd759720519c805c046f392d88e2404268392446f896e265",
-            "armv7l-linux": "09a6548e5abc4e1589870031bf35edb00b506da10102bb5d1b52fc069b7c1b34",
-            "headers": "0pi0nf8dk7sxj2a8k57zmwy39slph8j18icgpkgqyq5pfl5skmci",
-            "x86_64-darwin": "f9995e244e0c703b0c1e06bcad2b1b9feca79d4437901e3b9dfa1f635b03884b",
-            "x86_64-linux": "713570bbe7877fa950cbb533197cfb12aa7ff85d4db7e1fc9ad6ac57ca5733c9"
+            "aarch64-darwin": "2e2a3533f9969ded3b11eb0baa5357abeb652975d9bcaea0b0725c9bd0866061",
+            "aarch64-linux": "a8caf72372eb47deb336dc440eb183c30d228b3fef5349dac7571d86103f117c",
+            "armv7l-linux": "5d5f02b2e28e8328435d2fd83207098e69dc3e5fecbbbdc2612792370ab2c4ec",
+            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
+            "x86_64-darwin": "c74882bcbdd53f6e8cd65906809ac446bb032dce3ce8f109e2376d49b9b394ee",
+            "x86_64-linux": "e336dc2dce9d11d44f6eb5b5cc655d3311a9a109ea184625da3ac51181c3ad27"
         },
-        "version": "39.8.2"
+        "version": "39.8.7"
     },
     "40": {
         "hashes": {

From 3fa64d1ed1173166c244ba2f4a05fb04f665bf07 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:36:36 +0200
Subject: [PATCH 173/389] electron_40-bin: 40.8.2 -> 40.8.5

- Changelog: https://github.com/electron/electron/releases/tag/v40.8.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v40.8.2...v40.8.5
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index cac5a8501f0c..d27b10c8bcfd 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "40": {
         "hashes": {
-            "aarch64-darwin": "fdcd3e3500a09c7191b3e5375f7bf884bde1068b013e9f7786d4572364fadd22",
-            "aarch64-linux": "13b4d4b73d1ed96b647e26f5117cd79180db1d8cf3bf344e6c13c506693bf988",
-            "armv7l-linux": "af746bd31ef1801eba08cae6935fd6f576262c311d3f641a8accc4c2f0f4b986",
+            "aarch64-darwin": "7a400c28aeba7bdf691ff03d2a620b76c7f8c75fdfac1f4543a8dc13b039fa24",
+            "aarch64-linux": "5af0073c52a8dc729e118340b5f50c4b2932bd94ba992e1c5380fe1545330373",
+            "armv7l-linux": "8f65d16758cdec2d4474732fb60e1f28e1829b4ee7ba67fcb9b5b6510652e667",
             "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
-            "x86_64-darwin": "96f9f69e6a91dff7defcfe6c6a9ff3d366478dbbb0ae6ff4f74fe779ea1bb893",
-            "x86_64-linux": "3eba5cc2ebe1d33395188c22c4b2310658db18699ee55b6a7a003a388321b761"
+            "x86_64-darwin": "2600d89b2ffa452bb5dc2fe11f0f7719ae001273f6f6c68988140986e5f95508",
+            "x86_64-linux": "3bce6ee4e4e481f7ce6d0be384f6c539ce16e0b9b7f46115aec6516770f6c26d"
         },
-        "version": "40.8.2"
+        "version": "40.8.5"
     },
     "41": {
         "hashes": {

From b82d7818ad10e0521d34b7cea13fb53decc53285 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:36:38 +0200
Subject: [PATCH 174/389] electron-chromedriver_40: 40.8.2 -> 40.8.5

- Changelog: https://github.com/electron/electron/releases/tag/v40.8.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v40.8.2...v40.8.5
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 98d698bab006..a5902c3b6e97 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "40": {
         "hashes": {
-            "aarch64-darwin": "9e6e4b4ed6a76dae4528c2d89d7df2dcf6f9c998f87e84fae346006403612448",
-            "aarch64-linux": "bff62b17117e6f574067efe776bfb64760a5ec1167e7cd69995cc549778d5c53",
-            "armv7l-linux": "87ec532bb5dbec921e8772099b928c2ababb3f07b163c1bcd0c620eab7d4a4b4",
+            "aarch64-darwin": "60a199b111b7cb032f6400371064cfa75457c13fd1699aa25dae2ca780e10b63",
+            "aarch64-linux": "6dec383c6f0779daffdd7b8e106d7a4261bc798acf7c250195a98de79f0e92d5",
+            "armv7l-linux": "57304ae9d455ba9be1fc079138ccaa1c4f168dece10aec970477beea7b92270f",
             "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
-            "x86_64-darwin": "f3e196a27eee46e58965747041f1e6ec55ac089a433ed18aa3cebcc0072ae896",
-            "x86_64-linux": "7cbc40681c71bbdd56f7f3dd9cbb8912fbffb9044e9e6a2e363583103b26c60f"
+            "x86_64-darwin": "6e774f3ae2d69accc3745e09f39fce6dc18d7cbe63e2698dfb7f36a2881b2f05",
+            "x86_64-linux": "804d1cd1c20c44691e071a2f9a25e42cfd28f4ccfd4368552072e37ad18ad807"
         },
-        "version": "40.8.2"
+        "version": "40.8.5"
     },
     "41": {
         "hashes": {

From 6d665b16fa08641db020a378b58973b094ec0767 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:36:42 +0200
Subject: [PATCH 175/389] electron_41-bin: 41.0.2 -> 41.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v41.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v41.0.2...v41.2.0
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index d27b10c8bcfd..4c4791aeba72 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "41": {
         "hashes": {
-            "aarch64-darwin": "8e18ef53da62bca6132508721c1f94e06b5773b48d366b95e593479892f0a2fe",
-            "aarch64-linux": "5eff34c3c28f7a35d8f90ba23b58e5d5125b7f8fb39be12416dc61fe28b24c21",
-            "armv7l-linux": "963b9ddbad8f6003807544c485fc548554ced3cfedcf0b8c130ba724b5560952",
-            "headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",
-            "x86_64-darwin": "446bd464236cec71fdfb5562bae5d092cbf27ed5213feac39b7667081578b9c6",
-            "x86_64-linux": "9f1f347dc81e94b1207fc6ae4c1f1d189d26d3356da6f99e7e46087c84d28f10"
+            "aarch64-darwin": "e018684f96c873415fbea4713fc7db96b6d1e2bd3db4513e2b8c1887ec83a719",
+            "aarch64-linux": "f8983c877df8f2b93c76d35e45af9df82c9eb5f294b183f8fe5930e5155fdc4e",
+            "armv7l-linux": "71e8db75ab19d3c403c5476fdec120bbd19750b0c4cbe9086ff729e0e0c712c4",
+            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
+            "x86_64-darwin": "fb3750bcfccc0146065708bf065288252da02489d51414a6d5b77d04f94a3f2a",
+            "x86_64-linux": "fb0b31f5bb2b248d571c08ab57437c08a69b57f63ccdf9e55d6692b6132848d4"
         },
-        "version": "41.0.2"
+        "version": "41.2.0"
     }
 }

From 1659c5e6515dde0f761ff04fac15ddecf4e031f7 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:36:44 +0200
Subject: [PATCH 176/389] electron-chromedriver_41: 41.0.2 -> 41.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v41.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v41.0.2...v41.2.0
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index a5902c3b6e97..acbf58fdf2d5 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "41": {
         "hashes": {
-            "aarch64-darwin": "b24542ea11f192425a8416524bd710cad3e0bf61f4ef6f8e0bb772034f445798",
-            "aarch64-linux": "04c82fd4c384197e088921a1fc80d0ecf2e26437c1e61d9d1a448e177fc901bd",
-            "armv7l-linux": "d991063e2c9006fe2561b13e267860400958d78a75bb9e1abec7732d215a6996",
-            "headers": "0ndgpbszlnimvrmxjwlx15xds9csjsxpi6ix36cfq9dbvr6dn85m",
-            "x86_64-darwin": "1b42ad2c246480b994f939ebcda435a48e048bdcda278316c02ed657489ba29e",
-            "x86_64-linux": "43c41b02eddc944300c516e218c46a12db924cfa5d9559023085adc3aa18c564"
+            "aarch64-darwin": "9f8e18fec80a8a93d123549e379f1524c61bdd7c005d90a4df02a5aa5c9b779b",
+            "aarch64-linux": "83c9570411fb2ed83548b08b1a95928a3828ecb5f8a5f7c862f4188611420614",
+            "armv7l-linux": "217ffd04268cd8f459e1f6be0cd81431f45a04af3175073e0e56a4f15068e372",
+            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
+            "x86_64-darwin": "9e7fc8ded16d5f4c82373a4b048d48beec8529b6126bad188f08fc7923f8b40d",
+            "x86_64-linux": "84009c924c7e5feabee8066f7dbf54abf1997d033d9156a6a36e3b8cf9f0b148"
         },
-        "version": "41.0.2"
+        "version": "41.2.0"
     }
 }

From 0171195d28c8f553516dfb15c030e584ea1d9b24 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:37:30 +0200
Subject: [PATCH 177/389] electron-source.electron_39: 39.8.2 -> 39.8.7

- Changelog: https://github.com/electron/electron/releases/tag/v39.8.7
- Diff: https://github.com/electron/electron/compare/refs/tags/v39.8.2...v39.8.7
---
 pkgs/development/tools/electron/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 8f156e401d57..2f680c3fd908 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -56,10 +56,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-RveQxDKnvEMdijWO1w3qVME64bc/EPosyv5qS1BUQTc=",
+                    "hash": "sha256-RrqxAum+OEmuh/f2PfPFDulmU3LhTqUtwww8Nb+F7NI=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v39.8.2"
+                    "tag": "v39.8.7"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1342,10 +1342,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "sha256-l24z99s6gwdwkAnFex/tFxLpOlN72SS0j1rWP0V3LmA=",
+        "electron_yarn_hash": "sha256-HCnJJqfgcilB+Cl2OaezL9Uu1xk0ZBdVEXg2VDR1dwU=",
         "modules": "140",
         "node": "22.22.1",
-        "version": "39.8.2"
+        "version": "39.8.7"
     },
     "40": {
         "chrome": "144.0.7559.236",

From bb25f1f152bed57d02b7ab7a5e9ed64611417562 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Wed, 8 Apr 2026 14:37:45 +0200
Subject: [PATCH 178/389] electron-source.electron_40: 40.8.2 -> 40.8.5

- Changelog: https://github.com/electron/electron/releases/tag/v40.8.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v40.8.2...v40.8.5
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 2f680c3fd908..0b13724b603a 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1404,10 +1404,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-ft8q4spa4DiNH+rinT83KZHENA1gFHA0L8fLq+uO2MY=",
+                    "hash": "sha256-Uvgjmq/xfD1IjYMC2CSmNHGWtsV9V2RJmtKhhRKITyM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v40.8.2"
+                    "tag": "v40.8.5"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2693,7 +2693,7 @@
         "electron_yarn_hash": "sha256-+7UFFBC4awv3Eg7aB5fKgIysAA2QIpds7s7xN2DuoP8=",
         "modules": "143",
         "node": "24.14.0",
-        "version": "40.8.2"
+        "version": "40.8.5"
     },
     "41": {
         "chrome": "146.0.7680.72",

From 3ccb323dc91e8ea397372aa652822ace17370a52 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Thu, 9 Apr 2026 09:42:51 +0200
Subject: [PATCH 179/389] electron-source.electron_41: 41.0.2 -> 41.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v41.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v41.0.2...v41.2.0
---
 pkgs/development/tools/electron/info.json | 48 +++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 0b13724b603a..141cd63c6139 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2696,7 +2696,7 @@
         "version": "40.8.5"
     },
     "41": {
-        "chrome": "146.0.7680.72",
+        "chrome": "146.0.7680.179",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2705,15 +2705,15 @@
                     "version": "0-unstable-2026-02-05"
                 }
             },
-            "version": "146.0.7680.72"
+            "version": "146.0.7680.179"
         },
         "chromium_npm_hash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-+McF03H5tyxItoSfqFpaRO/nSx6T4rjOmoHaGgkaS4s=",
+                    "hash": "sha256-HTeAvITnXbFdNiKmXWlOPfWFRjJ1ES2QkY5LjwX4OII=",
                     "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "146.0.7680.72",
+                    "tag": "146.0.7680.179",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2752,10 +2752,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Bto47eWPdteTsKKrVtH6e0dI303cRbaaev3Hd2+m2nA=",
+                    "hash": "sha256-Pt/BZVy3kSREabV0LvLAQN5D2v2GHBvnRKUuZ9DIQ+Y=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v41.0.2"
+                    "tag": "v41.2.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2785,8 +2785,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-QVtTxBBox8fiqTj0gjqvYx6HoBSlvuWIe5ki4iCQl08=",
-                    "rev": "1d3190bf5633327395d694d621258978d989dffd",
+                    "hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc=",
+                    "rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2977,8 +2977,8 @@
             },
             "src/third_party/dawn": {
                 "args": {
-                    "hash": "sha256-Duv3kNulPtVxCLPa3bFIev64O9Y4ObJP/IZz31oPJ0E=",
-                    "rev": "c46c81b25577c40de6e7e510743ae0454e0c8351",
+                    "hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU=",
+                    "rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5",
                     "url": "https://dawn.googlesource.com/dawn.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3243,8 +3243,8 @@
             },
             "src/third_party/harfbuzz-ng/src": {
                 "args": {
-                    "hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=",
-                    "rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b",
+                    "hash": "sha256-2utl+HNeomIpdqS3hsYZveFfZ+ksMGRvgCaH3WVvsFw=",
+                    "rev": "c24f6a29e5912332e269891fbdb1ac771d543a08",
                     "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3347,8 +3347,8 @@
             },
             "src/third_party/libaom/source/libaom": {
                 "args": {
-                    "hash": "sha256-RuCmzPIR6hW8znjQH4kQqSJmIIJWtMkUQjYEVn3B9AE=",
-                    "rev": "4018d3b63456eb657475e66c352bfa86f321e0f5",
+                    "hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE=",
+                    "rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce",
                     "url": "https://aomedia.googlesource.com/aom.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3628,8 +3628,8 @@
             },
             "src/third_party/pdfium": {
                 "args": {
-                    "hash": "sha256-jMoYwf63C0IHx/QcOT+LKCCYN3dJVUhC5COukkhwqx0=",
-                    "rev": "67cf48602b0c8aaa9807cd185212ee078eb30b21",
+                    "hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=",
+                    "rev": "bccc616f83aaed08f65d4a707dfe00e24133772b",
                     "url": "https://pdfium.googlesource.com/pdfium.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3724,8 +3724,8 @@
             },
             "src/third_party/skia": {
                 "args": {
-                    "hash": "sha256-RoLgaE5mj9UqePhnfH+BOTit04TyiAvgF7/2PLuBG4Y=",
-                    "rev": "50841da4a7b7064b3cea8a851e60ef921c87a103",
+                    "hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM=",
+                    "rev": "30d129c8800b5626c46fb83fa62db10b9b22b319",
                     "url": "https://skia.googlesource.com/skia.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3999,8 +3999,8 @@
             },
             "src/third_party/webrtc": {
                 "args": {
-                    "hash": "sha256-evtOzxwWgKUaJl9zwpQDqPp1wM7w3DzjRcLg29z9ELQ=",
-                    "rev": "d1972add2a63b2a528a6471d447f82e0010b5215",
+                    "hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw=",
+                    "rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",
                     "url": "https://webrtc.googlesource.com/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -4047,16 +4047,16 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-dsjddO/LCNAYLJ1XyDkJLJ9TToiy7pENlBryF1VcmtY=",
-                    "rev": "bc343986bd4cb17e49ef15b70c4bdac710e27167",
+                    "hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI=",
+                    "rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "sha256-yZJjsVx1dvxj0X08n5kO8F2FWYIndbJ+ZiNIXTxsgEw=",
+        "electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=",
         "modules": "145",
         "node": "24.14.0",
-        "version": "41.0.2"
+        "version": "41.2.0"
     }
 }

From c9a7b684e60aa207548e4a3b912b874106fba516 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 09:43:51 +0000
Subject: [PATCH 180/389] gemini-cli-bin: 0.36.0 -> 0.37.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 9d87c7ac0475..ed6f97a515e9 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.36.0";
+  version = "0.37.0";
 
   src = fetchzip {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini-cli-bundle.zip";
-    hash = "sha256-wu+QZ5roBNY1mwtte+7opKFBRdOCXONW95UEJ7M3gJI=";
+    hash = "sha256-JbR37CZGjZN0px+bGLQ67dbo/yyAb7BSx1v6IVuBCJc=";
     stripRoot = false;
   };
 

From d2d1238df918f7f39e497f2fc33a79dc8e643d12 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 9 Apr 2026 11:44:27 +0200
Subject: [PATCH 181/389] harper: 1.12.0 -> 2.0.0

Changelog: https://github.com/Automattic/harper/releases/tag/v2.0.0
Diff: https://github.com/Automattic/harper/compare/v1.12.0...v2.0.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 94f5d8627744..1af500db650f 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harper";
-  version = "1.12.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PIUrOwKiLZyeHceOUK7gSylhO815gyj7/XERGGGYAsA=";
+    hash = "sha256-3NwQOs0G0b13dnCN0oif863/BJ2zAUFXsF9TpFeMDLA=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-79wUwINGkhHSmb+0Mq+x+evZNLfhNtWoRgoJHhIlw90=";
+  cargoHash = "sha256-+WUmNmFBuk9lQsUXYBEpTo49Ygul0BPRY0kcHCCC0GU=";
 
   passthru.updateScript = nix-update-script { };
 

From a8649c6ac13782c8572cc991073593c2d5857832 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 9 Apr 2026 11:58:22 +0200
Subject: [PATCH 182/389] homer: 25.11.1 -> 26.4.1

Git changelog: https://github.com/bastienwirtz/homer/compare/v25.11.1...v26.4.1

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/ho/homer/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index eb901a28eefd..370f4316e979 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -10,14 +10,16 @@
   nix-update-script,
   nixosTests,
 }:
+
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
-  version = "25.11.1";
+  version = "26.4.1";
+
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
     rev = "v${version}";
-    hash = "sha256-6shFVaCtPQeZCeeswAQHgcXOwVwABNa3ljsdUG63QGo=";
+    hash = "sha256-zb6A0h0OuSUxh43tO/ksKXvkjrJMwNCsRJwgIy7eXpk=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -27,8 +29,8 @@ stdenvNoCC.mkDerivation rec {
       src
       ;
     pnpm = pnpm_10;
-    fetcherVersion = 2;
-    hash = "sha256-TtazfRhcniA1H//C95AMH8/Pw+Rbtinlfg7dDAmSk1w=";
+    fetcherVersion = 3;
+    hash = "sha256-7BLQHmnw+FfUm9R5//8kEBusM2O+wbTF5joHo60zKfQ=";
   };
 
   nativeBuildInputs = [

From 2fa8efa0b16cd38f5979f82f7d2fdf27370cfd81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 09:59:58 +0000
Subject: [PATCH 183/389] firefox-devedition-unwrapped: 150.0b3 -> 150.0b7

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 6e8f1e818757..235be9bf0062 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "150.0b3";
+  version = "150.0b7";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "1a1f9079b50bb632fe578be6452269db6195df0663165d3d3906897368d4d3752c51fb4ace9651881d5a4e9a5dd5dcb2bdf18efab193d80acac1c2f502ef11e1";
+    sha512 = "e4240a9c13bbe188763eb03d65935576c03ba4ead80411ff2ca528a06788bbe4b61be3fa221c01f70e4601428bf8c7895506df28a782078e8171d34d017299a0";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 4aa12738ba49b95c42d7df4bdc56014da0a89776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 10:03:42 +0000
Subject: [PATCH 184/389] tree-sitter-grammars.tree-sitter-sshclientconfig:
 2026.3.19 -> 2026.4.9

---
 .../tools/parsing/tree-sitter/grammars/grammar-sources.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index bf672fccf608..f6ec3302a181 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -2484,9 +2484,9 @@
   };
 
   sshclientconfig = rec {
-    version = "2026.3.19";
+    version = "2026.4.9";
     url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-lR9YMp62YjB4OF/eSQlbEDOqGu5Ag/YMrZBIHldXN6s=";
+    hash = "sha256-6DyyfBbq72J6ciCCLRn2oN30/+VY55ztshoOinZpbHE=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [

From 8a5d87908059973594b0069774320e7f54c01e32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 10:20:39 +0000
Subject: [PATCH 185/389] postgresqlPackages.pg_search: 0.22.5 -> 0.22.6

---
 pkgs/servers/sql/postgresql/ext/pg_search.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix
index 55c7427e1d28..adface4d866c 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_search.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix
@@ -11,16 +11,16 @@
 
 buildPgrxExtension (finalAttrs: {
   pname = "pg_search";
-  version = "0.22.5";
+  version = "0.22.6";
 
   src = fetchFromGitHub {
     owner = "paradedb";
     repo = "paradedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b5sdKEWy4/uXLIE6HtcRMihtRK9iO9jM8pvktO3rOUU=";
+    hash = "sha256-TJLrsdsCZJX1opwvr92G2zQjRoGbuD5a/jKar/rlb9E=";
   };
 
-  cargoHash = "sha256-Umbx1ZrQEYifp09+unfaN/MBcbSq16NcqhP6h703Sb8=";
+  cargoHash = "sha256-VgoN4joyobRyKbiDDwjyMFt+mWaIJFQtCdIpTSNf134=";
 
   inherit postgresql;
 

From 21a518831a79836ca68b6edac4ca7a5124dc66b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Apr 2026 12:33:33 +0200
Subject: [PATCH 186/389] python3Packages.awswrangler: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index c0fc53356a78..4d6d8977b10b 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -23,7 +23,7 @@
   sparqlwrapper,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "awswrangler";
   version = "3.16.0";
   pyproject = true;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-pandas";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-utxSM8S3uelwrLHrXx5NglOmqjS7YKnAPujNS7UhWf8=";
   };
 
@@ -83,8 +83,8 @@ buildPythonPackage rec {
   meta = {
     description = "Pandas on AWS";
     homepage = "https://github.com/aws/aws-sdk-pandas";
-    changelog = "https://github.com/aws/aws-sdk-pandas/releases/tag/${src.tag}";
+    changelog = "https://github.com/aws/aws-sdk-pandas/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mcwitt ];
   };
-}
+})

From 3d12e576b39a22ac70cb5bf37509d091a0fb7949 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 9 Apr 2026 00:41:13 +0200
Subject: [PATCH 187/389] signal-desktop: 8.4.1 -> 8.6.0

changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v8.6.0

diff: https://github.com/signalapp/Signal-Desktop/compare/v8.4.1...v8.6.0
---
 .../force-90-days-expiration.patch            |  8 +++---
 .../si/signal-desktop/libsignal-node.nix      |  8 +++---
 pkgs/by-name/si/signal-desktop/package.nix    | 20 ++++++-------
 .../replace-apple-emoji-with-noto-emoji.patch | 28 +++++++++----------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch b/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch
index 982ed6eaac8e..0f87e258dada 100644
--- a/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch
+++ b/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch
@@ -1,18 +1,18 @@
 diff --git a/ts/scripts/get-expire-time.node.ts b/ts/scripts/get-expire-time.node.ts
-index 7938f74d3..9d427977d 100644
+index deebfcee6..50f6df652 100644
 --- a/ts/scripts/get-expire-time.node.ts
 +++ b/ts/scripts/get-expire-time.node.ts
 @@ -18,7 +18,7 @@ const buildCreation = unixTimestamp * 1000;
  
  // NB: Build expirations are also determined via users' auto-update settings; see
  // getExpirationTimestamp
--const validDuration = isNotUpdatable(version) ? DAY * 30 : DAY * 90;
+-const validDuration = isNotUpdatable(packageJson.version) ? DAY * 30 : DAY * 90;
 +const validDuration = DAY * 90;
  const buildExpiration = buildCreation + validDuration;
  
  const localProductionPath = join(
 diff --git a/ts/util/buildExpiration.std.ts b/ts/util/buildExpiration.std.ts
-index 530443ec7..26cb03d7c 100644
+index c2ac24c6d..65260f8bd 100644
 --- a/ts/util/buildExpiration.std.ts
 +++ b/ts/util/buildExpiration.std.ts
 @@ -70,9 +70,7 @@ export function hasBuildExpired({
@@ -25,4 +25,4 @@ index 530443ec7..26cb03d7c 100644
 +  const safeExpirationMs = NINETY_ONE_DAYS;
  
    const buildExpirationDuration = buildExpirationTimestamp - now;
-   const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;
+   const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;
\ No newline at end of file
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index d71c7d6a3546..1009f28ac4b3 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -14,23 +14,23 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.89.1";
+  version = "0.91.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eYeRlyKtTxPT1tpmuEsFrXNnp1F+l/PJcxpUDblCL60=";
+    hash = "sha256-icmmQWWVCWg8dpNkQtLi3YWSxBrUwaGP4ezTDqC/0kc=";
   };
 
-  cargoHash = "sha256-7kLqrU/yD0aeeULpuh8EgZvmKo1c3Wuwe+9vEm8sFT8=";
+  cargoHash = "sha256-NaFl9r4e08I3+/asek7VMA0yikxPR0MtBX9TnHaebSU=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-SZJIj5uBB6EZEACC44IpGvDTQuQIDgqmLGkgRbtUwOc=";
+    hash = "sha256-TTU7cfoS0h2fqHanSOCsF+dtkhBfaWApfOC3O4DGClo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index c452a132f4f7..5bda913e7a00 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -58,13 +58,13 @@ let
     '';
   });
 
-  version = "8.4.1";
+  version = "8.6.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-HjIU7L3iSr51w3KxzmaVzOI6qtAyyyWTlK1HygNyEzw=";
+    hash = "sha256-K6mufC7LFGWeCkIkrsYPO2n/0L1b6yBqiLcv7w7e57g=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -159,11 +159,11 @@ stdenv.mkDerivation (finalAttrs: {
     # language-pack postprocessing), and they expect a different macOS
     # app layout than nixpkgs' Electron provides.
     substituteInPlace package.json \
-      --replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.js",' "" \
-      --replace-fail '"afterSign": "ts/scripts/after-sign.node.js",' "" \
-      --replace-fail '"afterPack": "ts/scripts/after-pack.node.js",' "" \
-      --replace-fail '"sign": "./ts/scripts/sign-macos.node.js",' "" \
-      --replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.js",' ""
+      --replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.ts",' "" \
+      --replace-fail '"afterSign": "ts/scripts/after-sign.node.ts",' "" \
+      --replace-fail '"afterPack": "ts/scripts/after-pack.node.ts",' "" \
+      --replace-fail '"sign": "./ts/scripts/sign-macos.node.ts",' "" \
+      --replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.ts",' ""
   '';
 
   pnpmDeps = fetchPnpmDeps {
@@ -177,15 +177,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 3;
     hash =
       if withAppleEmojis then
-        "sha256-QaYUL5/JcXqd564CFAR+4EMMG38h8a1dpls054iWDzU="
+        "sha256-d6ul6MTJhnM4PyxMlMaVovnvSPfYh3DmMjHjmOideB4="
       else
-        "sha256-NEUKdRT0aVznkXTZOJJ8TCUhidhTAiDdBxoukKvt4qs=";
+        "sha256-JymcPdFMi0wfceOJnPrwEBG4PnosIFnrxiIrTlcGf/g=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1774560637;
+    SOURCE_DATE_EPOCH = 1775687068;
   }
   // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     # Disable code signing during local macOS builds.
diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
index 71e6d448bfab..8cf90b611334 100644
--- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
+++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
@@ -46,32 +46,32 @@ index 483d1c4e4..66609d9e9 100644
      getBadgesPath(userDataPath),
      getDraftPath(userDataPath),
 diff --git a/package.json b/package.json
-index 31399e645..05fc46b8b 100644
+index 8585e6bdc..4d900ebfe 100644
 --- a/package.json
 +++ b/package.json
-@@ -156,7 +156,6 @@
-     "dashdash": "2.0.0",
-     "direction": "1.0.4",
+@@ -122,7 +122,6 @@
+     "@signalapp/sqlcipher": "3.2.1",
+     "@signalapp/windows-ucv": "1.0.1",
      "emoji-datasource": "16.0.0",
 -    "emoji-datasource-apple": "16.0.0",
-     "emoji-regex": "10.4.0",
-     "encoding": "0.1.13",
-     "fabric": "4.6.0",
+     "google-libphonenumber": "3.2.39"
+   },
+   "devDependencies": {
 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index 223557f67..2250b619d 100644
+index 756130661..4872be4cf 100644
 --- a/pnpm-lock.yaml
 +++ b/pnpm-lock.yaml
-@@ -200,9 +200,6 @@ importers:
+@@ -97,9 +97,6 @@ importers:
        emoji-datasource:
          specifier: 16.0.0
          version: 16.0.0
 -      emoji-datasource-apple:
 -        specifier: 16.0.0
 -        version: 16.0.0
-       emoji-regex:
-         specifier: 10.4.0
-         version: 10.4.0
-@@ -5835,9 +5832,6 @@ packages:
+       google-libphonenumber:
+         specifier: 3.2.39
+         version: 3.2.39
+@@ -6068,9 +6065,6 @@ packages:
      resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
      engines: {node: '>=12'}
  
@@ -81,7 +81,7 @@ index 223557f67..2250b619d 100644
    emoji-datasource@16.0.0:
      resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
  
-@@ -17062,8 +17056,6 @@ snapshots:
+@@ -16954,8 +16948,6 @@ snapshots:
  
    emittery@0.13.1: {}
  

From cfebe85a8ee1bb1914018eed48157efb2b3f53eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 11:01:35 +0000
Subject: [PATCH 188/389] phpunit: 13.0.6 -> 13.1.1

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index 43c0e975e9aa..9908e2f860bc 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -8,16 +8,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "13.0.6";
+  version = "13.1.1";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-leSHb+G5zzYOw0AbQRbB8bIcKS4kvIY/6TGDFBto/9o=";
+    hash = "sha256-M6O+jfS2B3QUPJoxrVHW8PmeTw77D+oDoLkDstyJ5Vs=";
   };
 
-  vendorHash = "sha256-uUENOq9BEX0vZU3PBc7+nL4IkUx/R2QTO+COT6oNsPM=";
+  vendorHash = "sha256-vpUVKV8+Ymoir8YmyoyRqdvQnUtYp1+HmjEuPGtxRy0=";
 
   passthru = {
     updateScript = nix-update-script { };

From a5673e674446d540fab626b2692e8be09365f776 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 9 Apr 2026 14:18:45 +0200
Subject: [PATCH 189/389] claude-code: 2.1.92 -> 2.1.97

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/package-lock.json | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 0e9dc25c3830..a1149bd0e4e0 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.1.92",
+  "version": "2.1.97",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.1.92",
+      "version": "2.1.97",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 29fdae0555e3..7bd025e02c07 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.1.92";
+  version = "2.1.97";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-CLLCtVK3TeXFZ8wBnRRHNc2MoUt7lTdMJwz8sZHpkFM=";
+    hash = "sha256-J92ILqBJmXyAueUPZ+HYZY0ls3OfN2EAhFyQHTOQF5A=";
   };
 
-  npmDepsHash = "sha256-5LvH7fG5pti2SiXHQqgRxfFpxaXxzrmGxIoPR4dGE+8=";
+  npmDepsHash = "sha256-0fZu5r/zQjUSbm49FhZSqiIyMKdmH050NSxoVWd3XoU=";
 
   strictDeps = true;
 

From 8816d2af308a42d6812c8eb15be438bb6ddbdf94 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 9 Apr 2026 14:18:50 +0200
Subject: [PATCH 190/389] vscode-extensions.anthropic.claude-code: 2.1.92 ->
 2.1.96

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 6f17beb99dac..912a15f69a5b 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.1.92";
-    hash = "sha256-L3W9LoFA6JzsPa20Md9rOJBG/siauIJeuDcE7euZxMg=";
+    version = "2.1.96";
+    hash = "sha256-9WVCySGmohmyzTzcskzGCHk6ZFX+/HwkpmX2yudVar8=";
   };
 
   postInstall = ''

From d8407edc2e5ed412fb8b867881a9232db559b88d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 12:50:15 +0000
Subject: [PATCH 191/389] veusz: 4.2 -> 4.2.1

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

diff --git a/pkgs/by-name/ve/veusz/package.nix b/pkgs/by-name/ve/veusz/package.nix
index a114e6212af1..cb0b56d6487f 100644
--- a/pkgs/by-name/ve/veusz/package.nix
+++ b/pkgs/by-name/ve/veusz/package.nix
@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "veusz";
-  version = "4.2";
+  version = "4.2.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-jyghPk/u4THHnXrG/UDzHfW4AkS6n0CEd3VK+GX9he0=";
+    hash = "sha256-+txG1MQWbZaVq322p4ZctzanPw+geEf9ilu5kGQI3Qk=";
   };
 
   nativeBuildInputs = [

From a3fab50f8ee9bf243276d055d4bd3e4cf50ce99d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 13:32:02 +0000
Subject: [PATCH 192/389] androidenv.test-suite: bf29939be4d269fd ->
 7fb1f87547f5d4c6

---
 pkgs/development/mobile/androidenv/repo.json | 1664 +++++++++---------
 1 file changed, 795 insertions(+), 869 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index ce9701d123ec..58a1311e91de 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -23,8 +23,7 @@
         "type-details": {
           "api-level:0": "10",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -91,7 +90,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -102,8 +101,7 @@
         "type-details": {
           "api-level:0": "11",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -156,7 +154,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -167,8 +165,7 @@
         "type-details": {
           "api-level:0": "12",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -233,7 +230,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -244,8 +241,7 @@
         "type-details": {
           "api-level:0": "12",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -280,7 +276,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -291,8 +287,7 @@
         "type-details": {
           "api-level:0": "13",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -357,7 +352,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -368,8 +363,7 @@
         "type-details": {
           "api-level:0": "13",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -404,7 +398,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -415,8 +409,7 @@
         "type-details": {
           "api-level:0": "14",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -483,7 +476,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -494,8 +487,7 @@
         "type-details": {
           "api-level:0": "15",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -576,7 +568,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -587,8 +579,7 @@
         "type-details": {
           "api-level:0": "16",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -669,7 +660,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -680,8 +671,7 @@
         "type-details": {
           "api-level:0": "17",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -762,7 +752,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -773,8 +763,7 @@
         "type-details": {
           "api-level:0": "18",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -855,7 +844,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -866,8 +855,7 @@
         "type-details": {
           "api-level:0": "19",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -948,7 +936,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -959,8 +947,7 @@
         "type-details": {
           "api-level:0": "21",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1041,7 +1028,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1052,8 +1039,7 @@
         "type-details": {
           "api-level:0": "22",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1145,8 +1131,7 @@
         "type-details": {
           "api-level:0": "23",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1227,7 +1212,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1238,8 +1223,7 @@
         "type-details": {
           "api-level:0": "24",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1320,7 +1304,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1331,8 +1315,7 @@
         "type-details": {
           "api-level:0": "23",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1413,7 +1396,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1424,8 +1407,7 @@
         "type-details": {
           "api-level:0": "3",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1478,7 +1460,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1489,8 +1471,7 @@
         "type-details": {
           "api-level:0": "4",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1543,7 +1524,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1554,8 +1535,7 @@
         "type-details": {
           "api-level:0": "5",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1608,7 +1588,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1619,8 +1599,7 @@
         "type-details": {
           "api-level:0": "6",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1673,7 +1652,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1684,8 +1663,7 @@
         "type-details": {
           "api-level:0": "7",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1738,7 +1716,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1749,8 +1727,7 @@
         "type-details": {
           "api-level:0": "8",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1803,7 +1780,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1814,8 +1791,7 @@
         "type-details": {
           "api-level:0": "9",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns8:addonDetailsType"
           },
@@ -1869,7 +1845,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1900,7 +1876,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1931,7 +1907,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1960,7 +1936,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -2010,7 +1986,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2036,7 +2012,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2072,7 +2048,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2101,7 +2077,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2130,7 +2106,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2168,7 +2144,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2197,7 +2173,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2226,7 +2202,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2239,8 +2215,7 @@
           "xsi:type": "ns8:extraDetailsType"
         },
         "vendor:0": {
-          "display:1": {
-          },
+          "display:1": {},
           "id:0": "google"
         }
       }
@@ -2256,7 +2231,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2285,7 +2260,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2314,7 +2289,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20549,
+      "last-available-day": 20552,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2984,7 +2959,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3001,13 +2976,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3030,7 +3003,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3047,13 +3020,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3078,7 +3049,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3130,7 +3101,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3179,7 +3150,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3196,13 +3167,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3229,7 +3198,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3246,13 +3215,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3275,7 +3242,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3292,13 +3259,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3323,7 +3288,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3375,7 +3340,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3431,7 +3396,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3448,13 +3413,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3470,7 +3433,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3487,13 +3450,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3516,7 +3477,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3533,13 +3494,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3564,7 +3523,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3616,7 +3575,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3672,7 +3631,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3689,13 +3648,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3711,7 +3668,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3728,13 +3685,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3757,7 +3712,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3811,7 +3766,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3863,7 +3818,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3919,7 +3874,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3936,13 +3891,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -3965,7 +3918,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3982,13 +3935,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4013,7 +3964,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4065,7 +4016,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4121,7 +4072,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4138,13 +4089,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4167,7 +4116,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4184,13 +4133,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4215,7 +4162,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4267,7 +4214,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4316,7 +4263,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4353,7 +4300,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4392,7 +4339,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4409,13 +4356,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4438,7 +4383,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4455,13 +4400,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4484,7 +4427,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4501,13 +4444,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4530,7 +4471,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4547,13 +4488,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4571,7 +4510,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4623,7 +4562,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4675,7 +4614,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4727,7 +4666,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4776,7 +4715,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4815,7 +4754,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4832,13 +4771,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4861,7 +4798,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4878,13 +4815,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4907,7 +4842,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4924,13 +4859,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4953,7 +4886,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4970,13 +4903,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -4994,7 +4925,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -5046,7 +4977,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5098,7 +5029,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5150,7 +5081,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5199,7 +5130,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5243,7 +5174,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5282,7 +5213,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5299,13 +5230,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5328,7 +5257,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5345,13 +5274,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5374,7 +5301,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5391,13 +5318,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5420,7 +5345,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5437,13 +5362,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5461,7 +5384,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5513,7 +5436,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5565,7 +5488,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5617,7 +5540,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5673,7 +5596,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5712,7 +5635,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5729,13 +5652,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5745,8 +5666,8 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "e22c47afd06398b35f2705ca2e7fa85323351568",
-              "size": 782997866,
+              "sha1": "3454546b4eed2d6c3dd06d47757d6da9f4176033",
+              "size": 283677512,
               "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip"
             }
           ],
@@ -5758,7 +5679,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5775,13 +5696,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5804,7 +5723,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5821,13 +5740,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5850,7 +5767,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5867,13 +5784,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -5898,7 +5813,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5950,7 +5865,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -6002,7 +5917,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -6056,7 +5971,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6112,7 +6027,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6158,7 +6073,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6202,7 +6117,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6241,7 +6156,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6258,13 +6173,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -6287,7 +6200,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6304,13 +6217,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -6333,7 +6244,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6350,13 +6261,11 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             },
             "tag:2": {
-              "display:1": {
-              },
+              "display:1": {},
               "id:0": "default"
             }
           }
@@ -6374,7 +6283,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6426,7 +6335,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6478,7 +6387,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6530,7 +6439,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6584,7 +6493,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6655,7 +6564,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6701,7 +6610,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6752,7 +6661,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6796,7 +6705,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6840,7 +6749,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6891,7 +6800,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6958,7 +6867,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -7025,7 +6934,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7094,7 +7003,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7150,7 +7059,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7201,7 +7110,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7245,7 +7154,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7289,7 +7198,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7340,7 +7249,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7407,7 +7316,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7476,7 +7385,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7537,7 +7446,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7582,7 +7491,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7628,7 +7537,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7679,7 +7588,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7716,7 +7625,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7753,7 +7662,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7804,7 +7713,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7871,7 +7780,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7938,7 +7847,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7997,7 +7906,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -8064,7 +7973,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8131,7 +8040,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8192,7 +8101,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8252,7 +8161,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8291,7 +8200,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8354,7 +8263,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8417,7 +8326,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8468,7 +8377,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8525,7 +8434,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -8582,7 +8491,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -8641,7 +8550,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8722,7 +8631,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8803,7 +8712,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8864,7 +8773,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8924,7 +8833,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8970,7 +8879,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -9014,7 +8923,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -9053,7 +8962,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9102,7 +9011,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9153,7 +9062,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9220,7 +9129,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9287,7 +9196,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9353,7 +9262,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9434,7 +9343,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9515,7 +9424,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9586,7 +9495,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9645,7 +9554,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9696,7 +9605,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9745,7 +9654,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9806,7 +9715,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9873,7 +9782,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9949,7 +9858,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -10016,7 +9925,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -10077,7 +9986,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10130,7 +10039,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10185,7 +10094,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10234,7 +10143,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10295,7 +10204,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10362,7 +10271,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10438,7 +10347,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10519,7 +10428,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10580,7 +10489,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -10633,7 +10542,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -10698,7 +10607,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10757,7 +10666,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10803,7 +10712,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10847,7 +10756,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10898,7 +10807,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10947,7 +10856,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -11008,7 +10917,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -11075,7 +10984,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11144,7 +11053,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11211,7 +11120,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11286,7 +11195,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11335,7 +11244,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11398,7 +11307,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11458,7 +11367,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11498,7 +11407,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11535,7 +11444,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11586,7 +11495,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11635,7 +11544,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11696,7 +11605,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11764,7 +11673,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11834,7 +11743,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11903,7 +11812,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11966,7 +11875,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -12019,7 +11928,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -12088,7 +11997,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12137,7 +12046,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12178,7 +12087,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12210,7 +12119,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12256,7 +12165,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12301,7 +12210,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12348,7 +12257,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12406,7 +12315,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12466,7 +12375,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12524,7 +12433,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12584,7 +12493,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12646,7 +12555,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12712,7 +12621,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-arm64-v8a",
           "path": "system-images/android-35-ext15/android-automotive/arm64-v8a",
@@ -12765,7 +12674,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-x86_64",
           "path": "system-images/android-35-ext15/android-automotive/x86_64",
@@ -12808,7 +12717,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12841,7 +12750,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12888,7 +12797,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12937,7 +12846,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12988,7 +12897,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -13037,7 +12946,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -13090,7 +12999,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
@@ -13135,7 +13044,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
@@ -13170,7 +13079,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -13203,7 +13112,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -13250,7 +13159,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-default-arm64-v8a",
           "path": "system-images/android-36/default/arm64-v8a",
@@ -13295,7 +13204,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-default-x86_64",
           "path": "system-images/android-36/default/x86_64",
@@ -13342,7 +13251,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -13391,7 +13300,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -13442,7 +13351,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
@@ -13491,7 +13400,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -13542,7 +13451,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -13595,7 +13504,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -13640,7 +13549,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-arm64-v8a",
           "path": "system-images/android-36.1/android-wear-signed/arm64-v8a",
@@ -13673,7 +13582,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-x86_64",
           "path": "system-images/android-36.1/android-wear-signed/x86_64",
@@ -13720,7 +13629,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_ps16k/arm64-v8a",
@@ -13778,7 +13687,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis_ps16k/x86_64",
@@ -13838,7 +13747,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13896,7 +13805,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -14066,7 +13975,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -14115,7 +14024,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -14166,7 +14075,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -14215,7 +14124,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -14268,7 +14177,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_ps16k/arm64-v8a",
@@ -14325,7 +14234,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis-x86_64",
           "path": "system-images/android-37.0/google_apis_ps16k/x86_64",
@@ -14384,7 +14293,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/arm64-v8a",
@@ -14441,7 +14350,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis_playstore-x86_64",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/x86_64",
@@ -14502,7 +14411,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a",
@@ -14552,7 +14461,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis/x86_64",
@@ -14604,7 +14513,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a",
@@ -14654,7 +14563,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64",
@@ -14706,7 +14615,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -14760,7 +14669,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -14818,13 +14727,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_ps16k/arm64-v8a",
           "revision": "CANARY-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "9"
+            "major:0": "10"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -14881,13 +14790,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis_ps16k/x86_64",
           "revision": "CANARY-google_apis-x86_64",
           "revision-details": {
-            "major:0": "9"
+            "major:0": "10"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -14946,13 +14855,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "CANARY-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "9"
+            "major:0": "10"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -15009,13 +14918,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
           "revision": "CANARY-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "9"
+            "major:0": "10"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -15074,7 +14983,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -15128,7 +15037,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -15186,7 +15095,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/arm64-v8a",
@@ -15244,7 +15153,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/x86_64",
@@ -15304,7 +15213,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/arm64-v8a",
@@ -15362,7 +15271,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20549,
+          "last-available-day": 20552,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/x86_64",
@@ -15620,10 +15529,8 @@
       }
     },
     "UpsideDownCake": {
-      "google_apis": {
-      },
-      "google_apis_playstore": {
-      }
+      "google_apis": {},
+      "google_apis_playstore": {}
     },
     "UpsideDownCakePrivacySandbox": {
       "google_apis_playstore": {
@@ -15982,9 +15889,9 @@
     "platform-tools": "37.0.0",
     "platforms": "37.0",
     "skiaparser": "8",
-    "sources": "36.1",
+    "sources": "37.0",
     "tools": "26.1.1",
-    "fingerprint": "bf29939be4d269fd"
+    "fingerprint": "7fb1f87547f5d4c6"
   },
   "licenses": {
     "android-googletv-license": [
@@ -16052,7 +15959,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16101,7 +16008,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16150,7 +16057,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16199,7 +16106,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16248,7 +16155,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16297,7 +16204,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16346,7 +16253,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16395,7 +16302,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16444,7 +16351,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -16492,7 +16399,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -16540,7 +16447,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16589,7 +16496,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16638,7 +16545,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16687,7 +16594,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16736,7 +16643,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16785,7 +16692,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16833,7 +16740,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16882,7 +16789,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16930,7 +16837,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16979,7 +16886,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -17027,7 +16934,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -17075,7 +16982,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -17123,7 +17030,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -17171,7 +17078,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -17219,7 +17126,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -17267,7 +17174,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -17315,7 +17222,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -17363,7 +17270,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -17411,7 +17318,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -17459,7 +17366,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -17507,7 +17414,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -17555,7 +17462,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -17603,7 +17510,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -17651,7 +17558,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -17699,7 +17606,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -17747,7 +17654,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -17795,7 +17702,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17843,7 +17750,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17891,7 +17798,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17939,7 +17846,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17989,7 +17896,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18039,7 +17946,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -18087,7 +17994,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -18135,7 +18042,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -18183,7 +18090,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -18231,7 +18138,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18281,7 +18188,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18331,7 +18238,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18381,7 +18288,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -18429,7 +18336,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -18477,7 +18384,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -18525,7 +18432,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -18573,7 +18480,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -18621,7 +18528,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -18669,7 +18576,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -18710,7 +18617,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -18751,7 +18658,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -18792,7 +18699,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18834,7 +18741,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18875,7 +18782,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18916,7 +18823,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18957,7 +18864,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18998,7 +18905,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -19039,7 +18946,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -19081,7 +18988,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -19123,7 +19030,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -19165,7 +19072,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -19206,7 +19113,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -19248,7 +19155,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -19290,7 +19197,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -19332,7 +19239,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -19374,7 +19281,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -19415,7 +19322,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -19456,7 +19363,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -19498,7 +19405,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -19540,7 +19447,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -19582,7 +19489,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -19624,7 +19531,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -19665,7 +19572,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -19707,7 +19614,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0",
@@ -19748,7 +19655,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc1",
@@ -19790,7 +19697,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc2",
@@ -19841,7 +19748,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -19882,7 +19789,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -19923,7 +19830,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19964,7 +19871,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -20005,7 +19912,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -20046,7 +19953,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -20087,7 +19994,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -20128,7 +20035,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -20169,7 +20076,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -20210,7 +20117,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -20251,7 +20158,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -20299,7 +20206,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -20340,7 +20247,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -20381,7 +20288,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -20422,7 +20329,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -20463,7 +20370,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -20504,7 +20411,7 @@
           }
         ],
         "displayName": "CMake 4.1.2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.2",
@@ -20547,7 +20454,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -20587,7 +20494,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -20627,7 +20534,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -20667,7 +20574,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -20707,7 +20614,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -20747,7 +20654,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -20788,7 +20695,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -20829,7 +20736,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -20869,7 +20776,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -20910,7 +20817,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20950,7 +20857,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20990,7 +20897,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -21031,7 +20938,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -21072,7 +20979,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -21112,7 +21019,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/20.0",
@@ -21152,7 +21059,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -21192,7 +21099,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -21232,7 +21139,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -21272,7 +21179,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -21312,7 +21219,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -21352,7 +21259,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -21392,7 +21299,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -22725,7 +22632,7 @@
           }
         ],
         "displayName": "Android Emulator",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
@@ -22788,6 +22695,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.6.3": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "4d1ddbbcc6d708fd933b08931163182e0e205ad0",
+            "size": 347008218,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15142779.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "a3718deefc7d16ef3376626807cebcadb73ca5f4",
+            "size": 462646251,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15142779.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "a46e8160288ff40dd2768536fa70f2d5f13a67ce",
+            "size": 396370301,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15142779.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "8f5ff31b854cf4f9eaf15c1b571148240edfcaf4",
+            "size": 428894868,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15142779.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20552,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.6.3",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "3",
+          "minor:1": "6"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -22913,7 +22868,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -22975,7 +22930,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -23037,7 +22992,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -23099,7 +23054,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23162,7 +23117,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -23224,7 +23179,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23288,7 +23243,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23352,7 +23307,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -23414,7 +23369,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -23462,7 +23417,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -23511,7 +23466,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -23559,7 +23514,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -23615,7 +23570,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -23671,7 +23626,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -23726,7 +23681,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -23782,7 +23737,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -23837,7 +23792,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -23892,7 +23847,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -23947,7 +23902,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -24003,7 +23958,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -24058,7 +24013,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -24113,7 +24068,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -24169,7 +24124,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -24225,7 +24180,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -24281,7 +24236,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -24330,7 +24285,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -24379,7 +24334,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -24428,7 +24383,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -24476,7 +24431,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -24524,7 +24479,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -24572,7 +24527,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -24621,7 +24576,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -24670,7 +24625,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -24719,7 +24674,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -24767,7 +24722,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -24816,7 +24771,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -24865,7 +24820,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -24914,7 +24869,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -24963,7 +24918,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -25011,7 +24966,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -25059,7 +25014,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -25107,7 +25062,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -25149,7 +25104,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -25191,7 +25146,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -25232,7 +25187,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -25273,7 +25228,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -25314,7 +25269,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -25355,7 +25310,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -25397,7 +25352,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -25439,7 +25394,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -25480,7 +25435,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -25521,7 +25476,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -25562,7 +25517,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -25603,7 +25558,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -25645,7 +25600,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -25687,7 +25642,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -25729,7 +25684,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -25770,7 +25725,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -25811,7 +25766,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -25852,7 +25807,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -25894,7 +25849,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -25936,7 +25891,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -25978,7 +25933,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -26020,7 +25975,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -26061,7 +26016,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 30.0.14904198",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/30.0.14904198",
@@ -26126,7 +26081,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26188,7 +26143,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26250,7 +26205,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26312,7 +26267,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26375,7 +26330,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26437,7 +26392,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26501,7 +26456,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26565,7 +26520,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26627,7 +26582,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26675,7 +26630,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26724,7 +26679,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26772,7 +26727,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26828,7 +26783,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26884,7 +26839,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26939,7 +26894,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26995,7 +26950,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27050,7 +27005,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27105,7 +27060,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27160,7 +27115,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27216,7 +27171,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27271,7 +27226,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27326,7 +27281,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27382,7 +27337,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27438,7 +27393,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27494,7 +27449,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27512,8 +27467,7 @@
         }
       }
     },
-    "patcher": {
-    },
+    "patcher": {},
     "platform-tools": {
       "35.0.1": {
         "archives": [
@@ -27742,7 +27696,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -27771,7 +27725,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -27782,8 +27736,7 @@
         "type-details": {
           "api-level:0": "10",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -27810,7 +27763,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -27821,8 +27774,7 @@
         "type-details": {
           "api-level:0": "11",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -27849,7 +27801,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -27860,8 +27812,7 @@
         "type-details": {
           "api-level:0": "12",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -27888,7 +27839,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -27899,8 +27850,7 @@
         "type-details": {
           "api-level:0": "13",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -27927,7 +27877,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -27938,8 +27888,7 @@
         "type-details": {
           "api-level:0": "14",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -27966,7 +27915,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -27977,8 +27926,7 @@
         "type-details": {
           "api-level:0": "15",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28005,7 +27953,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -28016,8 +27964,7 @@
         "type-details": {
           "api-level:0": "16",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28044,7 +27991,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -28055,8 +28002,7 @@
         "type-details": {
           "api-level:0": "17",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28083,7 +28029,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -28094,8 +28040,7 @@
         "type-details": {
           "api-level:0": "18",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28122,7 +28067,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -28133,8 +28078,7 @@
         "type-details": {
           "api-level:0": "19",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28175,7 +28119,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28187,8 +28131,7 @@
         "type-details": {
           "api-level:0": "2",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28215,7 +28158,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -28226,8 +28169,7 @@
         "type-details": {
           "api-level:0": "20",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28254,7 +28196,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -28265,8 +28207,7 @@
         "type-details": {
           "api-level:0": "21",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28293,7 +28234,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -28304,8 +28245,7 @@
         "type-details": {
           "api-level:0": "22",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28332,7 +28272,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -28343,8 +28283,7 @@
         "type-details": {
           "api-level:0": "23",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28371,7 +28310,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -28382,8 +28321,7 @@
         "type-details": {
           "api-level:0": "24",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28410,7 +28348,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -28421,8 +28359,7 @@
         "type-details": {
           "api-level:0": "25",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28449,7 +28386,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -28460,8 +28397,7 @@
         "type-details": {
           "api-level:0": "26",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28488,7 +28424,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -28499,8 +28435,7 @@
         "type-details": {
           "api-level:0": "27",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28527,7 +28462,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -28538,8 +28473,7 @@
         "type-details": {
           "api-level:0": "28",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28566,7 +28500,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -28577,8 +28511,7 @@
         "type-details": {
           "api-level:0": "29",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28619,7 +28552,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28631,8 +28564,7 @@
         "type-details": {
           "api-level:0": "3",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28659,7 +28591,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -28670,8 +28602,7 @@
         "type-details": {
           "api-level:0": "30",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28698,7 +28629,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -28709,8 +28640,7 @@
         "type-details": {
           "api-level:0": "31",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28737,7 +28667,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -28748,8 +28678,7 @@
         "type-details": {
           "api-level:0": "32",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28776,7 +28705,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -28787,8 +28716,7 @@
         "type-details": {
           "api-level:0": "33",
           "base-extension:3": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28816,7 +28744,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -28827,8 +28755,7 @@
         "type-details": {
           "api-level:0": "33x",
           "base-extension:3": "false",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28851,7 +28778,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28863,8 +28790,7 @@
         "type-details": {
           "api-level:0": "34",
           "base-extension:3": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -28897,7 +28823,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -28930,7 +28856,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -28968,7 +28894,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -29001,7 +28927,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -29034,7 +28960,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -29067,7 +28993,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -29100,7 +29026,7 @@
           }
         ],
         "displayName": "Android SDK Platform 37.0",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-37.0",
@@ -29111,8 +29037,7 @@
         "type-details": {
           "api-level:0": "37.0",
           "base-extension:3": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29149,7 +29074,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29161,8 +29086,7 @@
         "type-details": {
           "api-level:0": "4",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29203,7 +29127,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29215,8 +29139,7 @@
         "type-details": {
           "api-level:0": "5",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29257,7 +29180,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29269,8 +29192,7 @@
         "type-details": {
           "api-level:0": "6",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29297,7 +29219,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -29308,8 +29230,7 @@
         "type-details": {
           "api-level:0": "7",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29336,7 +29257,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -29347,8 +29268,7 @@
         "type-details": {
           "api-level:0": "8",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29375,7 +29295,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -29386,8 +29306,7 @@
         "type-details": {
           "api-level:0": "9",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
@@ -29414,7 +29333,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava-ext19",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava-ext19",
@@ -29442,19 +29361,19 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "756112dd034ba5c1fbc995a472fb17d196c21a59",
-            "size": 66842057,
-            "url": "https://dl.google.com/android/repository/platform-CANARY_r09.zip"
+            "sha1": "c302ae12b604acd942e31568f32917fe3141750c",
+            "size": 67144025,
+            "url": "https://dl.google.com/android/repository/platform-CANARY_r10.zip"
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
         "revision": "CANARY",
         "revision-details": {
-          "major:0": "9"
+          "major:0": "10"
         },
         "type-details": {
           "api-level:0": "36.1",
@@ -29482,7 +29401,7 @@
           }
         ],
         "displayName": "Android SDK Platform CinnamonBun",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CinnamonBun",
@@ -29547,7 +29466,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29665,7 +29584,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -29786,7 +29705,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -29878,7 +29797,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -29905,7 +29824,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -29917,8 +29836,7 @@
         "type-details": {
           "api-level:0": "14",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -29935,7 +29853,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -29946,8 +29864,7 @@
         "type-details": {
           "api-level:0": "15",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -29964,7 +29881,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -29975,8 +29892,7 @@
         "type-details": {
           "api-level:0": "16",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -29993,7 +29909,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -30004,8 +29920,7 @@
         "type-details": {
           "api-level:0": "17",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30022,7 +29937,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -30033,8 +29948,7 @@
         "type-details": {
           "api-level:0": "18",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30051,7 +29965,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -30062,8 +29976,7 @@
         "type-details": {
           "api-level:0": "19",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30080,7 +29993,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -30091,8 +30004,7 @@
         "type-details": {
           "api-level:0": "20",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30109,7 +30021,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -30120,8 +30032,7 @@
         "type-details": {
           "api-level:0": "21",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30138,7 +30049,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -30149,8 +30060,7 @@
         "type-details": {
           "api-level:0": "22",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30167,7 +30077,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -30178,8 +30088,7 @@
         "type-details": {
           "api-level:0": "23",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30196,7 +30105,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -30207,8 +30116,7 @@
         "type-details": {
           "api-level:0": "24",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30225,7 +30133,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -30236,8 +30144,7 @@
         "type-details": {
           "api-level:0": "25",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30254,7 +30161,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -30265,8 +30172,7 @@
         "type-details": {
           "api-level:0": "26",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30283,7 +30189,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -30294,8 +30200,7 @@
         "type-details": {
           "api-level:0": "27",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30312,7 +30217,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -30323,8 +30228,7 @@
         "type-details": {
           "api-level:0": "28",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30341,7 +30245,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -30352,8 +30256,7 @@
         "type-details": {
           "api-level:0": "29",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30370,7 +30273,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -30381,8 +30284,7 @@
         "type-details": {
           "api-level:0": "30",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30399,7 +30301,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -30410,8 +30312,7 @@
         "type-details": {
           "api-level:0": "31",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30428,7 +30329,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -30439,8 +30340,7 @@
         "type-details": {
           "api-level:0": "32",
           "base-extension:2": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           }
@@ -30457,7 +30357,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -30468,8 +30368,7 @@
         "type-details": {
           "api-level:0": "33",
           "base-extension:3": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           },
@@ -30487,7 +30386,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -30498,8 +30397,7 @@
         "type-details": {
           "api-level:0": "34",
           "base-extension:3": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           },
@@ -30517,7 +30415,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -30528,8 +30426,7 @@
         "type-details": {
           "api-level:0": "35",
           "base-extension:3": "true",
-          "codename:1": {
-          },
+          "codename:1": {},
           "element-attributes": {
             "xsi:type": "ns11:sourceDetailsType"
           },
@@ -30547,7 +30444,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -30575,7 +30472,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -30591,6 +30488,35 @@
           },
           "extension-level:1": "20"
         }
+      },
+      "37.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "all",
+            "sha1": "5dc25b723b23edfcb9604bc2917acdea265fd6fb",
+            "size": 52760617,
+            "url": "https://dl.google.com/android/repository/source-37.0_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 37.0",
+        "last-available-day": 20552,
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-37.0",
+        "revision": "37.0",
+        "revision-details": {
+          "major:0": "1"
+        },
+        "type-details": {
+          "api-level:0": "37.0",
+          "base-extension:3": "true",
+          "codename:1": {},
+          "element-attributes": {
+            "xsi:type": "ns11:sourceDetailsType"
+          },
+          "extension-level:2": "22"
+        }
       }
     },
     "tools": {
@@ -30642,7 +30568,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20549,
+        "last-available-day": 20552,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",

From da8643764fd646a545a0f436cf825e0a3542afd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 14:06:53 +0000
Subject: [PATCH 193/389] smile: 2.11.0 -> 2.12.2

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

diff --git a/pkgs/by-name/sm/smile/package.nix b/pkgs/by-name/sm/smile/package.nix
index baba320a1deb..07b2b68daf84 100644
--- a/pkgs/by-name/sm/smile/package.nix
+++ b/pkgs/by-name/sm/smile/package.nix
@@ -15,14 +15,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "smile";
-  version = "2.11.0";
+  version = "2.12.2";
   pyproject = false; # Builds with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "smile";
     tag = finalAttrs.version;
-    hash = "sha256-uggbeFcafCvIpT+qHsnULTZ9oyQkfT7phI5KW00HEXg=";
+    hash = "sha256-qAeAntJXitypbSu9dVvnMenXs9UwatcdIkdqmbjxFgk=";
   };
 
   nativeBuildInputs = [

From 0d6af2d415dadedfcf637af4e0e012f60ce7b8ba Mon Sep 17 00:00:00 2001
From: god464 <god464@users.noreply.github.com>
Date: Thu, 9 Apr 2026 22:27:35 +0800
Subject: [PATCH 194/389] astro-language-server: include ts-plugin in package
 output

---
 pkgs/by-name/as/astro-language-server/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index d9404b551d92..23dba017b17b 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -20,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   # https://pnpm.io/filtering#--filter-package_name-1
-  pnpmWorkspaces = [ "@astrojs/language-server..." ];
+  pnpmWorkspaces = [
+    "@astrojs/language-server..."
+    "@astrojs/ts-plugin"
+  ];
   prePnpmInstall = ''
     pnpm config set dedupe-peer-dependents false
     pnpm approve-builds @emmetio/css-parser
@@ -36,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-QJSFRJ3U7M0B7ukiU+BYY2KdrcNUpyiOcGA7G3xja3I=";
+    hash = "sha256-+5S/VuZjP6LoWUPKF1NMhw317AFAJUgaY7/Tq0ZKouw=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    pnpm --filter "@astrojs/language-server..." build
+    pnpm --filter "@astrojs/language-server..." --filter "@astrojs/ts-plugin" build
 
     runHook postBuild
   '';
@@ -63,11 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm install --offline --prod --filter="@astrojs/language-server..."
     mkdir -p $out/{bin,lib/node_modules/astro-language-server/packages/language-tools}
     cp -r ./node_modules $out/lib/node_modules/astro-language-server
-    cp -r packages/language-tools/{language-server,yaml2ts} $out/lib/node_modules/astro-language-server/packages/language-tools/
+    cp -r packages/language-tools/{language-server,yaml2ts,ts-plugin} $out/lib/node_modules/astro-language-server/packages/language-tools/
     pushd $out/lib/node_modules/astro-language-server/node_modules
-    rm -rf {./,.pnpm/node_modules/}astro-{scripts,benchmark}
+    rm -rf {./,.pnpm/node_modules/}astro-{scripts,benchmark} .pnpm/node_modules/@astrojs/ts-plugin
     popd
-
     ln -s $out/lib/node_modules/astro-language-server/packages/language-tools/language-server/bin/nodeServer.js $out/bin/astro-ls
 
     runHook postInstall

From b28184533fde4af2db39a062c6dfd86ce5022c49 Mon Sep 17 00:00:00 2001
From: god464 <god464@users.noreply.github.com>
Date: Thu, 9 Apr 2026 22:29:31 +0800
Subject: [PATCH 195/389] maintainers: add god464

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 115c78f08cf3..77deaa01a6dc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9890,6 +9890,12 @@
     name = "Adrian Groh";
     keys = [ { fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; } ];
   };
+  god464 = {
+    github = "god464";
+    githubId = 36400459;
+    name = "god464";
+    keys = [ { fingerprint = "089E 1560 7145 FE93 2C00  2942 D7A7 2706 FC8D E569"; } ];
+  };
   goertzenator = {
     email = "daniel.goertzen@gmail.com";
     github = "goertzenator";

From 50ec3a582f351c2508d976193bca32a53ba4e60a Mon Sep 17 00:00:00 2001
From: god464 <god464@users.noreply.github.com>
Date: Thu, 9 Apr 2026 22:30:10 +0800
Subject: [PATCH 196/389] astro-language-server: add a maintainer

---
 pkgs/by-name/as/astro-language-server/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 23dba017b17b..478a6231cd82 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/withastro/astro/tree/main/packages/language-tools";
     changelog = "https://github.com/withastro/astro/blob/%40astrojs/language-server%40${finalAttrs.version}/packages/language-tools/language-server/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ miniharinn ];
+    maintainers = with lib.maintainers; [
+      miniharinn
+      god464
+    ];
     mainProgram = "astro-ls";
     platforms = lib.platforms.unix;
   };

From 5d7966d3d48c6dd90a3ff78c7f997836b3337fe3 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Thu, 26 Mar 2026 20:43:09 -0400
Subject: [PATCH 197/389] element-{web,desktop}: 1.12.10 -> 1.12.14

---
 .../element-desktop/element-desktop-pin.nix   |   7 -
 pkgs/by-name/el/element-desktop/package.nix   | 276 +++++++++---------
 .../el/element-desktop/seshat/default.nix     |  64 ++--
 .../el/element-desktop/seshat/pin.json        |   6 -
 .../el/element-desktop/seshat/update.sh       |  49 ----
 pkgs/by-name/el/element-desktop/update.sh     |  65 -----
 .../element-web-unwrapped/element-web-pin.nix |   8 -
 .../el/element-web-unwrapped/package.nix      | 114 ++++----
 8 files changed, 208 insertions(+), 381 deletions(-)
 delete mode 100644 pkgs/by-name/el/element-desktop/element-desktop-pin.nix
 delete mode 100644 pkgs/by-name/el/element-desktop/seshat/pin.json
 delete mode 100755 pkgs/by-name/el/element-desktop/seshat/update.sh
 delete mode 100755 pkgs/by-name/el/element-desktop/update.sh
 delete mode 100644 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
deleted file mode 100644
index 9c28e4b7f199..000000000000
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "version" = "1.12.10";
-  "hashes" = {
-    "desktopSrcHash" = "sha256-2LQBT3+2JTR3XHO3DynOp8cw2m2SB/mGH01e3SFD/IM=";
-    "desktopYarnHash" = "sha256-QIzuVKmUS4tqXAzhpfLZOp51kLbfC1M2nrff8e+sdg4=";
-  };
-}
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index d62ac5ad5a1b..c4cba7c6d64b 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -5,16 +5,17 @@
   makeWrapper,
   makeDesktopItem,
   nodejs,
-  electron_40,
+  electron_41,
   element-web,
-  sqlcipher,
   callPackage,
   typescript,
+  tsx,
+  sqlcipher,
   # command line arguments which are always set
   commandLineArgs ? "",
-  yarnConfigHook,
-  yarnBuildHook,
-  fetchYarnDeps,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  pnpm,
   asar,
   copyDesktopItems,
   darwin,
@@ -22,166 +23,159 @@
 }:
 
 let
-  pinData = import ./element-desktop-pin.nix;
-  inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
-  executableName = "element-desktop";
-  electron = electron_40;
+  electron = electron_41;
   seshat = callPackage ./seshat { };
 in
-stdenv.mkDerivation (
-  finalAttrs:
-  removeAttrs pinData [ "hashes" ]
-  // {
-    pname = "element-desktop";
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
-    src = fetchFromGitHub {
-      owner = "element-hq";
-      repo = "element-desktop";
-      rev = "v${finalAttrs.version}";
-      hash = desktopSrcHash;
-    };
+stdenv.mkDerivation (finalAttrs: {
+  pname = "element-desktop";
+  version = "1.12.14";
 
-    offlineCache = fetchYarnDeps {
-      yarnLock = finalAttrs.src + "/yarn.lock";
-      hash = desktopYarnHash;
-    };
+  src = fetchFromGitHub {
+    owner = "element-hq";
+    repo = "element-web";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yy7CfMOMT1DBXHDHaDyAaOgp3s2KQIKA1A6zUhVOUhM=";
+  };
 
-    env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  pnpmDeps = fetchPnpmDeps {
+    pname = "element";
+    inherit (finalAttrs)
+      version
+      src
+      ;
+    fetcherVersion = 3;
+    hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
+  };
 
-    nativeBuildInputs = [
-      asar
-      copyDesktopItems
-      nodejs
-      makeWrapper
-      typescript
-      yarnConfigHook
-      yarnBuildHook
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.autoSignDarwinBinariesHook
-      actool
-    ];
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
-    inherit seshat;
+  nativeBuildInputs = [
+    asar
+    copyDesktopItems
+    nodejs
+    makeWrapper
+    typescript
+    pnpm
+    pnpmConfigHook
+    tsx
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.autoSignDarwinBinariesHook
+    actool
+  ];
 
-    # Only affects unused scripts in $out/share/element/electron/scripts. Also
-    # breaks because there are some `node`-scripts with a `npx`-shebang and
-    # this shouldn't be in the closure just for unused scripts.
-    dontPatchShebangs = true;
+  inherit seshat;
 
-    postPatch = ''
-      cp -r ${electron.dist} electron-dist
-      chmod -R u+w electron-dist
+  postPatch = ''
+    cd apps/desktop
 
-      substituteInPlace package.json \
-        --replace-fail \
-        ' electron-builder",' \
-        ' electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null",'
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
 
-      # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
-      substituteInPlace ./electron-builder.ts \
-        --replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
+    # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
+    substituteInPlace ./electron-builder.ts \
+      --replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
 
-      # Need to disable asar integrity check to copy in native seshat files, see postBuild phase
-      substituteInPlace ./electron-builder.ts \
-        --replace-fail "enableEmbeddedAsarIntegrityValidation: true" "enableEmbeddedAsarIntegrityValidation: false"
-    '';
+    # Need to disable asar integrity check to copy in native seshat files, see postBuild phase
+    substituteInPlace ./electron-builder.ts \
+      --replace-fail "enableEmbeddedAsarIntegrityValidation: true" "enableEmbeddedAsarIntegrityValidation: false"
 
-    preBuild = ''
-      # Apply upstream patch
-      # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
-      # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
-      node ./node_modules/patch-package/index.js
-    '';
+    cd ../../
+  '';
 
-    postBuild = ''
-      # relative path to app.asar differs on Linux and MacOS
-      packed=$(find ./dist -name app.asar)
-      asar extract "$packed" tmp-app
+  buildPhase = ''
+    runHook preBuild
 
-      # linking here leads to Error: tmp-app/node_modules/matrix-seshat: file ... links out of the package
-      cp -r $seshat tmp-app/node_modules/matrix-seshat
+    export VERSION=${finalAttrs.version}
 
-      asar pack tmp-app "$packed"
-    '';
+    pnpm -C apps/desktop run build:ts
+    pnpm -C apps/desktop run build:res
+    pnpm -C apps/desktop exec electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null
 
-    installPhase = ''
-      runHook preInstall
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p "$out/Applications" "$out/bin"
-      mv dist/mac*/Element.app "$out/Applications"
+    cd apps/desktop
 
-      ln -s '${element-web}' "$out/Applications/Element.app/Contents/Resources/webapp"
+    # relative path to app.asar differs on Linux and MacOS
+    packed=$(find ./dist -name app.asar)
+    asar extract "$packed" tmp-app
 
-      wrapProgram "$out/Applications/Element.app/Contents/MacOS/Element" \
-        --add-flags ${lib.escapeShellArg commandLineArgs}
+    # linking here leads to Error: tmp-app/node_modules/matrix-seshat: file ... links out of the package
+    cp -r $seshat tmp-app/node_modules/matrix-seshat
 
-      makeWrapper "$out/Applications/Element.app/Contents/MacOS/Element" "$out/bin/${executableName}"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir -p "$out/bin" "$out/share"
+    asar pack tmp-app "$packed"
 
-      cp -a dist/*-unpacked/resources $out/share/element
+    runHook postBuild
+  '';
 
-      ln -s '${element-web}' "$out/share/element/webapp"
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p "$out/Applications" "$out/bin"
+    mv dist/mac*/Element.app "$out/Applications"
 
-      # icon, used in makeDesktopItem
-      mkdir -p "$out/share/icons/hicolor/512x512/apps"
-      ln -s "$out/share/element/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
+    ln -s '${element-web}' "$out/Applications/Element.app/Contents/Resources/webapp"
 
-      # executable wrapper
-      # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
-      makeWrapper '${lib.getExe electron}' "$out/bin/${executableName}" \
-        --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
-        --add-flags "$out/share/element/app.asar" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-        --add-flags ${lib.escapeShellArg commandLineArgs}
-    ''
-    + ''
-      runHook postInstall
-    '';
+    wrapProgram "$out/Applications/Element.app/Contents/MacOS/Element" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
-    # The desktop item properties should be kept in sync with data from upstream:
-    # https://github.com/element-hq/element-desktop/blob/develop/package.json
-    desktopItems = [
-      (makeDesktopItem {
-        name = "element-desktop";
-        exec = "${executableName} %u";
-        icon = "element";
-        desktopName = "Element";
-        genericName = "Matrix Client";
-        comment = finalAttrs.meta.description;
-        categories = [
-          "Network"
-          "InstantMessaging"
-          "Chat"
-        ];
-        startupWMClass = "Element";
-        mimeTypes = [
-          "x-scheme-handler/element"
-          "x-scheme-handler/io.element.desktop"
-        ];
-      })
-    ];
+    makeWrapper "$out/Applications/Element.app/Contents/MacOS/Element" "$out/bin/element-desktop"
+  ''
+  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    mkdir -p "$out/bin" "$out/share"
 
-    stripDebugList = lib.optionals stdenv.hostPlatform.isDarwin [
-      "Applications/Element.app/Contents/MacOS"
-    ];
+    cp -a dist/*-unpacked/resources $out/share/element
 
-    passthru = {
-      # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop
-      updateScript = ./update.sh;
-    };
+    ln -s '${element-web}' "$out/share/element/webapp"
 
-    meta = {
-      description = "Feature-rich client for Matrix.org";
-      homepage = "https://element.io/";
-      changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
-      license = lib.licenses.agpl3Plus;
-      teams = [ lib.teams.matrix ];
-      inherit (electron.meta) platforms;
-      mainProgram = "element-desktop";
-    };
-  }
-)
+    # icon, used in makeDesktopItem
+    mkdir -p "$out/share/icons/hicolor/512x512/apps"
+    ln -s "$out/share/element/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
+
+    # executable wrapper
+    makeWrapper '${lib.getExe electron}' "$out/bin/element-desktop" \
+      --add-flags "$out/share/element/app.asar" \
+      --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+  ''
+  + ''
+    runHook postInstall
+  '';
+
+  # The desktop item properties should be kept in sync with data from upstream:
+  # https://github.com/element-hq/element-desktop/blob/develop/package.json
+  desktopItems = [
+    (makeDesktopItem {
+      name = "element-desktop";
+      exec = "element-desktop %u";
+      icon = "element";
+      desktopName = "Element";
+      genericName = "Matrix Client";
+      comment = finalAttrs.meta.description;
+      categories = [
+        "Network"
+        "InstantMessaging"
+        "Chat"
+      ];
+      startupWMClass = "Element";
+      mimeTypes = [
+        "x-scheme-handler/element"
+        "x-scheme-handler/io.element.desktop"
+      ];
+    })
+  ];
+
+  stripDebugList = lib.optionals stdenv.hostPlatform.isDarwin [
+    "Applications/Element.app/Contents/MacOS"
+  ];
+
+  meta = {
+    description = "Feature-rich client for Matrix.org";
+    homepage = "https://element.io/";
+    changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.agpl3Plus;
+    teams = [ lib.teams.matrix ];
+    inherit (electron.meta) platforms;
+    mainProgram = "element-desktop";
+  };
+})
diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix
index 72e89b675d15..545f411598d5 100644
--- a/pkgs/by-name/el/element-desktop/seshat/default.nix
+++ b/pkgs/by-name/el/element-desktop/seshat/default.nix
@@ -1,72 +1,50 @@
 {
-  lib,
   stdenv,
-  rustPlatform,
   fetchFromGitHub,
-  sqlcipher,
+  rustPlatform,
   nodejs,
-  python3,
   yarn,
-  fixup-yarn-lock,
   fetchYarnDeps,
-  removeReferencesTo,
+  yarnConfigHook,
+  yarnBuildHook,
+  sqlcipher,
 }:
 
-let
-  pinData = lib.importJSON ./pin.json;
-
-in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "seshat-node";
-  inherit (pinData) version cargoHash;
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "seshat";
-    rev = finalAttrs.version;
-    hash = pinData.srcHash;
+    tag = finalAttrs.version;
+    hash = "sha256-2v/qXMCD+r+CSQHtP/YT62p4GoApbGz33kcZfJAKbOU=";
   };
 
-  sourceRoot = "${finalAttrs.src.name}/seshat-node/native";
+  sourceRoot = "${finalAttrs.src.name}/seshat-node";
 
-  nativeBuildInputs = [
-    nodejs
-    python3
-    yarn
-    fixup-yarn-lock
-  ];
-  buildInputs = [ sqlcipher ];
-
-  npm_config_nodedir = nodejs;
+  cargoHash = "sha256-krSm1wy7HkCOLEHPPHCx6V9Mj+FiavyhO6bLOz2/3Qw=";
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/seshat-node/yarn.lock";
-    sha256 = pinData.yarnHash;
+    hash = "sha256-hh9n8By/dNdKS55rcZkzCxmJWwQa6Ovt+4M3YP3/hDs=";
   };
 
-  buildPhase = ''
-    runHook preBuild
-    cd ..
-    chmod u+w . ./yarn.lock
-    export HOME=$PWD/tmp
-    mkdir -p $HOME
-    yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-    fixup-yarn-lock yarn.lock
-    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-    patchShebangs node_modules/
-    node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release
-    runHook postBuild
-  '';
+  nativeBuildInputs = [
+    nodejs
+    yarn
+    yarnConfigHook
+    yarnBuildHook
+  ];
 
-  doCheck = false;
+  buildInputs = [ sqlcipher ];
 
   installPhase = ''
     runHook preInstall
-    shopt -s extglob
-    rm -rf native/!(index.node)
-    rm -rf node_modules $HOME
-    cp -r . $out
-    ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/native/index.node
+
+    mkdir -p "$out"
+    mv "index."{node,js} "$out"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/el/element-desktop/seshat/pin.json b/pkgs/by-name/el/element-desktop/seshat/pin.json
deleted file mode 100644
index aacdffa1ddd2..000000000000
--- a/pkgs/by-name/el/element-desktop/seshat/pin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "version": "2.3.3",
-  "srcHash": "sha256-HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=",
-  "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp",
-  "cargoHash": "sha256-klrFk0gpqQu/9MzLEYMNqEBETZMXtZJX67Sm5ZqyHfE=="
-}
diff --git a/pkgs/by-name/el/element-desktop/seshat/update.sh b/pkgs/by-name/el/element-desktop/seshat/update.sh
deleted file mode 100755
index 6e7e75e66bce..000000000000
--- a/pkgs/by-name/el/element-desktop/seshat/update.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch nix-prefetch-github
-
-if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
-  echo "Regenerates packaging data for the seshat package."
-  echo "Usage: $0 [git release tag]"
-  exit 1
-fi
-
-version="$1"
-
-set -euo pipefail
-
-if [ -z "$version" ]; then
-  version="$(wget -O- "https://api.github.com/repos/matrix-org/seshat/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)"
-fi
-
-SRC="https://raw.githubusercontent.com/matrix-org/seshat/$version"
-
-tmpdir=$(mktemp -d)
-trap 'rm -rf "$tmpdir"' EXIT
-
-pushd $tmpdir
-wget "$SRC/seshat-node/yarn.lock"
-yarn_hash=$(prefetch-yarn-deps yarn.lock)
-popd
-
-src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .hash)
-
-cat > pin.json << EOF
-{
-  "version": "$version",
-  "srcHash": "$src_hash",
-  "yarnHash": "$yarn_hash",
-  "cargoHash": "0000000000000000000000000000000000000000000000000000"
-}
-EOF
-
-cargo_hash=$(nix-prefetch "{ sha256 }: (import ../../../../../.. {}).element-desktop.seshat.cargoDeps")
-
-cat > pin.json << EOF
-{
-  "version": "$version",
-  "srcHash": "$src_hash",
-  "yarnHash": "$yarn_hash",
-  "cargoHash": "$cargo_hash"
-}
-EOF
-
diff --git a/pkgs/by-name/el/element-desktop/update.sh b/pkgs/by-name/el/element-desktop/update.sh
deleted file mode 100755
index 63ef2e2d39f1..000000000000
--- a/pkgs/by-name/el/element-desktop/update.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nix coreutils prefetch-yarn-deps jq curl
-
-if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
-  echo "Regenerates packaging data for the element packages."
-  echo "Usage: $0 [git release tag]"
-  exit 1
-fi
-
-version="$1"
-
-set -euo pipefail
-
-if [ -z "$version" ]; then
-  version="$(curl -fsSL "https://api.github.com/repos/element-hq/element-desktop/releases/latest" | jq -r '.tag_name')"
-fi
-
-# strip leading "v"
-version="${version#v}"
-
-cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1
-
-nixflags=(
-  --extra-experimental-features
-  "nix-command flakes"
-)
-
-# HACK: prefetch-yarn-deps hashes may output extra clutter on stdout (!) so
-# we'll need to get the last line, last word
-fixupHash() {
-  local sorta_yarn_hash="$(tail -n1 <<< "$1")"
-  local almost_yarn_hash="${sorta_yarn_hash##* }"
-  local yarn_hash="$(nix "${nixflags[@]}" hash convert --hash-algo sha256 "$almost_yarn_hash")"
-
-  printf "%s" "$yarn_hash"
-}
-
-getHashes() {
-  variant="$1"
-  output="$2"
-
-  local url="github:element-hq/element-$variant/v$version"
-  local src="$(nix "${nixflags[@]}" flake prefetch --json "$url")"
-  local src_hash="$(jq -r ".hash" <<< "$src")"
-  local src_path="$(jq -r ".storePath" <<< "$src")"
-  local yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/yarn.lock")")"
-
-  cat > "$output" << EOF
-{
-  "version" = "$version";
-  "hashes" = {
-    "${variant}SrcHash" = "$src_hash";
-    "${variant}YarnHash" = "$yarn_hash";
-  };
-}
-EOF
-
-  if [ "$variant" = "web" ]; then
-    local shared_components_yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/packages/shared-components/yarn.lock")")"
-    sed -i "/^    \"webYarnHash/a \    \"webSharedComponentsYarnHash\" = \"$shared_components_yarn_hash\";" "$output"
-  fi
-}
-
-getHashes web ../element-web-unwrapped/element-web-pin.nix
-getHashes desktop element-desktop-pin.nix
diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
deleted file mode 100644
index 982b477e1225..000000000000
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "version" = "1.12.10";
-  "hashes" = {
-    "webSrcHash" = "sha256-qc17AK2HvTJi0r03VTH0D2QitdYcGNRObji9cm6XsFU=";
-    "webYarnHash" = "sha256-qdmdwjVXA+ZnNG3S9Pnm3JOrJXYXVdH+w7mccNjRmVM=";
-    "webSharedComponentsYarnHash" = "sha256-0sOF3w6BnY1WenDP+zqZAo1W4C91glMQSMQ22iYajTw=";
-  };
-}
diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index 0da4b2771eae..bd13a9fc861b 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -2,16 +2,16 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchYarnDeps,
   jq,
-  yarnConfigHook,
   nodejs,
   jitsi-meet,
+  fetchPnpmDeps,
+  pnpm,
+  pnpmConfigHook,
+  faketty,
 }:
 
 let
-  pinData = import ./element-web-pin.nix;
-  inherit (pinData.hashes) webSrcHash webYarnHash webSharedComponentsYarnHash;
   noPhoningHome = {
     disable_guests = true; # disable automatic guest account registration at matrix.org
   };
@@ -22,72 +22,62 @@ let
     meta = removeAttrs previousAttrs.meta [ "knownVulnerabilities" ];
   });
 in
-stdenv.mkDerivation (
-  finalAttrs:
-  removeAttrs pinData [ "hashes" ]
-  // {
-    pname = "element-web";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "element-web";
+  version = "1.12.14";
 
-    src = fetchFromGitHub {
-      owner = "element-hq";
-      repo = "element-web";
-      rev = "v${finalAttrs.version}";
-      hash = webSrcHash;
-    };
+  src = fetchFromGitHub {
+    owner = "element-hq";
+    repo = "element-web";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yy7CfMOMT1DBXHDHaDyAaOgp3s2KQIKA1A6zUhVOUhM=";
+  };
 
-    # https://github.com/element-hq/element-web/commit/e883b05206129857aa00ca726252e10a0eb05cf9
-    # introduced a link: dependency that we need to fetch as well
-    offlineCacheSharedComponents = fetchYarnDeps {
-      yarnLock = finalAttrs.src + "/packages/shared-components/yarn.lock";
-      sha256 = webSharedComponentsYarnHash;
-    };
+  pnpmDeps = fetchPnpmDeps {
+    pname = "element";
+    inherit (finalAttrs) version src;
+    fetcherVersion = 3;
+    hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
+  };
 
-    offlineCache = fetchYarnDeps {
-      yarnLock = finalAttrs.src + "/yarn.lock";
-      sha256 = webYarnHash;
-    };
+  nativeBuildInputs = [
+    jq
+    nodejs
+    pnpm
+    pnpmConfigHook
+    faketty
+  ];
 
-    nativeBuildInputs = [
-      yarnConfigHook
-      jq
-      nodejs
-    ];
+  # faketty is required to work around a bug in nx.
+  # See: https://github.com/nrwl/nx/issues/22445
+  buildPhase = ''
+    runHook preBuild
 
-    buildPhase = ''
-      runHook preBuild
+    cd apps/web
 
-      export VERSION=${finalAttrs.version}
+    export VERSION=${finalAttrs.version}
+    faketty pnpm run build
 
-      pushd packages/shared-components
-      yarnOfflineCache=${finalAttrs.offlineCacheSharedComponents} yarnConfigHook
-      popd
-      yarn --offline --cwd packages/shared-components prepare
+    runHook postBuild
+  '';
 
-      yarn --offline build:res
-      yarn --offline build:module_system
-      yarn --offline build:bundle
+  installPhase = ''
+    runHook preInstall
 
-      runHook postBuild
-    '';
+    cp -R webapp $out
+    cp ${jitsi-meet-override}/libs/external_api.min.js $out/jitsi_external_api.min.js
+    echo "${finalAttrs.version}" > "$out/version"
+    jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
 
-    installPhase = ''
-      runHook preInstall
+    runHook postInstall
+  '';
 
-      cp -R webapp $out
-      cp ${jitsi-meet-override}/libs/external_api.min.js $out/jitsi_external_api.min.js
-      echo "${finalAttrs.version}" > "$out/version"
-      jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
-
-      runHook postInstall
-    '';
-
-    meta = {
-      description = "Glossy Matrix collaboration client for the web";
-      homepage = "https://element.io/";
-      changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
-      teams = [ lib.teams.matrix ];
-      license = lib.licenses.agpl3Plus;
-      platforms = lib.platforms.all;
-    };
-  }
-)
+  meta = {
+    description = "Glossy Matrix collaboration client for the web";
+    homepage = "https://element.io/";
+    changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
+    teams = [ lib.teams.matrix ];
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.all;
+  };
+})

From d16e77ee32be83ca4c09fd4cd1d3b90633dfa22c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 9 Apr 2026 10:36:38 -0500
Subject: [PATCH 198/389] luaPackages: preserve meta attrs in override

Discovered in https://github.com/nix-community/nixvim/pull/4196
---
 pkgs/development/lua-modules/overrides.nix | 82 +++++++++++++++-------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 2c4cde548e79..576b7daec748 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -109,7 +109,9 @@ in
       "${date}-${rev}";
     __intentionallyOverridingVersion = true;
 
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.5";
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.5";
+    };
 
     nativeBuildInputs = old.nativeBuildInputs ++ [
       gnum4
@@ -323,7 +325,9 @@ in
 
     # Lua 5.4 support is experimental at the moment, see
     # https://github.com/lgi-devs/lgi/pull/249
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.4";
+    };
   });
 
   ljsyscall = prev.ljsyscall.overrideAttrs (old: rec {
@@ -340,7 +344,9 @@ in
     preConfigure = ''
       sed -i 's/lua == 5.1/lua >= 5.1, < 5.3/' ${knownRockspec}
     '';
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.3";
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.3";
+    };
 
     propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional (!isLuaJIT) final.luaffi;
   });
@@ -409,7 +415,9 @@ in
     buildInputs = old.buildInputs ++ [
       gnulib
     ];
-    meta.broken = isLuaJIT;
+    meta = (old.meta or { }) // {
+      broken = isLuaJIT;
+    };
   });
 
   lrexlib-oniguruma = prev.lrexlib-oniguruma.overrideAttrs {
@@ -474,10 +482,12 @@ in
     };
   });
 
-  lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs {
+  lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs (old: {
     strictDeps = false;
-    meta.broken = isLuaJIT;
-  };
+    meta = (old.meta or { }) // {
+      broken = isLuaJIT;
+    };
+  });
 
   lua-curl = prev.lua-curl.overrideAttrs (old: {
     buildInputs = old.buildInputs ++ [
@@ -524,12 +534,16 @@ in
 
     # ld: symbol(s) not found for architecture arm64
     # clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
-    meta.broken = stdenv.hostPlatform.isDarwin || luaAtLeast "5.5";
+    meta = (old.meta or { }) // {
+      broken = stdenv.hostPlatform.isDarwin || luaAtLeast "5.5";
+    };
   });
 
-  lua-subprocess = prev.lua-subprocess.overrideAttrs {
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
-  };
+  lua-subprocess = prev.lua-subprocess.overrideAttrs (old: {
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.4";
+    };
+  });
 
   lua-yajl = prev.lua-yajl.overrideAttrs (old: {
     buildInputs = old.buildInputs ++ [
@@ -605,7 +619,9 @@ in
         dep = libevent;
       }
     ];
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.4";
+    };
   });
 
   luaexpat = prev.luaexpat.overrideAttrs (_: {
@@ -617,7 +633,7 @@ in
     ];
   });
 
-  luaffi = prev.luaffi.overrideAttrs {
+  luaffi = prev.luaffi.overrideAttrs (old: {
     # TODO Somehow automatically amend buildInputs for things that need luaffi
     # but are in luajitPackages?
 
@@ -629,8 +645,10 @@ in
       sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig";
     };
     knownRockspec = with prev.luaffi; "${pname}-${version}.rockspec";
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
-  };
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT;
+    };
+  });
 
   lualdap = prev.lualdap.overrideAttrs (_: {
     externalDeps = [
@@ -870,7 +888,9 @@ in
     '';
 
     # Requires ffi
-    meta.broken = !isLuaJIT;
+    meta = (old.meta or { }) // {
+      broken = !isLuaJIT;
+    };
   });
 
   mpack = prev.mpack.overrideAttrs (drv: {
@@ -1033,10 +1053,12 @@ in
     '';
   };
 
-  rest-nvim = prev.rest-nvim.overrideAttrs {
+  rest-nvim = prev.rest-nvim.overrideAttrs (old: {
     strictDeps = false;
-    meta.broken = luaAtLeast "5.5";
-  };
+    meta = (old.meta or { }) // {
+      broken = luaAtLeast "5.5";
+    };
+  });
 
   rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs {
 
@@ -1243,7 +1265,9 @@ in
   });
 
   tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (old: {
-    meta.broken = lua.luaversion != "5.1";
+    meta = (old.meta or { }) // {
+      broken = lua.luaversion != "5.1";
+    };
   });
 
   tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: {
@@ -1253,7 +1277,9 @@ in
     ];
 
     # should be fixed upstream
-    meta.broken = lua.luaversion != "5.1";
+    meta = (old.meta or { }) // {
+      broken = lua.luaversion != "5.1";
+    };
   });
 
   tree-sitter-teal = prev.tree-sitter-teal.overrideAttrs (old: {
@@ -1273,8 +1299,10 @@ in
     '';
   };
 
-  vstruct = prev.vstruct.overrideAttrs (_: {
-    meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
+  vstruct = prev.vstruct.overrideAttrs (old: {
+    meta = (old.meta or { }) // {
+      broken = luaOlder "5.1" || luaAtLeast "5.4";
+    };
   });
 
   vusted = prev.vusted.overrideAttrs (_: {
@@ -1284,9 +1312,11 @@ in
     '';
   });
 
-  xml2lua = prev.xml2lua.overrideAttrs {
-    meta.broken = luaAtLeast "5.5";
-  };
+  xml2lua = prev.xml2lua.overrideAttrs (old: {
+    meta = (old.meta or { }) // {
+      broken = luaAtLeast "5.5";
+    };
+  });
 
   # keep-sorted end
 }

From dafa47c181759e9fedc8864e0f4015ed0dbe1a59 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Thu, 9 Apr 2026 17:54:23 +0200
Subject: [PATCH 199/389] feh: 3.11.4 -> 3.12.1

Changelog: https://feh.finalrewind.org/archive/3.12.1/
Changelog: https://feh.finalrewind.org/archive/3.12/
Diff: https://github.com/derf/feh/compare/3.11.4...3.12.1
---
 pkgs/by-name/fe/feh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix
index e9d4de23b606..b4d8b30b68e7 100644
--- a/pkgs/by-name/fe/feh/package.nix
+++ b/pkgs/by-name/fe/feh/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "feh";
-  version = "3.11.4";
+  version = "3.12.1";
 
   src = fetchFromGitHub {
     owner = "derf";
     repo = "feh";
     rev = finalAttrs.version;
-    hash = "sha256-CURXaEkYwN0RWxjkoe5cZptIUcgTOOH3q0QAAw3P+cs=";
+    hash = "sha256-cjfP/jnVWIGXTihtjVANE1T31R9ZFj8g5H8W3F+JrQk=";
   };
 
   outputs = [

From d46b5f7687b1c5e408d458e6eac45cc4689b3f68 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Thu, 9 Apr 2026 17:54:48 +0200
Subject: [PATCH 200/389] feh: fix -v not showing version

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

diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix
index b4d8b30b68e7..1a6d2957145a 100644
--- a/pkgs/by-name/fe/feh/package.nix
+++ b/pkgs/by-name/fe/feh/package.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
+    "VERSION=${finalAttrs.version}"
     "exif=1"
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0"

From f1b105bd0cf0d5247daf63829d9351949a4645c3 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Thu, 9 Apr 2026 17:05:03 +0100
Subject: [PATCH 201/389] zsh-forgit: 26.04.0 -> 26.04.1

---
 pkgs/by-name/zs/zsh-forgit/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
index 6416d9bd2348..edcf7cde83c1 100644
--- a/pkgs/by-name/zs/zsh-forgit/package.nix
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -11,17 +11,18 @@
   gnugrep,
   gnused,
   makeWrapper,
+  perl,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-forgit";
-  version = "26.04.0";
+  version = "26.04.1";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     tag = finalAttrs.version;
-    hash = "sha256-H5Vuf+VIrurs9lwad/K4klElXvM1kg6LEjm/wgv1/z8=";
+    hash = "sha256-/tG//6s0km8IUJXI4f++/UUCTAOYTDE/C5bbkHFhdNY=";
   };
 
   strictDeps = true;
@@ -52,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           git
           gnugrep
           gnused
+          perl
         ]
       }
 

From c7e226a9c6e016b3045e0c06b1e75e6308dacd95 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 7 Apr 2026 14:06:18 +0200
Subject: [PATCH 202/389] python3Packages.requests-cache: 1.2.1 -> 1.3.1

Changelog: https://github.com/requests-cache/requests-cache/blob/v1.3.1/HISTORY.md
---
 .../python-modules/requests-cache/default.nix | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 329d359480a0..d3308e715747 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -2,14 +2,13 @@
   lib,
   attrs,
   buildPythonPackage,
-  bson,
+  hatchling,
   boto3,
   botocore,
   cattrs,
   fetchFromGitHub,
   itsdangerous,
   platformdirs,
-  poetry-core,
   psutil,
   pymongo,
   pytestCheckHook,
@@ -23,27 +22,27 @@
   rich,
   tenacity,
   time-machine,
-  timeout-decorator,
   ujson,
+  orjson,
   urllib3,
   url-normalize,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "requests-cache";
-  version = "1.2.1";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "requests-cache";
     repo = "requests-cache";
-    tag = "v${version}";
-    hash = "sha256-juRCcBUr+Ko6kVPpUapwRbUGqWLKaRiCqppOc3S5FMU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-t9SJ+enZHHYPRXaSrPop2hVOagE4oMnuXExO2DeNttc=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     cattrs
     platformdirs
@@ -57,12 +56,15 @@ buildPythonPackage rec {
       boto3
       botocore
     ];
-    mongodbo = [ pymongo ];
+    mongodb = [ pymongo ];
     redis = [ redis ];
-    bson = [ bson ];
-    json = [ ujson ];
     security = [ itsdangerous ];
     yaml = [ pyyaml ];
+    all = [
+      orjson
+      ujson
+    ]
+    ++ (with finalAttrs.optional-dependencies; dynamodb ++ mongodb ++ redis ++ security ++ yaml);
   };
 
   nativeCheckInputs = [
@@ -75,10 +77,7 @@ buildPythonPackage rec {
     rich
     tenacity
     time-machine
-    timeout-decorator
-  ]
-  ++ optional-dependencies.json
-  ++ optional-dependencies.security;
+  ];
 
   preCheck = ''
     export HOME=$(mktemp -d);
@@ -90,11 +89,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Tests are flaky in the sandbox
-    "test_remove_expired_responses"
-    # Tests that broke with urllib 2.0.5
+    # Flaky
     "test_request_only_if_cached__stale_if_error__expired"
-    "test_stale_if_error__error_code"
   ];
 
   pythonImportsCheck = [ "requests_cache" ];
@@ -102,8 +98,8 @@ buildPythonPackage rec {
   meta = {
     description = "Persistent cache for requests library";
     homepage = "https://github.com/reclosedev/requests-cache";
-    changelog = "https://github.com/requests-cache/requests-cache/blob/v${version}/HISTORY.md";
+    changelog = "https://github.com/requests-cache/requests-cache/blob/$v{finalAttrs.version}/HISTORY.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 7c577fa670dc9e612907218e84f07c08aef23e16 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 7 Apr 2026 16:05:27 +0200
Subject: [PATCH 203/389] mnamer: fix build for requests-cache 1.3.1

---
 .../fix-requests-cache-version-check.patch    | 33 +++++++++++++++++++
 pkgs/by-name/mn/mnamer/package.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/mn/mnamer/fix-requests-cache-version-check.patch

diff --git a/pkgs/by-name/mn/mnamer/fix-requests-cache-version-check.patch b/pkgs/by-name/mn/mnamer/fix-requests-cache-version-check.patch
new file mode 100644
index 000000000000..2a29976187d0
--- /dev/null
+++ b/pkgs/by-name/mn/mnamer/fix-requests-cache-version-check.patch
@@ -0,0 +1,33 @@
+From 634d56361e967adcd81c3cb839458d3aea99e5db Mon Sep 17 00:00:00 2001
+From: Skid <26208369+skid9000@users.noreply.github.com>
+Date: Sun, 22 Feb 2026 20:28:03 +0100
+Subject: [PATCH] Fix requests_cache version check for 1.3.0
+
+Using the same method provided here : https://github.com/requests-cache/requests-cache/commit/61fae61e07222777eb26a6fb670c4ee6a9cdddb7
+---
+ mnamer/const.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/mnamer/const.py b/mnamer/const.py
+index 66510ebf..bf321f41 100644
+--- a/mnamer/const.py
++++ b/mnamer/const.py
+@@ -4,6 +4,7 @@
+ from pathlib import Path
+ from platform import platform, python_version
+ from sys import argv, gettrace, version_info
++from importlib.metadata import version as pkg_version, PackageNotFoundError
+ 
+ VERSION: str
+ 
+@@ -37,8 +38,8 @@
+     requests_version = "N/A"
+ 
+ try:
+-    from requests_cache import __version__ as requests_cache_version
+-except ModuleNotFoundError:
++    requests_cache_version = pkg_version('requests_cache')
++except PackageNotFoundError:
+     requests_cache_version = "N/A"
+ 
+ try:
diff --git a/pkgs/by-name/mn/mnamer/package.nix b/pkgs/by-name/mn/mnamer/package.nix
index d80ae16df58e..e4196ee96fbb 100644
--- a/pkgs/by-name/mn/mnamer/package.nix
+++ b/pkgs/by-name/mn/mnamer/package.nix
@@ -35,6 +35,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   patches = [
     # https://github.com/jkwill87/mnamer/pull/291
     ./cached_session_error.patch
+    # https://github.com/jkwill87/mnamer/pull/333
+    ./fix-requests-cache-version-check.patch
   ];
 
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];

From d6244a71293353e87b7f0bec371b9e2bad5e018c Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 9 Jul 2025 13:29:59 +0200
Subject: [PATCH 204/389] open-web-calendar: 1.49 -> 1.51

Changelog: https://open-web-calendar.quelltext.eu/changelog/#v151
---
 pkgs/by-name/op/open-web-calendar/package.nix         | 11 +++++++----
 .../python-modules/requests-cache/default.nix         |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/open-web-calendar/package.nix b/pkgs/by-name/op/open-web-calendar/package.nix
index 7ea2c1781495..b63ad48acbd2 100644
--- a/pkgs/by-name/op/open-web-calendar/package.nix
+++ b/pkgs/by-name/op/open-web-calendar/package.nix
@@ -12,13 +12,13 @@ let
 in
 python.pkgs.buildPythonApplication (finalAttrs: {
   pname = "open-web-calendar";
-  version = "1.49";
+  version = "1.51";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "open_web_calendar";
-    hash = "sha256-vtmIqiF85zn8CiMUWsCKJUzfiiK/j+xlZIyuIMGxR4I=";
+    hash = "sha256-r+7ZKdNOhjnjE1MBNAkni4Rrpx4DMRhUaP1Mmk5wzOo=";
   };
 
   # The Pypi tarball doesn't contain open_web_calendars/features
@@ -39,7 +39,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
   dependencies =
     with python.pkgs;
     [
-      flask-caching
       flask-allowed-hosts
       flask
       icalendar
@@ -48,6 +47,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       bcrypt
       caldav
       requests
+      requests-cache
       pyyaml
       recurring-ical-events
       gunicorn
@@ -59,7 +59,10 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     ]
     ++ requests.optional-dependencies.socks;
 
-  nativeCheckInputs = with python.pkgs; [ pytestCheckHook ];
+  nativeCheckInputs = with python.pkgs; [
+    pytestCheckHook
+    pytest-responses
+  ];
 
   enabledTestPaths = [ "open_web_calendar/test" ];
 
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index d3308e715747..92d46c37db03 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage (finalAttrs: {
       orjson
       ujson
     ]
-    ++ (with finalAttrs.optional-dependencies; dynamodb ++ mongodb ++ redis ++ security ++ yaml);
+    ++ lib.concatAttrValues (lib.removeAttrs finalAttrs.optional-dependencies [ "all" ]);
   };
 
   nativeCheckInputs = [

From f5b75578b4e1fbcb4ee558927895db1a083e212f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:27:00 +0200
Subject: [PATCH 205/389] electron_41: remove no longer needed patch

Upstream removed skia patch_dir in https://github.com/electron/electron/commit/21f9474f4f3d9787c5514884107e748095c59bf1
---
 .../tools/electron/41-skia-patchdir.patch            | 12 ------------
 pkgs/development/tools/electron/common.nix           |  3 ---
 2 files changed, 15 deletions(-)
 delete mode 100644 pkgs/development/tools/electron/41-skia-patchdir.patch

diff --git a/pkgs/development/tools/electron/41-skia-patchdir.patch b/pkgs/development/tools/electron/41-skia-patchdir.patch
deleted file mode 100644
index 9612d4292b85..000000000000
--- a/pkgs/development/tools/electron/41-skia-patchdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/electron/patches/config.json b/electron/patches/config.json
-index ed42ff8123..7af1c839cc 100644
---- a/electron/patches/config.json
-+++ b/electron/patches/config.json
-@@ -12,6 +12,6 @@
-   { "patch_dir": "src/electron/patches/ReactiveObjC", "repo": "src/third_party/squirrel.mac/vendor/ReactiveObjC" },
-   { "patch_dir": "src/electron/patches/webrtc", "repo": "src/third_party/webrtc" },
-   { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
--  { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia/src" },
-+  { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
-   { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" }
- ]
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index f06739827857..6a67cde6d74c 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -131,9 +131,6 @@ in
     ]
     ++ lib.optionals (lib.versions.major info.version == "39") [
       ./39-angle-patchdir.patch
-    ]
-    ++ lib.optionals (lib.versions.major info.version == "41") [
-      ./41-skia-patchdir.patch
     ];
 
   postPatch = ''

From dd8989329daed43bbc6e018e5e1d00f39192c9f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 16:37:25 +0000
Subject: [PATCH 206/389] frankenphp: 1.12.1 -> 1.12.2

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

diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix
index d3b53a54db82..154ff1b5ebb7 100644
--- a/pkgs/by-name/fr/frankenphp/package.nix
+++ b/pkgs/by-name/fr/frankenphp/package.nix
@@ -30,13 +30,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "frankenphp";
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "php";
     repo = "frankenphp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Bna8hp0wWlSbYR0GwGSl+ermFbmgSdgOqqYNqAr/XTc=";
+    hash = "sha256-wXBqUxGUvgfX2XmygBMZ6UEDxy8pyjcl+yob9egU8qw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/caddy";
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
   # frankenphp requires C code that would be removed with `go mod tidy`
   # https://github.com/golang/go/issues/26366
   proxyVendor = true;
-  vendorHash = "sha256-aUILdXS6XNAnO3MIi+VBq3gqfSohhK3KHpMoSNKAtYs=";
+  vendorHash = "sha256-nfDKg1erdErCVankdoqr1u5c2+lkgXU2tEgF3PDyTmU=";
 
   buildInputs = [
     phpUnwrapped

From d2f205b9b909f863aebe3ea5298ed5624ebfa754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theobori@disroot.org>
Date: Thu, 9 Apr 2026 18:38:20 +0200
Subject: [PATCH 207/389] rendercv: 2.7 -> 2.8

---
 .../fix_theme_directory_permissions.patch     | 42 -------------------
 pkgs/by-name/re/rendercv/package.nix          | 12 ++----
 2 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/re/rendercv/fix_theme_directory_permissions.patch

diff --git a/pkgs/by-name/re/rendercv/fix_theme_directory_permissions.patch b/pkgs/by-name/re/rendercv/fix_theme_directory_permissions.patch
deleted file mode 100644
index 95f2666decce..000000000000
--- a/pkgs/by-name/re/rendercv/fix_theme_directory_permissions.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/rendercv/cli/create_theme_command/create_theme_command.py b/src/rendercv/cli/create_theme_command/create_theme_command_fixed.py
-index 3812d5b..42a69db 100644
---- a/src/rendercv/cli/create_theme_command/create_theme_command.py
-+++ b/src/rendercv/cli/create_theme_command/create_theme_command_fixed.py
-@@ -1,3 +1,4 @@
-+import os
- import pathlib
- import textwrap
- from typing import Annotated
-@@ -35,11 +36,21 @@ def cli_command_create_theme(
- 
-     copy_templates("typst", new_theme_folder)
- 
-+    # Explicit directory permissions
-+    pathlib.Path.chmod(new_theme_folder, 0o755)
-+    # Explicit files and sub-directories permissions recursively
-+    for root, directories, files in os.walk(new_theme_folder):
-+        for directory in directories:
-+            pathlib.Path.chmod(pathlib.Path(root) / directory, 0o755)
-+        for file in files:
-+            pathlib.Path.chmod(pathlib.Path(root) / file, 0o644)
-+
-     # Create the __init__.py file for the new theme:
-     create_init_file_for_theme(theme_name, new_theme_folder / "__init__.py")
- 
-     # Build the panel
--    message = textwrap.dedent(f"""
-+    message = textwrap.dedent(
-+        f"""
-         [green]✓[/green] Created your custom theme: [purple]./{theme_name}[/purple]
- 
-         What you can do with this theme:
-@@ -52,7 +63,8 @@ def cli_command_create_theme(
-         To use your theme, set in your YAML input file:
-         [cyan]  design:
-         [cyan]    theme: {theme_name}
--    """).strip("\n")
-+    """
-+    ).strip("\n")
- 
-     print(
-         rich.panel.Panel(
diff --git a/pkgs/by-name/re/rendercv/package.nix b/pkgs/by-name/re/rendercv/package.nix
index 3a2b0ab3fd44..12c0957db66e 100644
--- a/pkgs/by-name/re/rendercv/package.nix
+++ b/pkgs/by-name/re/rendercv/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "rendercv";
-  version = "2.7";
+  version = "2.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rendercv";
     repo = "rendercv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2ClS/RwfAhjo+bh1fTiir1YCVelDJPOjp+Z3GHVzF4E=";
+    hash = "sha256-iYfUoSN5HiDsAwkx44KbmHPN+vcYAra1zyfxTwziYkI=";
   };
 
   build-system = with python3Packages; [ uv-build ];
@@ -37,11 +37,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   pythonRelaxDeps = [
     "phonenumbers"
-    "markdown"
-  ];
-
-  patches = [
-    ./fix_theme_directory_permissions.patch
   ];
 
   postPatch = ''
@@ -61,6 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "tests/renderer/test_pdf_png.py"
     "tests/cli/render_command/test_render_command.py"
     "tests/test_pyodide.py"
+    "tests/test_generated_files.py"
   ];
 
   doCheck = true;
@@ -68,7 +64,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Typst-based CV/resume generator";
     homepage = "https://rendercv.com";
-    changelog = "https://docs.rendercv.com/changelog/#27-march-6-2026";
+    changelog = "https://docs.rendercv.com/changelog/#28-march-21-2026";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ theobori ];
     mainProgram = "rendercv";

From 889f33c909e14ffbe9e70c764ec23efbc4181239 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:40:54 +0200
Subject: [PATCH 208/389] electron_40: fix build

---
 .../tools/electron/40-angle-patchdir.patch            | 11 +++++++++++
 pkgs/development/tools/electron/common.nix            |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/tools/electron/40-angle-patchdir.patch

diff --git a/pkgs/development/tools/electron/40-angle-patchdir.patch b/pkgs/development/tools/electron/40-angle-patchdir.patch
new file mode 100644
index 000000000000..595d93b35891
--- /dev/null
+++ b/pkgs/development/tools/electron/40-angle-patchdir.patch
@@ -0,0 +1,11 @@
+diff --git a/electron/patches/config.json b/electron/patches/config.json
+index f5dbe8600f..9e1e5e0704 100644
+--- a/electron/patches/config.json
++++ b/electron/patches/config.json
+@@ -15,5 +15,5 @@
+   { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
+   { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
+   { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
+-  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
++  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
+ ]
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 6a67cde6d74c..ec3f4fe34b46 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -131,6 +131,9 @@ in
     ]
     ++ lib.optionals (lib.versions.major info.version == "39") [
       ./39-angle-patchdir.patch
+    ]
+    ++ lib.optionals (lib.versions.major info.version == "40") [
+      ./40-angle-patchdir.patch
     ];
 
   postPatch = ''

From 2aba1b95d20d29bbd69b548003946ad6123a7d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theobori@disroot.org>
Date: Thu, 9 Apr 2026 18:55:53 +0200
Subject: [PATCH 209/389] python3Packages.mediawiki-langcodes: 0.2.20 -> 0.2.21

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

diff --git a/pkgs/development/python-modules/mediawiki-langcodes/default.nix b/pkgs/development/python-modules/mediawiki-langcodes/default.nix
index cfc89afc033b..dd351dbf8e69 100644
--- a/pkgs/development/python-modules/mediawiki-langcodes/default.nix
+++ b/pkgs/development/python-modules/mediawiki-langcodes/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mediawiki-langcodes";
-  version = "0.2.20";
+  version = "0.2.21";
   pyproject = true;
 
   # Using fetchPypi instead of fetching from source for technical reason.
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "mediawiki_langcodes";
     inherit (finalAttrs) version;
-    hash = "sha256-a6zztQVAUf61XWJ1AUmQYGinK86hSBzVMU9sn0A4DDY=";
+    hash = "sha256-WUzxMJu2PYuuxEUlLQpuVvP1F3h6+NVgH8g4ohbjenI=";
   };
 
   build-system = [ setuptools ];

From 08afd3a8e625af98d7313f362b28843322f3a86a Mon Sep 17 00:00:00 2001
From: Artem Leshchev <matshch@avride.ai>
Date: Thu, 9 Apr 2026 11:59:39 -0500
Subject: [PATCH 210/389] bazelisk: fix version injection

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

diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix
index 3155d4372068..ddf6f48206eb 100644
--- a/pkgs/by-name/ba/bazelisk/package.nix
+++ b/pkgs/by-name/ba/bazelisk/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X main.BazeliskVersion=${finalAttrs.version}"
+    "-X github.com/bazelbuild/bazelisk/core.BazeliskVersion=${finalAttrs.version}"
   ];
 
   meta = {

From 27f9d4c5bed9105ff74de57557cb91034b051641 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 17:06:46 +0000
Subject: [PATCH 211/389] buffrs: 0.12.2 -> 0.13.0

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

diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
index 7d76362ed577..025d3f05ad03 100644
--- a/pkgs/by-name/bu/buffrs/package.nix
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "buffrs";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "helsing-ai";
     repo = "buffrs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xwIJeXbXBotx/1ZsvCSaUlttkTYi2Ceq6MvFPwp2bj8=";
+    hash = "sha256-DTA30wVgThUu76AHWcpxAiOQZf92N6hMDPUHOUjg1vA=";
   };
 
-  cargoHash = "sha256-d8eCd6WKRX4RJKA9Z5D2Or9MgxU0VMqt/FoF1GnryAI=";
+  cargoHash = "sha256-c8Y81+IUpOWWlCsnltFWgbWW9I2ZkardzT94wGTKMVo=";
 
   # Disabling tests meant to work over the network, as they will fail
   # inside the builder.

From 426cac481879f68cf0aad67d43cba774974733d7 Mon Sep 17 00:00:00 2001
From: Artem Leshchev <matshch@avride.ai>
Date: Thu, 9 Apr 2026 12:19:45 -0500
Subject: [PATCH 212/389] bazelisk: make version match the upstream

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

diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix
index ddf6f48206eb..3d2bdb9a7940 100644
--- a/pkgs/by-name/ba/bazelisk/package.nix
+++ b/pkgs/by-name/ba/bazelisk/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/bazelbuild/bazelisk/core.BazeliskVersion=${finalAttrs.version}"
+    "-X github.com/bazelbuild/bazelisk/core.BazeliskVersion=v${finalAttrs.version}"
   ];
 
   meta = {

From ed119b57cd535af21e5659218352dc892486567c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 17:35:40 +0000
Subject: [PATCH 213/389] python3Packages.synchronicity: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/synchronicity/default.nix b/pkgs/development/python-modules/synchronicity/default.nix
index 45ff33aad211..27952183d50f 100644
--- a/pkgs/development/python-modules/synchronicity/default.nix
+++ b/pkgs/development/python-modules/synchronicity/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "synchronicity";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modal-labs";
     repo = "synchronicity";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/yN7FrOIVB30MVUZxqy607uG+niF7flxOLh94DvIrhM=";
+    hash = "sha256-RJyqQX1leo3Qx6dyp8lMGaWxaML7zFvKjG6fE13t8do=";
   };
 
   build-system = [ hatchling ];

From f477f4596b09e8755e845ccb8943e0c03fc82dee Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Thu, 9 Apr 2026 10:39:35 -0700
Subject: [PATCH 214/389] python3Packages.opencc: 1.1.9 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/opencc/default.nix b/pkgs/development/python-modules/opencc/default.nix
index 2a4c7fa01611..83e1f7eb129a 100644
--- a/pkgs/development/python-modules/opencc/default.nix
+++ b/pkgs/development/python-modules/opencc/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "opencc";
-  version = "1.1.9";
+  version = "1.2.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "opencc";
     inherit version;
-    hash = "sha256-itcig3MpUTAzkPrjOhztqYrJsDNoqPKRLtyTTXQHfko=";
+    hash = "sha256-K7kTx+04hGaybTivTIxLtBndtQMjXQcPDuGySZjvi8o=";
   };
 
   nativeBuildInputs = [

From e4672699e28859e748594fb84798e2299381213b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Apr 2026 01:01:00 +0700
Subject: [PATCH 215/389] wgpu-utils: 25.0.2 -> 29.0.1

---
 pkgs/by-name/wg/wgpu-utils/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wg/wgpu-utils/package.nix b/pkgs/by-name/wg/wgpu-utils/package.nix
index 9bec2cc4b2ee..e0e1cf5102a5 100644
--- a/pkgs/by-name/wg/wgpu-utils/package.nix
+++ b/pkgs/by-name/wg/wgpu-utils/package.nix
@@ -12,16 +12,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wgpu-utils";
-  version = "25.0.2";
+  version = "29.0.1";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu";
     tag = "wgpu-v${finalAttrs.version}";
-    hash = "sha256-Na8UWMEzY0mvw8YERZ86PH79Z5YlXITPdOYha7Ahn7k=";
+    hash = "sha256-BLw1HnB0DghtWAe8jo6GPO54U3qNNO4yprArme1CdeE=";
   };
 
-  cargoHash = "sha256-9o1Tb0pVTc3iWPjNlAPBQX72djcx3EPJhxuUW6xZfCs=";
+  # cargo-auditable fails on wgpu's dep:-based feature wiring.
+  auditable = false;
+
+  cargoHash = "sha256-QMH5GHjOHbzYdFUQxJ6aEQ+rX6Okl1HYog0hMh6bc8w=";
 
   nativeBuildInputs = [
     pkg-config

From a2d7928bbf14fcfab5507d0f581a44dcf575b9cf Mon Sep 17 00:00:00 2001
From: Nathan Mills <38995150+Quipyowert2@users.noreply.github.com>
Date: Tue, 7 Apr 2026 20:32:33 -0700
Subject: [PATCH 216/389] crawl: 0.33.1 -> 0.34.1

https://github.com/crawl/crawl/releases/tag/0.34.1
---
 pkgs/by-name/cr/crawl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cr/crawl/package.nix b/pkgs/by-name/cr/crawl/package.nix
index 1e5a9d4cdcba..4369a521388f 100644
--- a/pkgs/by-name/cr/crawl/package.nix
+++ b/pkgs/by-name/cr/crawl/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   which,
   sqlite,
-  lua5_1,
+  lua5_4,
   perl,
   python3,
   zlib,
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "crawl${lib.optionalString tileMode "-tiles"}";
-  version = "0.33.1";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "crawl";
     repo = "crawl";
     rev = version;
-    hash = "sha256-GXrYLGoQ1UwDHs+kLLcaBNpJ2BVMv4NhmpyfNFxPmg8=";
+    hash = "sha256-exntfZbGEDBwFA8AHhOoBPIXw/MDrHx5oxrxPDixpCc=";
   };
 
   # Patch hard-coded paths and remove force library builds
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   # Still unstable with luajit
   buildInputs = [
-    lua5_1
+    lua5_4
     zlib
     sqlite
     ncurses

From 85ac4b308922cf77c6a4f80e3e3ca906dfaba0a0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 9 Apr 2026 21:57:57 +0300
Subject: [PATCH 217/389] vscode: 1.114 -> 1.115

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 7c04b08d5726..67af88256f06 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -35,17 +35,17 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-D+2JWjC0kutfkEF5QKOKwh9Z8+jWgMgMN2b8pKwYays=";
-      x86_64-darwin = "sha256-dgOKMYRKfGRipLMsQcVmlOEHbG9l4ryJZv5J8znSxwA=";
-      aarch64-linux = "sha256-NRaxhWEdYDNIK1AbimKwzw4zGd3ljwBIYJ+BaTz2/gk=";
-      aarch64-darwin = "sha256-nWkNoryvsD2SPkc5veQ12+DWPXgWPJjfWwUcC7PjbC4=";
-      armv7l-linux = "sha256-Ae5sKYiyvIF9KZzKi7BK3/SLgKjuQCLjNKi9dXIqGbo=";
+      x86_64-linux = "sha256-eDSGfF05h5HPTZNeV9l/SBV+9fIV9iVnommM5P/cGgA=";
+      x86_64-darwin = "sha256-gHNXSWjbS+xqxjNYaoE7WSeo1Vf2+au/x68RVObJtp0=";
+      aarch64-linux = "sha256-PkZiq6STbt1Rb/g9XKeE3tktcrSRyQn/ah1QQxrOITg=";
+      aarch64-darwin = "sha256-T7An1+qkBO2QncPvoyymjerwLwti2/MgwmOJJCb2Nhw=";
+      armv7l-linux = "sha256-+KfjkiqMBGg9x/Qnd4FHiW0kw0dIQ56DSGUm8SBTc8o=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.114.0";
+  version = "1.115.0";
 
   # The update server (update.code.visualstudio.com) expects the version path
   # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@@ -53,7 +53,7 @@ let
   downloadVersion = lib.versions.pad 3 version;
 
   # This is used for VS Code - Remote SSH test
-  rev = "e7fb5e96c0730b9deb70b33781f98e2f35975036";
+  rev = "41dd792b5e652393e7787322889ed5fdc58bd75b";
 in
 buildVscode {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -86,7 +86,7 @@ buildVscode {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-Sx9XXo3qB+7hwi9vzAncX49usOSMVgKilgBa2UrG6pQ=";
+      hash = "sha256-2CQBU7TfYNO4m1Mf6Q0QXFt8C2txJgcN9kd7wX355J4=";
     };
     stdenv = stdenvNoCC;
   };

From 95c54463b815be494caf991364eb596540c3c9a8 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 12:08:29 -0700
Subject: [PATCH 218/389] bencode: drop

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

diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix
deleted file mode 100644
index c4f66b92cd8c..000000000000
--- a/pkgs/by-name/be/bencode/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  catch2,
-  cmake,
-  expected-lite,
-  fmt,
-  gsl-lite,
-  ninja,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "bencode";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "fbdtemme";
-    repo = "bencode";
-    rev = finalAttrs.version;
-    hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-  ];
-
-  buildInputs = [
-    catch2
-    expected-lite
-    fmt
-    gsl-lite
-  ];
-
-  postPatch = ''
-    # Disable a test that requires an internet connection.
-    substituteInPlace tests/CMakeLists.txt \
-      --replace "add_subdirectory(cmake_fetch_content)" ""
-  '';
-
-  doCheck = true;
-
-  postInstall = ''
-    rm -rf $out/lib64
-  '';
-
-  meta = {
-    description = "Header-only C++20 bencode serialization/deserialization library";
-    homepage = "https://github.com/fbdtemme/bencode";
-    changelog = "https://github.com/fbdtemme/bencode/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    platforms = lib.platforms.unix;
-    # Broken because the default stdenv on these targets doesn't support C++20.
-    broken = with stdenv; isDarwin || (isLinux && isAarch64);
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 76007cb15d3c..d2993c83efa6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -372,6 +372,7 @@ mapAliases {
   belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
   belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
+  bencode = throw "'bencode' has been removed because it is unmaintained upstream"; # Added 2026-04-09
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   bfr = throw "bfr has been removed, did not update since 2004, fails to build on gcc-15, no homepage"; # Added 2026-01-28
   bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24

From 2c8b0bdd2dea6ef0391460cb84e225b4d2516944 Mon Sep 17 00:00:00 2001
From: SystematicError <systematicerror@users.noreply.github.com>
Date: Thu, 9 Apr 2026 20:18:12 +0100
Subject: [PATCH 219/389] edwin: use installFonts

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

diff --git a/pkgs/by-name/ed/edwin/package.nix b/pkgs/by-name/ed/edwin/package.nix
index 506e8d5cd389..35d4e03c4e2e 100644
--- a/pkgs/by-name/ed/edwin/package.nix
+++ b/pkgs/by-name/ed/edwin/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchurl,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -13,14 +14,7 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-F6BzwnrsaELegdo6Bdju1OG+RI9zKnn4tIASR3q6zYk=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/fonts/opentype
-    install *.otf $out/share/fonts/opentype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Text font for musical scores";

From e5a534244de6fc711562bffea995e686c86be9b0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 9 Apr 2026 20:19:55 +0100
Subject: [PATCH 220/389] rust-analyzer-unwrapped: 2026-03-30 -> 2026-04-06

Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2026-04-06
---
 pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index 147144654b25..f3e4a0746918 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -13,15 +13,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rust-analyzer-unwrapped";
-  version = "2026-03-30";
+  version = "2026-04-06";
 
-  cargoHash = "sha256-nTllacWD0alq8OVKAPhcuMnAyPW2Uh0JAJkHhB9YcZ4=";
+  cargoHash = "sha256-IQ+hVSJw3iQ7cAY7PMRHR8md3Shn3xu/OSZB3de5UFY=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = finalAttrs.version;
-    hash = "sha256-Cbpmf0+1pqi/zbpub2vkp5lTPx3QdVtDkkagDwQzHHg=";
+    hash = "sha256-bFC/p7Ywyd9QIr9DbU3Q75c7AcaCm9wVmEvcI3702cY=";
   };
 
   cargoBuildFlags = [

From ecfed6327ed43ee96605e8e85dc12080b1ccdfd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 19:29:00 +0000
Subject: [PATCH 221/389] xan: 0.56.0 -> 0.57.0

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

diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix
index f43d71bcc40b..b05e9b2d99da 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xan";
-  version = "0.56.0";
+  version = "0.57.0";
 
   src = fetchFromGitHub {
     owner = "medialab";
     repo = "xan";
     tag = finalAttrs.version;
-    hash = "sha256-eXzWquBFuX4DB9uOJFgWwp1cNxi02KcU4yZQ3PsPRRs=";
+    hash = "sha256-54kLrWOSHnS26nogw/u3Prq6nfxsrT/VaDKEQr8kK48=";
   };
 
-  cargoHash = "sha256-Mck41QDRCyQvbKDIIjaoniHOk2U5FPbr4Oun2WuL800=";
+  cargoHash = "sha256-3L6WMkCecyhYVWchcFcs5lesxax468pIZc+ZllLwbro=";
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable
   # tests so that we can manually run and test the package for packaging purposes.

From badde960cc5736270ad36355ca5df50ef85a81a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 9 Apr 2026 13:20:43 -0700
Subject: [PATCH 222/389] immich: 2.7.2 -> 2.7.3

Diff: https://github.com/immich-app/immich/compare/v2.7.2...v2.7.3

Changelog: https://github.com/immich-app/immich/releases/tag/v2.7.3
---
 pkgs/by-name/im/immich/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index f50db575c2d2..9cea10f3ec32 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -115,20 +115,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "2.7.2";
+  version = "2.7.3";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I3+pmG6tO01tT9H/WyEVB+FRT+78yllIJfVT+fEIo2c=";
+    hash = "sha256-z3Z2/X9LT0iZtFVHUuVbWPZIPJUMbJGn5NmHCDxNVj0=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-Xyhsxyk7ZZD9KgqYAAiJPtgEC6SqqT4dIjthInFkO+Q=";
+    hash = "sha256-k8ZG1SKRKymG4fau46SrGjkIPM3JK+xIUPMFaE2CXVg=";
   };
 
   postPatch = ''

From feaf713164f029df8876289eb4b66d3bd063ca18 Mon Sep 17 00:00:00 2001
From: twoneis <git@chpu.eu>
Date: Thu, 9 Apr 2026 22:42:55 +0200
Subject: [PATCH 223/389] osmium: 0.0.16 -> 0.0.19

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

diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
index e81a1e258de1..717ce1d49f33 100644
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osmium";
-  version = "0.0.16";
+  version = "0.0.19";
 
   src = fetchurl {
     url = "https://updater.osmium.chat/Osmium-${version}-alpha-x64.tar.gz";
-    hash = "sha256-dMOyZ9oPVnLt6MHeQwsMJ03wgvaKzalynwAL/PRfI28=";
+    hash = "sha256-Qwh6K2QlJJapqR0BkaA0LvwLEsqktnLzOnyJg+7sMFo=";
   };
 
   nativeBuildInputs = [

From cdbfdb64a0559ce6b12107641d49c05ed742a046 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 9 Apr 2026 17:01:04 -0400
Subject: [PATCH 224/389] ci: update pinned

Should fix treefmt timeouts, see numtide/treefmt#677
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 5f4203d1ffa2..bab709798be6 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f",
-      "url": "https://github.com/NixOS/nixpkgs/archive/106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f.tar.gz",
-      "hash": "0wyyhddz2mqhmq938d337223675jpd83dd5lsks2nhz0hs4r3jha"
+      "revision": "02f3fa0374fa13707d42d55d58ecc76b091f223c",
+      "url": "https://github.com/NixOS/nixpkgs/archive/02f3fa0374fa13707d42d55d58ecc76b091f223c.tar.gz",
+      "hash": "0z8d33c5g0gk9a74ppqq77npisf9xx9c8ai9isxa2hyjx4lv1pki"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "75925962939880974e3ab417879daffcba36c4a3",
-      "url": "https://github.com/numtide/treefmt-nix/archive/75925962939880974e3ab417879daffcba36c4a3.tar.gz",
-      "hash": "118zlbyzmh21x6rad2vrxjkdfyicd8lx3s0if8b791n51hz1r9ns"
+      "revision": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+      "url": "https://github.com/numtide/treefmt-nix/archive/790751ff7fd3801feeaf96d7dc416a8d581265ba.tar.gz",
+      "hash": "1zah3dmbpn3ap5acg22kq1j19dg32gj73l43yamjcxhc38sv9kd5"
     }
   },
   "version": 5

From 0c9c74006a8a9198d5f9e98b5ffb284471cd4f4a Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Thu, 9 Apr 2026 21:11:12 +0000
Subject: [PATCH 225/389] llama-cpp: 8667 -> 8733

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 7e9feed798ad..ee304e3febeb 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -78,7 +78,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "8667";
+  version = "8733";
 
   outputs = [
     "out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-bDI7a7OMCbuZyaJX4o22fmQIyrGdzYkoIeVvxBYlnRI=";
+    hash = "sha256-hHySLday/Kz0jNPLxbDxZXL/1O2VOBPG7fNaBLkD6tc=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -121,7 +121,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ [ openssl ];
 
   npmRoot = "tools/server/webui";
-  npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ=";
+  npmDepsHash = "sha256-eeftjKt0FuS0Dybez+Iz9VTVMA4/oQVh+3VoIqvhVMw=";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src patches;

From cef6a51463271fc8974bd9290dbf1985e96841d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 21:19:57 +0000
Subject: [PATCH 226/389] python3Packages.session-info2: 0.4 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/session-info2/default.nix b/pkgs/development/python-modules/session-info2/default.nix
index ba0a03562a14..f9aa7582be48 100644
--- a/pkgs/development/python-modules/session-info2/default.nix
+++ b/pkgs/development/python-modules/session-info2/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "session-info2";
-  version = "0.4";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "session-info2";
     tag = "v${version}";
-    hash = "sha256-zm0UpbKKPKEAF2iq1ZVu7hGOU6vlfd7+liUVJauaD98=";
+    hash = "sha256-n568j109rnWxCWLsdu0RS7huVfUebzFshAd84i6ALM4=";
   };
 
   build-system = [

From 55fa5bce2804e13be0ee20454fa0c3d8f25babad Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 9 Apr 2026 21:22:21 +0000
Subject: [PATCH 227/389] vivid: 0.11.0 -> 0.11.1

Diff: https://github.com/sharkdp/vivid/compare/v0.11.0...v0.11.1
---
 pkgs/by-name/vi/vivid/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix
index 6f7561749af6..1e9d9d6a93dd 100644
--- a/pkgs/by-name/vi/vivid/package.nix
+++ b/pkgs/by-name/vi/vivid/package.nix
@@ -2,20 +2,24 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vivid";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "vivid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-963rJz0ZsWnKQx8tO1Y65RHAW/oZnF4A5XKneP0PyBM=";
+    hash = "sha256-5SRZq2L49Kn6zwK1DXjtakz2zKrcAdbMdQ0yxykUvm8=";
   };
 
-  cargoHash = "sha256-oP5/G/PSkwn4JruLQOGtM8M2uPt4Q88bU3kNmXUK4JE=";
+  cargoHash = "sha256-RM6OY5TLofKZPsWoNnF4ZPGhF9eV+ZmOuGXe7Xjc254=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
   meta = {
     description = "Generator for LS_COLORS with support for multiple color themes";

From f80dc590e47a5c657124f62de38e51bdd282dc38 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 9 Apr 2026 23:35:42 +0200
Subject: [PATCH 228/389] rimgo: 1.2.6 -> 1.4.1

---
 pkgs/by-name/ri/rimgo/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ri/rimgo/package.nix b/pkgs/by-name/ri/rimgo/package.nix
index 877abb1893e6..7900b47483aa 100644
--- a/pkgs/by-name/ri/rimgo/package.nix
+++ b/pkgs/by-name/ri/rimgo/package.nix
@@ -2,22 +2,23 @@
   lib,
   fetchFromCodeberg,
   buildGoModule,
-  tailwindcss_3,
+  tailwindcss_4,
+  nix-update-script,
 }:
 buildGoModule (finalAttrs: {
   pname = "rimgo";
-  version = "1.2.6";
+  version = "1.4.1";
 
   src = fetchFromCodeberg {
     owner = "rimgo";
     repo = "rimgo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PBzbCiRIDrtKH3j6jxmylPpwafR5qgRYDHgYP1m/+Ok=";
+    hash = "sha256-0P2+U4wXiFybpGzV7IB1DXZWC+qIdeQtR6mtiYrrih0=";
   };
 
-  vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU=";
+  vendorHash = "sha256-unqml6T50BTBzYXXGcL4cc+q9qJJ9W2b2flPBPheBpk=";
 
-  nativeBuildInputs = [ tailwindcss_3 ];
+  nativeBuildInputs = [ tailwindcss_4 ];
 
   preBuild = ''
     tailwindcss -i static/tailwind.css -o static/app.css -m
@@ -29,6 +30,8 @@ buildGoModule (finalAttrs: {
     "-X codeberg.org/rimgo/rimgo/pages.VersionInfo=${finalAttrs.version}"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Alternative frontend for Imgur";
     homepage = "https://codeberg.org/rimgo/rimgo";

From 461c22c6d53636b03325695b6380eabb28d3ae2a Mon Sep 17 00:00:00 2001
From: Andrew Sukach <andrew@sukach.org>
Date: Sun, 15 Feb 2026 11:46:42 -0800
Subject: [PATCH 229/389] rectangle-pro: 3.63 -> 3.68

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

diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix
index e82940b53a39..e2f832212398 100644
--- a/pkgs/by-name/re/rectangle-pro/package.nix
+++ b/pkgs/by-name/re/rectangle-pro/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle-pro";
-  version = "3.63";
+  version = "3.68";
 
   src = fetchurl {
     url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
-    hash = "sha256-ysRIf19Woo6odCEgkNfoRDelF7gflDhaiNH+hjygz/Q=";
+    hash = "sha256-8tS9vH55A4h7q+eMDGKolcK6o8HbgAXcPmLlzbI3W8E=";
   };
 
   sourceRoot = ".";

From 50e0342e3e372bcad704d03dc4a14d0c02971854 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 9 Apr 2026 23:43:31 +0200
Subject: [PATCH 230/389] rectangle-pro: 3.68 -> 3.75

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

diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix
index e2f832212398..72724e5fd38a 100644
--- a/pkgs/by-name/re/rectangle-pro/package.nix
+++ b/pkgs/by-name/re/rectangle-pro/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle-pro";
-  version = "3.68";
+  version = "3.75";
 
   src = fetchurl {
     url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
-    hash = "sha256-8tS9vH55A4h7q+eMDGKolcK6o8HbgAXcPmLlzbI3W8E=";
+    hash = "sha256-1NIR3iql9+e2nX/mzThkJ2LnLi0onrgF8gLwFBf2iKc=";
   };
 
   sourceRoot = ".";

From 8ddd409f9859cfbd80f37d3b4af049e1956fcb4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 21:48:44 +0000
Subject: [PATCH 231/389] alpaca: 9.2.2 -> 9.2.3

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

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index e0307f7e4fea..ee8e76566a76 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -33,14 +33,14 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "9.2.2";
+  version = "9.2.3";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-5ZvvYsWfj51ie8LOP0fWeg3lDBHGjLwDjz4wQIvCj4A=";
+    hash = "sha256-SwZcycyY2S4GcB6mMcP6JdzMsBlN5Xr6I9kaKKqnb/8=";
   };
 
   postPatch = ''

From c82b5546d25f81ab75369aa1a674c3a409b37c05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 21:52:04 +0000
Subject: [PATCH 232/389] tanka: 0.36.4 -> 0.37.0

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

diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index 6bfcd6120daa..aa05ebcd9bee 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tanka";
-  version = "0.36.4";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tanka";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-t40sGSXKb7Q0WvMl4D7J59FurbkGRX8PHA34WM2Hnwk=";
+    sha256 = "sha256-HhDwnpP6xM2i0fCOymDZeUQjrn5l+/UcWKYENIl2n7I=";
   };
 
-  vendorHash = "sha256-4Ojuu4Jv++yh/wbJATdd/uozFb9gDVv3nD64Iy5EjQQ=";
+  vendorHash = "sha256-z877U8bnCKED7mOqF8X8VyNzGUULuWCopyHd7aFinxQ=";
 
   doCheck = false;
   # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK

From 66d814a63d28b3b160ace0731115898225283728 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 22:09:40 +0000
Subject: [PATCH 233/389] vscode-extensions.xdebug.php-debug: 1.40.0 -> 1.40.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 52b747cf26b6..611033322a96 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5333,8 +5333,8 @@ let
         mktplcRef = {
           name = "php-debug";
           publisher = "xdebug";
-          version = "1.40.0";
-          hash = "sha256-B8x954/nltRZcuX9y1NYu5JrDGiYxuPINSs1bgtCnWA=";
+          version = "1.40.1";
+          hash = "sha256-WI4d6Kk+lEmFTYYfwSH7q32YaOeokdEquFtZQJcyyDA=";
         };
         meta = {
           description = "PHP Debug Adapter";

From 12c52513d679ad5b0bd60c90741f5e4b257cd55a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 22:12:24 +0000
Subject: [PATCH 234/389] python3Packages.llm-venice: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix
index e3b86a463838..2253ba38b4ac 100644
--- a/pkgs/development/python-modules/llm-venice/default.nix
+++ b/pkgs/development/python-modules/llm-venice/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "llm-venice";
-  version = "0.8.2";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ar-jan";
     repo = "llm-venice";
     tag = version;
-    hash = "sha256-CwvFthuahWPmenI4jrhGmscJd1sJCXkkvU+hYYYekx0=";
+    hash = "sha256-jshOfbZUccmK6sRCDTzkE7tOKX2ILue93Jp2GFoGTxY=";
   };
 
   build-system = [ setuptools ];

From bf6d88bf0e33c058d2596e8671610ad2cf271d89 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 15:42:34 -0700
Subject: [PATCH 235/389] bip: fix build with gcc15

---
 pkgs/by-name/bi/bip/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bi/bip/package.nix b/pkgs/by-name/bi/bip/package.nix
index 1d4655cc83ab..a6844808867c 100644
--- a/pkgs/by-name/bi/bip/package.nix
+++ b/pkgs/by-name/bi/bip/package.nix
@@ -7,6 +7,7 @@
   bison,
   flex,
   openssl,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation {
@@ -27,9 +28,13 @@ stdenv.mkDerivation {
 
   postPatch = ''
     # Drop blanket -Werror to avoid build failure on fresh toolchains
-    # and libraries. Without the cnage build fails on gcc-13 and on
+    # and libraries. Without the change build fails on gcc-13 and on
     # openssl-3.
     substituteInPlace src/Makefile.am --replace-fail ' -Werror ' ' '
+    # Fix incompatible function pointer type for cmp in list_t
+    # The cmp function pointer is declared as taking no arguments but is
+    # used with qsort-style callback signature (const void *, const void *)
+    substituteInPlace src/util.h --replace-fail 'int (*cmp)()' 'int (*cmp)(const void *, const void *)'
   '';
 
   nativeBuildInputs = [
@@ -44,6 +49,10 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-v";
+  doInstallCheck = true;
+
   meta = {
     description = "IRC proxy (bouncer)";
     homepage = "http://bip.milkypond.org/";

From da048a16af65e02d01bf9fdc13888ca7a6d85c18 Mon Sep 17 00:00:00 2001
From: Taylor Howard <taylorhoward@me.com>
Date: Fri, 10 Apr 2026 09:12:23 +1000
Subject: [PATCH 236/389] ogre-next: add pkgConfigModules and pkg-config test

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

diff --git a/pkgs/by-name/og/ogre-next/package.nix b/pkgs/by-name/og/ogre-next/package.nix
index 8e0eb1b4c5aa..4a8bf556a739 100644
--- a/pkgs/by-name/og/ogre-next/package.nix
+++ b/pkgs/by-name/og/ogre-next/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch2,
+  testers,
 
   cmake,
   ninja,
@@ -75,12 +76,23 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "OGRE_CONFIG_ENABLE_STBI" true)
   ];
 
+  passthru.tests.pkg-config = testers.hasPkgConfigModules {
+    package = finalAttrs.finalPackage;
+    versionCheck = true;
+  };
+
   meta = {
     description = "3D Object-Oriented Graphics Rendering Engine";
     homepage = "https://www.ogre3d.org/";
     maintainers = with lib.maintainers; [
       marcin-serwin
     ];
+    pkgConfigModules = [
+      "OGRE"
+      "OGRE-Hlms"
+      "OGRE-MeshLodGenerator"
+      "OGRE-Overlay"
+    ];
     platforms = lib.platforms.linux;
     license = lib.licenses.mit;
 

From 68101fd57b70aa8e06ca2e746be9a06366130f91 Mon Sep 17 00:00:00 2001
From: Taylor Howard <taylorhoward@me.com>
Date: Fri, 10 Apr 2026 09:13:25 +1000
Subject: [PATCH 237/389] ogre-next: add darwin support

- Add apple-sdk_15 for Metal/Cocoa/OpenGL frameworks on macOS
- Move openvr to Linux-only (broken on darwin)
- Disable framework bundle output on darwin (incompatible with Nix store)
- Guard Xcode-style POST_BUILD commands behind OGRE_BUILD_LIBS_AS_FRAMEWORKS
  to fix ninja "bad $-escape" error from $(PLATFORM_NAME)/$(CONFIGURATION)
- Remove Xcode-centric CMAKE_OSX_SYSROOT overrides (Nix stdenv handles this)
- Disable GL3Plus on darwin (missing Khronos headers; Metal is the primary
  render system on macOS)
- Disable both NEON and SSE2 SIMD on aarch64 (fixes build failures)
- Extend platforms from linux to unix

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pkgs/by-name/og/ogre-next/package.nix | 55 ++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/og/ogre-next/package.nix b/pkgs/by-name/og/ogre-next/package.nix
index 4a8bf556a739..c58e108a2c29 100644
--- a/pkgs/by-name/og/ogre-next/package.nix
+++ b/pkgs/by-name/og/ogre-next/package.nix
@@ -22,6 +22,7 @@
   openvr,
   rapidjson,
   zziplib,
+  apple-sdk_15,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ogre-next";
@@ -42,6 +43,35 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    # OgreMain/CMakeLists.txt has a macOS post-build block that uses `ditto`
+    # (a macOS system tool unavailable in the Nix sandbox) to copy headers
+    # into an Ogre.framework bundle. This block runs unconditionally on
+    # non-iOS macOS — it is not gated by OGRE_BUILD_LIBS_AS_FRAMEWORKS.
+    # Wrap it in a framework guard so it is skipped when frameworks are
+    # disabled, avoiding the missing `ditto` and the unnecessary framework
+    # directory structure.
+    substituteInPlace OgreMain/CMakeLists.txt \
+      --replace-fail \
+        'set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")' \
+        'if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
+    set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")' \
+      --replace-fail \
+        'ogre_config_framework(''${OGRE_NEXT}Main)' \
+        'endif ()
+    ogre_config_framework(''${OGRE_NEXT}Main)'
+
+    # Remove Xcode-centric CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES overrides.
+    # Nix stdenv already sets these correctly via apple-sdk.
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'set(XCODE_ATTRIBUTE_SDKROOT macosx)' "" \
+      --replace-fail 'set(CMAKE_OSX_SYSROOT macosx)' "" \
+      --replace-fail \
+        'execute_process(COMMAND xcodebuild -version -sdk "''${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)' "" \
+      --replace-fail \
+        'string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "''${CMAKE_OSX_SYSROOT}")' ""
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -54,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
     zziplib
     zlib
     tinyxml
-    openvr
     rapidjson
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -64,7 +93,11 @@ stdenv.mkDerivation (finalAttrs: {
     libxrandr
     libxt
     libxcb
-  ];
+    # openvr is broken on darwin
+    openvr
+  ]
+  # apple-sdk_15 provides Metal, Cocoa, and OpenGL frameworks
+  ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_15;
 
   # TODO: Figure out Vulkan plugin deps
 
@@ -74,6 +107,19 @@ stdenv.mkDerivation (finalAttrs: {
     # Use STB instead of freeimage since the latter is marked as insecure
     (lib.cmakeBool "OGRE_CONFIG_ENABLE_FREEIMAGE" false)
     (lib.cmakeBool "OGRE_CONFIG_ENABLE_STBI" true)
+
+    # Framework bundles are incompatible with the Nix store
+    (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # GL3Plus requires Khronos headers not available on darwin; Metal is the
+    # primary render system on macOS
+    (lib.cmakeBool "OGRE_BUILD_RENDERSYSTEM_GL3PLUS" false)
+  ]
+  # Both NEON and SSE2 SIMD cause build failures on aarch64
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    (lib.cmakeBool "OGRE_SIMD_NEON" false)
+    (lib.cmakeBool "OGRE_SIMD_SSE2" false)
   ];
 
   passthru.tests.pkg-config = testers.hasPkgConfigModules {
@@ -93,10 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
       "OGRE-MeshLodGenerator"
       "OGRE-Overlay"
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     license = lib.licenses.mit;
-
-    # build problems around NEON intrinsics
-    broken = stdenv.hostPlatform.isAarch64;
   };
 })

From 4446a4c871129d4757d7698c710d6e9f11848055 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 23:30:22 +0000
Subject: [PATCH 238/389] hugo: 0.159.2 -> 0.160.1

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 9b81b25d694d..5bd4bad0aa17 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.159.2";
+  version = "0.160.1";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-86qlh4did365g75j3fk5gkBp3T3YH3zEnNhaOrPFVcI=";
+    hash = "sha256-6vBVGqT/Ia7XSbBhRaQVsr/pT1bRXvMz3rZZLYydSfc=";
   };
 
-  vendorHash = "sha256-w6wjKB4jQejxW7IqpZaujxlZSUxWYqHiPI6aqOOD2+0=";
+  vendorHash = "sha256-x1Gk4fZfzTKr6QcnraJ6fuwPMa3cTLlY6OaSQkWrdC0=";
 
   checkFlags =
     let

From 161fbe578f83977253e7a91c558fe5756147b7f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 23:45:24 +0000
Subject: [PATCH 239/389] uutils-login: 0-unstable-2026-04-01 ->
 0-unstable-2026-04-07

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

diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix
index 38165e913d12..783626f1b512 100644
--- a/pkgs/by-name/uu/uutils-login/package.nix
+++ b/pkgs/by-name/uu/uutils-login/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-login";
-  version = "0-unstable-2026-04-01";
+  version = "0-unstable-2026-04-07";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "login";
-    rev = "c1a70e6c2f8125076c69a7eed7b0c267731ef00e";
-    hash = "sha256-eW8edhGeE3XnPq59kl2tz78QEu8SBsUKGbjU8vYEOSs=";
+    rev = "20df30470f98dc50af80c23f53cd6cacc64e85c3";
+    hash = "sha256-YQsnKpJRG3rEllKb4KtPi+lUeGoywh/UGsMfvRBdu4M=";
   };
 
-  cargoHash = "sha256-h1judrTw9/r3iHRU3ndnJvx4ksHNCNHh67XpRDV1QkA=";
+  cargoHash = "sha256-dKpgyGcZEEx94iQH7NnO/X1+KLE/Bcdl1FFT7ijS1WE=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 3ccd70c72f4390a48cc8087475e0935650f89a10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 23:48:28 +0000
Subject: [PATCH 240/389] heimdall-proxy: 0.17.12 -> 0.17.13

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

diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index be7d8048846c..b91b8206377a 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.17.12";
+  version = "0.17.13";
 in
 buildGoModule {
   pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "dadrus";
     repo = "heimdall";
     tag = "v${version}";
-    hash = "sha256-LwvizSMmMzcKl3BbPZAXLJkpxyLkz75uSL12PxgrrCM=";
+    hash = "sha256-BJgrY3UNBPLssUh4HrWShO9BF2jW5D5q+A66y4fK5+k=";
   };
 
-  vendorHash = "sha256-W0XhE9wcnLT9pVe5hNuDbkX1egsuS7x6ueBscVDztsA=";
+  vendorHash = "sha256-n7q49RU59AHVqrBidZ+kxgqybyiyncJm6mfNtR7lGEg=";
 
   tags = [ "sqlite" ];
 

From 74c68120dcc54e1c1d65facb0bcfa0ec94913a67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 23:50:22 +0000
Subject: [PATCH 241/389] cargo-readme: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix
index fc8a1fa67697..6de86e184a61 100644
--- a/pkgs/by-name/ca/cargo-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-readme/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-readme";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "webern";
     repo = "cargo-readme";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
+    sha256 = "sha256-p8QQNACU9lFig0vBQrb1u2T44Icwk10OBjGzaVLj7kk=";
   };
 
-  cargoHash = "sha256-24D+ZcMGZN175LZNcNW8F5IsStk4au4xB0ZFe95EjPk=";
+  cargoHash = "sha256-kfXDMBqS4/QC+khQhQ2Jrer8TuFKlnZFS3IZ2lcVOR8=";
 
   # disable doc tests
   cargoTestFlags = [

From 511164afca700509b6070de8efd868e266b70254 Mon Sep 17 00:00:00 2001
From: Willy <jemand771@gmx.net>
Date: Mon, 30 Mar 2026 21:14:11 +0200
Subject: [PATCH 242/389] imnodes: unstable-2024-03-12 -> unstable-2025-06-25

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

diff --git a/pkgs/by-name/im/imnodes/package.nix b/pkgs/by-name/im/imnodes/package.nix
index aece5ddd1f37..f00f17e82fc4 100644
--- a/pkgs/by-name/im/imnodes/package.nix
+++ b/pkgs/by-name/im/imnodes/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation {
   pname = "imnodes";
-  version = "unstable-2024-03-12";
+  version = "unstable-2025-06-25";
   outputs = [
     "out"
     "dev"
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Nelarius";
     repo = "imnodes";
-    rev = "8563e1655bd9bb1f249e6552cc6274d506ee788b";
-    hash = "sha256-E7NNCxYq9dyVvutWbpl2a+D2Ap2ErvdYHBDqpX0kb0c=";
+    rev = "b2ec254ce576ac3d42dfb7aef61deadbff8e7211";
+    hash = "sha256-Hdde198chSm3Ii0grEB4imqp7vVu6mYxa1VPZovvb7A=";
   };
   patches = [
     # CMake install rules

From a7690a6c0e2ac753330bbaed56043b54ba0d88e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 23:59:55 +0000
Subject: [PATCH 243/389] asak: 0.3.5 -> 0.3.7

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

diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix
index 146e4e026e1b..0bf966630225 100644
--- a/pkgs/by-name/as/asak/package.nix
+++ b/pkgs/by-name/as/asak/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asak";
-  version = "0.3.5";
+  version = "0.3.7";
 
   src = fetchFromGitHub {
     owner = "chaosprint";
     repo = "asak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI=";
+    hash = "sha256-/c7E8q7Kx6BewzJoB+nvktX1yzybH+HGSOMgdOk8GVA=";
   };
 
-  cargoHash = "sha256-XoTfymCXrvoToSY7jw+Pn8Wm6fskFzl4f55uiKnSsJ8=";
+  cargoHash = "sha256-vj88bErQ3STrY4nN8XoC2QMISW1Qt5963QqIYhwCIKM=";
 
   nativeBuildInputs = [
     pkg-config

From 61f6d7f8f60e8fde357f29810188b56789cbe5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 10 Apr 2026 02:20:52 +0200
Subject: [PATCH 244/389] 
 home-assistant-custom-lovelace-modules.light-entity-card: 6.1.3 -> 6.3.1

---
 .../light-entity-card/package.nix                      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
index 7a6fbb975da7..ce40d5c17553 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
@@ -6,18 +6,16 @@
 
 buildNpmPackage rec {
   pname = "light-entity-card";
-  version = "6.1.3";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "ljmerza";
     repo = "light-entity-card";
-    tag = version;
-    hash = "sha256-DtpNKcnxMWbKwfIwo9R2g2Vux9oAjTI0URixGC41qeA=";
+    tag = "v${version}";
+    hash = "sha256-Y25jtbKJNTVi6XUHntm2AtIzuht96/o5l+uScwEE9So=";
   };
 
-  npmDepsHash = "sha256-EZDTWtn3joikwiC5Kfn94+tXRDpBhMDHqHozfIkfbJ0=";
-
-  env.NODE_OPTIONS = "--openssl-legacy-provider";
+  npmDepsHash = "sha256-Sl2TgA73Wq1n//lqokLC7iHcE1Oqt+ZP6MT+Deidhn0=";
 
   installPhase = ''
     runHook preInstall

From 4223927c89a7b0cca145f90295d8a60999433abc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 00:27:32 +0000
Subject: [PATCH 245/389] python3Packages.dtschema: 2025.12 -> 2026.04

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

diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix
index a4a3037ad2cb..f891540dc797 100644
--- a/pkgs/development/python-modules/dtschema/default.nix
+++ b/pkgs/development/python-modules/dtschema/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dtschema";
-  version = "2025.12";
+  version = "2026.04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "devicetree-org";
     repo = "dt-schema";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DCkZDI0/W/4IkMzaa769vKJxlSMWoEsLIdlyChYd+Mk=";
+    hash = "sha256-U86h0FVmsYfoKMOaS3DRwKOUjpsm4uNTbUm2YJehaFs=";
   };
 
   build-system = [ setuptools-scm ];

From ff7d418dca62baadd09a0e985a15775f7d1b3a25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 00:27:46 +0000
Subject: [PATCH 246/389] terraform-providers.tencentcloudstack_tencentcloud:
 1.82.82 -> 1.82.84

---
 .../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 ae3e2261828a..97c77a1f4d3c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1310,11 +1310,11 @@
     "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-xsYh5gDneL3nQDUIHe3fRjObFTGp3ssPq8wlqPWsq7Y=",
+    "hash": "sha256-JA8urZd08fyGkFZMCF9aVJ9UEGx+aPreGqiAuFTqA84=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.82",
+    "rev": "v1.82.84",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 5be2b8276713179b6b3d34606569009619f6f489 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 00:43:23 +0000
Subject: [PATCH 247/389] vscode-extensions.augment.vscode-augment: 0.789.1 ->
 0.825.5

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

diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
index 4f7715d09625..85ea94bf4822 100644
--- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-augment";
     publisher = "augment";
-    version = "0.789.1";
-    hash = "sha256-RQg4XnFJhTttphjhR+arfRibCs0Y9ITvryrsq+hvFhQ=";
+    version = "0.825.5";
+    hash = "sha256-UKkrdxHlbcdpd3RQxNpZVBINZlncPv7e5RETnj/19Ts=";
   };
 
   meta = {

From 28beebd41a6d9b49f7d38d9fb1d68cc8c4b17e3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 00:43:53 +0000
Subject: [PATCH 248/389] lunar-client: 3.6.3 -> 3.6.4

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

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 22a58ed929cb..b1e655347933 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-hsH6xgTVQFrUVM4DF06+WBNbr3X2TlN8gKO2J0m7OUrOO2LDBLR2jweuajN9C0d5EiosdiXHPjxmiv+7JXeCFQ==";
+    hash = "sha512-JpFYTBAewvxmJLvhHPLNyUw74EmcflThK5qjADZhfJR+buZgpbbLCOho00auRWTIg0+xoyNM9ZGGYWfjxfIe9Q==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 503f4b640e5acf9f2d2f9b01f7ff72ace218366c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 00:44:34 +0000
Subject: [PATCH 249/389] home-assistant-custom-lovelace-modules.sankey-chart:
 3.10.2 -> 3.11.0

---
 .../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 44cd8530269e..1e75753333df 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 = "3.10.2";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-dwviZVfs8CAdawUuaVHYmGWBri+X6r962kX8xiFhzsM=";
+    hash = "sha256-P6D/Inm9vFRF9Ozel8W1iKbd+H3ZR6Eoyk5Gm7tKv2s=";
   };
 
-  npmDepsHash = "sha256-Kpv43sPc/+1E7TJzzncOBQbV2lVTNIfMC3gYWXDP/6k=";
+  npmDepsHash = "sha256-dHix97fuLEM2FySzJ0DZStx+ZExWwCKPakOGJbTI1rw=";
 
   installPhase = ''
     runHook preInstall

From 9491cfaa2dbbdcc76c903ef15abbe7e6ccc7bc71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 01:04:56 +0000
Subject: [PATCH 250/389] gate: 0.63.0 -> 0.64.0

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

diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 666fb4e54273..a00e48b98c5d 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gate";
-  version = "0.63.0";
+  version = "0.64.0";
 
   src = fetchFromGitHub {
     owner = "minekube";
     repo = "gate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xHzXJgMNoubjaGD/cr9syIxlJKzxjWm13g6fQtFI3Sc=";
+    hash = "sha256-C+XKDFzsCgZpTS2fEpAKOExPyO9WOjdmHKvVpmNyDRo=";
   };
 
   vendorHash = "sha256-7tDEtZyV4upFG/DGg1rbJbO8XV7MSAzFSs/3NmH4qI4=";

From 1c14c31ce9d2b5746c560c23605f882600f54931 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 10 Apr 2026 03:22:15 +0200
Subject: [PATCH 251/389] qbz: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/by-name/qb/qbz/package.nix b/pkgs/by-name/qb/qbz/package.nix
index 5328d60ff79f..9cf729e63add 100644
--- a/pkgs/by-name/qb/qbz/package.nix
+++ b/pkgs/by-name/qb/qbz/package.nix
@@ -22,23 +22,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qbz";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "vicrodh";
     repo = "qbz";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B9nnjsuC//9b4HmFjHHRvDaEkUWSfNZRyiek6aU0Gd4=";
+    hash = "sha256-3MPWLovWRmSrSfaR5ciZR2+4S7QzPYYVdVKP+mczhis=";
   };
 
-  cargoHash = "sha256-6Rv+wE2FMg58A7TDRly1wC96VmbgITX8/fh073tPuPA=";
+  cargoHash = "sha256-jc/OZi93S0Hu3ywuwNgekyezJ1qCvxWpE60mTu0Y8jU=";
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   npmDeps = fetchNpmDeps {
     name = "qbz-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-ErO+ulCe+nx4OEHki0zKyq4HWtKfKt04VIWsDFJfCCk=";
+    hash = "sha256-JN3lQyEX1n5G1OcWuRNZl/KSfL7JEfsc4opeh4F/iAY=";
   };
 
   env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";

From 4a7bd75948b32c31d33229ce5c6ba22ba4ab4b21 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 18:37:54 -0700
Subject: [PATCH 252/389] wayqt: 0.3.0-unstable-2026-01-05 ->
 0.3.0-unstable-2026-03-03

---
 pkgs/development/libraries/wayqt/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/wayqt/default.nix b/pkgs/development/libraries/wayqt/default.nix
index 215c1b3c558f..93069d20d41e 100644
--- a/pkgs/development/libraries/wayqt/default.nix
+++ b/pkgs/development/libraries/wayqt/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  replaceVars,
   meson,
   pkg-config,
   ninja,
@@ -13,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayqt";
-  version = "0.3.0-unstable-2026-01-05";
+  version = "0.3.0-unstable-2026-03-03";
 
   src = fetchFromGitLab {
     owner = "desktop-frameworks";
     repo = "wayqt";
-    rev = "2750cd93a3110bff6345f9e2a1a3090a3e3f7203";
-    hash = "sha256-WGIZ3OgeGkQWEzc/m0/Moo9Qgr3vg4dFfQhba2vx0do=";
+    rev = "a7dfc9c682dce2721ddd84c17738619a95a23998";
+    hash = "sha256-rC4Gdhr8mkL2V3bMWprMRo75AIhk9OJsoWjlBUnILEA=";
   };
 
   nativeBuildInputs = [

From 8709496feecade2bc73d4255d0707c4eb18b5382 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 01:40:07 +0000
Subject: [PATCH 253/389] mieru: 3.30.0 -> 3.30.1

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 7e8fec507489..438ca1a04ddb 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mieru";
-  version = "3.30.0";
+  version = "3.30.1";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-frSW7qLKhRTJLE2rAaZekoaJUmQWqVECQhCSCsmub/U=";
+    hash = "sha256-kS7da5cO/g0FD5cs1zqz2RRhTExzv3ohnxMfAaDbhHc=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From ce7a751b1ef2f73972659dfef667c92380401a63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 01:49:05 +0000
Subject: [PATCH 254/389] asn: 0.80.5 -> 0.81.0

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

diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix
index 614d2ab56765..e809b7c29697 100644
--- a/pkgs/by-name/as/asn/package.nix
+++ b/pkgs/by-name/as/asn/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "asn";
-  version = "0.80.5";
+  version = "0.81.0";
 
   src = fetchFromGitHub {
     owner = "nitefood";
     repo = "asn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o+qyNxEV2lPRsCNkkcZbj07hKw4eV45qhB8G34OWmgg=";
+    hash = "sha256-HPLdi5Eok06jnToWPn1bGnnAGirGV8zGFoDsKsMvrI8=";
   };
 
   nativeBuildInputs = [

From eb6744ff46f6e533e9db50691f39b8279e43e0ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 01:51:52 +0000
Subject: [PATCH 255/389] az-pim-cli: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index 076c48090f55..34a6fe2faf0b 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xc8DHsb+cwXQYlffP/n/ejP/qcvnmMrgVnEeWo4Wih8=";
+    hash = "sha256-3SC3iYW5TN5ljUr1g7aBXJsdAD03C4M+99Wtue8Sm7Y=";
   };
 
   patches = [

From fb53728f297a8b8e78228810b8f21ac00227c18b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 01:52:53 +0000
Subject: [PATCH 256/389] python3Packages.firebase-admin: 7.3.0 -> 7.4.0

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

diff --git a/pkgs/development/python-modules/firebase-admin/default.nix b/pkgs/development/python-modules/firebase-admin/default.nix
index 741669b3cd78..11718315903c 100644
--- a/pkgs/development/python-modules/firebase-admin/default.nix
+++ b/pkgs/development/python-modules/firebase-admin/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "firebase-admin";
-  version = "7.3.0";
+  version = "7.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-admin-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Or9F+bW5rW7+XnP7AQayfhZNtRuYdgotKOQdodeTA1k=";
+    hash = "sha256-RaoBR9NVFdpIXuSVQScAySWpUOumV+flkfKMBGOFs6w=";
   };
 
   build-system = [ setuptools ];

From 551aaefd3489d52482c7b701436d29cf03dc7a90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 02:16:30 +0000
Subject: [PATCH 257/389] python3Packages.urllib3-future: 2.19.900 -> 2.19.904

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

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 6b51b06424de..32341aeaf819 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.19.900";
+  version = "2.19.904";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-6jRc3hxPSFV+vhAzbSudKuCGV0l+X2aTKXPZnAAs0Bk=";
+    hash = "sha256-bYkT78OT665Ea3k4boORlaFiORaryqRXSfxXt0yZLSM=";
   };
 
   postPatch = ''

From 08d0b13dfe8a2352e253712b4c4e24dd0e674548 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 02:26:12 +0000
Subject: [PATCH 258/389] libretro.mgba: 0-unstable-2026-03-30 ->
 0-unstable-2026-04-03

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

diff --git a/pkgs/applications/emulators/libretro/cores/mgba.nix b/pkgs/applications/emulators/libretro/cores/mgba.nix
index c0de852de2a2..e7009525f8db 100644
--- a/pkgs/applications/emulators/libretro/cores/mgba.nix
+++ b/pkgs/applications/emulators/libretro/cores/mgba.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mgba";
-  version = "0-unstable-2026-03-30";
+  version = "0-unstable-2026-04-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mgba";
-    rev = "6ab29fed1b5139f19ac98c523fd4a6a7f0b30e38";
-    hash = "sha256-6cCd2tuj2kXTL1w0DUPodaLU0ivNjPyKGytgxrjlwb0=";
+    rev = "6dce57eef127dc4cc292644f38196e0e7c58590c";
+    hash = "sha256-sLxQ7NG5ypSQACo1Q/9/FwQKCpZsIU0Y35dLa8uhOVs=";
   };
 
   meta = {

From 2eae3662d66cc2fabd9333efc863b492f2e90ed6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 02:39:37 +0000
Subject: [PATCH 259/389] glances: 4.5.2 -> 4.5.3.2

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

diff --git a/pkgs/by-name/gl/glances/package.nix b/pkgs/by-name/gl/glances/package.nix
index c5929080386a..82dacd9c4d04 100644
--- a/pkgs/by-name/gl/glances/package.nix
+++ b/pkgs/by-name/gl/glances/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "glances";
-  version = "4.5.2";
+  version = "4.5.3.2";
   pyproject = true;
 
   disabled = python3Packages.isPyPy;
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "nicolargo";
     repo = "glances";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o/q/zW7lRKQg+u4XblwNIswCVIroMdeUaPTNkN8QKwo=";
+    hash = "sha256-QMKi37+uuRkZxK1qcRIUDAElLU7njjGYUoSecBdbCO0=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 9cea77dd95acd7cf5ce6861c98a483543f7d2301 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 03:15:20 +0000
Subject: [PATCH 260/389] terraform-providers.yandex-cloud_yandex: 0.195.0 ->
 0.197.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 36708cbea6b1..c20970579af8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1499,12 +1499,12 @@
     "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-F2nbu/MImDXHSYPjo3O6K0tsZJ4PTrmB14Ghfvnp5sc=",
+    "hash": "sha256-gCzM7pfQaez/Zw6JAJcw4bVSpqVhxxiQyjqP/FeldJQ=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.195.0",
+    "rev": "v0.197.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-lSpDmhzCed9NUJkQ35tsrUbMIzx6wnEJ20UFMPbwhWE="
+    "vendorHash": "sha256-Prtwe3JPfWpx+yO37lT31VsqQ6E2aDLI7fAbYYq7gSE="
   }
 }

From c6cf73c5a6800a53c4443cc7f97e0b82e05fe276 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 03:33:56 +0000
Subject: [PATCH 261/389] mixing-station: 2.8.0 -> 2.8.2

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

diff --git a/pkgs/by-name/mi/mixing-station/package.nix b/pkgs/by-name/mi/mixing-station/package.nix
index e705ba39d310..d40c4e1ad60c 100644
--- a/pkgs/by-name/mi/mixing-station/package.nix
+++ b/pkgs/by-name/mi/mixing-station/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mixing-station";
-  version = "2.8.0";
+  version = "2.8.2";
 
   src = fetchzip {
     url = "https://mixingstation.app/backend/api/web/download/archive/mixing-station-pc/update/${finalAttrs.version}";
     name = "mixing-station-${finalAttrs.version}.zip";
     extension = "zip";
-    hash = "sha256-AGmBCkaYt3kZv/XuR9fkeEVryFw6t/p1CHVirNp+81s=";
+    hash = "sha256-hGxwr+Juf8ES4Mifs/B6wq5h2Vs+ymcMl8k8Y6HxcJk=";
     stripRoot = false;
   };
 

From 5914aa7d0332af0d8561edbc0f643af4e203e539 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 03:37:19 +0000
Subject: [PATCH 262/389] symfony-cli: 5.16.1 -> 5.17.1

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

diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index ae7838c25401..bb8dbd5b4423 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -12,14 +12,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "symfony-cli";
-  version = "5.16.1";
-  vendorHash = "sha256-StRdOTEuijjnDWvXNjAVzvDL3zXQJ4LZOioart1CFPw=";
+  version = "5.17.1";
+  vendorHash = "sha256-eCvlfkUH80EXshBkWz4+ehVlRXPsKyydixo76+kxSgE=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q8m8bhM07CUQxtwEB/BqE90tDY6uSoyNsCShbMIBesQ=";
+    hash = "sha256-6FqfbVfNGfIGJFBemwfUVwVR7fwrnZT38vF+8Qr8p3s=";
     leaveDotGit = true;
     postFetch = ''
       git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE

From 6a00ba414555aab01e4506ae141cd3021f2e3c6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 03:43:04 +0000
Subject: [PATCH 263/389] emulsion: 11.0 -> 12.3

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

diff --git a/pkgs/by-name/em/emulsion/package.nix b/pkgs/by-name/em/emulsion/package.nix
index 87d013db2d7a..9664ba732692 100644
--- a/pkgs/by-name/em/emulsion/package.nix
+++ b/pkgs/by-name/em/emulsion/package.nix
@@ -34,16 +34,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emulsion";
-  version = "11.0";
+  version = "12.3";
 
   src = fetchFromGitHub {
     owner = "ArturKovacs";
     repo = "emulsion";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8=";
+    sha256 = "sha256-+C4YB5usNKfNydyEyIvaScnjK0h/PKN1x8gnt7Lz2kQ=";
   };
 
-  cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00=";
+  cargoHash = "sha256-i+lSUSgq98iT9OzsdkZgRidLszc6mJJA1b1Jfq+yk5s=";
 
   nativeBuildInputs = [
     installShellFiles

From 4fa39605f30544ed7388e03c6de3714fb0c5b031 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 03:57:52 +0000
Subject: [PATCH 264/389] python3Packages.pyvista: 0.47.1 -> 0.47.2

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

diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index 47ba0224bb71..7a752e62971a 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.47.1";
+  version = "0.47.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-tsDoyg+YmrDRZLZb3dRRu9D9lOX1HvQY2hYpqWSlOBw=";
+    hash = "sha256-59Crx2YeCLUcmiFeBGa9yrefRgamW58OqGIO933zkJc=";
   };
 
   build-system = [ setuptools ];

From 094b279a716a27e8f309d5bc28ac186480508a58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:02:57 +0000
Subject: [PATCH 265/389] pv-migrate: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/by-name/pv/pv-migrate/package.nix b/pkgs/by-name/pv/pv-migrate/package.nix
index 725ef9df4db6..8747c7d7e7f2 100644
--- a/pkgs/by-name/pv/pv-migrate/package.nix
+++ b/pkgs/by-name/pv/pv-migrate/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "pv-migrate";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "utkuozdemir";
     repo = "pv-migrate";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-zWE0jpBYauI8Xm4HcArV3I0m3LMLEz8CoThjNrjxddE=";
+    sha256 = "sha256-ieE7kO/PA/2ZgvGbDhu1MzJTk5yvg2plKTyQe0Y/nb8=";
   };
 
   subPackages = [ "cmd/pv-migrate" ];

From c051fb025fc1687a2ae46a0ec1a917e77da9a87f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:15:20 +0000
Subject: [PATCH 266/389] pgdog: 0.1.34 -> 0.1.36

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

diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index cf4de6f92beb..e6370f11f40f 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.34";
+  version = "0.1.36";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZbDj+2x2TlYz8r1gRF7msyKUELTTuvhjQlyJcN4g0NI=";
+    hash = "sha256-3ESeZA+824abvTMp7Vge4ldqqQ6qSF/dkDgGaY6h4mM=";
   };
 
-  cargoHash = "sha256-7CR3tE3YpfN864lCrl1Wm/eL008c5UzlsFN4k22oCF0=";
+  cargoHash = "sha256-PNqUYP3lUXuQLosrDvoIMofWglJQjD9I/k6u/M3qfZ0=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''

From 3831149b627b201c42f4daa5806fbb5e3cc92701 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:20:06 +0000
Subject: [PATCH 267/389] terraform-mcp-server: 0.5.0 -> 0.5.1

---
 pkgs/by-name/te/terraform-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
index 9132fe3def87..f83843677771 100644
--- a/pkgs/by-name/te/terraform-mcp-server/package.nix
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "terraform-mcp-server";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V+TcIuw9SrSbqtjZMM5CSUjPof9xpdwN0NKGrU7M6kQ=";
+    hash = "sha256-pYco93oARCqgUk99X3oxBcuNKStw0JeyVQOoEt6PYn8=";
   };
 
-  vendorHash = "sha256-8bKDnnByc6tId7mWCaSxY9zgoBW7Ajlmd33xuMrJp1E=";
+  vendorHash = "sha256-fJ3G/kqJlnoBdBVgnl1MzYLrNhucNocWT3rHgrTpfQU=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"

From 47146bb557ab84b049266b044b3c945a817add24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:20:33 +0000
Subject: [PATCH 268/389] temporal_capi: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/by-name/te/temporal_capi/package.nix b/pkgs/by-name/te/temporal_capi/package.nix
index a19ee4efe21f..28ea9526a1b9 100644
--- a/pkgs/by-name/te/temporal_capi/package.nix
+++ b/pkgs/by-name/te/temporal_capi/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "temporal_capi";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "boa-dev";
     repo = "temporal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aAe8gaMAkUrVcEbe8PJfo1Mn8wEwriH4PPjbgNdcUkY=";
+    hash = "sha256-wD4pTVgQZrGONgSTDm9Eq3fo3Ez7aIC0/n4Rqgksad4=";
   };
 
-  cargoHash = "sha256-25NBtoWc/YrBjvRT/AqMYwFVBuGuEyn3Nrq+ZlzTIXQ=";
+  cargoHash = "sha256-8m4fWMEZxQ4g3h+81K9KnQvHHewmExOq0nouJ7wec8M=";
 
   postPatch = ''
     # Force crate-type to include staticlib

From 00629168415dcbcbf31009687d248f3579fcfae7 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 21:20:50 -0700
Subject: [PATCH 269/389] boxfs: fix build with gcc15

---
 pkgs/by-name/bo/boxfs/package.nix       |  1 +
 pkgs/by-name/bo/boxfs/use-stdbool.patch | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/bo/boxfs/use-stdbool.patch

diff --git a/pkgs/by-name/bo/boxfs/package.nix b/pkgs/by-name/bo/boxfs/package.nix
index cd5b2af099b6..2d9ca8313878 100644
--- a/pkgs/by-name/bo/boxfs/package.nix
+++ b/pkgs/by-name/bo/boxfs/package.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation {
   patches = [
     ./work-around-API-borkage.patch
     ./libapp-include-ctype.diff
+    ./use-stdbool.patch
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/bo/boxfs/use-stdbool.patch b/pkgs/by-name/bo/boxfs/use-stdbool.patch
new file mode 100644
index 000000000000..9177886eadc3
--- /dev/null
+++ b/pkgs/by-name/bo/boxfs/use-stdbool.patch
@@ -0,0 +1,18 @@
+diff --git a/tmp/orig_base.h b/libapp/libapp/base.h
+index 7d8abdb..2f42b03 100644
+--- a/tmp/orig_base.h
++++ b/libapp/libapp/base.h
+@@ -1,12 +1,7 @@
+ #ifndef APP_BASE_H
+ #define APP_BASE_H
+ 
+-#ifndef __cplusplus
+-typedef enum {
+-        false = 0,
+-        true = 1
+-} bool;
+-#endif
++#include <stdbool.h>
+ 
+ #define ASSERT(clause) if( !clause) { fprintf(stderr, "Assertion '%s' failed at %s:%d\n", #clause, __FILE__, __LINE__ ); exit(-1); }
+ 

From 4696d84021b9812d5c6f4e5b5a0aeaffe57e1a07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:36:42 +0000
Subject: [PATCH 270/389] uv: 0.11.4 -> 0.11.6

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 3a278f0bf0a6..0c2d86df19bd 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.11.4";
+  version = "0.11.6";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-bOvArcuBrF/4ENhQx1cH79Q2+zygBO+GMOe2oNZwCTc=";
+    hash = "sha256-S3D8KjIyUw9cy+y8FCNX4o2CezWWBS1c00f6bLytTrE=";
   };
 
-  cargoHash = "sha256-1Q58GFLhBVFqhSxI1korv3iwSwxEKNHLN9rzqIhWBHU=";
+  cargoHash = "sha256-1zKhePStJQx8OiRJo7omJn1w0UdQ9at0c1glsjFPuTo=";
 
   buildInputs = [
     rust-jemalloc-sys

From 46a5006f9fddedf92adb10e7aa3076518ae88c1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:39:19 +0000
Subject: [PATCH 271/389] gpxsee: 16.0 -> 16.2

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

diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index 33444ad441a4..df2115272e86 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "16.0";
+  version = "16.2";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-kZLIDgC1XGZlFyTeZYtbIe684Jnh5eJvlwTDlPbmei8=";
+    hash = "sha256-7zEk8cFYgDNlRpXkgGVBj9XMmvOWDS++C8vCSP4DL1Q=";
   };
 
   buildInputs = [

From b3400d5a2e0b83f3bf0c70ecd0ee8b176560003c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 04:53:00 +0000
Subject: [PATCH 272/389] faas-cli: 0.18.7 -> 0.18.8

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

diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index 480b296b4e6d..b10b405a7815 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -24,13 +24,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "faas-cli";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = finalAttrs.version;
-    sha256 = "sha256-K1VKMlf6B+o0UEmuCtBlVpsUEMJ2d0GiFAmL4zmFuWY=";
+    sha256 = "sha256-JiIKCrNH6aWiCqw1ji5RwNrHwLHuSbw/iwqzrumfQQQ=";
   };
 
   vendorHash = null;

From a455db628e467d5fd2c467ef0858ef141844ef31 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 21:55:05 -0700
Subject: [PATCH 273/389] gaphor: fix build

---
 pkgs/by-name/ga/gaphor/fix-dulwich-api.patch | 29 ++++++++++++++++++++
 pkgs/by-name/ga/gaphor/package.nix           |  6 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ga/gaphor/fix-dulwich-api.patch

diff --git a/pkgs/by-name/ga/gaphor/fix-dulwich-api.patch b/pkgs/by-name/ga/gaphor/fix-dulwich-api.patch
new file mode 100644
index 000000000000..8af56ca1aa8e
--- /dev/null
+++ b/pkgs/by-name/ga/gaphor/fix-dulwich-api.patch
@@ -0,0 +1,29 @@
+From 7f4f7fcd97acef841e046191d98c900b61b78c17 Mon Sep 17 00:00:00 2001
+From: Dan Yeaw <dan@yeaw.me>
+Date: Sat, 4 Apr 2026 15:46:25 -0400
+Subject: [PATCH] Fix dulwich porcelain API
+
+---
+ gaphor/storage/tests/fixtures.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gaphor/storage/tests/fixtures.py b/gaphor/storage/tests/fixtures.py
+index d071e4556f..4dd0c60bf1 100644
+--- a/gaphor/storage/tests/fixtures.py
++++ b/gaphor/storage/tests/fixtures.py
+@@ -16,11 +16,13 @@ def commit_all(message):
+     main_ref = commit_all("Initial commit")
+ 
+     porcelain.branch_create(repo, "branch")
+-    porcelain.checkout_branch(repo, "branch")
++    porcelain.switch(repo, "branch")
+     filename.write_text(their_text, encoding="utf-8")
+     branch_oid = commit_all("Branch commit")
+ 
+-    porcelain.checkout_branch(repo, main_ref)
++    # OID + detach=True: works when default branch is not "main" (e.g. older
++    # Dulwich uses "master"); "git merge" still runs on HEAD.
++    porcelain.switch(repo, main_ref, detach=True)
+     filename.write_text(our_text, encoding="utf-8")
+     commit_all("Second commit")
+ 
diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index a414571cfcad..6922fc74d7b8 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -23,6 +23,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-0Z0RFQrN2g0beV2konZBfMroeNtbT+sPRsWlRvQFYBk=";
   };
 
+  patches = [
+    # from https://github.com/gaphor/gaphor/pull/4236
+    # please remove after next update
+    ./fix-dulwich-api.patch
+  ];
+
   pythonRelaxDeps = [
     "pydot"
     "pygobject"

From a81de3b1a9279caaf68eb4a82bc68d7b2794f79f Mon Sep 17 00:00:00 2001
From: dram <dramforever@live.com>
Date: Fri, 10 Apr 2026 12:58:40 +0800
Subject: [PATCH 274/389] Revert "maintainers: init kaynetik"

---
 nixos/modules/services/security/yubikey-agent.nix | 1 -
 pkgs/by-name/ag/age-plugin-yubikey/package.nix    | 1 -
 pkgs/by-name/ag/age/package.nix                   | 5 +----
 pkgs/by-name/at/atuin/package.nix                 | 1 -
 pkgs/by-name/ba/bazel-buildtools/package.nix      | 1 -
 pkgs/by-name/ba/bazelisk/package.nix              | 5 +----
 pkgs/by-name/ez/eza/package.nix                   | 1 -
 pkgs/by-name/k9/k9s/package.nix                   | 1 -
 pkgs/by-name/la/lazygit/package.nix               | 1 -
 pkgs/by-name/po/podman-compose/package.nix        | 5 +----
 pkgs/by-name/po/podman-desktop/package.nix        | 1 -
 pkgs/by-name/ri/ripgrep/package.nix               | 1 -
 pkgs/by-name/so/sops/package.nix                  | 1 -
 pkgs/by-name/tf/tflint/package.nix                | 5 +----
 pkgs/by-name/tf/tfsec/package.nix                 | 1 -
 pkgs/by-name/tm/tmux/package.nix                  | 1 -
 pkgs/by-name/wi/wireguard-tools/package.nix       | 1 -
 pkgs/by-name/wi/wireguard-ui/package.nix          | 5 +----
 pkgs/by-name/zo/zoxide/package.nix                | 1 -
 19 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix
index 7b3be280e0c0..0cfc34b13553 100644
--- a/nixos/modules/services/security/yubikey-agent.nix
+++ b/nixos/modules/services/security/yubikey-agent.nix
@@ -14,7 +14,6 @@ in
   meta.maintainers = with lib.maintainers; [
     philandstuff
     rawkode
-    kaynetik
   ];
 
   options = {
diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
index 543bdd51910d..10df405f10bd 100644
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       kranzes
       vtuan10
       adamcstephens
-      kaynetik
     ];
   };
 })
diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix
index d3ef5ec2a066..ecbb1d9d5309 100644
--- a/pkgs/by-name/ag/age/package.nix
+++ b/pkgs/by-name/ag/age/package.nix
@@ -80,9 +80,6 @@ buildGoModule (finalAttrs: {
     description = "Modern encryption tool with small explicit keys";
     license = lib.licenses.bsd3;
     mainProgram = "age";
-    maintainers = with lib.maintainers; [
-      tazjin
-      kaynetik
-    ];
+    maintainers = with lib.maintainers; [ tazjin ];
   };
 })
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index 1e9db1613a82..6b8a1387b8bd 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       sciencentistguy
       _0x4A6F
       rvdp
-      kaynetik
     ];
     mainProgram = "atuin";
   };
diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix
index 143a674ab3be..8426f09a67a3 100644
--- a/pkgs/by-name/ba/bazel-buildtools/package.nix
+++ b/pkgs/by-name/ba/bazel-buildtools/package.nix
@@ -41,7 +41,6 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       elasticdog
-      kaynetik
     ];
     teams = [ lib.teams.bazel ];
   };
diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix
index 3155d4372068..f499de78c6ea 100644
--- a/pkgs/by-name/ba/bazelisk/package.nix
+++ b/pkgs/by-name/ba/bazelisk/package.nix
@@ -32,9 +32,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/bazelbuild/bazelisk";
     changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      elasticdog
-      kaynetik
-    ];
+    maintainers = with lib.maintainers; [ elasticdog ];
   };
 })
diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index ba6171163dbe..19293a765010 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       cafkafk
       _9glenda
       sigmasquadron
-      kaynetik
     ];
     platforms = with lib.platforms; unix ++ windows;
   };
diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 37759f5c43b2..c1e7558875b5 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -78,7 +78,6 @@ buildGoModule (finalAttrs: {
       qjoly
       devusb
       ryan4yin
-      kaynetik
     ];
   };
 })
diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 175e8686435d..1f6a1fe5e186 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -46,7 +46,6 @@ buildGoModule (finalAttrs: {
       khaneliman
       starsep
       sigmasquadron
-      kaynetik
     ];
     mainProgram = "lazygit";
   };
diff --git a/pkgs/by-name/po/podman-compose/package.nix b/pkgs/by-name/po/podman-compose/package.nix
index 01654d3c70cf..d0169a667af0 100644
--- a/pkgs/by-name/po/podman-compose/package.nix
+++ b/pkgs/by-name/po/podman-compose/package.nix
@@ -43,10 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/containers/podman-compose";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      sikmir
-      kaynetik
-    ];
+    maintainers = [ lib.maintainers.sikmir ];
     teams = [ lib.teams.podman ];
     mainProgram = "podman-compose";
   };
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 92b1651bbded..4aee451bfef9 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       booxter
-      kaynetik
     ];
     inherit (electron.meta) platforms;
     mainProgram = "podman-desktop";
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index 6f73c6662b66..69d06b695139 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -70,7 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       globin
       ma27
       zowoq
-      kaynetik
     ];
     mainProgram = "rg";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix
index 1ca994f2f58f..ef2b6bcb5509 100644
--- a/pkgs/by-name/so/sops/package.nix
+++ b/pkgs/by-name/so/sops/package.nix
@@ -66,7 +66,6 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       Scrumplex
       mic92
-      kaynetik
     ];
     license = lib.licenses.mpl20;
   };
diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index cfe01d58999e..bd873fcaa6b5 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -61,9 +61,6 @@ buildGo125Module (finalAttrs: {
     homepage = "https://github.com/terraform-linters/tflint";
     changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [
-      momeemt
-      kaynetik
-    ];
+    maintainers = with lib.maintainers; [ momeemt ];
   };
 })
diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix
index ba0640878a39..13515402aab7 100644
--- a/pkgs/by-name/tf/tfsec/package.nix
+++ b/pkgs/by-name/tf/tfsec/package.nix
@@ -38,7 +38,6 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
-      kaynetik
     ];
   };
 })
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 82bff08133d7..d3907e4b164e 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -113,7 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ethancedwards8
       fpletz
-      kaynetik
     ];
   };
 })
diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix
index 83f30ed50d46..025e1b9912b7 100644
--- a/pkgs/by-name/wi/wireguard-tools/package.nix
+++ b/pkgs/by-name/wi/wireguard-tools/package.nix
@@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       zx2c4
       ma27
-      kaynetik
     ];
     mainProgram = "wg";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wi/wireguard-ui/package.nix b/pkgs/by-name/wi/wireguard-ui/package.nix
index 916ec10327a4..0c96cf6d288a 100644
--- a/pkgs/by-name/wi/wireguard-ui/package.nix
+++ b/pkgs/by-name/wi/wireguard-ui/package.nix
@@ -75,10 +75,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/ngoduykhanh/wireguard-ui";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      bot-wxt1221
-      kaynetik
-    ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
     mainProgram = "wireguard-ui";
   };
 })
diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 4927ade45dc5..877ea5379d04 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -76,7 +76,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       SuperSandro2000
       matthiasbeyer
       ryan4yin
-      kaynetik
     ];
     mainProgram = "zoxide";
   };

From effd5a0df44706de4b5b37c2e988306281333814 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 05:10:39 +0000
Subject: [PATCH 275/389] cargo-update: 19.0.1 -> 20.0.0

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

diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 5d8ca451ce6b..2ace34600749 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-update";
-  version = "19.0.1";
+  version = "20.0.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-XK5ky0t8IdQRVsDU6VDB+HzWzgn4uXhlvOS66GPCVn8=";
+    hash = "sha256-J/FujtsQF8WfHFoHJ3r2M+vv8WVh4cxDFw07JntnW2g=";
   };
 
-  cargoHash = "sha256-/teRXWO3alCU4i4WsQaojCNAXVm/DnpxbYysCEb/Ohg=";
+  cargoHash = "sha256-bH8Mg7QQbbXlF7fxwWEFYmYQD1CmDM+g4GhFPZwLy/M=";
 
   nativeBuildInputs = [
     cmake

From e0f65a0c6cf5fc801a5e3628474b294b2e1b1f38 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 22:11:54 -0700
Subject: [PATCH 276/389] elektroid: 3.2.3 -> 3.3.2

---
 pkgs/by-name/el/elektroid/package.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix
index a433315f4bc3..570a98ae3ce5 100644
--- a/pkgs/by-name/el/elektroid/package.nix
+++ b/pkgs/by-name/el/elektroid/package.nix
@@ -10,23 +10,20 @@
   libsndfile,
   libzip,
   pkg-config,
+  rubberband,
   stdenv,
   zlib,
 }:
 
-let
-  version = "3.2.3";
-in
-stdenv.mkDerivation {
-  inherit version;
-
+stdenv.mkDerivation (finalAttrs: {
   pname = "elektroid";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "dagargo";
     repo = "elektroid";
-    rev = version;
-    hash = "sha256-gK6WQA0KenyksLLFHejCXDTpBm2uhJwn6/E4TXUdeJ8=";
+    rev = finalAttrs.version;
+    hash = "sha256-ozpc2+sXOedmYYXdIH6HibGszLyKsT8QYS0Trhem6kI=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +39,7 @@ stdenv.mkDerivation {
     libsamplerate
     libsndfile
     libzip
+    rubberband
     zlib
   ];
 
@@ -51,4 +49,4 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ camelpunch ];
   };
-}
+})

From f08de2978e5d51b741c5520c2e792158025f456e Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 10 Apr 2026 10:53:42 +0530
Subject: [PATCH 277/389] act3: init at 2.0.0

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/ac/act3/package.nix | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/ac/act3/package.nix

diff --git a/pkgs/by-name/ac/act3/package.nix b/pkgs/by-name/ac/act3/package.nix
new file mode 100644
index 000000000000..3b1c8275d6e2
--- /dev/null
+++ b/pkgs/by-name/ac/act3/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "act3";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "dhth";
+    repo = "act3";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GE9f4hm+R4G4NCqdPN6h5MTZqMVLkrdMnc20bOZGcu4=";
+  };
+
+  vendorHash = "sha256-+WSWlmxQTryLrpeloYdupyMibsgFYpjSuDvW+if3IHE=";
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Glance at the last 3 runs of your GitHub Actions workflows";
+    homepage = "https://github.com/dhth/act3";
+    license = lib.licenses.mit;
+    mainProgram = "act3";
+    maintainers = with lib.maintainers; [ phanirithvij ];
+    platforms = lib.platforms.unix;
+  };
+})

From 1f32a6e6c2c360e47d707ac276678c800f15cf78 Mon Sep 17 00:00:00 2001
From: usertam <code@usertam.dev>
Date: Fri, 10 Apr 2026 13:41:27 +0800
Subject: [PATCH 278/389] lightway: 0-unstable-2026-01-02 ->
 0-unstable-2026-04-10

---
 .../backport-darwin-address-calc-fix.patch    | 398 ------------------
 pkgs/by-name/li/lightway/package.nix          |  17 +-
 2 files changed, 4 insertions(+), 411 deletions(-)
 delete mode 100644 pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch

diff --git a/pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch b/pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch
deleted file mode 100644
index 9d5c684555ef..000000000000
--- a/pkgs/by-name/li/lightway/backport-darwin-address-calc-fix.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-From 9228741450f627da1dba800b44da03db8df44b32 Mon Sep 17 00:00:00 2001
-From: Samuel Tam <samuel.tam@expressvpn.com>
-Date: Fri, 9 Jan 2026 18:12:12 +0800
-Subject: [PATCH] ARM64 ASM: Darwin specific address calc fix
-
-Don't use ':lo12:' in Darwin specific address calculation code.
-@PAGEOFF is indicating this.
----
- wolfcrypt/src/port/arm/armv8-mlkem-asm.S  | 74 +++++++++++------------
- wolfcrypt/src/port/arm/armv8-sha3-asm.S   |  4 +-
- wolfcrypt/src/port/arm/armv8-sha512-asm.S |  8 +--
- 3 files changed, 43 insertions(+), 43 deletions(-)
-
-diff --git a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
-index a45475c..1ded4af 100644
---- a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
-+++ b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
-@@ -168,21 +168,21 @@ _mlkem_ntt:
- 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas
- #else
- 	adrp x2, L_mlkem_aarch64_zetas@PAGE
--	add  x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
-+	add  x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x3, L_mlkem_aarch64_zetas_qinv
- 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
- #else
- 	adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_aarch64_consts
- 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x4, L_mlkem_aarch64_consts@PAGE
--	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	add	x1, x0, #0x100
- 	ldr	q4, [x4]
-@@ -1562,21 +1562,21 @@ _mlkem_invntt:
- 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
- #else
- 	adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
--	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
-+	add  x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv
- 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
- #else
- 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_aarch64_consts
- 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x4, L_mlkem_aarch64_consts@PAGE
--	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	add	x1, x0, #0x100
- 	ldr	q8, [x4]
-@@ -3013,21 +3013,21 @@ _mlkem_ntt_sqrdmlsh:
- 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas
- #else
- 	adrp x2, L_mlkem_aarch64_zetas@PAGE
--	add  x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
-+	add  x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x3, L_mlkem_aarch64_zetas_qinv
- 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
- #else
- 	adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_aarch64_consts
- 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x4, L_mlkem_aarch64_consts@PAGE
--	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	add	x1, x0, #0x100
- 	ldr	q4, [x4]
-@@ -4195,21 +4195,21 @@ _mlkem_invntt_sqrdmlsh:
- 	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
- #else
- 	adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
--	add  x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
-+	add  x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv
- 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
- #else
- 	adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_aarch64_consts
- 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x4, L_mlkem_aarch64_consts@PAGE
--	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	add	x1, x0, #0x100
- 	ldr	q8, [x4]
-@@ -5532,14 +5532,14 @@ _mlkem_basemul_mont:
- 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
- #else
- 	adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_aarch64_consts
- 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x4, L_mlkem_aarch64_consts@PAGE
--	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q1, [x4]
- 	ldp	q2, q3, [x1]
-@@ -6230,14 +6230,14 @@ _mlkem_basemul_mont_add:
- 	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
- #else
- 	adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_aarch64_consts
- 	add  x4, x4, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x4, L_mlkem_aarch64_consts@PAGE
--	add  x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x4, x4, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q1, [x4]
- 	ldp	q2, q3, [x1]
-@@ -6991,7 +6991,7 @@ _mlkem_csubq_neon:
- 	add  x1, x1, :lo12:L_mlkem_aarch64_q
- #else
- 	adrp x1, L_mlkem_aarch64_q@PAGE
--	add  x1, x1, :lo12:L_mlkem_aarch64_q@PAGEOFF
-+	add  x1, x1, L_mlkem_aarch64_q@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q20, [x1]
- 	ld4	{v0.8h, v1.8h, v2.8h, v3.8h}, [x0], #0x40
-@@ -7172,7 +7172,7 @@ _mlkem_add_reduce:
- 	add  x2, x2, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x2, L_mlkem_aarch64_consts@PAGE
--	add  x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x2, x2, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q0, [x2]
- 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
-@@ -7363,7 +7363,7 @@ _mlkem_add3_reduce:
- 	add  x3, x3, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x3, L_mlkem_aarch64_consts@PAGE
--	add  x3, x3, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x3, x3, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q0, [x3]
- 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
-@@ -7594,7 +7594,7 @@ _mlkem_rsub_reduce:
- 	add  x2, x2, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x2, L_mlkem_aarch64_consts@PAGE
--	add  x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x2, x2, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q0, [x2]
- 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
-@@ -7785,7 +7785,7 @@ _mlkem_to_mont:
- 	add  x1, x1, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x1, L_mlkem_aarch64_consts@PAGE
--	add  x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x1, x1, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q0, [x1]
- 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
-@@ -7999,7 +7999,7 @@ _mlkem_to_mont_sqrdmlsh:
- 	add  x1, x1, :lo12:L_mlkem_aarch64_consts
- #else
- 	adrp x1, L_mlkem_aarch64_consts@PAGE
--	add  x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
-+	add  x1, x1, L_mlkem_aarch64_consts@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q0, [x1]
- 	ld4	{v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
-@@ -8226,21 +8226,21 @@ _mlkem_to_msg_neon:
- 	add  x2, x2, :lo12:L_mlkem_to_msg_low
- #else
- 	adrp x2, L_mlkem_to_msg_low@PAGE
--	add  x2, x2, :lo12:L_mlkem_to_msg_low@PAGEOFF
-+	add  x2, x2, L_mlkem_to_msg_low@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x3, L_mlkem_to_msg_high
- 	add  x3, x3, :lo12:L_mlkem_to_msg_high
- #else
- 	adrp x3, L_mlkem_to_msg_high@PAGE
--	add  x3, x3, :lo12:L_mlkem_to_msg_high@PAGEOFF
-+	add  x3, x3, L_mlkem_to_msg_high@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x4, L_mlkem_to_msg_bits
- 	add  x4, x4, :lo12:L_mlkem_to_msg_bits
- #else
- 	adrp x4, L_mlkem_to_msg_bits@PAGE
--	add  x4, x4, :lo12:L_mlkem_to_msg_bits@PAGEOFF
-+	add  x4, x4, L_mlkem_to_msg_bits@PAGEOFF
- #endif /* __APPLE__ */
- 	ldr	q0, [x2]
- 	ldr	q1, [x3]
-@@ -8506,14 +8506,14 @@ _mlkem_from_msg_neon:
- 	add  x2, x2, :lo12:L_mlkem_from_msg_q1half
- #else
- 	adrp x2, L_mlkem_from_msg_q1half@PAGE
--	add  x2, x2, :lo12:L_mlkem_from_msg_q1half@PAGEOFF
-+	add  x2, x2, L_mlkem_from_msg_q1half@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x3, L_mlkem_from_msg_bits
- 	add  x3, x3, :lo12:L_mlkem_from_msg_bits
- #else
- 	adrp x3, L_mlkem_from_msg_bits@PAGE
--	add  x3, x3, :lo12:L_mlkem_from_msg_bits@PAGEOFF
-+	add  x3, x3, L_mlkem_from_msg_bits@PAGEOFF
- #endif /* __APPLE__ */
- 	ld1	{v2.16b, v3.16b}, [x1]
- 	ldr	q1, [x2]
-@@ -9517,28 +9517,28 @@ _mlkem_rej_uniform_neon:
- 	add  x4, x4, :lo12:L_mlkem_rej_uniform_mask
- #else
- 	adrp x4, L_mlkem_rej_uniform_mask@PAGE
--	add  x4, x4, :lo12:L_mlkem_rej_uniform_mask@PAGEOFF
-+	add  x4, x4, L_mlkem_rej_uniform_mask@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x5, L_mlkem_aarch64_q
- 	add  x5, x5, :lo12:L_mlkem_aarch64_q
- #else
- 	adrp x5, L_mlkem_aarch64_q@PAGE
--	add  x5, x5, :lo12:L_mlkem_aarch64_q@PAGEOFF
-+	add  x5, x5, L_mlkem_aarch64_q@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x6, L_mlkem_rej_uniform_bits
- 	add  x6, x6, :lo12:L_mlkem_rej_uniform_bits
- #else
- 	adrp x6, L_mlkem_rej_uniform_bits@PAGE
--	add  x6, x6, :lo12:L_mlkem_rej_uniform_bits@PAGEOFF
-+	add  x6, x6, L_mlkem_rej_uniform_bits@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x7, L_mlkem_rej_uniform_indices
- 	add  x7, x7, :lo12:L_mlkem_rej_uniform_indices
- #else
- 	adrp x7, L_mlkem_rej_uniform_indices@PAGE
--	add  x7, x7, :lo12:L_mlkem_rej_uniform_indices@PAGEOFF
-+	add  x7, x7, L_mlkem_rej_uniform_indices@PAGEOFF
- #endif /* __APPLE__ */
- 	eor	v1.16b, v1.16b, v1.16b
- 	eor	v12.16b, v12.16b, v12.16b
-@@ -9754,7 +9754,7 @@ _mlkem_sha3_blocksx3_neon:
- 	add  x27, x27, :lo12:L_sha3_aarch64_r
- #else
- 	adrp x27, L_sha3_aarch64_r@PAGE
--	add  x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
-+	add  x27, x27, L_sha3_aarch64_r@PAGEOFF
- #endif /* __APPLE__ */
- 	str	x0, [x29, #40]
- 	ld4	{v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
-@@ -10079,7 +10079,7 @@ _mlkem_shake128_blocksx3_seed_neon:
- 	add  x28, x28, :lo12:L_sha3_aarch64_r
- #else
- 	adrp x28, L_sha3_aarch64_r@PAGE
--	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
-+	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
- #endif /* __APPLE__ */
- 	str	x0, [x29, #40]
- 	add	x0, x0, #32
-@@ -10426,7 +10426,7 @@ _mlkem_shake256_blocksx3_seed_neon:
- 	add  x28, x28, :lo12:L_sha3_aarch64_r
- #else
- 	adrp x28, L_sha3_aarch64_r@PAGE
--	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
-+	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
- #endif /* __APPLE__ */
- 	str	x0, [x29, #40]
- 	add	x0, x0, #32
-@@ -10774,7 +10774,7 @@ _mlkem_sha3_blocksx3_neon:
- 	add  x27, x27, :lo12:L_sha3_aarch64_r
- #else
- 	adrp x27, L_sha3_aarch64_r@PAGE
--	add  x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
-+	add  x27, x27, L_sha3_aarch64_r@PAGEOFF
- #endif /* __APPLE__ */
- 	str	x0, [x29, #40]
- 	ld4	{v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
-@@ -11184,7 +11184,7 @@ _mlkem_shake128_blocksx3_seed_neon:
- 	add  x28, x28, :lo12:L_sha3_aarch64_r
- #else
- 	adrp x28, L_sha3_aarch64_r@PAGE
--	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
-+	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
- #endif /* __APPLE__ */
- 	str	x0, [x29, #40]
- 	add	x0, x0, #32
-@@ -11616,7 +11616,7 @@ _mlkem_shake256_blocksx3_seed_neon:
- 	add  x28, x28, :lo12:L_sha3_aarch64_r
- #else
- 	adrp x28, L_sha3_aarch64_r@PAGE
--	add  x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
-+	add  x28, x28, L_sha3_aarch64_r@PAGEOFF
- #endif /* __APPLE__ */
- 	str	x0, [x29, #40]
- 	add	x0, x0, #32
-diff --git a/wolfcrypt/src/port/arm/armv8-sha3-asm.S b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
-index 411349f..6089f8c 100644
---- a/wolfcrypt/src/port/arm/armv8-sha3-asm.S
-+++ b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
-@@ -95,7 +95,7 @@ _BlockSha3_crypto:
- 	add  x1, x1, :lo12:L_SHA3_transform_crypto_r
- #else
- 	adrp x1, L_SHA3_transform_crypto_r@PAGE
--	add  x1, x1, :lo12:L_SHA3_transform_crypto_r@PAGEOFF
-+	add  x1, x1, L_SHA3_transform_crypto_r@PAGEOFF
- #endif /* __APPLE__ */
- 	ld4	{v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
- 	ld4	{v4.d, v5.d, v6.d, v7.d}[0], [x0], #32
-@@ -268,7 +268,7 @@ _BlockSha3_base:
- 	add  x27, x27, :lo12:L_SHA3_transform_base_r
- #else
- 	adrp x27, L_SHA3_transform_base_r@PAGE
--	add  x27, x27, :lo12:L_SHA3_transform_base_r@PAGEOFF
-+	add  x27, x27, L_SHA3_transform_base_r@PAGEOFF
- #endif /* __APPLE__ */
- 	ldp	x1, x2, [x0]
- 	ldp	x3, x4, [x0, #16]
-diff --git a/wolfcrypt/src/port/arm/armv8-sha512-asm.S b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
-index 514e5de..ee64e6e 100644
---- a/wolfcrypt/src/port/arm/armv8-sha512-asm.S
-+++ b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
-@@ -165,14 +165,14 @@ _Transform_Sha512_Len_neon:
- 	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k
- #else
- 	adrp x3, L_SHA512_transform_neon_len_k@PAGE
--	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
-+	add  x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
- #endif /* __APPLE__ */
- #ifndef __APPLE__
- 	adrp x27, L_SHA512_transform_neon_len_r8
- 	add  x27, x27, :lo12:L_SHA512_transform_neon_len_r8
- #else
- 	adrp x27, L_SHA512_transform_neon_len_r8@PAGE
--	add  x27, x27, :lo12:L_SHA512_transform_neon_len_r8@PAGEOFF
-+	add  x27, x27, L_SHA512_transform_neon_len_r8@PAGEOFF
- #endif /* __APPLE__ */
- 	ld1	{v11.16b}, [x27]
- 	# Load digest into working vars
-@@ -1070,7 +1070,7 @@ L_sha512_len_neon_start:
- 	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k
- #else
- 	adrp x3, L_SHA512_transform_neon_len_k@PAGE
--	add  x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
-+	add  x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
- #endif /* __APPLE__ */
- 	subs	w2, w2, #0x80
- 	bne	L_sha512_len_neon_begin
-@@ -1211,7 +1211,7 @@ _Transform_Sha512_Len_crypto:
- 	add  x4, x4, :lo12:L_SHA512_trans_crypto_len_k
- #else
- 	adrp x4, L_SHA512_trans_crypto_len_k@PAGE
--	add  x4, x4, :lo12:L_SHA512_trans_crypto_len_k@PAGEOFF
-+	add  x4, x4, L_SHA512_trans_crypto_len_k@PAGEOFF
- #endif /* __APPLE__ */
- 	# Load first 16 64-bit words of K permanently
- 	ld1	{v8.2d, v9.2d, v10.2d, v11.2d}, [x4], #0x40
--- 
-2.51.2
-
diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
index 364967bfdab6..26d0ba9082dd 100644
--- a/pkgs/by-name/li/lightway/package.nix
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -10,25 +10,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "lightway";
-  version = "0-unstable-2026-01-02";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "expressvpn";
     repo = "lightway";
-    rev = "8e21da7ab3a97ab75235264e85fa8615f7b0f33b";
-    hash = "sha256-1YpXaxPm1BMALhRU25FH5PLJ1IIRfcYA3W6e4c8Si+w=";
+    rev = "72a924935df9db641e7f4fe28cbeafaead59014f";
+    hash = "sha256-tygK2CQmbbynJiwGkMvYzt2dHoE17DCJeqD+jlai/m8=";
   };
 
-  cargoHash = "sha256-4SIE/kGRd2I3sqO+IgItO1PBQHeFv9N4erfVe/9re7A=";
-
-  # Backport fix for Darwin address calculation to vendored wolfSSL 5.8.2.
-  # https://github.com/wolfSSL/wolfssl/pull/9537
-  # Drop when Lightway bumps wolfSSL past commit 5c2c459, or > 5.8.4.
-  postPatch = ''
-    patch -Np1 \
-      -d $cargoDepsCopy/*/wolfssl-sys-2.0.0/wolfssl-src \
-      -i ${./backport-darwin-address-calc-fix.patch}
-  '';
+  cargoHash = "sha256-NdVOphyBW5sflv5jZPV/ShfAJXb3ZOyDRctmn/2JY38=";
 
   cargoBuildFlags = lib.cli.toCommandLineGNU { } {
     package = [

From a67edb0ef15257a00c11a705862a1e74ac995801 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 9 Apr 2026 22:43:19 -0700
Subject: [PATCH 279/389] disk_indicator: fix build with gcc15

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

diff --git a/pkgs/by-name/di/disk_indicator/package.nix b/pkgs/by-name/di/disk_indicator/package.nix
index 8de9b94a97f1..01cb82f987ce 100644
--- a/pkgs/by-name/di/disk_indicator/package.nix
+++ b/pkgs/by-name/di/disk_indicator/package.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     substituteInPlace Makefile --replace "-Werror" ""
     # avoid host-specific options
     substituteInPlace Makefile --replace "-march=native" ""
+    # fix signal handler signature
+    substituteInPlace src/main.c --replace-fail "void handle_signal()" "void handle_signal(int sig)"
   '';
 
   postConfigure = ''

From 4500bb9af89e195e432921f5ca317cbeed91b140 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 10 Apr 2026 01:43:34 -0400
Subject: [PATCH 280/389] brave: 1.88.138 -> 1.89.132

https://community.brave.app/t/release-channel-1-89-132-notes-pending/651572
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index f211c2d245d1..ef7912e2e08e 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.88.138";
+  version = "1.89.132";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-8qsWJeHsSPukHbsYIssELvr5Sq6TIxnDzXak/eQrwYk=";
+      hash = "sha256-mYY8eyMWcwx6RuMNP5ucf6xd1NXfYO4nqXEkiTUtX0o=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-Z1cXDihjzrVTj9XsG9ral8NMZSdPqL4q8VIZ2Ee05Qc=";
+      hash = "sha256-/SmzRSgmXM567D1YQdD/IfDaIe3RPLtgJMYvcOCwvZo=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-yDBGo/J2b5iu9e4NvXN3EgYEDYaMq1V9MVb9xeGHpHo=";
+      hash = "sha256-3f29ehqJNQjYJ+vh15ZI2UJEB1VdBfLL3VWv8CRasCw=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-RzLlDoyqPdL51aDD4/3r+f8sO4Tz8Osso50fsFR3iBc=";
+      hash = "sha256-KIod2FbWck1OUATr/vKK+vgwIih3Lha48MAdt5qNIAk=";
     };
   };
 

From b688faa86ddbfd5af0a5aab3af3d9a0c4456a864 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 06:12:02 +0000
Subject: [PATCH 281/389] retroarch-assets: 1.22.0-unstable-2025-12-01 ->
 1.22.0-unstable-2026-04-09

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

diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix
index f1c637868d6a..ae22101f70b0 100644
--- a/pkgs/by-name/re/retroarch-assets/package.nix
+++ b/pkgs/by-name/re/retroarch-assets/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.22.0-unstable-2025-12-01";
+  version = "1.22.0-unstable-2026-04-09";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "a7b711dfd74871e9985ba3b2fe2c15048a928aaf";
-    hash = "sha256-M0abYzsWxGHgwQEobhLKIIKj3XeDxmZBN+5+UER4c9k=";
+    rev = "9ba4071d04cbd00404a52b5c6c41cf9d3cf218fb";
+    hash = "sha256-K3EtqRStUSJwRxX0OeFPtnjuX0aV5DHcr/d4YvZgb1c=";
   };
 
   makeFlags = [

From 14d5973aa5e16b619c0ee60c95bc193d380d6c4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 06:31:53 +0000
Subject: [PATCH 282/389] ripdrag: 0.4.11 -> 0.4.12

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

diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index 5adf25b0b4d3..486887ccc03d 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ripdrag";
-  version = "0.4.11";
+  version = "0.4.12";
 
   src = fetchFromGitHub {
     owner = "nik012003";
     repo = "ripdrag";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1IUS0PNzIoSrlBXQrUmw/lXUD8auVVKhu/irSoYoK6w=";
+    hash = "sha256-syirR3t3AxThwIPMviGaSeXpDz2ApDGZOozPJ5bGEt4=";
   };
 
-  cargoHash = "sha256-LtkSGu261rPFgofaD/t2rSilxUPL6eHBpd/Tz9gR8ZM=";
+  cargoHash = "sha256-/OczChiDDK6Y2CxpjfgWkTwweKe4FVpOMlsB+qMp/r8=";
 
   nativeBuildInputs = [
     pkg-config

From 82c2735bb60489fdebe70ac81935a2047c335889 Mon Sep 17 00:00:00 2001
From: azban <me@azban.net>
Date: Fri, 10 Apr 2026 00:44:56 -0600
Subject: [PATCH 283/389] _389-ds-base: use cargoSetupHook and remove
 hard-coded vendor path

This was not previously not using cargoSetupHook and therefore had a faulty configuration when building subpackages with vendored packages. This fixes that and removes a hard-coded vendor path from the source cargo config which was interfering with the generated configuration.
---
 .../0001-remove-hard-coded-vendor-paths.patch | 26 +++++++++++++++++++
 pkgs/by-name/_3/_389-ds-base/package.nix      | 11 ++++----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/_3/_389-ds-base/0001-remove-hard-coded-vendor-paths.patch

diff --git a/pkgs/by-name/_3/_389-ds-base/0001-remove-hard-coded-vendor-paths.patch b/pkgs/by-name/_3/_389-ds-base/0001-remove-hard-coded-vendor-paths.patch
new file mode 100644
index 000000000000..8e7d32898c7c
--- /dev/null
+++ b/pkgs/by-name/_3/_389-ds-base/0001-remove-hard-coded-vendor-paths.patch
@@ -0,0 +1,26 @@
+From 815bf49134f9dc049080b0ec4eb2fd807c23086b Mon Sep 17 00:00:00 2001
+From: azban <me@azban.net>
+Date: Mon, 6 Apr 2026 19:49:19 -0600
+Subject: [PATCH 1/2] remove hard-coded vendor paths
+
+Hard-coded vendored sources is not compatible with fetchCargoVendor.
+
+Signed-off-by: azban <me@azban.net>
+---
+ .cargo/config.toml.in | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
+index d7d8ff4d4..e69de29bb 100644
+--- a/.cargo/config.toml.in
++++ b/.cargo/config.toml.in
+@@ -1,6 +0,0 @@
+-[source.crates-io]
+-registry = "https://github.com/rust-lang/crates.io-index"
+-@rust_vendor_sources@
+-
+-[source.vendored-sources]
+-directory = "./vendor"
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix
index 9d3dec9e04c4..dd2da0d95d65 100644
--- a/pkgs/by-name/_3/_389-ds-base/package.nix
+++ b/pkgs/by-name/_3/_389-ds-base/package.nix
@@ -57,11 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/389ds/389-ds-base/commit/1701419551c246e9dc21778b118220eeb2258125.patch";
       hash = "sha256-trzY/fDH3rs66DWbWI+PY46tIC9ShuVqspMHqEEKZYA=";
     })
+    ./0001-remove-hard-coded-vendor-paths.patch
   ];
 
+  cargoRoot = "src";
+
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    sourceRoot = "${finalAttrs.src.name}/src";
+    inherit (finalAttrs) src cargoRoot;
     name = "389-ds-base-${finalAttrs.version}";
     hash = "sha256-pNzMQjeBpmzFg6oWCxhLDmKGUKIW6jGmZQWai5Yunjc=";
   };
@@ -74,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     cargo
     rustc
+    rustPlatform.cargoSetupHook
   ]
   ++ lib.optional withCockpit rsync;
 
@@ -106,10 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./autogen.sh --prefix="$out"
   '';
 
-  preBuild = ''
-    ln -s ${finalAttrs.cargoDeps} ./vendor
-  '';
-
   configureFlags = [
     "--enable-rust-offline"
     "--enable-autobind"

From 5cb349c30ab74383d8e4241a7b77d9a15ebbe5e8 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:52:37 +0300
Subject: [PATCH 284/389] yarn-zpm: 6.0.0-rc.15 -> 6.0.0-rc.16

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

diff --git a/pkgs/by-name/ya/yarn-zpm/package.nix b/pkgs/by-name/ya/yarn-zpm/package.nix
index 7781a020e630..1e11bc47e3cf 100644
--- a/pkgs/by-name/ya/yarn-zpm/package.nix
+++ b/pkgs/by-name/ya/yarn-zpm/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yarn-zpm";
-  version = "6.0.0-rc.15";
+  version = "6.0.0-rc.16";
 
   src = fetchFromGitHub {
     owner = "yarnpkg";
     repo = "zpm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2HIEZR8gfze1Xf0LIQiMxjXAjs2NfZrs0mf/l/uku4U=";
+    hash = "sha256-51KnGFT+6DwESpYii6dkYCGwT62ZrDCPDL1S4wANmWQ=";
   };
 
-  cargoHash = "sha256-gDgJ2u0Rm8pOB/XILy69qQCFSB5DbqbQI/LcVf/97Ng=";
+  cargoHash = "sha256-hwbOT5xpSSyQb3ChaXUJPNvJs38MI8Bd37h8T6GktgQ=";
 
   cargoBuildFlags = [ "--package=zpm" ];
   cargoTestFlags = [ "--package=zpm" ];

From 6c0dc8c3d16273f929a8009737f7be7b6a2dc5a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 07:17:04 +0000
Subject: [PATCH 285/389] grpc-client-cli: 1.24.2 -> 1.24.3

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

diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix
index 312169c352b4..4d5758145575 100644
--- a/pkgs/by-name/gr/grpc-client-cli/package.nix
+++ b/pkgs/by-name/gr/grpc-client-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grpc-client-cli";
-  version = "1.24.2";
+  version = "1.24.3";
 
   src = fetchFromGitHub {
     owner = "vadimi";
     repo = "grpc-client-cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-y+EY0dhz5+rxegWEgBwcFHcz1MFlbygt0jAWh8yFQmw=";
+    sha256 = "sha256-M3YhVNu7yx/JAMoNrG/JDEMR7JLLLx02+XchCniYVCU=";
   };
 
-  vendorHash = "sha256-dkntncYuu5KtIpr73qSxb45NeiuKv8a1bJi645xsIx4=";
+  vendorHash = "sha256-MNl+4PA0hJwWQZwegwVBcUTKWUSfaSdNo4b4lvKRMxM=";
 
   meta = {
     description = "Generic gRPC command line client";

From 2d7ad1644a2e3ccfecd2ef47f8c8d5ae45b6c778 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:25:35 +0200
Subject: [PATCH 286/389] python3Packages.iamdata: 0.1.202604091 ->
 0.1.202604101

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604091...v0.1.202604101

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202604101
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 17bd2700fcc0..1963012fec26 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202604091";
+  version = "0.1.202604101";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KcXJmV+5aeOhIxN3xvjZPFQSDTMxeFPYq/1IErnV1t0=";
+    hash = "sha256-YA6q5BMQ+71Jn54KEqAqt7LMg+t36f56paDtMYQcHGc=";
   };
 
   __darwinAllowLocalNetworking = true;

From 7e8e40c4de411e7d57fb57e21d792a6b48058736 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:27:15 +0200
Subject: [PATCH 287/389] python3Packages.mypy-boto3-mediaconnect: 1.42.37 ->
 1.42.87

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8491a8795859..70a2a4cfd588 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -854,8 +854,8 @@ in
       "sha256-1cIpxNx/Q1C89D27DO0PTsFRhZvSok7L1e+B6WjPXvs=";
 
   mypy-boto3-mediaconnect =
-    buildMypyBoto3Package "mediaconnect" "1.42.37"
-      "sha256-NYn/N65sVAUxA4kTCi/IJNP/QQeutFjH8S7N2AeK3g8=";
+    buildMypyBoto3Package "mediaconnect" "1.42.87"
+      "sha256-JxR2l3AZarl6nr9l6UiBxTC7638DvVwNQmm6a0dxpsI=";
 
   mypy-boto3-mediaconvert =
     buildMypyBoto3Package "mediaconvert" "1.42.71"

From f36033e4abbecf88e7b35baf879649eb222052f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:27:32 +0200
Subject: [PATCH 288/389] python3Packages.mypy-boto3-redshift-data: 1.42.3 ->
 1.42.87

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 70a2a4cfd588..de9a8daf7cfd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1094,8 +1094,8 @@ in
       "sha256-hQyZdqznZ8uJVoiwuiVRQRG8fDVWykuyWGJ6BOEc0bE=";
 
   mypy-boto3-redshift-data =
-    buildMypyBoto3Package "redshift-data" "1.42.3"
-      "sha256-Mby+hQJcBXqmDY5wC1Uut4EQex1PmjT8bgB81rT5NKU=";
+    buildMypyBoto3Package "redshift-data" "1.42.87"
+      "sha256-KjFXEK3rcYOgaN1unw0mFxqW8VKPzsYT95KQO4DTZp8=";
 
   mypy-boto3-redshift-serverless =
     buildMypyBoto3Package "redshift-serverless" "1.42.28"

From 92bd828c13941523e538b7331b9f9d6e2e3ccd04 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:27:39 +0200
Subject: [PATCH 289/389] python3Packages.mypy-boto3-sagemaker: 1.42.79 ->
 1.42.87

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index de9a8daf7cfd..2eaaeb38ecd4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1170,8 +1170,8 @@ in
       "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.42.79"
-      "sha256-HSSrvBgXk0HwS8ys2e8+euzupPc075axwh7WAduvvR8=";
+    buildMypyBoto3Package "sagemaker" "1.42.87"
+      "sha256-w1mjZjHC65uJ+pkfhBcn7wwhhmaZ4AQPKATS2mXYfkU=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"

From 75e5b6e426135d899c83542d3e9493a1aff4e437 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:28:06 +0200
Subject: [PATCH 290/389] python3Packages.boto3-stubs: 1.42.86 -> 1.42.87

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 8241bacfb826..1c4f5c914b14 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.86";
+  version = "1.42.87";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-hfwSM39wUj4l8wiFuA/u7PhiOXerpT92cr03pWdHGKM=";
+    hash = "sha256-TDhzzDzBsJVgdhaQnezE+aqbujejwh1HNIKA7t+YVmM=";
   };
 
   build-system = [ setuptools ];

From 172eb51eda8bcb7e2eaa4955feb616f28d3db467 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:28:26 +0200
Subject: [PATCH 291/389] python3Packages.publicsuffixlist: 1.0.2.20260408 ->
 1.0.2.20260410

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20260410-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 81dbad46782a..8ac1eb348f2a 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260408";
+  version = "1.0.2.20260410";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-nADjVKqlb776Rw8CC7dDqryD2BRJqXr8MNMWTKH2puk=";
+    hash = "sha256-XhH04df3ikVy3yxVzipIdybghKAwi1/9kVH8bsNAp5E=";
   };
 
   postPatch = ''

From d584c010bcfd66d697e7446468a172f11f09fec0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Apr 2026 09:30:20 +0200
Subject: [PATCH 292/389] python3Packages.tencentcloud-sdk-python: 3.1.73 ->
 3.1.75

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.73...3.1.75

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.75/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 0a94e4a85409..57c4df9eb4d2 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.73";
+  version = "3.1.75";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-VYjJLaFVGgIV35naRZaFhTSf8Z3AjCmPTkcxJdshSyY=";
+    hash = "sha256-O/heoxVZybJYZF3qFcuKXgbncClfKK21WpXGqtwxw58=";
   };
 
   build-system = [ setuptools ];

From 1b7c078a469cf56dcfb62b4bada2c58e8f041be9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 07:39:07 +0000
Subject: [PATCH 293/389] code-cursor: 3.0.12 -> 3.0.16

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

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 95306b7b02cc..6acce0b40e06 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.0.12",
+  "version": "3.0.16",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/x64/Cursor-3.0.12-x86_64.AppImage",
-      "hash": "sha256-dUAF18h48nzLW+pjcAGeY0c7jZVbwD/3ceczZXxKJv0="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/x64/Cursor-3.0.16-x86_64.AppImage",
+      "hash": "sha256-/kBlLvaF3/7WSEI6ika6opgUVDQVo7vLVLsgG8htEpk="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/arm64/Cursor-3.0.12-aarch64.AppImage",
-      "hash": "sha256-6RJaoJtx2YYr21174CfwxVYdjHoDXLAj19ekUA7E3Ck="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/arm64/Cursor-3.0.16-aarch64.AppImage",
+      "hash": "sha256-tG75z9SPVaH6cgN75XW1ZKRyj689Yd97cbQZSvQtPrA="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-ct29cI2vrcy/E4nODVgdVf+pCm7faj3VlcaUws7cOps="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-8pGWntBuY6hwIuQ3x5yF93j0++3gB+wg/KsVfIVWUgI="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-7igCfkYPRVdwKzakKxYpY0cgqfbpneHJIfcUv3KfRKk="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-HHd3CpSlGpuRUjakSCBRp3q3RYhiOapBKqblRNiQaZI="
     }
   }
 }

From 76e56346b3177062fd6dfd0cafb8c4032cf2944f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 07:40:01 +0000
Subject: [PATCH 294/389] mediawriter: 5.3.0 -> 5.3.1

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

diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index 206646af2c09..83bf8aae2e98 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediawriter";
-  version = "5.3.0";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "MediaWriter";
     tag = finalAttrs.version;
-    hash = "sha256-oicnUxyo+5nuDh7A3oL9Pgrm69Lv7CWeNaJdMfuESu8=";
+    hash = "sha256-INq07MdWLq5qwBNWrrBRmtIpxsmnHcqPEUyRkIl3Qa4=";
   };
 
   nativeBuildInputs = [

From 333fe88e6e8e950c582dca906b5096f113d3903e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 07:42:02 +0000
Subject: [PATCH 295/389] python3Packages.pytapo: 3.4.11 -> 3.4.12

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

diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 7a1d5512e635..afd473b952d8 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytapo";
-  version = "3.4.11";
+  version = "3.4.12";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-FqQVMtZ7Jv3QsDVVW/ZtjQhWMQg95ucQvx6CUl4LSVM=";
+    hash = "sha256-FK8ELrhCZ7jHyziK+mOGPj4NW7R8FN0mkynSUfnQ17s=";
   };
 
   build-system = [ setuptools ];

From 04275d5d50a8410373bd9144d6a327691943761a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 08:16:02 +0000
Subject: [PATCH 296/389] proto: 0.55.4 -> 0.56.0

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

diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index f7b059a48f2e..67568933acbb 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proto";
-  version = "0.55.4";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-roaCQ2hPcYR6TFTVhfz7D5l9++UEB1blMCwB/dXb3hE=";
+    hash = "sha256-QVqtESS2c4gr8rDqw1WL6ai+Szo24aBSmGzwQEuRhG4=";
   };
 
-  cargoHash = "sha256-zBwuimKV2D78zJXOMxcRqWRdJW1GbZH56OEYHccZM3I=";
+  cargoHash = "sha256-/rUuQSrOn8jkbeqF9aOAYTjkyKrcKRznP9snUWZsvbU=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

From 8f88bef54efd525bed7e6e810aa1a693f09e0f02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 08:32:33 +0000
Subject: [PATCH 297/389] undock: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/by-name/un/undock/package.nix b/pkgs/by-name/un/undock/package.nix
index 5a0ddc6543d1..a85ed09323ce 100644
--- a/pkgs/by-name/un/undock/package.nix
+++ b/pkgs/by-name/un/undock/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "undock";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "crazy-max";
     repo = "undock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sFH6+2Ncg8B+Vxs2IyRurwJdzKiKRwmQKIoxjKY8+JE=";
+    hash = "sha256-ZjvF7BvjL/IZ25JDO4P9ELPdgCrGc9b+ldqFOx/i0ic=";
   };
 
   vendorHash = null;

From b5c03f5e5906e6b25ba5acf96b671d05fc7a26f1 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 6 Aug 2025 14:12:36 +0200
Subject: [PATCH 298/389] cargo-sbom: init at 0.10.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Co-authored-by: Acid Bong <acidbong@tilde.club>
---
 pkgs/by-name/ca/cargo-sbom/package.nix | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/ca/cargo-sbom/package.nix

diff --git a/pkgs/by-name/ca/cargo-sbom/package.nix b/pkgs/by-name/ca/cargo-sbom/package.nix
new file mode 100644
index 000000000000..de854436a5fb
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-sbom/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "cargo-sbom";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "psastras";
+    repo = "sbom-rs";
+    tag = "cargo-sbom-v${finalAttrs.version}";
+    hash = "sha256-U11tUXhUD0RjnTuTSmQwBD7OSsYXBfeofDfURDwbGrc=";
+  };
+
+  cargoHash = "sha256-a0tGBTCLvYUObFeZwSxEqRPpMkEZdsO4kHnExUMrNWk=";
+
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  checkFlags = [
+    "--skip=test_cargo_binary_cyclonedx_1_5_example"
+    "--skip=test_cargo_binary_cyclonedx_1_6_example"
+    "--skip=test_cargo_binary_cyclonedx_example"
+    "--skip=test_cargo_binary_spdx_example"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Create software bill of materials (SBOM) for Rust";
+    homepage = "https://github.com/psastras/sbom-rs";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+    ];
+    platforms = lib.platforms.all;
+    mainProgram = "cargo-sbom";
+  };
+})

From 33358e177d5078f53fc700473ad5c34012ad3a95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 09:20:27 +0000
Subject: [PATCH 299/389] session-desktop: 1.17.17 -> 1.18.0

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

diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix
index 9c0012015c7d..2d7d87a48ba1 100644
--- a/pkgs/by-name/se/session-desktop/package.nix
+++ b/pkgs/by-name/se/session-desktop/package.nix
@@ -109,7 +109,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "session-desktop";
-  version = "1.17.17";
+  version = "1.18.0";
   src =
     (fetchFromGitHub {
       owner = "session-foundation";
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
         rm -rf .git
         popd
       '';
-      hash = "sha256-YqDkL91PbgNlaDnfCpZn6oL2r4z0zClRb4OGys4o2Yw=";
+      hash = "sha256-xulsnbC3C7n+4hFeuzRS8XzzYTO6T2vR3jBxTkxHFHE=";
     }).overrideAttrs
       (oldAttrs: {
         # https://github.com/NixOS/nixpkgs/issues/195117#issuecomment-1410398050

From fc403f81c3b3d12819bf59ad2a1d1fbd16440c57 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Fri, 10 Apr 2026 02:21:02 -0700
Subject: [PATCH 300/389] denemo: 2.6.43 -> 2.6.49

---
 pkgs/by-name/de/denemo/package.nix | 35 +++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/denemo/package.nix b/pkgs/by-name/de/denemo/package.nix
index 2dc1d61a776f..80f7970597a5 100644
--- a/pkgs/by-name/de/denemo/package.nix
+++ b/pkgs/by-name/de/denemo/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchgit,
+  fetchDebianPatch,
   pkg-config,
   libjack2,
   gettext,
@@ -26,14 +27,14 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "denemo";
-  version = "2.6.43";
+  version = "2.6.49";
 
   src = fetchgit {
     url = "https://git.savannah.gnu.org/git/denemo.git";
-    rev = "b04ead1d3efeee036357cf36898b838a96ec5332";
-    hash = "sha256-XMFbPk70JqUHWBPEK8rjr70iMs49RNyaaCUGnYlLf2E=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TUdaGOChqwK3fAmdaP9Lg2FGrEWF0yjwqsRXK7h/83Y=";
   };
 
   buildInputs = [
@@ -58,6 +59,30 @@ stdenv.mkDerivation {
   # error by default in GCC 14
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
+  patches = [
+    (fetchDebianPatch {
+      pname = "denemo";
+      version = "2.6.49";
+      debianRevision = "0.2";
+      patch = "0002-Prevent-incompatible-pointer-types.patch";
+      hash = "sha256-l1eXjQieH5ySqwaTJAE8lUq/FsB//cl02Wgt0TRQBMo=";
+    })
+    (fetchDebianPatch {
+      pname = "denemo";
+      version = "2.6.49";
+      debianRevision = "0.2";
+      patch = "0013-Fix-FTBFS-with-GCC-14.patch";
+      hash = "sha256-H3hRmAPazYRkwQI97vNR9kpV0lYpIiAXyMfrnJl+lNo=";
+    })
+    (fetchDebianPatch {
+      pname = "denemo";
+      version = "2.6.49";
+      debianRevision = "0.2";
+      patch = "0014-Fix-FTBFS-with-GCC-15.patch";
+      hash = "sha256-UG/YZWp+twJdvqiXR4NfB3knm04lAyICh5/LHN2pm54=";
+    })
+  ];
+
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix PATH : "${lilypond}/bin"
@@ -80,4 +105,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.olynch ];
   };
-}
+})

From 141ba16a9bd2bf3b54c3d4a1e111b71946d5114d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Apr 2026 11:34:55 +0200
Subject: [PATCH 301/389] python3Packages.pydantic-graph: 1.77.0 -> 1.79.0

https://github.com/pydantic/pydantic-ai/compare/v1.77.0...v1.79.0
---
 pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 3aa221715ecd..0cd50ab85822 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "1.77.0";
+  version = "1.79.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g1behrlnpYio1w12jzMS13DQSs6ajgN8bezinIPr928=";
+    hash = "sha256-humCEXsoBNoLG33GjHdvagg3QNxjf/1gSQZUrk6ZnHg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";

From 062a169b7aebf3115f1cc9ce2700b4c7c9f0f91f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Apr 2026 11:38:37 +0200
Subject: [PATCH 302/389] python3Packages.pydantic-ai-slim: 1.77.0 -> 1.79.0

https://github.com/pydantic/pydantic-ai/compare/v1.77.0...v1.79.0
---
 pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index 224c87006dac..61e0cf930cd3 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "1.77.0";
+  version = "1.79.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g1behrlnpYio1w12jzMS13DQSs6ajgN8bezinIPr928=";
+    hash = "sha256-humCEXsoBNoLG33GjHdvagg3QNxjf/1gSQZUrk6ZnHg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";

From eb66eaa1e2e0fb8b821b59966f6f31bac8480aa4 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Fri, 10 Apr 2026 02:56:13 -0700
Subject: [PATCH 303/389] jerryscript: fix build with gcc15

---
 pkgs/by-name/je/jerryscript/fix-gcc15.patch | 19 +++++++++++++++++++
 pkgs/by-name/je/jerryscript/package.nix     | 21 ++++++++++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/je/jerryscript/fix-gcc15.patch

diff --git a/pkgs/by-name/je/jerryscript/fix-gcc15.patch b/pkgs/by-name/je/jerryscript/fix-gcc15.patch
new file mode 100644
index 000000000000..7ba30a141f23
--- /dev/null
+++ b/pkgs/by-name/je/jerryscript/fix-gcc15.patch
@@ -0,0 +1,19 @@
+diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
+index 280a94c..b147679 100644
+--- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
++++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
+@@ -36,12 +36,12 @@
+ /**
+  * Day names
+  */
+-const char day_names_p[7][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
++const char day_names_p[7][3] __attribute__((nonstring)) = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+ 
+ /**
+  * Month names
+  */
+-const char month_names_p[12][3] = {
++const char month_names_p[12][3] __attribute__((nonstring)) = {
+   "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+ 
diff --git a/pkgs/by-name/je/jerryscript/package.nix b/pkgs/by-name/je/jerryscript/package.nix
index 300a6618fcd4..0dcec30c9627 100644
--- a/pkgs/by-name/je/jerryscript/package.nix
+++ b/pkgs/by-name/je/jerryscript/package.nix
@@ -30,6 +30,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Evu4qLlwg3Sf9w/ojtZMNxGJEtopHgKnwqlpf115zD4=";
   };
 
+  patches = [
+    # https://github.com/jerryscript-project/jerryscript/issues/5263
+    ./fix-gcc15.patch
+  ];
+
+  postPatch = ''
+    # get rid of bundled CMake toolchain files
+    rm cmake/toolchain_*
+  '';
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -41,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ];
 
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-enum-enum-conversion -Wno-enum-float-conversion -Wno-literal-range";
+
   nativeCheckInputs = [
     python3
   ];
@@ -57,8 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Uses a custom lib variable that ignores what nixpkgs's cmake setupHook specifies.
   postInstall = ''
-    mkdir -p "$lib/lib"
-    mv "$out/lib/"*.so "$lib/lib"
+    mkdir $lib
+    mv "$out/lib" "$lib/"
   '';
 
   nativeInstallCheckInputs = [
@@ -92,6 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
       "libjerry-ext"
       "libjerry-port"
     ];
-    maintainers = with lib.maintainers; [ RossSmyth ];
+    maintainers = with lib.maintainers; [
+      RossSmyth
+      wishstudio
+    ];
   };
 })

From ca4120ec8edf1085d0c7f6c5b3ea37bf546333ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 10:14:04 +0000
Subject: [PATCH 304/389] opencode: 1.4.0 -> 1.4.3

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 773e6dfa6a5d..5dd682b3ae68 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.4.0";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u3OeU+3Y/O6KEeDiOl+pswBZ7++kMqwoK+ams03qWE4=";
+    hash = "sha256-m+Ue7FWiTjKMAn1QefAwOMfOb2Vybk0mJPV9zcbkOmE=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-atufNVv1pxdcz9TGhlZsQSwZ8E8dxJ7syPA/FD/cZWI=";
+    outputHash = "sha256-hVXlQcUuvUudIB35Td6ucBYopM/QOSx59tQbCTqoB/0=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From bc87c837e33b52a170a37297d1e1405dc156dce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 10:26:30 +0000
Subject: [PATCH 305/389] gotenberg: 8.29.1 -> 8.30.1

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

diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix
index cada59eedc1f..56231686e4a3 100644
--- a/pkgs/by-name/go/gotenberg/package.nix
+++ b/pkgs/by-name/go/gotenberg/package.nix
@@ -24,7 +24,7 @@ let
 in
 buildGo126Module (finalAttrs: {
   pname = "gotenberg";
-  version = "8.29.1";
+  version = "8.30.1";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ buildGo126Module (finalAttrs: {
     owner = "gotenberg";
     repo = "gotenberg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Sgpx4ewBe88RuXRWi7JEgCAHjtpt3+8uo1ZFcXfPYs4=";
+    hash = "sha256-kK+l1v+G8G7oBR8DVsROD3Z7lymiFZrJY3K0W9G9npI=";
   };
 
   vendorHash = "sha256-XhKf0Kucp6bGjw3UXXV86gsyaDyk5nS2acc4PgVs9yw=";

From 69fe9ab6986141b6a7a717ec13e3c36aee50c8b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Apr 2026 12:33:25 +0200
Subject: [PATCH 306/389] python3Packages.resvg-py: 0.2.6 -> 0.3.0

https://github.com/baseplate-admin/resvg-py/releases/tag/0.3.0
---
 pkgs/development/python-modules/resvg-py/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/resvg-py/default.nix b/pkgs/development/python-modules/resvg-py/default.nix
index ce60f88d0455..fec1c29484c4 100644
--- a/pkgs/development/python-modules/resvg-py/default.nix
+++ b/pkgs/development/python-modules/resvg-py/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "resvg-py";
-  version = "0.2.6";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "baseplate-admin";
     repo = "resvg-py";
     tag = finalAttrs.version;
-    hash = "sha256-lNNAIEEzwPEs/Qup6PXkMWezGHEAVs4VxuwBv5DgjWE=";
+    hash = "sha256-XXzNrOR2/bMXR5GWEk8XKlCNHNG4+Sz0+0EgESc8FbQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-OrXWiMIgqZ2opl3XfC2zVwN9w0xz2u08mRA883tN6pM=";
+    hash = "sha256-pIz92GeQctxAbCZ8QPbFhSTmdSVNopw0vL2fwMJXoYc=";
   };
 
   build-system = [

From 86ba9f5a4e415d5437a2ddb5b346b69fb6d6d0a1 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Fri, 10 Apr 2026 19:08:40 +0800
Subject: [PATCH 307/389] ntfsprogs-plus: enable `strictDeps` and
 `__structuredAttrs`

---
 pkgs/by-name/nt/ntfsprogs-plus/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/nt/ntfsprogs-plus/package.nix b/pkgs/by-name/nt/ntfsprogs-plus/package.nix
index 7d5282dd1a4f..e616ade324b7 100644
--- a/pkgs/by-name/nt/ntfsprogs-plus/package.nix
+++ b/pkgs/by-name/nt/ntfsprogs-plus/package.nix
@@ -30,17 +30,19 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    # autoreconf will not succeed without libgcrypt, maybe due to leftover checks from ntfs-3g?
+    libgcrypt
   ];
 
   # We don't need GnuTLS despite the configure warning about its absence,
   # because ntfsdecrypt from ntfs-3g is not used in ntfsprogs-plus and is not built.
   # See: https://github.com/search?q=repo%3Antfsprogs-plus%2Fntfsprogs-plus%20gnutls&type=code
-  buildInputs = [
-    # autoreconf will not succeed without libgcrypt, maybe due to leftover checks from ntfs-3g?
-    libgcrypt
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ]
-  ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ gettext ];
+  buildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [ libuuid ]
+    ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ gettext ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
 
   configureFlags = [ "--exec-prefix=\${prefix}" ];
 

From 75eda6a47a0c0d10a7357b8c1b9a1e2d2fa2d432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Apr 2026 13:17:42 +0200
Subject: [PATCH 308/389] gitbutler: skip flaky pre_push husky hook test

The hook script used in this test does not consume stdin and can exit
before pre_push finishes writing the ref line, surfacing as EPIPE in
the sandbox where scheduling makes the race more likely. Skip it
alongside the other known-flaky tests so the build is reproducible.
---
 pkgs/by-name/gi/gitbutler/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index c3421e433870..835b7e19bded 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -131,6 +131,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "git_editor_takes_precedence"
     # FLAKY (try again): child exited unsuccessfully: ExitStatus(unix_wait_status(10752))
     "migrations_in_parallel_with_processes"
+    # FLAKY: Broken pipe (os error 32) - hook script doesn't consume stdin, races with writer
+    "pre_push_ignores_husky_core_hooks_path_when_disabled"
     # Archive at 'tests/fixtures/generated-archives/[...].tar' not found [..] Error: No such file or directory (os error 2)
     "merge_first_branch_into_gb_local_and_verify_rebase"
     "json_output_with_dangling_commits"

From 1456493aa83668fe7bfd2a791058985afb602dba Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Fri, 10 Apr 2026 13:22:51 +0200
Subject: [PATCH 309/389] schroot: adapt to boost 1.89

---
 pkgs/by-name/sc/schroot/boost-1.89.patch | 11 +++++++++++
 pkgs/by-name/sc/schroot/package.nix      |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/by-name/sc/schroot/boost-1.89.patch

diff --git a/pkgs/by-name/sc/schroot/boost-1.89.patch b/pkgs/by-name/sc/schroot/boost-1.89.patch
new file mode 100644
index 000000000000..323537190e7c
--- /dev/null
+++ b/pkgs/by-name/sc/schroot/boost-1.89.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@
+ 
+ include(FindBoost)
+ find_package(Boost REQUIRED
+-             COMPONENTS filesystem system iostreams program_options regex)
++             COMPONENTS filesystem iostreams program_options regex)
+ 
+ # HEADER CHECKS
+ include(CheckIncludeFileCXX)
diff --git a/pkgs/by-name/sc/schroot/package.nix b/pkgs/by-name/sc/schroot/package.nix
index 7046d2344fbf..4938ac049910 100644
--- a/pkgs/by-name/sc/schroot/package.nix
+++ b/pkgs/by-name/sc/schroot/package.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation {
     ./fix-absolute-paths.patch
     ./fix-boost-includes.patch
     ./bump-cmake-minimum.patch
+    ./boost-1.89.patch
   ];
 
   nativeBuildInputs = [

From b7e66be21f2b464e60d4d4ea10929abbfeaf8e26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 11:23:10 +0000
Subject: [PATCH 310/389] .github: Bump actions/github-script from 8.0.0 to
 9.0.0

Bumps [actions/github-script](https://github.com/actions/github-script) from 8.0.0 to 9.0.0.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/ed597411d8f924073f98dfc5c65a23a2325f34cd...3a2844b7e9c422d3c10d287c895573f7108da1b3)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/backport.yml            | 2 +-
 .github/workflows/bot.yml                 | 2 +-
 .github/workflows/check.yml               | 2 +-
 .github/workflows/comment.yml             | 2 +-
 .github/workflows/edited.yml              | 2 +-
 .github/workflows/eval.yml                | 8 ++++----
 .github/workflows/lint.yml                | 2 +-
 .github/workflows/merge-group.yml         | 4 ++--
 .github/workflows/pull-request-target.yml | 4 ++--
 .github/workflows/review.yml              | 2 +-
 .github/workflows/teams.yml               | 2 +-
 .github/workflows/test.yml                | 4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 48504d817b6d..6504fa8c4763 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: "Add 'has: port to stable' label"
         if: steps.backport.outputs.created_pull_numbers != ''
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           # Not using the app on purpose to avoid triggering another workflow run after adding this label.
           script: |
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 1d8d349ead30..d8a4d215c1c7 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -74,7 +74,7 @@ jobs:
         run: gh api /rate_limit | jq
 
       - name: Run bot
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 768937e70521..8a55d030d8c3 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -52,7 +52,7 @@ jobs:
 
       - name: Check commits
         id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}
         with:
diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
index 7894d704723b..dcbbc755eb8e 100644
--- a/.github/workflows/comment.yml
+++ b/.github/workflows/comment.yml
@@ -38,7 +38,7 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-pull-requests: write
 
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index a60cede7b26d..165cad607d97 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -43,7 +43,7 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-pull-requests: write
 
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 5fcdc81d273a..f8f18b7adc9a 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Find commit that touched ci/pinned.json
         id: find-pinned-commit
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           TARGET_SHA: ${{ inputs.targetSha }}
           HEAD_SHA: ${{ inputs.headSha }}
@@ -307,7 +307,7 @@ jobs:
 
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { readFile } = require('node:fs/promises')
@@ -337,7 +337,7 @@ jobs:
             })
       - name: Request changes if PR is against an inappropriate branch
         if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             require('./nixpkgs/trusted/ci/github-script/check-target-branch.js')({
@@ -359,7 +359,7 @@ jobs:
           path: versions
 
       - name: Add version comparison table to job summary
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
           SYSTEMS: ${{ inputs.systems }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 867c5c7737a8..b87e3c72050b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -139,7 +139,7 @@ jobs:
           persist-credentials: true # Needed to run git fetch for large PRs.
           path: trusted
       - name: Check commit messages
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const checkCommitMessages = require('./trusted/ci/github-script/lint-commits.js')
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 895bd2aafa5d..6fcbbe4def72 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -32,7 +32,7 @@ jobs:
             ci/github-script/supportedSystems.js
 
       - id: prepare
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           MERGED_SHA: ${{ inputs.mergedSha }}
           TARGET_SHA: ${{ inputs.targetSha }}
@@ -125,7 +125,7 @@ jobs:
     permissions:
       statuses: write # creating 'no PR failures' commit status
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           RESULTS: ${{ toJSON(needs.*.result) }}
         with:
diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
index d62972e10e88..190ce2510a3e 100644
--- a/.github/workflows/pull-request-target.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -37,7 +37,7 @@ jobs:
           sparse-checkout: |
             ci/github-script
       - id: prepare
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           retries: 10
           # The default for this includes code 422, which happens regularly for us when comparing commits:
@@ -126,7 +126,7 @@ jobs:
     permissions:
       statuses: write
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           RESULTS: ${{ toJSON(needs.*.result) }}
         with:
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index db3b1d464b46..edf4f39b4bf6 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -35,7 +35,7 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-pull-requests: write
 
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml
index a924a1291212..bef56a83bc1c 100644
--- a/.github/workflows/teams.yml
+++ b/.github/workflows/teams.yml
@@ -41,7 +41,7 @@ jobs:
         run: npm install bottleneck@2.19.5
 
       - name: Synchronise teams
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bf40e819491d..64b7dbd85dd8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
           sparse-checkout: |
             ci/github-script
       - id: prepare
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           retries: 10
           # The default for this includes code 422, which happens regularly for us when comparing commits:
@@ -45,7 +45,7 @@ jobs:
 
       - name: Determine changed files
         id: files
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const files = (await github.paginate(github.rest.pulls.listFiles, {

From 2b2d5e95d4f681e15f2e0129d86b3ac3e8267df6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 11:23:15 +0000
Subject: [PATCH 311/389] .github: Bump cachix/install-nix-action from 31.10.3
 to 31.10.4

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.10.3 to 31.10.4.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/96951a368ba55167b55f1c916f7d416bac6505fe...616559265b40713947b9c190a8ff4b507b5df49b)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.10.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 2 +-
 .github/workflows/check.yml | 2 +-
 .github/workflows/eval.yml  | 8 ++++----
 .github/workflows/lint.yml  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cf9cb9f5fe91..bf48232c15c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 768937e70521..7b276e470ccb 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -85,7 +85,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 5fcdc81d273a..57fd293beb02 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -132,7 +132,7 @@ jobs:
             core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
 
       - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - name: Load supported versions
         id: versions
@@ -180,7 +180,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
@@ -270,7 +270,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - name: Combine all output paths and eval stats
         run: |
@@ -451,7 +451,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - name: Ensure flake outputs on all systems still evaluate
         run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 867c5c7737a8..2d205743400b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
       # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true

From 68cb60a9f61411ba78b7b48471af79e361f6aa63 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Apr 2026 16:37:41 -0500
Subject: [PATCH 312/389] lxi-tools: migrate to by-name

lxi-tools-gui: migrate to by-name
---
 pkgs/by-name/lx/lxi-tools-gui/package.nix                  | 7 +++++++
 .../default.nix => by-name/lx/lxi-tools/package.nix}       | 0
 pkgs/top-level/all-packages.nix                            | 3 ---
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/lx/lxi-tools-gui/package.nix
 rename pkgs/{tools/networking/lxi-tools/default.nix => by-name/lx/lxi-tools/package.nix} (100%)

diff --git a/pkgs/by-name/lx/lxi-tools-gui/package.nix b/pkgs/by-name/lx/lxi-tools-gui/package.nix
new file mode 100644
index 000000000000..bc664e768e58
--- /dev/null
+++ b/pkgs/by-name/lx/lxi-tools-gui/package.nix
@@ -0,0 +1,7 @@
+{
+  lxi-tools,
+}:
+
+lxi-tools.override {
+  withGui = true;
+}
diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/by-name/lx/lxi-tools/package.nix
similarity index 100%
rename from pkgs/tools/networking/lxi-tools/default.nix
rename to pkgs/by-name/lx/lxi-tools/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8423e7c1b0f7..9d8f2470cbb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9996,9 +9996,6 @@ with pkgs;
 
   luddite = with python3Packages; toPythonApplication luddite;
 
-  lxi-tools = callPackage ../tools/networking/lxi-tools { };
-  lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
-
   lyx = libsForQt5.callPackage ../applications/misc/lyx { };
 
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;

From 4a418efe561f6950396b342f31bb286d73049fb4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 5 Apr 2026 08:17:36 -0500
Subject: [PATCH 313/389] rsyslog-light: migrate overrides to by-name

---
 pkgs/by-name/rs/rsyslog-light/package.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           | 27 --------------------
 2 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/by-name/rs/rsyslog-light/package.nix

diff --git a/pkgs/by-name/rs/rsyslog-light/package.nix b/pkgs/by-name/rs/rsyslog-light/package.nix
new file mode 100644
index 000000000000..1a0aab3a1036
--- /dev/null
+++ b/pkgs/by-name/rs/rsyslog-light/package.nix
@@ -0,0 +1,30 @@
+{
+  rsyslog,
+}:
+
+rsyslog.override {
+  withKrb5 = false;
+  withSystemd = false;
+  withJemalloc = false;
+  withMysql = false;
+  withPostgres = false;
+  withDbi = false;
+  withNetSnmp = false;
+  withUuid = false;
+  withCurl = false;
+  withGnutls = false;
+  withGcrypt = false;
+  withLognorm = false;
+  withMaxminddb = false;
+  withOpenssl = false;
+  withRelp = false;
+  withKsi = false;
+  withLogging = false;
+  withNet = false;
+  withHadoop = false;
+  withRdkafka = false;
+  withMongo = false;
+  withCzmq = false;
+  withRabbitmq = false;
+  withHiredis = false;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b21df77052b..1852fa1b5337 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1935,33 +1935,6 @@ with pkgs;
 
   roundcubePlugins = recurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
 
-  rsyslog-light = rsyslog.override {
-    withKrb5 = false;
-    withSystemd = false;
-    withJemalloc = false;
-    withMysql = false;
-    withPostgres = false;
-    withDbi = false;
-    withNetSnmp = false;
-    withUuid = false;
-    withCurl = false;
-    withGnutls = false;
-    withGcrypt = false;
-    withLognorm = false;
-    withMaxminddb = false;
-    withOpenssl = false;
-    withRelp = false;
-    withKsi = false;
-    withLogging = false;
-    withNet = false;
-    withHadoop = false;
-    withRdkafka = false;
-    withMongo = false;
-    withCzmq = false;
-    withRabbitmq = false;
-    withHiredis = false;
-  };
-
   xmlsort = perlPackages.XMLFilterSort;
 
   mcelog = callPackage ../os-specific/linux/mcelog {

From d4c592396e36cc30bb138d254f99d2c7ac7874de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 11:36:10 +0000
Subject: [PATCH 314/389] flexget: 3.19.8 -> 3.19.10

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

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index ac10d33624a5..14f922dc3216 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "flexget";
-  version = "3.19.8";
+  version = "3.19.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jscIOKqcG/ycb8WcFBheJm3XFBNgmY33iJsMmwL6M/U=";
+    hash = "sha256-G0Scv6XHjpxp5V0Ep+4itu+SmO/8jhR6LHvG/9scIPY=";
   };
 
   pythonRelaxDeps = true;

From 4387389a28b22e7bb42fc8c657d59f523c7e1211 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 10 Feb 2026 17:09:18 -0600
Subject: [PATCH 315/389] xygrib: migrate to by-name

---
 .../default.nix => by-name/xy/xygrib/package.nix}      | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/xygrib/default.nix => by-name/xy/xygrib/package.nix} (96%)

diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/by-name/xy/xygrib/package.nix
similarity index 96%
rename from pkgs/applications/misc/xygrib/default.nix
rename to pkgs/by-name/xy/xygrib/package.nix
index 67d3e165702b..ecac076e3eed 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/pkgs/by-name/xy/xygrib/package.nix
@@ -2,15 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wrapQtAppsHook,
   cmake,
   bzip2,
-  qtbase,
-  qttools,
   libnova,
   proj,
   libpng,
   openjpeg,
+  qt5,
 }:
 
 stdenv.mkDerivation {
@@ -26,12 +24,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt5.qttools
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     bzip2
-    qtbase
+    qt5.qtbase
     libnova
     proj
     openjpeg
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8a8219a1fea..d9fdcc473d32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10969,8 +10969,6 @@ with pkgs;
     xppen_4
     ;
 
-  xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
-
   ydiff = with python3.pkgs; toPythonApplication ydiff;
 
   yokadi = python3Packages.callPackage ../applications/misc/yokadi { };

From efaacd513cf2d95e8c968bceeb4e4a29b59bfd99 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 10 Feb 2026 17:10:17 -0600
Subject: [PATCH 316/389] xygrib: switch from rev to hash

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

diff --git a/pkgs/by-name/xy/xygrib/package.nix b/pkgs/by-name/xy/xygrib/package.nix
index ecac076e3eed..0d75836e8cb0 100644
--- a/pkgs/by-name/xy/xygrib/package.nix
+++ b/pkgs/by-name/xy/xygrib/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     owner = "opengribs";
     repo = "XyGrib";
     rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310";
-    sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
+    hash = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
   };
 
   nativeBuildInputs = [

From a55a785bbe85a05bd260213cd198512c2e376c75 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Thu, 9 Apr 2026 14:29:48 +0200
Subject: [PATCH 317/389] avogadrolibs: 1.103.0 -> 2.0.0

---
 .../chemistry/avogadrolibs/default.nix        | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index 0ac82bdacfb7..476fa6e19eff 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -23,44 +23,45 @@ let
       numpy
     ]
   );
-
-  # Pure data repositories
-  moleculesRepo = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "molecules";
-    tag = "1.103.0";
-    hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
-  };
-  crystalsRepo = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "crystals";
-    tag = "1.103.0";
-    hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
-  };
-  fragmentsRepo = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "fragments";
-    tag = "1.103.0";
-    hash = "sha256-jH8k+qPlyU3Tset63uxrDlMFLdcWh8JhJoe5sl1pJ2E=";
-  };
-
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "avogadrolibs";
-  version = "1.103.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadrolibs";
     tag = finalAttrs.version;
-    hash = "sha256-2SuSNaZnY3LXcUuGboc8ZRCCeoClENoYtWmNNahdor4=";
+    hash = "sha256-Un1TSXFucCFmHq8DoWQS7RaNgtXiD2JcXGueavugU64=";
   };
 
-  postUnpack = ''
-    cp -r ${moleculesRepo} molecules
-    cp -r ${crystalsRepo} crystals
-    cp -r ${fragmentsRepo} fragments
-  '';
+  postUnpack =
+    let
+      # Pure data repositories
+      moleculesRepo = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "molecules";
+        tag = finalAttrs.version;
+        hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
+      };
+      crystalsRepo = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "crystals";
+        tag = finalAttrs.version;
+        hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
+      };
+      fragmentsRepo = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "fragments";
+        tag = finalAttrs.version;
+        hash = "sha256-OLLcQX3a9j9rEJtBziEU4fCZB2DiDDzql2mr2KfSp70=";
+      };
+    in
+    ''
+      cp -r ${moleculesRepo} molecules
+      cp -r ${crystalsRepo} crystals
+      cp -r ${fragmentsRepo} fragments
+    '';
 
   nativeBuildInputs = [
     cmake

From b52cdd730f61f322c91634bf54882a413bb692f8 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Thu, 9 Apr 2026 14:30:12 +0200
Subject: [PATCH 318/389] avogadro2: 1.103.0 -> 2.0.0

---
 .../science/chemistry/avogadro2/default.nix   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix
index 26778014e84f..4ec271a6fe3a 100644
--- a/pkgs/applications/science/chemistry/avogadro2/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro2/default.nix
@@ -12,29 +12,29 @@
   mesa,
 }:
 
-let
-  avogadroI18N = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "avogadro-i18n";
-    tag = "1.103.0";
-    hash = "sha256-gdr0Ed0UWjQB0LQq+6RvlAb8ZNFQAjV9mrgFLePG+CM=";
-  };
-
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "avogadro2";
-  version = "1.103.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
     rev = finalAttrs.version;
-    hash = "sha256-nmvK3R966Xv2Xs5wXDh/8itIZLIRqbXHFe8dffFiI+s=";
+    hash = "sha256-+/NZwLRrbrfrQqxLqgiqZk6324BGoN+qRfOq7G+UIBE=";
   };
 
-  postUnpack = ''
-    cp -r ${avogadroI18N} avogadro-i18n
-  '';
+  postUnpack =
+    let
+      avogadroI18N = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "avogadro-i18n";
+        tag = finalAttrs.version;
+        hash = "sha256-5eiOFJ5tbS+HFbnLbc6sjk62BvXDMQYpPsB4xFpVWXM=";
+      };
+    in
+    ''
+      cp -r ${avogadroI18N} avogadro-i18n
+    '';
 
   nativeBuildInputs = [
     cmake

From f174a5fe00adad9428dd508f9b8eadf2f093d8b7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 10 Apr 2026 15:23:35 +0300
Subject: [PATCH 319/389] kdePackages: Frameworks 6.24 -> 6.25

---
 pkgs/kde/frameworks/kirigami/default.nix      |   1 +
 .../frameworks/kirigami/rb-templates.patch    |  50 +-
 pkgs/kde/generated/sources/frameworks.json    | 432 +++++++++---------
 3 files changed, 231 insertions(+), 252 deletions(-)

diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix
index 44158c19a1f4..34528456ab94 100644
--- a/pkgs/kde/frameworks/kirigami/default.nix
+++ b/pkgs/kde/frameworks/kirigami/default.nix
@@ -19,6 +19,7 @@ let
     pname = "kirigami";
 
     patches = [
+      # upstream PR: https://invent.kde.org/frameworks/kirigami/-/merge_requests/1991
       ./rb-templates.patch
     ];
 
diff --git a/pkgs/kde/frameworks/kirigami/rb-templates.patch b/pkgs/kde/frameworks/kirigami/rb-templates.patch
index 7e8cc53fe235..ab1aa2e8d787 100644
--- a/pkgs/kde/frameworks/kirigami/rb-templates.patch
+++ b/pkgs/kde/frameworks/kirigami/rb-templates.patch
@@ -1,52 +1,30 @@
-commit a1801928b5eea0bf224c81a638f658bf3a9d9a6c
-Author: Arnout Engelen <arnout@bzzt.net>
-Date:   Wed Nov 26 11:24:02 2025 +0100
-
-    Make qml generation deterministic by adding explicit dependencies
-    
-    Similar to https://qt-project.atlassian.net/browse/QTBUG-137440
-    
-    To fix https://bugs.kde.org/show_bug.cgi?id=513292
-
 diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
-index 9bf3cde9..c199c6f5 100644
+index 9bf3cde9..c51437f6 100644
 --- a/src/dialogs/CMakeLists.txt
 +++ b/src/dialogs/CMakeLists.txt
-@@ -5,6 +5,7 @@ ecm_add_qml_module(KirigamiDialogs URI "org.kde.kirigami.dialogs"
-     GENERATE_PLUGIN_SOURCE
-     INSTALLED_PLUGIN_TARGET KF6KirigamiDialogsplugin
-     DEPENDENCIES QtQuick org.kde.kirigami.platform
-+    LIBRARIES KirigamiPrimitives
- )
+@@ -28,6 +28,10 @@ target_include_directories(KirigamiDialogs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.
  
+ target_link_libraries(KirigamiDialogs PRIVATE Qt6::Quick KirigamiPlatform)
  
-@@ -26,7 +27,7 @@ set_target_properties(KirigamiDialogs PROPERTIES
- 
- target_include_directories(KirigamiDialogs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
- 
--target_link_libraries(KirigamiDialogs PRIVATE Qt6::Quick KirigamiPlatform)
-+target_link_libraries(KirigamiDialogs PRIVATE Qt6::Quick KirigamiPlatform KirigamiPrimitives)
- 
++add_dependencies(KirigamiDialogs
++  KirigamiPrimitives
++)
++
  ecm_finalize_qml_module(KirigamiDialogs EXPORT KirigamiTargets)
  
+ install(TARGETS KirigamiDialogs EXPORT KirigamiTargets ${KF_INSTALL_DEFAULT_ARGUMENTS})
 diff --git a/src/templates/CMakeLists.txt b/src/templates/CMakeLists.txt
-index b0027ea2..6813a6d0 100644
+index 87ae9e72..f202b2fc 100644
 --- a/src/templates/CMakeLists.txt
 +++ b/src/templates/CMakeLists.txt
-@@ -4,6 +4,8 @@ ecm_add_qml_module(KirigamiTemplates URI "org.kde.kirigami.templates"
-     VERSION 2.0
-     GENERATE_PLUGIN_SOURCE
-     INSTALLED_PLUGIN_TARGET KF6KirigamiTemplates
-+    DEPENDENCIES
-+    LIBRARIES KirigamiPrimitives KirigamiLayouts
- )
- 
- set_source_files_properties(AppHeaderSizeGroup.qml PROPERTIES
-@@ -37,6 +39,7 @@ set_target_properties(KirigamiTemplates PROPERTIES
+@@ -40,6 +40,10 @@ set_target_properties(KirigamiTemplates PROPERTIES
  
  target_include_directories(KirigamiTemplates PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
  
-+target_link_libraries(KirigamiTemplates PRIVATE KirigamiPrimitives KirigamiLayouts)
++add_dependencies(KirigamiTemplates
++    KirigamiPrimitives
++    KirigamiLayouts
++)
  
  ecm_finalize_qml_module(KirigamiTemplates EXPORT KirigamiTargets)
  
diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index c83c705f5c3c..44ea407b61f6 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/attica-6.24.0.tar.xz",
-    "hash": "sha256-Z+p3FI+6CTv9vZEE4/CbmVrvw0sLbDS8MaluY7EQq8s="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/attica-6.25.0.tar.xz",
+    "hash": "sha256-+jnMdM00/9S+uQYJml9C5BgEMrWDmnWkslHAri+wGrE="
   },
   "baloo": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/baloo-6.24.0.tar.xz",
-    "hash": "sha256-H3JnaBe5Y2uAyXGTT7fyxdOW2kdYwzmYq8S5roIZXOQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/baloo-6.25.0.tar.xz",
+    "hash": "sha256-13RvV0LZb4XBG2Shquimrx8g5VuBX4Haik5sPFFyotk="
   },
   "bluez-qt": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/bluez-qt-6.24.0.tar.xz",
-    "hash": "sha256-kHz3fKK/BBfa1JrD6/5RMAECApuTUg3OXPpcNeJeWrM="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/bluez-qt-6.25.0.tar.xz",
+    "hash": "sha256-5yjJaNYzz9WSHdXPW0JKM/F6doLRx4BDfhVxCqP/IQE="
   },
   "breeze-icons": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/breeze-icons-6.24.0.tar.xz",
-    "hash": "sha256-Y9Z9g0so+V9F1T7kWUsbOd5IAkKVcPDjteY6tQmr3os="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/breeze-icons-6.25.0.tar.xz",
+    "hash": "sha256-IYhJLYPq2Ayug8uw24DKwLVTiOouPgLUNjVLbKJVnQw="
   },
   "extra-cmake-modules": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/extra-cmake-modules-6.24.0.tar.xz",
-    "hash": "sha256-jvP34XZYjgmcAlWdIN30/tBZD5LBaPC8xgp+Y4uh5qM="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/extra-cmake-modules-6.25.0.tar.xz",
+    "hash": "sha256-/+tJUb8JsrjuF+8koott5lDA2w9Z3f+5AJs3ysY680g="
   },
   "frameworkintegration": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/frameworkintegration-6.24.0.tar.xz",
-    "hash": "sha256-qvRz6AAhxj4G327iAKYecSlmZcdwpQRu8pfSCC+nfWU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/frameworkintegration-6.25.0.tar.xz",
+    "hash": "sha256-641VvQTLAj6gSAz4LDltY7ShSufl9gljoAoNWPR6gCI="
   },
   "kapidox": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kapidox-6.24.0.tar.xz",
-    "hash": "sha256-qxCpeoHrMKQOWvJPLGg+GjR7OsIqDSN5MGjrQZD7Hm4="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kapidox-6.25.0.tar.xz",
+    "hash": "sha256-Aa314g7R1Ng4rm5R7MBGz571im2okDJl4lOc8GVv6mc="
   },
   "karchive": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/karchive-6.24.0.tar.xz",
-    "hash": "sha256-to+qHJAS5Au+1RbYu2viHnQ69ar7AkmoTCmn2f8VDQ0="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/karchive-6.25.0.tar.xz",
+    "hash": "sha256-Ejomg1KrY9VIul48Po+/HXNwJeTFGJghzxDjMoq03hU="
   },
   "kauth": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kauth-6.24.0.tar.xz",
-    "hash": "sha256-9ZZmficlJLM2+G3YG5vkh+PXXL7csgeCk/Ubsu5vOEw="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kauth-6.25.0.tar.xz",
+    "hash": "sha256-4amyChuHGKCg6tlD5q6ZlpL+fv5rW9UT/bW6GEnkvfA="
   },
   "kbookmarks": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kbookmarks-6.24.0.tar.xz",
-    "hash": "sha256-4q2gV8d/WTnnFy0MOs2MhSc7CCOyhpfInLwsziPWjV0="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kbookmarks-6.25.0.tar.xz",
+    "hash": "sha256-XEqMH4SZ9v8c3QNbVvb+MhJEkTsYlKjGABw6zwgsW9Y="
   },
   "kcalendarcore": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcalendarcore-6.24.0.tar.xz",
-    "hash": "sha256-VxAkY8k6TH2QM/zJn2VYMlZGHZoXRcvrZa+24qT8JFo="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcalendarcore-6.25.0.tar.xz",
+    "hash": "sha256-1qGcPsDN/Gl5v94Iznxi24xS3Z3/ShPk2ol44ASA3+s="
   },
   "kcmutils": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcmutils-6.24.0.tar.xz",
-    "hash": "sha256-iTNGACtToRvJ3UBTrT2YfSVF+slP44dw9dRAND7o5Yo="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcmutils-6.25.0.tar.xz",
+    "hash": "sha256-zHwB6UjXBA6eAC6lN5zowF8qhfKM3UQxruEGvfBmHD0="
   },
   "kcodecs": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcodecs-6.24.0.tar.xz",
-    "hash": "sha256-UBCjcZROBS9l2U7WlMUrYY1MRohVscd/B4qPYUrv1vc="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcodecs-6.25.0.tar.xz",
+    "hash": "sha256-UFH+eDgD2UREojHHljW5bxJmWUlCuDb1muhGBJfHiMU="
   },
   "kcolorscheme": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcolorscheme-6.24.0.tar.xz",
-    "hash": "sha256-6cngFV6bgEmthYgElkXJmElLkRRWSEZ93L7xeOMehMU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcolorscheme-6.25.0.tar.xz",
+    "hash": "sha256-laijeBd2X5EMWbJpqZWFV1Bbmf9pj9bSILyxZtXjAvU="
   },
   "kcompletion": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcompletion-6.24.0.tar.xz",
-    "hash": "sha256-G9+48ty42lWNchDX8h8FTE8Nk01p6GrtNmdXVd7TcNU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcompletion-6.25.0.tar.xz",
+    "hash": "sha256-5BONUl654nqSItZV5BLA3otL17NCidHHylqAjiC1Mjg="
   },
   "kconfig": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kconfig-6.24.0.tar.xz",
-    "hash": "sha256-Rc+92EGb0a3lSm9UBQ8kZd52pPkbenArgGkw5vuzZR8="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kconfig-6.25.0.tar.xz",
+    "hash": "sha256-jGdcnTWoZvvxtWQ1SliQGbQpzKlJ97o7oK258voVlZw="
   },
   "kconfigwidgets": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kconfigwidgets-6.24.0.tar.xz",
-    "hash": "sha256-uvQxSKW9bjDSXA8dpmu6/Uxt9wz4pV31aZ/WdzUnrvA="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kconfigwidgets-6.25.0.tar.xz",
+    "hash": "sha256-xF7h9LLt6YfvyN6sSHENh9nTe7g1Xw1+Ew1VffsgKaI="
   },
   "kcontacts": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcontacts-6.24.0.tar.xz",
-    "hash": "sha256-f/xcDmx5ZtR8mW3XeKR9LNG7cRuqS2O+RByUGjNKtIs="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcontacts-6.25.0.tar.xz",
+    "hash": "sha256-OGgms4htazKkWD5jhJPM08+zdyL6rzGHQtcNa/Dj8Kc="
   },
   "kcoreaddons": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcoreaddons-6.24.0.tar.xz",
-    "hash": "sha256-vC+w2U3oWfbmvHQTYgWE8HKs4Uh+MCxlszmNfGsO/3w="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcoreaddons-6.25.0.tar.xz",
+    "hash": "sha256-5/CCVXbcRK8McZRTjkgRSqJA+P00AvJwR3cfAJ4WGn4="
   },
   "kcrash": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kcrash-6.24.0.tar.xz",
-    "hash": "sha256-RURCjDyWWH5GNC2vWx8IPdeVDHvJQNe8eSEwBgDvgHQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kcrash-6.25.0.tar.xz",
+    "hash": "sha256-sblSxQB4fnYMD8o84gxu2M9IjtEG4OcrxgRQnfhNj9c="
   },
   "kdav": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kdav-6.24.0.tar.xz",
-    "hash": "sha256-rMVphlVAOg0vvq3yQFIYZipC0iAcQe2zNlEINhVkKRM="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kdav-6.25.0.tar.xz",
+    "hash": "sha256-oWxMwbIc3yc54bogt3pSErnaq8fjlSWXcd0Hf1IA8Us="
   },
   "kdbusaddons": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kdbusaddons-6.24.0.tar.xz",
-    "hash": "sha256-dpgUMal9/nBr4J+uuPh9sxpMpqIvorvhsVrPIfForRE="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kdbusaddons-6.25.0.tar.xz",
+    "hash": "sha256-uHJGP/GHS+7/hs+VHlEEiOlZ1ZXKPSg5+46WOfv/sOI="
   },
   "kdeclarative": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kdeclarative-6.24.0.tar.xz",
-    "hash": "sha256-0A1peqjOeloWhk6SvHT1KtsrMAiIHW4StmFVqAsTaRU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kdeclarative-6.25.0.tar.xz",
+    "hash": "sha256-dpLM3/1Vgml26RaSe1mustJKd7Fq+Wf7Jl6f4M3jh/o="
   },
   "kded": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kded-6.24.0.tar.xz",
-    "hash": "sha256-9gmB1AAJYUJcvqvpDw936XksvVQh5VtMIk/bFKqWsqU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kded-6.25.0.tar.xz",
+    "hash": "sha256-AwzIJ8N7SQohgeEgzYMbc8mnaDqHz1XQ1bM0BZ94xZA="
   },
   "kdesu": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kdesu-6.24.0.tar.xz",
-    "hash": "sha256-vlrdACxPPZbCYy7Ou/VjPZeS+dE9Yakaaiw0lUCoB9M="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kdesu-6.25.0.tar.xz",
+    "hash": "sha256-Ca1L9f56uuQIhPi2RbIpSM0A9BjH1kOgtdUFoC729jQ="
   },
   "kdnssd": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kdnssd-6.24.0.tar.xz",
-    "hash": "sha256-LPv20xYRKhFDa063El91z0zHfJ8XrGNl9f4orI0cyaA="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kdnssd-6.25.0.tar.xz",
+    "hash": "sha256-hlF1YWxRadJfB4N5jgp5GKQYGAwzgo5GHBYI5hIdNjQ="
   },
   "kdoctools": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kdoctools-6.24.0.tar.xz",
-    "hash": "sha256-ruNRxS94OBPGwRSt5SDIV4xXDubcJey9ZMg+PS2WYNQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kdoctools-6.25.0.tar.xz",
+    "hash": "sha256-LFhmJX7dog8zw19kqLyrCN493bTnUbu8LgnpQd+XmRg="
   },
   "kfilemetadata": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kfilemetadata-6.24.0.tar.xz",
-    "hash": "sha256-Lv3C66z5rx9m9hH+ldd2AjWQ6dz5dSWqk+qtfxqiziM="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kfilemetadata-6.25.0.tar.xz",
+    "hash": "sha256-eLNRarMDj+wSL4bBNw9MfYhX3eqekHJjJCr/rh3R9zg="
   },
   "kglobalaccel": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kglobalaccel-6.24.0.tar.xz",
-    "hash": "sha256-ncXR9JXpUbVAJxPMYbAWF/WG/cOdvaPvfhLmYam1rwo="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kglobalaccel-6.25.0.tar.xz",
+    "hash": "sha256-gfmELxPbji1DhMDwJlDNB2RB0vupVAggkB//4dL0iX8="
   },
   "kguiaddons": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kguiaddons-6.24.0.tar.xz",
-    "hash": "sha256-xeRLVnOcvGfhtpVe3JU09YKIygnQL4Xqrlbbg0c5Xq8="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kguiaddons-6.25.0.tar.xz",
+    "hash": "sha256-OIUJY8uRl40I54HYGxR8e2b3j0IErYIGMeQqse9e92s="
   },
   "kholidays": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kholidays-6.24.0.tar.xz",
-    "hash": "sha256-lKPE6gA7guAwf/gaZl+Ve7WrmmBD5g+vGirucnUZt74="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kholidays-6.25.0.tar.xz",
+    "hash": "sha256-E8NFQi+AK9FXquoYssy1Jw61495EkVvM5w8aQjThSXs="
   },
   "ki18n": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/ki18n-6.24.0.tar.xz",
-    "hash": "sha256-dCS2HBUnZMhNTbulGtlgqdeJTmkJ7PqqE+exKVhcC1c="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/ki18n-6.25.0.tar.xz",
+    "hash": "sha256-f7rIvIj1yxrwD2pmc4HEvOu6b0F9xqPH7vi97WyRYd4="
   },
   "kiconthemes": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kiconthemes-6.24.0.tar.xz",
-    "hash": "sha256-X+4RQayUaTuUtvgOUusm7ZnIGBbGTrUgq/+g4eftWVY="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kiconthemes-6.25.0.tar.xz",
+    "hash": "sha256-9o8NgQpT7Fifu8CwXTdU4r0m4LfDzrOThpiwhwKuENU="
   },
   "kidletime": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kidletime-6.24.0.tar.xz",
-    "hash": "sha256-vozgx5GQCh9V6Zc79frvvhcnQEJKyfJUulQVUro8ywY="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kidletime-6.25.0.tar.xz",
+    "hash": "sha256-ZOg9RqFbREAXxjQeR54im71su4Mg7xNZdzc3zuid18o="
   },
   "kimageformats": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kimageformats-6.24.0.tar.xz",
-    "hash": "sha256-fp01hj4iJ+N2I/OQ8OU6IWkxzReSBYLPyCgqQuBPFuI="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kimageformats-6.25.0.tar.xz",
+    "hash": "sha256-36DpsWooio+UIzr8uv/IfBxd3AN6ymQ5Q6q1pnaF8ms="
   },
   "kio": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kio-6.24.0.tar.xz",
-    "hash": "sha256-n74mrjeST5L1WMzcCbVz2zjY8HgoiUBC6j+N3UVo88Q="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kio-6.25.0.tar.xz",
+    "hash": "sha256-v3GyInAW32VmZlzq1stGhybXzHCAWegS2u5+pU9AU3g="
   },
   "kirigami": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kirigami-6.24.0.tar.xz",
-    "hash": "sha256-ezJH3+NJhn1EJEM1vrjVSa1Kj2sxedFzbSMVEt6lsM4="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kirigami-6.25.0.tar.xz",
+    "hash": "sha256-2n87czVXsZl1u2sSLgXS9NkhSnCoHiu25xxldho8a0M="
   },
   "kitemmodels": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kitemmodels-6.24.0.tar.xz",
-    "hash": "sha256-Zja/R94N8kZKlGkaEJI0Dvuiq8kfswUlO7uQWK+Vlyc="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kitemmodels-6.25.0.tar.xz",
+    "hash": "sha256-q3gRmgC4Tqxl/8mG3zD7+bG40AY16PxiY3LoRYDRWMo="
   },
   "kitemviews": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kitemviews-6.24.0.tar.xz",
-    "hash": "sha256-x/OLAXcngueJPnMRWjVkCDzp+pFV5nm1vgZH5kghgvo="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kitemviews-6.25.0.tar.xz",
+    "hash": "sha256-tX841v0YSksmDQs1129sD7lr3YBHXjyn1BUQI3MOXT0="
   },
   "kjobwidgets": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kjobwidgets-6.24.0.tar.xz",
-    "hash": "sha256-s8X0Sb8puYOUFXZWYA6HuR92mvxfVHzvUm+t20VPm2E="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kjobwidgets-6.25.0.tar.xz",
+    "hash": "sha256-dWvcChyJqOcy6nKZvTJcOLgWBNp2tM82HM/ItApueB4="
   },
   "knewstuff": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/knewstuff-6.24.0.tar.xz",
-    "hash": "sha256-l1n04VjR9GYDATFEMgFEGy98/xJjiiT2GEva5LCOKgU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/knewstuff-6.25.0.tar.xz",
+    "hash": "sha256-jDHvJafXOJRz0SJFrlZK2IhGe475EKwhLhbpM0VAzQg="
   },
   "knotifications": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/knotifications-6.24.0.tar.xz",
-    "hash": "sha256-ErsLNKya45uW0YnMCyn1Jq4SqQFNCq03IcrMkUjkKUA="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/knotifications-6.25.0.tar.xz",
+    "hash": "sha256-CISt1p8mpFXLi2Mnv4ncetOg5Dl8Q8IC/Pf/cyBOxpU="
   },
   "knotifyconfig": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/knotifyconfig-6.24.0.tar.xz",
-    "hash": "sha256-RuqQfrxqU4iI+zJDS6jN4+irRCPfEd7Wk7y+C24dg7Y="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/knotifyconfig-6.25.0.tar.xz",
+    "hash": "sha256-jcN0BtjxMZMhYgF1Ls6WjL042lp2eArXhXXRG0e0QOo="
   },
   "kpackage": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kpackage-6.24.0.tar.xz",
-    "hash": "sha256-UODDX2GnZPhWh2CUj0AnxRxHZwHj3cUpNgq9eP48wHQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kpackage-6.25.0.tar.xz",
+    "hash": "sha256-vUZcDxwR7ExnZ8mF69FEzB79a28knn0ZvyzAS5VqZj4="
   },
   "kparts": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kparts-6.24.0.tar.xz",
-    "hash": "sha256-tKC3IWfg93l0qv6TMFwY3MmcDmbB8v1Wo+RNeOcvVOc="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kparts-6.25.0.tar.xz",
+    "hash": "sha256-8NY0bjEn0eRFBnMxE75GfYtQy4JzHTAKV5kN0Juq7fE="
   },
   "kpeople": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kpeople-6.24.0.tar.xz",
-    "hash": "sha256-0+JndT62TDu7qOSvSkUDaV7mLQFbMMLa0aHxNDiQ/qQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kpeople-6.25.0.tar.xz",
+    "hash": "sha256-i+zlg1cjMESd+nNbWJsd8nZ1nbuzofOk0TTFZ34r9Vg="
   },
   "kplotting": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kplotting-6.24.0.tar.xz",
-    "hash": "sha256-OYzqXaX7W1Bes0WC7Fwxir7HW4xAr5i1D3z5ttig/s8="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kplotting-6.25.0.tar.xz",
+    "hash": "sha256-n71Hdcmx9Wok2Q7kfNCtV8gW+79g46rrpuK2Mfez/Js="
   },
   "kpty": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kpty-6.24.0.tar.xz",
-    "hash": "sha256-J6/xT4IRqIcwCP1SiZhydSPZi7XVAY9IoFCe9Xkrgxk="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kpty-6.25.0.tar.xz",
+    "hash": "sha256-603rQkvfIDKNrAoS/aq3Fdv4AOHNCKQYjMLTB1VDcJ8="
   },
   "kquickcharts": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kquickcharts-6.24.0.tar.xz",
-    "hash": "sha256-O0oUqBl+LCJdxHF5ccxibJ+bBgbGEry3QPgO+ba9Gqs="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kquickcharts-6.25.0.tar.xz",
+    "hash": "sha256-FGWYoeEH6EgGMbMAH9OdJk6B3Vr2oxXexxUkRl0JkkQ="
   },
   "krunner": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/krunner-6.24.0.tar.xz",
-    "hash": "sha256-V3XXKSoxwMozmzhcGPNxb9pUhjF0I8U4CaENgAj/jk0="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/krunner-6.25.0.tar.xz",
+    "hash": "sha256-os8MmuKWhoJQsVuERtZXBjqVxw2dGCsAeBT7We+lBBk="
   },
   "kservice": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kservice-6.24.0.tar.xz",
-    "hash": "sha256-97Pl+rUpSdFsD86Wr8Wq6xzJS0dTbgJNWAdQ/7FzlyM="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kservice-6.25.0.tar.xz",
+    "hash": "sha256-BPqfgk5Qwltq1+KSYsZWbgzhHt77n+3jFzmaiFAen3Q="
   },
   "kstatusnotifieritem": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kstatusnotifieritem-6.24.0.tar.xz",
-    "hash": "sha256-92x33MJ6YABzMDKabWxgKYwR3d26gvcQqQcV7IH4hv8="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kstatusnotifieritem-6.25.0.tar.xz",
+    "hash": "sha256-emOX8IsVp9UOQHwZPxd0tUiZT2+dEjJ9+7Z0Jwrfya8="
   },
   "ksvg": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/ksvg-6.24.0.tar.xz",
-    "hash": "sha256-xNYfa7TGFFLoPeBCf0RM3sKW2HMz9sdnb7fa4JSA9NI="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/ksvg-6.25.0.tar.xz",
+    "hash": "sha256-nAUWbiidOWA2lpRO37w7UKGq3NGeW2AgAgE8YUmkQSk="
   },
   "ktexteditor": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/ktexteditor-6.24.0.tar.xz",
-    "hash": "sha256-/XA8d3cSrQ4gqEn4N8OteIDrgsG+tQGWYIyzJjc/eOM="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/ktexteditor-6.25.0.tar.xz",
+    "hash": "sha256-d+gV7c31cjl/XrdQ1yMrNm9sxidLs0JGq4jy8heXM7Q="
   },
   "ktexttemplate": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/ktexttemplate-6.24.0.tar.xz",
-    "hash": "sha256-hQIfafYdCf5bGwEHXf9PyQtNNZj36DvdT+4x1KAUiOA="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/ktexttemplate-6.25.0.tar.xz",
+    "hash": "sha256-Tp91g7Pcs3mAuZ+yrC3p6Vr4sU/poWZ1K8uDxmzibiU="
   },
   "ktextwidgets": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/ktextwidgets-6.24.0.tar.xz",
-    "hash": "sha256-uo99IQFKq836E+DMH/Wh22wEdh4IBnDKp2t+QWMIbRU="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/ktextwidgets-6.25.0.tar.xz",
+    "hash": "sha256-rbNbsZ+yfom5mWRfj51lDR3j6O2btoYSBwX9zRyw894="
   },
   "kunitconversion": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kunitconversion-6.24.0.tar.xz",
-    "hash": "sha256-oM1YLkjDAtVrXrzqVgtVkPlLhhXb1UvGe80WVxSXn6Y="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kunitconversion-6.25.0.tar.xz",
+    "hash": "sha256-Np7wQt55fqZHmUxSTMQ5FbUUhQAmz920skvHi9/D3Mg="
   },
   "kuserfeedback": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kuserfeedback-6.24.0.tar.xz",
-    "hash": "sha256-MAS+VBrPA7biIDter+3n+dmo/kHXfN0q7jXgPxOSmjA="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kuserfeedback-6.25.0.tar.xz",
+    "hash": "sha256-TOn9ZyvtIM5kbNF1Ui0gfg/nU/5Cxc93PAh5J8DzD+M="
   },
   "kwallet": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kwallet-6.24.0.tar.xz",
-    "hash": "sha256-CUom7CSi/JrnMJbEfaLZY3mWaO+eDkAEFioAguVPlSA="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kwallet-6.25.0.tar.xz",
+    "hash": "sha256-b+fI9MVW20hh8ARt/hecMeeJH7bs3PozaS0lK/I9OxE="
   },
   "kwidgetsaddons": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kwidgetsaddons-6.24.0.tar.xz",
-    "hash": "sha256-3+Vj5YsNjHLoodpPN58DYQVS2GY+rGE+R6Kmo4TCAQc="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kwidgetsaddons-6.25.0.tar.xz",
+    "hash": "sha256-ip+c3kQn/+w3oFAdM3qtrj3jlzZnT1cf+KE9F9HmyTg="
   },
   "kwindowsystem": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kwindowsystem-6.24.0.tar.xz",
-    "hash": "sha256-IpHZWDbouBJjzuoMH/p8/ZJ3MTDW7dEwtDmHQWnxPlg="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kwindowsystem-6.25.0.tar.xz",
+    "hash": "sha256-tRRIp2ae+hgZCrf6jW9eD3fY+Yec9Ffa20YpskWgJDQ="
   },
   "kxmlgui": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/kxmlgui-6.24.0.tar.xz",
-    "hash": "sha256-+H+IcyNnXYs2rp0VfOKYSKwOsXMf/QwK7J15QF55NhY="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/kxmlgui-6.25.0.tar.xz",
+    "hash": "sha256-Atl8JOwLwQLCmfNCkFa0UCXiTVnsMUZDF6MGLMH8ICE="
   },
   "modemmanager-qt": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/modemmanager-qt-6.24.0.tar.xz",
-    "hash": "sha256-xlj/jhnifJ15gFUtQJQjP74K0ob1ppJ/poclXoToDtI="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/modemmanager-qt-6.25.0.tar.xz",
+    "hash": "sha256-Hxw+9JNEWj+SFUYt2G0l4uQ1X/vOmnABYoi+BMU3uRs="
   },
   "networkmanager-qt": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/networkmanager-qt-6.24.0.tar.xz",
-    "hash": "sha256-udRPgOBUNT+HtCdEgbMgZ22VvTg1/7v98Z708qLvD/8="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/networkmanager-qt-6.25.0.tar.xz",
+    "hash": "sha256-w4dJOIksQ66NSGzXtx5YbzrTaFGMv4ADTcv5dRaXZ1Y="
   },
   "prison": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/prison-6.24.0.tar.xz",
-    "hash": "sha256-OeorUf0OQFuWTB8i1krQERx5iViUWQ1ospcS193kzTQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/prison-6.25.0.tar.xz",
+    "hash": "sha256-n0qPpXMuRRQsm6LjWjiQTUQZPvwFDhyiCkFERcOpizQ="
   },
   "purpose": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/purpose-6.24.0.tar.xz",
-    "hash": "sha256-6V26I295vxZVoFgenxw85k00J1ATX95wDUY90gW+vEc="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/purpose-6.25.0.tar.xz",
+    "hash": "sha256-dzq/qR9QzhBBk3P9tOfgsr4AnnOfjeLzRQ0+8Wm2oj4="
   },
   "qqc2-desktop-style": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/qqc2-desktop-style-6.24.0.tar.xz",
-    "hash": "sha256-RZZ6G1lvHf0hNxlIJ1ozCrPt5v2U/f0i9q5esLEi3mQ="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/qqc2-desktop-style-6.25.0.tar.xz",
+    "hash": "sha256-wJBw5XoZa6q1DmKqxeFwUWZqiY2VrCnYhTxmNKAqudE="
   },
   "solid": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/solid-6.24.0.tar.xz",
-    "hash": "sha256-L1BpCP8y/83ZkYh5BwtmbJOEsHlJPCX4BzVVPjMqU/0="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/solid-6.25.0.tar.xz",
+    "hash": "sha256-gXf6jxObhVhW4XFCbF8q25bXJ+YubsU2Z12hGqFXsz4="
   },
   "sonnet": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/sonnet-6.24.0.tar.xz",
-    "hash": "sha256-9fEHvU0VTJO7rMcX7DQRvOvONRPfEDlF4gL/ofDumuc="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/sonnet-6.25.0.tar.xz",
+    "hash": "sha256-UQUh8UBJFJQ7MUHgsRHyMwu+799AQF+TwM97hKjBxYk="
   },
   "syndication": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/syndication-6.24.0.tar.xz",
-    "hash": "sha256-meKCvyOgOY3ZoizpQWioIou/G3Kqr5xSFUtwuKdooFw="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/syndication-6.25.0.tar.xz",
+    "hash": "sha256-lT9ZNbGgunwscMwhPAFE2cc4VcgCoVJb5sCGVDQo+Vc="
   },
   "syntax-highlighting": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/syntax-highlighting-6.24.0.tar.xz",
-    "hash": "sha256-BhxZRtxhcOz6kbnH1Pql7IHrU7tfhu2oYcLOdIplSG0="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/syntax-highlighting-6.25.0.tar.xz",
+    "hash": "sha256-iu7kKOgqyWqtAbvUI1GHBdIU4POlrB/WQ4lWXQjl1QE="
   },
   "threadweaver": {
-    "version": "6.24.0",
-    "url": "mirror://kde/stable/frameworks/6.24/threadweaver-6.24.0.tar.xz",
-    "hash": "sha256-qnYIlhOX5829yDYq6dHqumxbqdrjqEwRgw/OFV5e1G8="
+    "version": "6.25.0",
+    "url": "mirror://kde/stable/frameworks/6.25/threadweaver-6.25.0.tar.xz",
+    "hash": "sha256-90yjH1VZ9VhwSW31Ny2gnftAnhl8xuD2YJebmM1hFEQ="
   }
 }
\ No newline at end of file

From 5e4c5cf9f2c39cf3e8a2f457d74930983858b5c0 Mon Sep 17 00:00:00 2001
From: Martin Thuemmler <martin.thuemmler@uni-jena.de>
Date: Fri, 10 Apr 2026 14:26:26 +0200
Subject: [PATCH 320/389] octopus: 16.2 -> 16.3

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

diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix
index e5018530f519..d12eac1d545f 100644
--- a/pkgs/by-name/oc/octopus/package.nix
+++ b/pkgs/by-name/oc/octopus/package.nix
@@ -31,13 +31,13 @@ assert (blas.isILP64 == arpack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "octopus";
-  version = "16.2";
+  version = "16.3";
 
   src = fetchFromGitLab {
     owner = "octopus-code";
     repo = "octopus";
     tag = finalAttrs.version;
-    hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
+    hash = "sha256-3DYfgoKznIWY8/HZByzz0MX03QzbivU9B3gDyNMnTQ4=";
   };
 
   outputs = [

From a7a7c57844e1939ec46549aae78a10148e565d63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 12:46:10 +0000
Subject: [PATCH 321/389] dovi-tool: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index 9cf19591cc63..9f0285e6bc5b 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -17,16 +17,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dovi-tool";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "quietvoid";
     repo = "dovi_tool";
     tag = finalAttrs.version;
-    hash = "sha256-4C9d8Rt1meV6Pcdnf2SaiWGA97sRj2WmvKsf1rC01Bs=";
+    hash = "sha256-8UG3p84wjuPpnwcz65dyDbLDaoFXtokxNvnldBZHqwc=";
   };
 
-  cargoHash = "sha256-Dg6IDcYm3qTSyE5kVgZ8Yka8538KDFyBN+weUyAfQT8=";
+  cargoHash = "sha256-nr2F+QZurNN/iCFW62LZaheZkuCGId4TSRuYd1yYH88=";
 
   nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     pkg-config

From 6f7d4ddb54bc8889db9715e7fed9d23ca57d5aa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 12:49:37 +0000
Subject: [PATCH 322/389] threatest: 1.2.5 -> 1.2.6

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

diff --git a/pkgs/by-name/th/threatest/package.nix b/pkgs/by-name/th/threatest/package.nix
index 3767ce68ffae..4b70716e9fd0 100644
--- a/pkgs/by-name/th/threatest/package.nix
+++ b/pkgs/by-name/th/threatest/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "threatest";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "threatest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rVRBrf/RTcHvKOLHNASzvij3fV+uQEuIVKb07CZ/cT0=";
+    hash = "sha256-ieOfCOgEdhfFJbv3wIfC1/QyTrDkq1k6ypbmcgXOpVE=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-EvVazz51sW8z+8XfZB0Xo42KuUT6Q9n2Y/0HvlF1bV4=";
+  vendorHash = "sha256-KfIs4LJHOaUKwc3ML/dMwSEkfRT3QW9Nlfla0KqkEyM=";
 
   nativeBuildInputs = [
     installShellFiles

From 68433a238ca04a89fb43211736d3484a7571b1d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 12:54:50 +0000
Subject: [PATCH 323/389] src-cli: 7.0.2 -> 7.0.3

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

diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 30eb9c0f52c5..e9bbfedbc2c9 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "src-cli";
-  version = "7.0.2";
+  version = "7.0.3";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
     rev = version;
-    hash = "sha256-RX3Fxa+AyzZQn68M5ZqeCqKjkNkp80ih0ECVvud1SSg=";
+    hash = "sha256-B0ESsPbB4rWRLpOnU/ugVakUaduAGCs7n+XEDIYwUxs=";
   };
 
-  vendorHash = "sha256-lChxbgIa4w24uUG0SYBbzouKt+a0eVLLSn/BG6Q5P6o=";
+  vendorHash = "sha256-WB7lXLnWsQLLfzlAyFbEbfsaTY2wbRyqsQ0PdRF1/tk=";
 
   subPackages = [
     "cmd/src"

From a53c4bf40aace9dd1cc263c223275d1ec3c6b19f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 13:12:46 +0000
Subject: [PATCH 324/389] python3Packages.pyenphase: 2.4.6 -> 2.4.7

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

diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index a95b4409d960..7fd7e8d5e670 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyenphase";
-  version = "2.4.6";
+  version = "2.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyenphase";
     repo = "pyenphase";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t2f0Zgcl/oWSTTN66dx1wO6ed1gxXZ+J8loN1X6CkM4=";
+    hash = "sha256-byNbyOBPQ2yXVOSXoYVbUr6wUf9EeqyjM9tOjUCqaF8=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];

From f7039b43618e3f4ea85b239da0301872d21bde37 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Fri, 10 Apr 2026 21:15:34 +0800
Subject: [PATCH 325/389] _7zip-zstd: enable `strictDeps` and `structuredAttrs`

---
 pkgs/by-name/_7/_7zip-zstd/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/_7/_7zip-zstd/package.nix b/pkgs/by-name/_7/_7zip-zstd/package.nix
index 3f573e97db0c..a10b436ad5b6 100644
--- a/pkgs/by-name/_7/_7zip-zstd/package.nix
+++ b/pkgs/by-name/_7/_7zip-zstd/package.nix
@@ -69,6 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
     "MSYSTEM=1"
   ];
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   enableParallelBuilding = true;
 
   postPatch = ''
@@ -103,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
       runHook preBuild
 
       for component in Bundles/{Alone,Alone2,Alone7z,Format7zF,SFXCon} UI/Console; do
-        make -j $NIX_BUILD_CORES -C CPP/7zip/$component -f ${makefile} $makeFlags
+        make -j $NIX_BUILD_CORES -C CPP/7zip/$component -f ${makefile} "''${makeFlags[@]}"
       done
 
       runHook postBuild

From 144b84be053e40e6c018cb5381cabfcf06bff5fc Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Apr 2026 20:21:22 +0700
Subject: [PATCH 326/389] coan: fix build with gcc15

---
 pkgs/by-name/co/coan/fix-path-operator-plus.diff | 11 +++++++++++
 pkgs/by-name/co/coan/package.nix                 |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/by-name/co/coan/fix-path-operator-plus.diff

diff --git a/pkgs/by-name/co/coan/fix-path-operator-plus.diff b/pkgs/by-name/co/coan/fix-path-operator-plus.diff
new file mode 100644
index 000000000000..3649c8a89ce2
--- /dev/null
+++ b/pkgs/by-name/co/coan/fix-path-operator-plus.diff
@@ -0,0 +1,11 @@
+diff --git a/src/path.h b/src/path.h
+--- a/src/path.h
++++ b/src/path.h
+@@ -232,7 +232,7 @@
+ 	 */
+ 	path operator+(std::string const & str) const {
+ 		path p(*this);
+-		p.append(str);
++		p.push_back(str);
+ 		return p;
+ 	}
diff --git a/pkgs/by-name/co/coan/package.nix b/pkgs/by-name/co/coan/package.nix
index 15931280fce9..4d8f8720c94e 100644
--- a/pkgs/by-name/co/coan/package.nix
+++ b/pkgs/by-name/co/coan/package.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # fix compile error in configure.ac
     ./fix-big-endian-config-check.diff
+    # Fix GCC 15 build: path::operator+ calls a nonexistent append() member.
+    ./fix-path-operator-plus.diff
   ];
 
   nativeBuildInputs = [

From d49eafdefcf72daec3fa4cc42dd3885204116304 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 13:23:28 +0000
Subject: [PATCH 327/389] calibre: 9.6.0 -> 9.7.0

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

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index e0d969686000..194877ea890d 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -40,11 +40,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "9.6.0";
+  version = "9.7.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xNdA1QoMLjisM68Q6BU2bL0tCEagba/KMAjqr+Lwm+o=";
+    hash = "sha256-FmEflROGdI6DSBlCPgk4k1dV5AIwHvB6pY+E9ItpQgE=";
   };
 
   patches =

From 423751c4f2c41605d74702ed5f759ec8040f7891 Mon Sep 17 00:00:00 2001
From: wolfram444 <kamiltox2006@gmail.com>
Date: Fri, 10 Apr 2026 18:28:40 +0500
Subject: [PATCH 328/389] maintainers: add wolfram444

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c3f745e0065..90ee57d2e947 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29376,6 +29376,12 @@
     githubId = 9132420;
     keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ];
   };
+  wolfram444 = {
+    name = "Xabibulloh To'xtayev";
+    email = "kamiltox2006@gmail.com";
+    github = "woolfram444";
+    githubId = 109225370;
+  };
   womeier = {
     name = "Wolfgang Meier";
     email = "womeier@posteo.de";

From 57860cab30c85a35228fd01afbf4d63123d3dbe2 Mon Sep 17 00:00:00 2001
From: wolfram444 <kamiltox2006@gmail.com>
Date: Fri, 10 Apr 2026 18:29:10 +0500
Subject: [PATCH 329/389] e-imzo: 5.00 -> 6.3.7

---
 pkgs/by-name/e-/e-imzo/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/e-/e-imzo/package.nix b/pkgs/by-name/e-/e-imzo/package.nix
index 1c54c0a142bf..7a785e43dc0d 100644
--- a/pkgs/by-name/e-/e-imzo/package.nix
+++ b/pkgs/by-name/e-/e-imzo/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "e-imzo";
-  version = "5.00";
+  version = "6.3.7";
 
   src = fetchurl {
     url = "https://cdn.xinux.uz/e-imzo/E-IMZO-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-jPAZu98prkC4NQlfA8/kJuw9qdCrSSSyzySSWPlIXpY=";
+    hash = "sha256-XjS9FAIqMc9tV1aeO8D6dP9hg7ppPE/iRHX/pmzfZmM=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     install -m 755 -d $out/lib/e-imzo
     install -m 644 ./E-IMZO.jar $out/lib/e-imzo/
     install -m 644 ./E-IMZO.pem $out/lib/e-imzo/
-    install -m 644 ./truststore.jks $out/lib/e-imzo/
     cp -r ./lib $out/lib/e-imzo/
 
     makeWrapper ${jre8}/bin/java $out/bin/e-imzo \

From baca13b31559a43cea78135f40b6f018730ba29a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 13:34:36 +0000
Subject: [PATCH 330/389] python3Packages.pyjvcprojector: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/pyjvcprojector/default.nix b/pkgs/development/python-modules/pyjvcprojector/default.nix
index 9d93d540b90e..25a74f80dae9 100644
--- a/pkgs/development/python-modules/pyjvcprojector/default.nix
+++ b/pkgs/development/python-modules/pyjvcprojector/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyjvcprojector";
-  version = "2.0.4";
+  version = "2.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SteveEasley";
     repo = "pyjvcprojector";
     tag = "v${version}";
-    hash = "sha256-nmoPOZv5/nIypfFqjgkcQYYffUcjsCMgL6TXqGyBxcQ=";
+    hash = "sha256-cfeC5KuExA4GIw7vrSBtUC4TWI8PBukOfdhbWpscyok=";
   };
 
   build-system = [ setuptools ];

From 63fefe439cbe1a00a47351dfa0fb9d63f4bb8586 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 13:44:42 +0000
Subject: [PATCH 331/389] kubedock: 0.20.3 -> 0.21.0

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

diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index fc38facc9371..585f15767ca9 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubedock";
-  version = "0.20.3";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = finalAttrs.version;
-    hash = "sha256-qQkg/SJukZU/efQoEY7PK646UScdM9wb7nOeCn1flJ8=";
+    hash = "sha256-ohriv6Lw5c+XvsENysplZ9FSbbVigjOILfOi3VpaGjI=";
   };
 
-  vendorHash = "sha256-PN9Ao8IDrcE7XnHeEDdwP4AMAgd/A11+X7irkhEE4ok=";
+  vendorHash = "sha256-EwFNwJ/JTyt+Ua1qvKMEHMbgnMaLCWN7xphV2Q3xnLU=";
 
   # config.Build not defined as it would break r-ryantm
   ldflags = [

From d1e805ecdeb030cde0d118882a36d96ddd2e6043 Mon Sep 17 00:00:00 2001
From: Antti Harju <antti@harju.io>
Date: Thu, 9 Apr 2026 22:44:11 +0300
Subject: [PATCH 332/389] action-validator: 0.8.0 -> 0.9.0

---
 pkgs/by-name/ac/action-validator/package.nix | 27 +++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index e7556ce0043a..562f8520b7a5 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -3,24 +3,45 @@
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
+  gitMinimal,
+  makeWrapper,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "action-validator";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "mpalmer";
     repo = "action-validator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-irBK27De9W5BSNIQynguOY8oPgA7K03dleE/0YvY75o=";
+    hash = "sha256-E0kqEzqw902Wg7QQNzOrtHQO9riSmAvDNcWIP3XmLSY=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-w6qC4gJ06TfoQl2WD8lgOxSxUWyG6Z8ma9mUvvYlkTU=";
+  cargoHash = "sha256-F8bJclpDpOdVET/dSIUYyP4DFcnhJDR2CV8poZtykko=";
 
   passthru.updateScript = nix-update-script { };
 
+  nativeBuildInputs = [ makeWrapper ];
+
+  nativeCheckInputs = [ gitMinimal ];
+
+  # The tests require a functional git installation and leaveDotGit appears broken https://github.com/NixOS/nixpkgs/issues/8567
+  preCheck = ''
+    git init -b main
+    git add --all # action-validator tests ignore unstaged files
+  '';
+
+  postCheck = ''
+    rm -rf .git
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/action-validator" \
+      --prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
+  '';
+
   meta = {
     description = "Tool to validate GitHub Action and Workflow YAML files";
     homepage = "https://github.com/mpalmer/action-validator";

From ab47f5e91e7c92c6b18b90784ae0859bbe3f6526 Mon Sep 17 00:00:00 2001
From: Antti Harju <antti@harju.io>
Date: Thu, 9 Apr 2026 22:51:19 +0300
Subject: [PATCH 333/389] action-validator: fix cli --version output

---
 pkgs/by-name/ac/action-validator/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index 562f8520b7a5..57801bf6d18b 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -23,6 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  postPatch = ''
+    substituteInPlace Cargo.toml --replace-fail 'version = "0.0.0-git"' 'version = "${finalAttrs.version}"'
+  '';
+
   nativeBuildInputs = [ makeWrapper ];
 
   nativeCheckInputs = [ gitMinimal ];

From 1ff624181847e616d6c2f30c394211c282d09015 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:14:08 +0000
Subject: [PATCH 334/389] fselect: 0.9.3 -> 0.10.0

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

diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix
index 4baf8c657174..3ef6ce28353a 100644
--- a/pkgs/by-name/fs/fselect/package.nix
+++ b/pkgs/by-name/fs/fselect/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fselect";
-  version = "0.9.3";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "jhspetersson";
     repo = "fselect";
     rev = finalAttrs.version;
-    sha256 = "sha256-NNDWKjO0A6ETIC+6Eg6LqyrwwErbP8362YzzNJYgtlE=";
+    sha256 = "sha256-2YLWFUDwmurQAkoYB0KNjCEhwDNAUIAkgw6+lpU7DDA=";
   };
 
-  cargoHash = "sha256-lDN3b5skS5+e1Lz3StBqW+yTN2dVxy9bWZ5z69o5z7s=";
+  cargoHash = "sha256-7dyMzlrlhU4yuEd9sNce2QoIB8dWjpcNr0mnIZxjC3U=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;

From 5515bbd20c6bad4c3413d1d72da632de21c31ac3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:23:55 +0000
Subject: [PATCH 335/389] python3Packages.jupyter-collaboration: 4.2.1 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix
index 7fe0ec01b2ea..9541ee317de6 100644
--- a/pkgs/development/python-modules/jupyter-collaboration/default.nix
+++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jupyter-collaboration";
-  version = "4.2.1";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterlab";
     repo = "jupyter-collaboration";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-09fJT81nWGvUME3QU5hk2886y93ssl3IlVSIblxqJ78=";
+    hash = "sha256-m9ABwJFZgoVZ5tqOh8q5qYA8F4V/aTL+9cjjTpldf8o=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/projects/jupyter-collaboration";

From c1033cb66342e141588702f6eaaf236ae1efc5e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:24:05 +0000
Subject: [PATCH 336/389] vscode-extensions.rooveterinaryinc.roo-cline: 3.51.1
 -> 3.52.0

---
 .../extensions/rooveterinaryinc.roo-cline/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index 4efd16906d06..fceb766b79ab 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -14,19 +14,19 @@ let
   vsix = stdenvNoCC.mkDerivation (finalAttrs: {
     name = "roo-code-${finalAttrs.version}.vsix";
     pname = "roo-code-vsix";
-    version = "3.51.1";
+    version = "3.52.0";
 
     src = fetchFromGitHub {
       owner = "RooCodeInc";
       repo = "Roo-Code";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-HpLL466mzDvNf7twW0a3dDUvgveRm0tbCOXGymTW+tA=";
+      hash = "sha256-DvuL1WByEJER+v73pCvwNdRNfM8j+c1VQGGjAyV79p8=";
     };
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 2;
-      hash = "sha256-Q97MDHl22lIF84/J3UW53dCD7oaN3Y6R32xhjRDBmpw=";
+      hash = "sha256-kQjxcqHEClQtG6x2QM1/zixN6rvcEivX8vicNydDdOw=";
     };
 
     nativeBuildInputs = [

From f095339a259810a43a4b3e19c28414fe352d1b66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:32:40 +0000
Subject: [PATCH 337/389] tpnote: 1.25.19 -> 1.25.20

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 69eaffbcb98a..953f7740c787 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.25.19";
+  version = "1.25.20";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bL+28Uv7HxXTEbz11am2wFsNf6qqXgd4XKwiLKwmS/Y=";
+    hash = "sha256-GsdK3giYfFjiXphWMUXQ7s84j5BStA/HDiRzCLbN1DI=";
   };
 
-  cargoHash = "sha256-EiLIHrV3YSVkBdKlNkKBN/+XpM+5rcHn6pfUAtsN+vU=";
+  cargoHash = "sha256-Ke8JtCOaTLe7RQPrOFSs1nHSkkQqAiqnbA1wHzv6DU4=";
 
   nativeBuildInputs = [
     cmake

From ece19c6a05c63bee1e222692a4f90145b0fbc23d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 10 Apr 2026 09:32:50 -0500
Subject: [PATCH 338/389] vimPlugins.spring-boot-nvim: init at
 0-unstable-2026-03-29

https://github.com/JavaHello/spring-boot.nvim
---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index efdc02b3c36d..f474648acdb5 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -15003,6 +15003,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  spring-boot-nvim = buildVimPlugin {
+    pname = "spring-boot.nvim";
+    version = "0-unstable-2026-03-29";
+    src = fetchFromGitHub {
+      owner = "JavaHello";
+      repo = "spring-boot.nvim";
+      rev = "98c6ff1dcdda943d341bba3c00ae9d190a2e5f7d";
+      hash = "sha256-JkOWlqyVLcwW7hxOGj5jb8BpUge3bUHbSV0o5qOYW1c=";
+    };
+    meta.homepage = "https://github.com/JavaHello/spring-boot.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   sqlite-lua = buildVimPlugin {
     pname = "sqlite.lua";
     version = "1.2.2-unstable-2025-03-14";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5f811437506d..5098d8cf10f8 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1153,6 +1153,7 @@ https://github.com/stsewd/sphinx.nvim/,,
 https://github.com/sjl/splice.vim/,,
 https://github.com/vimlab/split-term.vim/,,
 https://github.com/AndrewRadev/splitjoin.vim/,,
+https://github.com/JavaHello/spring-boot.nvim/,HEAD,
 https://github.com/kkharji/sqlite.lua/,,
 https://github.com/srcery-colors/srcery-vim/,,
 https://github.com/chr4/sslsecure.vim/,,

From afaeaf7307da8b3976066225924002841d52940d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 10 Apr 2026 16:33:09 +0200
Subject: [PATCH 339/389] nomad: Switch alias nomad_1_10 -> nomad_1_11

---
 pkgs/applications/networking/cluster/nomad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 0d8e2121910f..17644d07a79b 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -80,7 +80,7 @@ rec {
   # Upstream partially documents used Go versions here
   # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
 
-  nomad = nomad_1_10;
+  nomad = nomad_1_11;
 
   nomad_1_11 = generic {
     buildGoModule = buildGo125Module;

From 98b8a05143661bbd08f97ef1e0ffb82932a1b6ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:41:21 +0000
Subject: [PATCH 340/389] vfox: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix
index 67b4c3d73e23..4a7c7a168874 100644
--- a/pkgs/by-name/vf/vfox/package.nix
+++ b/pkgs/by-name/vf/vfox/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vfox";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "version-fox";
     repo = "vfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nDwzd+4yq5NshS01z/VUbeF9eO0IDcaNQ41bAjIAHuY=";
+    hash = "sha256-wpMxqt9m2Bh4oYSVmxG8AYZx3kzwmjBZC54UlBKWZz4=";
   };
 
   vendorHash = "sha256-494nqL6KiUk4VeKlG9YHFpgACgaYC3SR1I1EViD71Jw=";

From 022f1864946ea2d4c9448092c3ca3e6a54af6f25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:50:26 +0000
Subject: [PATCH 341/389] cargo-deny: 0.19.0 -> 0.19.1

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

diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 42e6dc5a34f9..d7fbb8bcb279 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deny";
-  version = "0.19.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
     tag = finalAttrs.version;
-    hash = "sha256-kDjRP+UXYzsXTrcsPbomtATzDVTSZqXoRXf6qqCGOZw=";
+    hash = "sha256-iS0MDeQhUCP/JBT9Lyos3s+zCeL5qe83lvsMGz7Hndg=";
   };
 
-  cargoHash = "sha256-Lu1KhQmsQGvzgozFTcv9/hY3ZXOuaxkv0I+QPmAdZBU=";
+  cargoHash = "sha256-LuUlPBLcThaN36ZAUbjAZ4+M/526WJBGUlUAfmNVKvs=";
 
   nativeBuildInputs = [
     pkg-config

From dbfbe44b78ada489eb7b93fc0ad5cdc0224a85da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:57:30 +0000
Subject: [PATCH 342/389] topgrade: 17.2.0 -> 17.3.0

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

diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index ee808d0214f7..db1378941d7c 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topgrade";
-  version = "17.2.0";
+  version = "17.3.0";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q8Cji21uJy/Az8FQiSQJ4nv+HRsqIVTsYoO9q3jv/as=";
+    hash = "sha256-iMIXmGim/wolgUspVwnIy3hqv3RsxB3zL2t83SOe6uw=";
   };
 
-  cargoHash = "sha256-/Ezf6ntvomhGsPpWPIA+ebkW+4i6BVvuIHNVbZSHow8=";
+  cargoHash = "sha256-sgLbYuLNiAGMIBGrciKxYvvNepGIb0/z9/rRSJkYUdU=";
 
   nativeBuildInputs = [
     installShellFiles

From 08a81f0e1060f76b78f368b2b2b95f4691d3456e Mon Sep 17 00:00:00 2001
From: Andrew Benbow <andrew.benbow@posteo.com>
Date: Fri, 10 Apr 2026 11:06:11 -0400
Subject: [PATCH 343/389] nixos/drupal: synchronize config sync yamls from src
 into drupal state dir

---
 doc/release-notes/rl-2605.section.md       |  2 +-
 nixos/modules/services/web-apps/drupal.nix | 69 ++++++++++++++++++++--
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 2e5d9f73d444..5b795f986f2f 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -328,4 +328,4 @@ gnuradioMinimal.override {
 
 - The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability.
 
-- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths.
+- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a new `webRoot` option for identifying custom webroots in source code, a new `configRoot` option for identifying and synchronizing config yamls onto NixOS, and a some new settings for managing variable content and filepaths.
diff --git a/nixos/modules/services/web-apps/drupal.nix b/nixos/modules/services/web-apps/drupal.nix
index a6fa29cbd351..dff3450553be 100644
--- a/nixos/modules/services/web-apps/drupal.nix
+++ b/nixos/modules/services/web-apps/drupal.nix
@@ -23,10 +23,12 @@ let
     mkPackageOption
     nameValuePair
     optionalAttrs
+    optionalString
     types
     ;
   inherit (lib.strings)
     removePrefix
+    removeSuffix
     ;
   inherit (pkgs)
     mariadb
@@ -51,7 +53,13 @@ let
         runHook preInstall
 
         mkdir -p $out
-        rsync -aq * $out/ --exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites
+        EXCLUDES="--exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites"
+
+        if [ ! -z "${cfg.configRoot}" ]; then
+          EXCLUDES="$EXCLUDES --exclude=${removePrefix "/" cfg.configRoot}"
+        fi
+
+        rsync -aq * $out/ $EXCLUDES
 
         runHook postInstall
       '';
@@ -81,6 +89,26 @@ let
       '';
     });
 
+  configSync =
+    hostName: cfg:
+    optionalString (cfg.configRoot != "") (
+      stdenv.mkDerivation (finalAttrs: {
+        pname = "drupal-config-${hostName}";
+        name = "drupal-config-${hostName}";
+        src = cfg.package;
+        buildInputs = with pkgs; [ rsync ];
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p $out/config
+          rsync -a ./share/php/${cfg.package.pname}${cfg.configRoot}/* $out/config/
+
+          runHook postInstall
+        '';
+      })
+    );
+
   drupalSettings =
     hostName: cfg:
     pkgs.writeTextFile {
@@ -136,7 +164,10 @@ let
     hostName: cfg:
     pkgs.writeShellApplication {
       name = "drupal-state-init-${hostName}";
-      excludeShellChecks = [ "SC2194" ];
+      excludeShellChecks = [
+        "SC2194"
+        "SC2157"
+      ];
       runtimeInputs = with pkgs; [ rsync ];
       text = ''
         echo "Updating the sites directory for ${hostName}..."
@@ -144,6 +175,12 @@ let
           --exclude "*/files" \
           --delete-before
 
+        if [ ! -z "${cfg.configRoot}" ]; then
+          echo "Updating config sync directory for ${hostName}..."
+          rsync -auq "${configSync hostName cfg}/config/" "${removeSuffix "/sync" cfg.configSyncDir}" \
+            --delete-before
+        fi
+
         if [ ! -d "${cfg.filesDir}" ]; then
           echo "Preparing files directory..."
           mkdir -p "${cfg.filesDir}"
@@ -221,6 +258,10 @@ let
             The location of the user-managed Drupal config sync directory.
             Drupal will both read from and write to this directory when executing
             configuration management operations.
+
+            This option differs from the `configRoot` option,
+            which this service uses to discover
+            the location of the config sync directory in the package's source code.
           '';
         };
 
@@ -229,12 +270,32 @@ let
           default = "";
           description = ''
             An optional path string with a leading slash
-            indicating the location of the Drupal webroot relative to the
-            project root directory, if one exists.
+            indicating the location of the Drupal webroot
+            in your package's source code.
+
+            The path relative to the project root directory.
           '';
           example = "/web";
         };
 
+        configRoot = mkOption {
+          type = types.str;
+          default = "";
+          description = ''
+            An optional path string with a leading slash
+            indicating the location of the config sync directory on
+            the Drupal package. Your package will probably have a config sync
+            directory if it has been significantly customized.
+
+            The path must be relative to the project root directory.
+
+            This option differs from the `configSyncDir` option, which
+            tells this service where to create a user-writeable config directory
+            on NixOS.
+          '';
+          example = "/config";
+        };
+
         extraConfig = mkOption {
           type = types.lines;
           default = "";

From b8c3e949336432a315c933d8213b43beb6e126f2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 9 Apr 2026 10:24:31 +0000
Subject: [PATCH 344/389] python3Packages.torch: build with nvshmem support

---
 pkgs/development/python-modules/torch/source/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index cfdb32bd9df5..4308a3711362 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -25,6 +25,7 @@
   magma-cuda-static,
   # Use the system NCCL as long as we're targeting CUDA on a supported platform.
   useSystemNccl ? (cudaSupport && cudaPackages.nccl.meta.available || rocmSupport),
+  withNvshmem ? (cudaSupport && cudaPackages.libnvshmem.meta.available),
   MPISupport ? false,
   mpi,
   buildDocs ? false,
@@ -469,6 +470,8 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
     USE_SYSTEM_NCCL = finalAttrs.env.USE_NCCL;
     USE_STATIC_NCCL = finalAttrs.env.USE_NCCL;
 
+    USE_NVSHMEM = setBool withNvshmem;
+
     # Set the correct Python library path, broken since
     # https://github.com/pytorch/pytorch/commit/3d617333e
     PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}";
@@ -578,6 +581,9 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
       (lib.getDev nccl) # Provides nccl.h
       (lib.getOutput "static" nccl) # Provides static library
     ]
+    ++ lists.optionals withNvshmem [
+      cudaPackages.libnvshmem
+    ]
     ++ [
       cuda_profiler_api # <cuda_profiler_api.h>
     ]

From 4631e6e78db146ad84b6e61645d5faaa27cf4138 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 10 Apr 2026 17:43:05 +0200
Subject: [PATCH 345/389] tfenv: Add missing __structuredAttrs = true

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/tf/tfenv/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/tf/tfenv/package.nix b/pkgs/by-name/tf/tfenv/package.nix
index 735853aacc08..fee5db080b1a 100644
--- a/pkgs/by-name/tf/tfenv/package.nix
+++ b/pkgs/by-name/tf/tfenv/package.nix
@@ -13,6 +13,8 @@
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+
   pname = "tfenv";
   version = "3.0.0";
 

From bb0a469673207839ae8058c05ee2edf4bbe4ca51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 16:02:54 +0000
Subject: [PATCH 346/389] qdl: 2.5 -> 2.6

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

diff --git a/pkgs/by-name/qd/qdl/package.nix b/pkgs/by-name/qd/qdl/package.nix
index 5e51f74c185b..fcd080c60d05 100644
--- a/pkgs/by-name/qd/qdl/package.nix
+++ b/pkgs/by-name/qd/qdl/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qdl";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "linux-msm";
     repo = "qdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-k6PMiKPwdV3eOFm9FEQPMbyN73DypAZ/UgwOR6aigHA=";
+    hash = "sha256-/lvKMC0bJdfqhPCuBYChX/6Aybpu+cPg0Vjl2HDbOeE=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From db5fcaad983d5a08696cb085e01018fce6df8c50 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 10 Apr 2026 18:05:35 +0200
Subject: [PATCH 347/389] kyverno: adopt

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/ky/kyverno/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index f80f458e7865..389fc7b12a3f 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -56,6 +56,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://kyverno.io/";
     changelog = "https://github.com/kyverno/kyverno/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ Scrumplex ];
   };
 })

From 5ec434cbb16a269991aa0f6d09714026cdf14961 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 16:07:17 +0000
Subject: [PATCH 348/389] grafanaPlugins.marcusolsson-csv-datasource: 0.6.19 ->
 0.8.2

---
 .../plugins/marcusolsson-csv-datasource/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
index 4a992df410fe..2d2c218505e4 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin {
   pname = "marcusolsson-csv-datasource";
-  version = "0.6.19";
+  version = "0.8.2";
   zipHash = {
-    x86_64-linux = "sha256-HCwh8v9UeO7eeESZ78Hj6uvLext/x7bPfACe1u2BqTM=";
-    aarch64-linux = "sha256-2Qtwe34fe8KlIye3RuuNLjlWWgXGJvAmwWUnZD8LdWE=";
-    x86_64-darwin = "sha256-6sGA06INQbiRCd23ykdtUWAR+oA3YFh57KBT7zWUP44=";
-    aarch64-darwin = "sha256-gzQRcPeRqLvl27SB18hTTtcHx/namT2V0NOgX5J1mbs=";
+    x86_64-linux = "sha256-iey8/aBEdvlX7l/ZT75dhDM135G0o+HozmFaapVMxvo=";
+    aarch64-linux = "sha256-+ceO0fNpBoWVtNNEwy8vppzK+PTWRE3Yk8yyg8eW9xo=";
+    x86_64-darwin = "sha256-kvYv/2zgqooordP4Zr0CTmYYfj8upq2L/9XWoBHcYSA=";
+    aarch64-darwin = "sha256-0XvHSdvFe0XgyYPuqm75OECGVNNHRaLLdYrNS18ZCu4=";
   };
   meta = {
     description = "Load CSV data into Grafana, expanding your capabilities to visualize and analyze data stored in CSV (Comma-Separated Values) format";

From 0f4d829648f2325107fa83dc637fa8b2fa577848 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 16:13:06 +0000
Subject: [PATCH 349/389] oh-my-posh: 29.9.2 -> 29.10.0

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

diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix
index e882702c852e..07dc1e0afc71 100644
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "oh-my-posh";
-  version = "29.9.2";
+  version = "29.10.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "oh-my-posh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fPAbb2kZtGWGV8OytmgeQH6/HaSglGxZyzXI+Zg/VAk=";
+    hash = "sha256-+j0et6rwTX3gPqky99NjvBf5i7YhbjbJQ8CvrhYKvRA=";
   };
 
-  vendorHash = "sha256-241naWsj/PwR0+JgRJA/Fa98IVmueg4d2lR0OlWNLQw=";
+  vendorHash = "sha256-peUWhtxKCDT3fE7CCir6l3XTjGvSMQFfkCZFHoxpBdw=";
 
   sourceRoot = "${finalAttrs.src.name}/src";
 

From f5781b5085b5fbaade926cd1b866412c91b8e0bf Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Fri, 3 Apr 2026 14:24:43 +0200
Subject: [PATCH 350/389] obs-studio-plugins.obs-color-monitor: 0.9.3 -> 0.9.6

changelog: https://github.com/norihiro/obs-color-monitor/releases/tag/0.9.6

diff: https://github.com/norihiro/obs-color-monitor/compare/0.9.3...0.9.6
---
 .../video/obs-studio/plugins/obs-color-monitor.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
index 8aac08543123..9391b422a092 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-color-monitor";
-  version = "0.9.3";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-color-monitor";
     tag = finalAttrs.version;
-    hash = "sha256-TwsEIOgQjj1wza7i8nne63oBM3FB6GmMjCq8/PuiWHs=";
+    hash = "sha256-2TjkPsudGwB2TNdfVnRqMiUQquAnCdBEmG9N9JLfewo=";
   };
 
   nativeBuildInputs = [ cmake ];

From e055be29bf0708c3f5ed2dacba6ace408484c518 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 10 Apr 2026 12:46:36 -0400
Subject: [PATCH 351/389] forgejo: 14.0.3 -> 14.0.4

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

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 5e8c42f2777a..7b60b9dd741f 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "14.0.3";
-  hash = "sha256-WE0CUwF5GBUr6+kUeHyPa0XPy5uigol/74eQhQQjBQA=";
-  npmDepsHash = "sha256-tJmX6VO7T6T4egy+Z2RZhe+/6ZfS6ZHFETfALmfAli4=";
-  vendorHash = "sha256-TpRVaXNlfnmFu8EdvKN8/mioLeQkghCy0nMWvRB6sYQ=";
+  version = "14.0.4";
+  hash = "sha256-kw3oN/Kr+SYF1vVbStaWWV59Pw75mEeF4eUYljI1f+0=";
+  npmDepsHash = "sha256-TjohWmdEZII0ti/T37kQ04Lkoy79VbY02hE1hxrWYx8=";
+  vendorHash = "sha256-Dm+aZMPjrqfHSLzkd9HHTuM8wVLtGpT2Nf5frWtYW10=";
   lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"

From fec47a1f388c01c34d877bbb600990848502b098 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 10 Apr 2026 12:46:45 -0400
Subject: [PATCH 352/389] forgejo-lts: 11.0.11 -> 11.0.12

---
 pkgs/by-name/fo/forgejo/lts.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index 0e6526d51ddc..7e184b6c7d22 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.11";
-  hash = "sha256-UZJW6C3Vn/e1KJEiyUI3o+/2xvKubjv+j1Lujmse//w=";
-  npmDepsHash = "sha256-kh7/xZPr5Y8CzGs8hop0a9JNPzmB3w2FPpCb+xOCz0c=";
-  vendorHash = "sha256-BL6wa+f+qFbDuHImMvAgwsqOTfV6Zt4oMBrOBI1sh1o=";
+  version = "11.0.12";
+  hash = "sha256-akPRq8quzdx8TU8NC/uxvngEl/fl/JjM1FcVhlHxcXo=";
+  npmDepsHash = "sha256-2COWPQM1iKpNG2TbPIv2zXXe28tsmuVc6IhkUeORBsU=";
+  vendorHash = "sha256-v1UZwhgZglJvIkEfO7662lKhdO3AxH+DGN70ziWfXG0=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

From 161e0b9803a7220a6e4e0918c4c8dbf9daafc60b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Apr 2026 16:47:38 +0000
Subject: [PATCH 353/389] python3Packages.umap-learn: 0.5.11 -> 0.5.12

Diff: https://github.com/lmcinnes/umap/compare/release-0.5.11...release-0.5.12

Changelog: https://github.com/lmcinnes/umap/releases/tag/release-release-0.5.12
---
 .../python-modules/umap-learn/default.nix        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index b6b16b5b5d42..239bcc3b898c 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -32,16 +32,16 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "umap-learn";
-  version = "0.5.11";
+  version = "0.5.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lmcinnes";
     repo = "umap";
-    tag = "release-${version}";
-    hash = "sha256-V63W9ax7iOq5+oZFRWaQbAws942JBeufnQ3IF4rcgko=";
+    tag = "release-${finalAttrs.version}";
+    hash = "sha256-NORv3wJliKfft/+kMNKL133PKPN88Pt23yqbT1LjUKE=";
   };
 
   build-system = [ setuptools ];
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     tqdm
   ];
 
-  optional-dependencies = rec {
+  optional-dependencies = {
     plot = [
       bokeh
       colorcet
@@ -77,8 +77,6 @@ buildPythonPackage rec {
       # Not packaged.
       #tbb
     ];
-
-    all = plot ++ parametric_umap ++ tbb;
   };
 
   nativeCheckInputs = [
@@ -104,8 +102,8 @@ buildPythonPackage rec {
   meta = {
     description = "Uniform Manifold Approximation and Projection";
     homepage = "https://github.com/lmcinnes/umap";
-    changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${src.tag}";
+    changelog = "https://github.com/lmcinnes/umap/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From 1c9c0d313434722cf7b4de905e20e72df0377ef0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 16:50:22 +0000
Subject: [PATCH 354/389] deadlock-mod-manager: 0.17.0 -> 0.18.0

---
 pkgs/by-name/de/deadlock-mod-manager/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix
index 30b09b3aa2df..751af9c6b69c 100644
--- a/pkgs/by-name/de/deadlock-mod-manager/package.nix
+++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix
@@ -27,19 +27,19 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deadlock-mod-manager";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "deadlock-mod-manager";
     repo = "deadlock-mod-manager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Z2w/92P/3PpFDcT1rhO3X4gyoV+l9uLb4jZ4Ixz6ck=";
+    hash = "sha256-+64Y6BFwgQIQhmFzZXOeJ/IGFn+OXV58I/ZdARVFt4w=";
   };
 
   cargoRoot = "apps/desktop";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoHash = "sha256-MQog4ro5NWXmyS5aPZBb7K4LwfIDzxdhGZjWlh5LelE=";
+  cargoHash = "sha256-6ljyPdobcoBaYyarc7Iin5N24y1YXPafrYAk2xvBtvY=";
 
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pnpm = pnpm_9;
     fetcherVersion = 2;
     sourceRoot = "source";
-    hash = "sha256-vZvQrKiuKlwY2+QCpsG2nm8uA0hmX0MOk603EcKbyOg=";
+    hash = "sha256-fFcKyqAo/HpGBaEJMk6Lq0FafNXrGu9z9nHnav5d6Hg=";
   };
 
   patches = [

From 07625cbd87c1fd884c888f03b21fc8099b444e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:57:10 -0400
Subject: [PATCH 355/389] lilypond: adopt

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

diff --git a/pkgs/by-name/li/lilypond/package.nix b/pkgs/by-name/li/lilypond/package.nix
index e9e2aeb9cb15..e18023db30f5 100644
--- a/pkgs/by-name/li/lilypond/package.nix
+++ b/pkgs/by-name/li/lilypond/package.nix
@@ -141,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
       ofl # mf/
     ];
     maintainers = with lib.maintainers; [
+      eclairevoyant
       yurrriq
     ];
     platforms = lib.platforms.all;

From 667483b8243d730a2dae726191e2394d2029ee67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:56:09 -0400
Subject: [PATCH 356/389] lilypond: fix build with clang21

---
 pkgs/by-name/li/lilypond-unstable/package.nix |  2 ++
 pkgs/by-name/li/lilypond/package.nix          | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/pkgs/by-name/li/lilypond-unstable/package.nix b/pkgs/by-name/li/lilypond-unstable/package.nix
index 05ea34a323fa..d0f46eca1787 100644
--- a/pkgs/by-name/li/lilypond-unstable/package.nix
+++ b/pkgs/by-name/li/lilypond-unstable/package.nix
@@ -14,6 +14,8 @@ lilypond.overrideAttrs (
       hash = "sha256-UFuL8TZ7uLZhXgFoMGxAye04dNcvrw1gqQMOnE4P2fc=";
     };
 
+    patches = [ ];
+
     passthru.updateScript = writeScript "update-lilypond-unstable" ''
       #!/usr/bin/env nix-shell
       #!nix-shell -i bash -p common-updater-scripts curl
diff --git a/pkgs/by-name/li/lilypond/package.nix b/pkgs/by-name/li/lilypond/package.nix
index e18023db30f5..0fad1654d612 100644
--- a/pkgs/by-name/li/lilypond/package.nix
+++ b/pkgs/by-name/li/lilypond/package.nix
@@ -41,6 +41,7 @@
     ]
   ),
   writeScript,
+  fetchpatch2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -78,6 +79,18 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"
   '';
 
+  patches = [
+    # fixes #475503
+    # distilled version of https://gitweb.git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commit;h=f2192eb294e
+    # so, remove once that commit reaches a stable release
+    (fetchpatch2 {
+      name = "fix-clang-21-build.patch";
+      url = "https://cgit.freebsd.org/ports/plain/print/lilypond/files/patch-lily_include_smobs.hh?id=58bab68c706086774b17dcacc61c8fd37ecc8a15";
+      extraPrefix = ""; # adds old/new prefixes to process properly in patchPhase
+      hash = "sha256-nT8+nYU+m6lLTvHEvSIpG/yAwy1Omb6+4Z+NGwEVE4Q=";
+    })
+  ];
+
   strictDeps = true;
 
   depsBuildBuild = [

From 6da079cbc0593eef597869e219102c62d190ca07 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Apr 2026 16:51:56 +0000
Subject: [PATCH 357/389] python3Packages.fast-array-utils: 1.3.1 -> 1.4.1

Diff: https://github.com/scverse/fast-array-utils/compare/v1.3.1...v1.4.1

Changelog: https://github.com/scverse/fast-array-utils/releases/tag/v1.4.1
---
 .../python-modules/fast-array-utils/default.nix  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/fast-array-utils/default.nix b/pkgs/development/python-modules/fast-array-utils/default.nix
index cbdbf12883c5..d3505e34895e 100644
--- a/pkgs/development/python-modules/fast-array-utils/default.nix
+++ b/pkgs/development/python-modules/fast-array-utils/default.nix
@@ -6,7 +6,6 @@
   # build-system
   hatch-docstring-description,
   hatch-fancy-pypi-readme,
-  hatch-min-requirements,
   hatch-vcs,
   hatchling,
 
@@ -22,13 +21,12 @@
   furo,
   pytest,
   sphinx,
-  sphinx-autodoc-typehints,
   # full
   h5py,
   zarr,
   # test
   anndata,
-  numcodecs,
+  scikit-learn,
   # test-min
   coverage,
   pytest-codspeed,
@@ -44,14 +42,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fast-array-utils";
-  version = "1.3.1";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "fast-array-utils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FUzCdDFDqP+izlSWruWzslfPayzRN7MFx1LOikyMDss=";
+    hash = "sha256-9tB8cV3i9WPbdLeS5/FmQzLu8rk/jRVtUZ35X/XSCx8=";
   };
 
   # hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.
@@ -60,7 +58,6 @@ buildPythonPackage (finalAttrs: {
   build-system = [
     hatch-docstring-description
     hatch-fancy-pypi-readme
-    hatch-min-requirements
     hatch-vcs
     hatchling
   ];
@@ -79,9 +76,7 @@ buildPythonPackage (finalAttrs: {
     doc = [
       furo
       pytest
-      # scanpydoc
       sphinx
-      sphinx-autodoc-typehints
       # sphinx-autofixture
     ];
     full = [
@@ -96,11 +91,10 @@ buildPythonPackage (finalAttrs: {
     ];
     test = [
       anndata
-      numcodecs
+      scikit-learn
       zarr
     ]
-    ++ self.accel
-    ++ self.test-min;
+    ++ self.accel;
     test-min = [
       coverage
       pytest

From 4fa3c00d799787e7e7620d2e4638db71e164425b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Apr 2026 16:20:22 +0000
Subject: [PATCH 358/389] python3Packages.scanpy: 1.12.0 -> 1.12.1

Diff: https://github.com/scverse/scanpy/compare/1.12.0...1.12.1

Changelog: https://github.com/scverse/scanpy/releases/tag/1.12.1
---
 .../python-modules/scanpy/default.nix            | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix
index 6d4880c5f0b4..1bb17259226a 100644
--- a/pkgs/development/python-modules/scanpy/default.nix
+++ b/pkgs/development/python-modules/scanpy/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonOlder,
 
   # build-system
   hatch-vcs,
@@ -9,6 +10,7 @@
 
   # dependencies
   anndata,
+  certifi,
   fast-array-utils,
   h5py,
   joblib,
@@ -28,8 +30,9 @@
   session-info2,
   statsmodels,
   tqdm,
-  typing-extensions,
   umap-learn,
+  # python<3.13 only:
+  typing-extensions,
 
   # optional-attrs
   # dask
@@ -60,14 +63,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "scanpy";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "scanpy";
     tag = finalAttrs.version;
-    hash = "sha256-jpi3SyTaG5mxCqUNSM564MMIrNdz4LBYo9+dn5nYmeY=";
+    hash = "sha256-r8kicjCFyEKLxQtFYuZg0NKK7gRBoaLSSFGWqcQtBqM=";
   };
 
   # Otherwise, several tests fail to be collected:
@@ -86,6 +89,7 @@ buildPythonPackage (finalAttrs: {
 
   dependencies = [
     anndata
+    certifi
     fast-array-utils
     h5py
     joblib
@@ -105,11 +109,13 @@ buildPythonPackage (finalAttrs: {
     session-info2
     statsmodels
     tqdm
-    typing-extensions
     umap-learn
   ]
   ++ fast-array-utils.optional-dependencies.accel
-  ++ fast-array-utils.optional-dependencies.sparse;
+  ++ fast-array-utils.optional-dependencies.sparse
+  ++ lib.optionals (pythonOlder "3.13") [
+    typing-extensions
+  ];
 
   optional-dependencies = {
     # commented attributes are due to some dependencies not being in Nixpkgs

From 21d9dd9511e11ef8b3e4a147f4a9cd74c5ee8421 Mon Sep 17 00:00:00 2001
From: Lyna <git@blooym.dev>
Date: Fri, 10 Apr 2026 17:55:50 +0100
Subject: [PATCH 359/389] maintainers: add blooym

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c3f745e0065..9ddeeb27e3a4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3635,6 +3635,11 @@
     githubId = 114744388;
     name = "bloominstrong";
   };
+  blooym = {
+    name = "Lyna";
+    github = "Blooym";
+    githubId = 19539165;
+  };
   bloveless = {
     email = "brennon.loveless@gmail.com";
     github = "bloveless";

From 2e0aa410091aba0831bf249717635530a24ddc5d Mon Sep 17 00:00:00 2001
From: Lyna <git@blooym.dev>
Date: Fri, 10 Apr 2026 17:56:57 +0100
Subject: [PATCH 360/389] xivlauncher: add blooym as maintainer

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

diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix
index 4219e059aab8..bb32e4cec01f 100644
--- a/pkgs/by-name/xi/xivlauncher/package.nix
+++ b/pkgs/by-name/xi/xivlauncher/package.nix
@@ -116,6 +116,7 @@ buildDotnetModule rec {
     homepage = "https://github.com/goatcorp/XIVLauncher.Core";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
+      blooym
       keysmashes
       witchof0x20
     ];

From 2507b7a4e092d90aa6a5a0f4d6feae412ae0fc1b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 10 Apr 2026 19:24:31 +0200
Subject: [PATCH 361/389] immich: 2.7.3 -> 2.7.4

https://github.com/immich-app/immich/releases/tag/v2.7.4

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/im/immich/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 9cea10f3ec32..8fa5d6c7691f 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -115,20 +115,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "2.7.3";
+  version = "2.7.4";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z3Z2/X9LT0iZtFVHUuVbWPZIPJUMbJGn5NmHCDxNVj0=";
+    hash = "sha256-cN5MM8lk2UY2gCG4RMryJc4SwbJNYm8IbTcqEmdaNF4=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-k8ZG1SKRKymG4fau46SrGjkIPM3JK+xIUPMFaE2CXVg=";
+    hash = "sha256-FEesjbhxP7ydFfNshF3iFIk9N3Z53jrEZ9DRBjgEfs0=";
   };
 
   postPatch = ''

From 3f6747c064627fe2662e93a4c824f53f34b40491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 10 Apr 2026 17:15:14 +0200
Subject: [PATCH 362/389] rl-2605: Mention nomad changes

---
 doc/release-notes/rl-2605.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 2e5d9f73d444..12f5ea2ba0b2 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -143,6 +143,8 @@
 
 - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
 
+- `nomad` has been updated to v1.11. Refer to the [release note](https://developer.hashicorp.com/nomad/docs/release-notes/nomad/v1-11-x) for more details. Once a new Nomad version has started and upgraded it's data directory, it generally cannot be downgraded to the previous version.
+
 - The default NVIDIA drivers no longer support Maxwell (GTX 1xxx) or older GPUs. Pin the nvidia package to ` config.boot.kernelPackages.nvidiaPackages.legacy_580` for continued support.
 
 - `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).

From c42510ea4f933ea2e4e8f044553c980904d8a7ae Mon Sep 17 00:00:00 2001
From: Jeffrey Lau <who.else.at.jlau.tk>
Date: Thu, 12 Mar 2026 05:20:05 -0400
Subject: [PATCH 363/389] container: 0.9.0 -> 0.11.0

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

diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix
index 75166c26b4ab..719438ed3dbd 100644
--- a/pkgs/by-name/co/container/package.nix
+++ b/pkgs/by-name/co/container/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "container";
-  version = "0.9.0";
+  version = "0.11.0";
 
   src = fetchurl {
-    url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-installer-signed.pkg";
-    hash = "sha256-6KQysR85bVzlDkTqFPAvffkP/O9EHJFrL6krY+lfWAE=";
+    url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
+    hash = "sha256-kGNqRgOmaeurQZuuHh2dMijAFWxJAiY8ksGdBQMPQEo=";
   };
 
   nativeBuildInputs = [

From eb903aef87ce8c256ea7e516d52606d388d6f420 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 18:25:25 +0000
Subject: [PATCH 364/389] wifitui: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/wi/wifitui/package.nix b/pkgs/by-name/wi/wifitui/package.nix
index 753543312d5d..d49041967b02 100644
--- a/pkgs/by-name/wi/wifitui/package.nix
+++ b/pkgs/by-name/wi/wifitui/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "wifitui";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "shazow";
     repo = "wifitui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9e9YaxoqA8JatI1eqsCWoSRvV7veKQMD5kjL1Nns8sU=";
+    hash = "sha256-thk2gwV/X+LwfqG31pQBxqSEu//UlLrwZWNL/DjrnCY=";
   };
 
   vendorHash = "sha256-2smXAK3mRweg0yKDerKgu3fcT3ulDjRSbbkMCSe+nVs=";

From f4936dbc31726ef3c659ccbb1d8c4c5ee694e2c1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 10 Apr 2026 20:32:37 +0200
Subject: [PATCH 365/389] pulsar: fix update script

Co-authored-by: bryango <bryango@users.noreply.github.com>
---
 pkgs/by-name/pu/pulsar/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index 70c737f9ebe7..51239aaf5ab1 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -259,10 +259,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = writeShellScript "update-pulsar" ''
     set -euo pipefail
-    PATH="${lib.getBin curl}:$PATH"
-    PATH="${lib.getBin jq}:$PATH"
-    PATH="${lib.getBin coreutils}:$PATH"
-    PATH="${lib.getBin nix-update}:$PATH"
+    export PATH="${
+      lib.makeBinPath [
+        coreutils
+        curl
+        jq
+        nix-update
+      ]
+    }"
     version="$(curl https://api.github.com/repos/pulsar-edit/pulsar/releases/latest | jq ".tag_name" -r | tr -d 'v')"
     nix-update pkgsCross.gnu64.pulsar --version "$version"
     nix-update pkgsCross.aarch64-multiplatform.pulsar --version skip

From b352614c534cd3f3f890a142a8596dace198263d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 18:40:09 +0000
Subject: [PATCH 366/389] python3Packages.reqif: 0.0.48 -> 0.0.49

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

diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix
index 426b131e22f5..fa9fbf2010ea 100644
--- a/pkgs/development/python-modules/reqif/default.nix
+++ b/pkgs/development/python-modules/reqif/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "reqif";
-  version = "0.0.48";
+  version = "0.0.49";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strictdoc-project";
     repo = "reqif";
     tag = version;
-    hash = "sha256-bDbItyn5nhoYZHReqfvD1mfq0dilZPUEusOC/L4XNek=";
+    hash = "sha256-zI3lW2HxymnIWi9zvVSAxabS6jYScn7KyVfltRrggXY=";
   };
 
   postPatch = ''

From 897cb09ddf3d6ba5708ec5aa7bc70b564e5cf4d6 Mon Sep 17 00:00:00 2001
From: azban <me@azban.net>
Date: Fri, 10 Apr 2026 01:02:37 -0600
Subject: [PATCH 367/389] _389-ds-base: add patch to fix CVE-2025-14905

This patch is in the tree but has not yet been included in a release.
---
 pkgs/by-name/_3/_389-ds-base/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix
index dd2da0d95d65..6c7b14d59505 100644
--- a/pkgs/by-name/_3/_389-ds-base/package.nix
+++ b/pkgs/by-name/_3/_389-ds-base/package.nix
@@ -58,6 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-trzY/fDH3rs66DWbWI+PY46tIC9ShuVqspMHqEEKZYA=";
     })
     ./0001-remove-hard-coded-vendor-paths.patch
+    (fetchpatch {
+      # https://github.com/389ds/389-ds-base/security/advisories/GHSA-4qwg-c5j2-q4hp
+      name = "CVE-2025-14905.patch";
+      url = "https://github.com/389ds/389-ds-base/commit/2e424110def2e3998f6045e136fb0d43f47b7f5a.patch";
+      hash = "sha256-ItxG0bnuNPWLClL677rChTDvDWXxJ2L6ygx4VY2v80w=";
+    })
   ];
 
   cargoRoot = "src";

From 533ef9f0bb991b586ed1e98199cd795e43bd7c21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 19:19:43 +0000
Subject: [PATCH 368/389] python3Packages.peakrdl-rust: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/peakrdl-rust/default.nix b/pkgs/development/python-modules/peakrdl-rust/default.nix
index 032150716ac8..5df80e88b5ed 100644
--- a/pkgs/development/python-modules/peakrdl-rust/default.nix
+++ b/pkgs/development/python-modules/peakrdl-rust/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "peakrdl-rust";
-  version = "0.7.1";
+  version = "0.7.2";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "darsor";
     repo = "PeakRDL-rust";
     tag = "v${version}";
-    hash = "sha256-GKozCmWtCb5cUxkBBHpHYPUY6QYILg1452skGoXxThE=";
+    hash = "sha256-eoEJUX6yvZU8xNA+tMWRmEH3CypohOpyVa6C9FzeehU=";
   };
 
   build-system = [ uv-build ];

From 4ff248be4ef2a292417e6c3b70dce4b583d85250 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 19:34:26 +0000
Subject: [PATCH 369/389] python3Packages.serialx: 1.1.1 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix
index b65ddd007393..a0523badbaa1 100644
--- a/pkgs/development/python-modules/serialx/default.nix
+++ b/pkgs/development/python-modules/serialx/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "serialx";
-  version = "1.1.1";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "puddly";
     repo = "serialx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u9+ffkZLfWt98bmPdnpWaziSpsBWDjvrUJprq1FJimI=";
+    hash = "sha256-7EtFGjcy9RWnbwRM6ptbBpeZDUw3ud4JvfMkuDru6i0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From ef827a1187f5d00ea153d671fe84c367aea1c7bc Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:50:02 +0000
Subject: [PATCH 370/389] python313Packages.langchain-core: 1.2.22 -> 1.2.27

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

diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index b613c8c68dd6..ea0c885d06cb 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-core";
-  version = "1.2.22";
+  version = "1.2.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-core==${finalAttrs.version}";
-    hash = "sha256-jaoZtRNHAXbt/a9hx4zPGEYppT/Kxu0MPn/cOj5kLP4=";
+    hash = "sha256-WdC43SUVgteNQLNMD+yEkD8TyyCFGXkYTi5moZMEmVo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/core";

From 651b18cbbf46fb6fef9fd32d8ef645cf69745a42 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Fri, 10 Apr 2026 19:19:26 +0000
Subject: [PATCH 371/389] python313Packages.langchain-tests: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 28add86608d3..ebda1040f1f9 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-tests";
-  version = "1.1.5";
+  version = "1.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-tests==${finalAttrs.version}";
-    hash = "sha256-HyPJ3binXV3ypksvpyz1t6B1Zdz3NY6z4Ttq7K4yo+g=";
+    hash = "sha256-W+uJy0t6awNwMpMHEftHV8tDliEhvL/g8V2ZJPWeYk8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/standard-tests";

From f0e318770f1df7278b0449bb96815da6ed7e6535 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 6 Apr 2026 10:55:34 -0700
Subject: [PATCH 372/389] python3Packages.langchain-openai: disable broken test
 due to formatting differences

---
 pkgs/development/python-modules/langchain-openai/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 0b1eab999404..82d4243f310b 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -87,6 +87,7 @@ buildPythonPackage (finalAttrs: {
     "test_load_openai_llm"
     "test_loads_openai_chat"
     "test_load_openai_chat"
+    "test_format_message_content"
   ];
 
   pythonImportsCheck = [ "langchain_openai" ];

From 9ed8818537a1f111a6d9764e3477476ca233f6f0 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:45:40 +0000
Subject: [PATCH 373/389] python313Packages.langchain-aws: 1.4.1 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 04a2a4f49fb2..d72d7927fcbf 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-aws";
-  version = "1.4.1";
+  version = "1.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${finalAttrs.version}";
-    hash = "sha256-q+79xKpUN9whg0E37m6Mu4oECdJfPxUTh94bXHLg6sM=";
+    hash = "sha256-Iya2xWuArROGgEPbYDCFqzuVP5UupemyU2wF/mNNLXo=";
   };
 
   postPatch = ''

From a6ebb28ba68338147ac1ca06a91232dc6a14bfe3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:45:50 +0000
Subject: [PATCH 374/389] python313Packages.langchain: 1.2.13 -> 1.2.15

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

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 580d6946580f..383a5a2542de 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -46,14 +46,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain";
-  version = "1.2.13";
+  version = "1.2.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain==${finalAttrs.version}";
-    hash = "sha256-Eb9sXYUaBQn6f7IqgrSIbNz75g79Vka0RommZFJUQko=";
+    hash = "sha256-aRiU8UwzotSybfgjexV9hYXsm5Ub3PFTz0k0hz1p2lk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/langchain_v1";

From fa7823e7100e0c12f092da0a4c05d2418761dcf2 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Fri, 10 Apr 2026 19:19:32 +0000
Subject: [PATCH 375/389] python313Packages.langgraph-sdk: 0.3.12 -> 0.3.13

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

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index f762f62a7a7a..22d1912f6d43 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-sdk";
-  version = "0.3.12";
+  version = "0.3.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "sdk==${finalAttrs.version}";
-    hash = "sha256-J8QqbzJe5tW11Nuio2uFAJk2EZIL1LNGIbJn7TZvlaA=";
+    hash = "sha256-pu2/iITwXJ1PdFJKu0g5cOqPukKURSITCpgCIxERRsw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/sdk-py";

From bf86b76aebec94f0d23b83da6163d32077dc00aa Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:46:37 +0000
Subject: [PATCH 376/389] python313Packages.langgraph: 1.1.3 -> 1.1.6

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

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 42ca6a2feedb..01200d17308b 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -41,14 +41,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "langgraph";
-  version = "1.1.4";
+  version = "1.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = finalAttrs.version;
-    hash = "sha256-7wFomrg5w4KTEprx9b93zQaeAbD5s1TPo97WZ/2R0S4=";
+    hash = "sha256-9YuvzPmyNOfx8AolUaY8XFeYUpWRmudtLEAUadRUAqY=";
   };
 
   postgresqlTestSetupPost = ''

From 4ad95b581667a57546181acdff56240a74ddbd04 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:49:43 +0000
Subject: [PATCH 377/389] python313Packages.langgraph-prebuilt: 1.0.8 -> 1.0.9

---
 .../python-modules/langgraph-prebuilt/default.nix           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
index 065651f4c5d9..8376a03386ce 100644
--- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix
+++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
@@ -14,6 +14,7 @@
   # tests
   langgraph-checkpoint-postgres,
   langgraph-checkpoint-sqlite,
+  langgraph-sdk,
   postgresql,
   postgresqlTestHook,
   psycopg,
@@ -31,14 +32,14 @@
 # It exists so the langgraph team can iterate on it without having to rebuild langgraph.
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-prebuilt";
-  version = "1.0.8";
+  version = "1.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "prebuilt==${finalAttrs.version}";
-    hash = "sha256-Gsh2bCcity0zf9A+FENxwktK5j3WhQOG/jZmhJ18KVE=";
+    hash = "sha256-B9ntvj6qoKd63W/cPkevtfHbv8XUxmkaWupxURA8C68=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/prebuilt";
@@ -48,6 +49,7 @@ buildPythonPackage (finalAttrs: {
   dependencies = [
     langchain-core
     langgraph-checkpoint
+    langgraph-sdk
   ];
 
   skipPythonImportsCheck = true; # This will be packaged with langgraph

From 18ec3e3c245a621de0eb1a50ccd48edd681ed194 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:49:48 +0000
Subject: [PATCH 378/389] python313Packages.langgraph-runtime-inmem: 0.26.0 ->
 0.27.3

---
 .../python-modules/langgraph-runtime-inmem/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
index 3748e4f07da9..de025a39eba3 100644
--- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-runtime-inmem";
-  version = "0.26.0";
+  version = "0.27.3";
   pyproject = true;
 
   # Not available in any repository
   src = fetchPypi {
     pname = "langgraph_runtime_inmem";
     inherit (finalAttrs) version;
-    hash = "sha256-ucWH0TOTIKKlSlcKIa7K9Z7rxL4HzvHYpbA18/LGHWo=";
+    hash = "sha256-jylX7GXEJFJr5pBxCnD2W/kG3dkqS9IFS7VhyPlErJE=";
   };
 
   build-system = [ hatchling ];

From db17bb8ff6055e9eb01679858ea7ebf4c9d1a565 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 5 Apr 2026 17:50:11 +0000
Subject: [PATCH 379/389] python313Packages.langsmith: 0.7.22 -> 0.7.30

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

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index ea327290d0ec..97a2cd4a0092 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langsmith";
-  version = "0.7.22";
+  version = "0.7.30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-raotchNZFcQPUvQckq4Z6ntvh4tviCjTLv2s5Ueulqw=";
+    hash = "sha256-JxbX7s1L1Zz3D+Te1EuiFt9y9YQSYM1Ta6LHt7KEGYY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python";

From 44bc59f72f7d34f0c73971b42ecfd08e529affa8 Mon Sep 17 00:00:00 2001
From: cr0n <cr0n@cypherpunks.cc>
Date: Fri, 10 Apr 2026 21:59:13 +0200
Subject: [PATCH 380/389] necesse-server: 1.1.1-21292486 -> 1.2.0-22728942

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

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index e0800c4b5fbe..73e8e1bf9b73 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.1.1-21292486";
+  version = "1.2.0-22728942";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-KPm11k4wLRraB0u3BwOUofC6dQO2yRra+Rk6M0UKG7U=";
+    hash = "sha256-kSBql3oHG368DczSM7FkWeAZcfTrNP1x31LX7HRrgTE=";
   };
 
   # removing packaged jre since we use our own

From 6fa596ebe38e570f936138ed043f6cfd13316931 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 20:03:10 +0000
Subject: [PATCH 381/389] dcp: 0.22.11 -> 0.23.0

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

diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix
index ff584f8debcd..1102274a57d3 100644
--- a/pkgs/by-name/dc/dcp/package.nix
+++ b/pkgs/by-name/dc/dcp/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dcp";
-  version = "0.22.11";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "dcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pf3vUmdUHUuPts7bwzjxGF3RXpWXz3HaHujz8UKSPbs=";
+    hash = "sha256-gpMH6oeFbfRuRiIoLXTeqCSyaGr6aS9Y1zq5x1bEiZw=";
   };
 
-  vendorHash = "sha256-n+F7YPU6/UfxN1nZ+K5UvIR7vav/trRPWdLc1izpNAU=";
+  vendorHash = "sha256-JO8++V4LyzX6aDdZNdzDD3EqdUdVvT4Jsjh/e6nqVgs=";
 
   # This is required so we:
   # - Delete an inconsistent vendor directory from upstream

From 2bf9dd1aca6bba8a0b4cacb2156797fcac6c736f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 20:10:27 +0000
Subject: [PATCH 382/389] fastly: 14.2.0 -> 14.3.0

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

diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix
index 7d2d7df1f49e..8e1736c3adb0 100644
--- a/pkgs/by-name/fa/fastly/package.nix
+++ b/pkgs/by-name/fa/fastly/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fastly";
-  version = "14.2.0";
+  version = "14.3.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pz1lK/A4PK41SNZgXLh041a8KQMH8zDuQevWQReffYU=";
+    hash = "sha256-lUhBSx6iPKk4j4jkSaSM4UrJkX84XJVgziayRlZ7bcg=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-/pLaVfP/qnfcGNClhkhYB3Au8tEz1Tiw2HM7IiKfhPs=";
+  vendorHash = "sha256-XzfsPSG0gEXhlAF9O3VGNn8FGXlvXFxqX7kffQDdsRA=";
 
   nativeBuildInputs = [
     installShellFiles

From e5e447ca8ebb2588cccfa6f05b763ba143415ea9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 20:28:07 +0000
Subject: [PATCH 383/389] python3Packages.wassima: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index 629297879e9a..67196d717211 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "wassima";
-  version = "2.0.5";
+  version = "2.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
     tag = version;
-    hash = "sha256-qfsoo+y8lbQomyBRltTsPp/OCPL/f1S0bzW9KwKabuA=";
+    hash = "sha256-k7gLLSfVVCk2YO7WRof3s3L2DVgFitQl9KRq9Bc+fJ8=";
   };
 
   build-system = [ hatchling ];

From c597e8aff4b7498c0e4447e0737b14af870d7024 Mon Sep 17 00:00:00 2001
From: Lorenz Bischof <1837725+LorenzBischof@users.noreply.github.com>
Date: Fri, 10 Apr 2026 17:40:56 +0200
Subject: [PATCH 384/389] kyverno: add LorenzBischof as maintainer

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

diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index 389fc7b12a3f..9d599d216bf3 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -56,6 +56,9 @@ buildGoModule (finalAttrs: {
     homepage = "https://kyverno.io/";
     changelog = "https://github.com/kyverno/kyverno/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ Scrumplex ];
+    maintainers = with lib.maintainers; [
+      LorenzBischof
+      Scrumplex
+    ];
   };
 })

From 3fa195e66e8f9e7dbf8610ad48d79de4a9d157cc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 11 Apr 2026 00:16:33 +0300
Subject: [PATCH 385/389] linux-firmware: 20260309 -> 20260410

Diff: https://gitlab.com/kernel-firmware/linux-firmware/-/compare/20260309...20260410
---
 pkgs/by-name/li/linux-firmware/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index 0ff710016fd6..21ea63d5ae1d 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20260309";
+  version = "20260410";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-IG7RN7m+VwFkdGRNv2FZSLumlo0FT47PBE16o8Xahxg=";
+    hash = "sha256-nceQEGm6+Cj6KCeUNwmYsUdArRULfLXysXjzOXdCBQw=";
   };
 
   postUnpack = ''

From 77b09bf23ae392390ee3ff9327ea927e17aec953 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Wed, 8 Apr 2026 14:48:11 -0700
Subject: [PATCH 386/389] phira{,-unwrapped,-free}: 0.6.7 -> 0.7.1

---
 pkgs/by-name/ph/phira-unwrapped/assets.patch  |  6 +--
 pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch  | 41 ++++++++++---------
 pkgs/by-name/ph/phira-unwrapped/package.nix   | 12 +++---
 .../ph/phira-unwrapped/stable-features.patch  | 10 -----
 pkgs/by-name/ph/phira-unwrapped/tracing.patch | 14 +++----
 pkgs/by-name/ph/phira/package.nix             | 24 +++++++----
 6 files changed, 54 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/by-name/ph/phira-unwrapped/stable-features.patch

diff --git a/pkgs/by-name/ph/phira-unwrapped/assets.patch b/pkgs/by-name/ph/phira-unwrapped/assets.patch
index eeb26be0b563..9d3c034bb1ac 100644
--- a/pkgs/by-name/ph/phira-unwrapped/assets.patch
+++ b/pkgs/by-name/ph/phira-unwrapped/assets.patch
@@ -1,11 +1,11 @@
 diff --git a/prpr/src/core.rs b/prpr/src/core.rs
-index 7f9d4db..33c44bb 100644
+index 24589df..7101fde 100644
 --- a/prpr/src/core.rs
 +++ b/prpr/src/core.rs
-@@ -68,6 +68,14 @@ thread_local! {
- }
+@@ -72,6 +72,14 @@ thread_local! {
  
  pub fn init_assets() {
+     #[cfg(not(target_env = "ohos"))]
 +    if let Ok(root_path) = std::env::var("PHIRA_ROOT") {
 +        let path = std::path::Path::new(&root_path);
 +        if path.exists() {
diff --git a/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
index 70912ebdb111..a517f471722f 100644
--- a/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
+++ b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
@@ -1,16 +1,19 @@
 diff --git a/prpr-avc/Cargo.toml b/prpr-avc/Cargo.toml
-index 257c575..bf35b10 100644
+index eea4b7b..134e02b 100644
 --- a/prpr-avc/Cargo.toml
 +++ b/prpr-avc/Cargo.toml
-@@ -9,3 +9,6 @@ edition = "2021"
- sasa = { git = "https://github.com/Mivik/sasa", default-features = false }
- thiserror = "1.0.56"
- tracing = "0.1.37"
-+
+@@ -9,6 +9,9 @@ edition = "2021"
+ thiserror = "2.0.18"
+ tracing = { workspace = true }
+ 
 +[build-dependencies]
 +pkg-config = "0.3"
++
+ [target.'cfg(target_env = "ohos")'.dependencies]
+ sasa = { workspace = true, default-features = false, features = ["ohos"] }
+ 
 diff --git a/prpr-avc/build.rs b/prpr-avc/build.rs
-index 961b032..6d0b714 100644
+index 961b032..eb2c684 100644
 --- a/prpr-avc/build.rs
 +++ b/prpr-avc/build.rs
 @@ -1,10 +1,7 @@
@@ -28,26 +31,26 @@ index 961b032..6d0b714 100644
 +    }
  }
 diff --git a/prpr-avc/src/ffi.rs b/prpr-avc/src/ffi.rs
-index 8218ef3..a2c7f6a 100644
+index c1060be..5dfcb6c 100644
 --- a/prpr-avc/src/ffi.rs
 +++ b/prpr-avc/src/ffi.rs
-@@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3;
+@@ -10,7 +10,6 @@ pub const AV_ROUND_UP: AVRounding = 0;
  
- pub const AV_ROUND_UP: AVRounding = 0;
+ pub const AVSEEK_FLAG_BACKWARD: i32 = 1;
  
 -#[link(name = "avformat", kind = "static")]
  extern "C" {
      pub fn avformat_alloc_context() -> *mut AVFormatContext;
      pub fn avformat_free_context(s: *mut AVFormatContext);
-@@ -20,7 +19,6 @@ extern "C" {
-     pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int;
+@@ -30,7 +29,6 @@ extern "C" {
+     ) -> ::std::os::raw::c_int;
  }
  
 -#[link(name = "avutil", kind = "static")]
  extern "C" {
      pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int;
      pub fn av_frame_alloc() -> *mut AVFrame;
-@@ -29,7 +27,6 @@ extern "C" {
+@@ -39,7 +37,6 @@ extern "C" {
      pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64;
  }
  
@@ -55,15 +58,15 @@ index 8218ef3..a2c7f6a 100644
  extern "C" {
      pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec;
      pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext;
-@@ -43,7 +40,6 @@ extern "C" {
-     pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat;
+@@ -54,7 +51,6 @@ extern "C" {
+     pub fn avcodec_flush_buffers(avctx: *mut AVCodecContext);
  }
  
 -#[link(name = "swscale", kind = "static")]
  extern "C" {
      pub fn sws_getContext(
          srcW: ::std::os::raw::c_int,
-@@ -68,10 +64,9 @@ extern "C" {
+@@ -79,10 +75,9 @@ extern "C" {
      ) -> ::std::os::raw::c_int;
  }
  
@@ -76,7 +79,7 @@ index 8218ef3..a2c7f6a 100644
          out_ch_layout: i64,
          out_sample_fmt: AVSampleFormat,
          out_sample_rate: ::std::os::raw::c_int,
-@@ -80,7 +75,7 @@ extern "C" {
+@@ -91,7 +86,7 @@ extern "C" {
          in_sample_rate: ::std::os::raw::c_int,
          log_offset: ::std::os::raw::c_int,
          log_ctx: *mut ::std::os::raw::c_void,
@@ -86,7 +89,7 @@ index 8218ef3..a2c7f6a 100644
      pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64;
      pub fn swr_convert(
 diff --git a/prpr-avc/src/swr.rs b/prpr-avc/src/swr.rs
-index 7288a51..c00b874 100644
+index f2a18f8..9128ef6 100644
 --- a/prpr-avc/src/swr.rs
 +++ b/prpr-avc/src/swr.rs
 @@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr<ffi::SwrContext>);
@@ -106,7 +109,7 @@ index 7288a51..c00b874 100644
                  0,
                  null_mut(),
 -            ))
--            .map(|ctx| Self(ctx))
+-            .map(Self)
 -            .ok_or(Error::AllocationFailed)
 +            );
 +            if ret < 0 || raw.is_null() {
diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix
index ee551e73766c..1daece210526 100644
--- a/pkgs/by-name/ph/phira-unwrapped/package.nix
+++ b/pkgs/by-name/ph/phira-unwrapped/package.nix
@@ -14,13 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "phira-unwrapped";
-  version = "0.6.7";
+  version = "0.7.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "TeamFlos";
     repo = "phira";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4WIvLfKeh+quu7dHKMlUKt+NQnui2/txlFYZoU3voPA=";
+    hash = "sha256-bn1vRxL4O32Txna3RqafOzXISziDiL//S8NwiIK5c4M=";
   };
 
   nativeBuildInputs = [
@@ -44,9 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # use dynamically linked ffmpeg instead of expecting static lib
     ./ffmpeg.patch
 
-    # error[E0554]: `#![feature]` may not be used on the stable release channel
-    ./stable-features.patch
-
     # missing macro from tracing crate
     ./tracing.patch
 
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./assets.patch
   ];
 
-  cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI=";
+  cargoHash = "sha256-a+bQ5d9n18jrsgnqygBlMKWlu7KPU5tbQQSXRXE5zWY=";
 
   # The developer put assets necessary for this test in gitignore, so it cannot run.
   checkFlags = [ "--skip=test_parse_chart" ];
diff --git a/pkgs/by-name/ph/phira-unwrapped/stable-features.patch b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch
deleted file mode 100644
index 9aac943305b1..000000000000
--- a/pkgs/by-name/ph/phira-unwrapped/stable-features.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/prpr/src/lib.rs b/prpr/src/lib.rs
-index 15a139f..6b4e469 100644
---- a/prpr/src/lib.rs
-+++ b/prpr/src/lib.rs
-@@ -1,5 +1,3 @@
--#![feature(local_key_cell_methods)]
--
- pub mod bin;
- pub mod config;
- pub mod core;
diff --git a/pkgs/by-name/ph/phira-unwrapped/tracing.patch b/pkgs/by-name/ph/phira-unwrapped/tracing.patch
index d1366f439f73..af12320f72fd 100644
--- a/pkgs/by-name/ph/phira-unwrapped/tracing.patch
+++ b/pkgs/by-name/ph/phira-unwrapped/tracing.patch
@@ -1,17 +1,17 @@
 diff --git a/phira-monitor/Cargo.toml b/phira-monitor/Cargo.toml
-index 722a022..899b7db 100644
+index f706fb1..1af4ff4 100644
 --- a/phira-monitor/Cargo.toml
 +++ b/phira-monitor/Cargo.toml
-@@ -15,6 +15,7 @@ serde = { version = "*", features = ["derive"] }
- serde_yaml = "*"
+@@ -24,6 +24,7 @@ serde_json = { workspace = true }
+ serde_yaml = { workspace = true }
  tokio = { workspace = true }
- uuid = { version = "1.4.0", features = ["v4"] }
+ uuid = { workspace = true, features = ["v4"] }
 +tracing = "0.1"
  
- phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
- phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
+ phira-mp-client = { workspace = true }
+ phira-mp-common = { workspace = true }
 diff --git a/phira-monitor/src/main.rs b/phira-monitor/src/main.rs
-index 61bcfba..a4bf8af 100644
+index 809a7c4..e780566 100644
 --- a/phira-monitor/src/main.rs
 +++ b/phira-monitor/src/main.rs
 @@ -14,6 +14,7 @@ use prpr::{
diff --git a/pkgs/by-name/ph/phira/package.nix b/pkgs/by-name/ph/phira/package.nix
index 3fb1d9098adc..590eac607de1 100644
--- a/pkgs/by-name/ph/phira/package.nix
+++ b/pkgs/by-name/ph/phira/package.nix
@@ -6,10 +6,13 @@
   phira-unwrapped,
   makeWrapper,
   libGL,
+  libx11,
+  libxi,
+  libxcursor,
   # A derivation or a path that contains a dir `assets`.
   overrideAssets ? fetchzip {
-    url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-v${phira-unwrapped.version}.zip";
-    hash = "sha256-kgmIIIzg+wxyspQTyW1GucW0RVPfBhIRlK5DEGXK1Qs=";
+    url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-x86_64-v${phira-unwrapped.version}.zip";
+    hash = "sha256-p0+o7q42caHqVWnHtgknYaCIJemG/9fNKF7pqTnRGE4=";
     stripRoot = false;
     meta.license = lib.licenses.unfree;
   },
@@ -29,14 +32,19 @@ symlinkJoin {
     cp -r ${overrideAssets}/assets $phira_root
 
     wrapper_options=(
-      ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"}
+      ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          libGL
+          libx11
+          libxi
+          libxcursor
+        ]
+      }"}
       --run '
         export PHIRA_ROOT=''${PHIRA_ROOT-"''${XDG_DATA_HOME-"$HOME/.local/share"}/phira"}
-        if [[ ! -d "$PHIRA_ROOT/assets" ]]; then
-          mkdir -p "$PHIRA_ROOT"
-          cp -r "'$phira_root/assets'" "$PHIRA_ROOT"
-          chmod -R +w "$PHIRA_ROOT/assets"
-        fi
+        mkdir -p "$PHIRA_ROOT"
+        cp -L -r --update=none "'$phira_root/assets'" "$PHIRA_ROOT"
+        chmod -R +w "$PHIRA_ROOT/assets"
       '
     )
 

From 146a5c979e26d0cf785c14cd5aaf4ed71c2c4b4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 22:09:51 +0000
Subject: [PATCH 387/389] copilot-language-server: 1.463.0 -> 1.467.0

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

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index eb635cd0186e..7c0d40bcd392 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.463.0";
+  version = "1.467.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-mxmHXLxWGb+cHrRgctX2PHGAVy4ZTY1+7C9gzeh0vdc=";
+    hash = "sha256-JSxuYBeMKTiBOSQk4IGcst0YYcXGi4V0D4EkJfEbPzo=";
     stripRoot = false;
   };
 

From 3aa68cb35958f278ae7656a97624f2cde6eacfce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 22:36:12 +0000
Subject: [PATCH 388/389] v2ray-domain-list-community: 20260331044442 ->
 20260409151144

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index df58226d8ccc..ac8fee64001a 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20260331044442";
+    version = "20260409151144";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-3iDOpqVPFXxqc2VyrIU2hPLCzS8nvpgJAMFOToeEqBE=";
+      hash = "sha256-/GFcIoRMv0AB5m4z0kL3Gh51cVqeil9MpnAOcwvudxE=";
     };
     vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk=";
     meta = {

From c1c8be3c2ef57bfa38dfd1acece7125f31ab7205 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Apr 2026 17:11:01 +0000
Subject: [PATCH 389/389] python3Packages.shimmy: 2.0.0 -> 2.0.1

Diff: https://github.com/Farama-Foundation/Shimmy/compare/v2.0.0...v2.0.1

Changelog: https://github.com/Farama-Foundation/Shimmy/releases/tag/v2.0.1
---
 .../python-modules/shimmy/default.nix         | 31 ++++---------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix
index 79df5decf66e..d807cb51fb98 100644
--- a/pkgs/development/python-modules/shimmy/default.nix
+++ b/pkgs/development/python-modules/shimmy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -21,32 +20,18 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "shimmy";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "Shimmy";
-    tag = "v${version}";
-    hash = "sha256-/wIXjOGb3UeMQdeifYagd7OcxbBcdGPS09mjvkFsWmk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vMVvD/UNzGs6igYskQ/L+yt0v5kdjOVal0sfaTkirsU=";
   };
 
-  patches = [
-    # Shimmy tries to register some environments from `dm-control` that require unpackaged `labmaze`.
-    # This prevents from importing `shimmy` itself by crashing with a `ModuleNotFoundError`.
-    # This patch imports those environments lazily.
-    #
-    # TODO: get rid of this patch at the next release as the issue has been fixed upstream:
-    # https://github.com/Farama-Foundation/Shimmy/pull/125
-    (fetchpatch {
-      name = "prevent-labmaze-import-crash";
-      url = "https://github.com/Farama-Foundation/Shimmy/commit/095d576f6aae15a09a1e426138629ce9f43a3c04.patch";
-      hash = "sha256-rr9l3tHunYFk0j7hfo9IaSRlogAtwXoXcQ0zuU/TL8c=";
-    })
-  ];
-
   build-system = [
     setuptools
   ];
@@ -76,10 +61,6 @@ buildPythonPackage rec {
     "tests/test_openspiel.py"
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTests = [
     # Require network access
     "test_check_env[bsuite/mnist_noise-v0]"
@@ -103,10 +84,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/Farama-Foundation/Shimmy/releases/tag/v${version}";
+    changelog = "https://github.com/Farama-Foundation/Shimmy/releases/tag/${finalAttrs.src.tag}";
     description = "API conversion tool for popular external reinforcement learning environments";
     homepage = "https://github.com/Farama-Foundation/Shimmy";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})