From 740cc14fade08d1878ffc5dbb8d652335121957e Mon Sep 17 00:00:00 2001
From: Haylin Moore <me@haylinmoore.com>
Date: Sat, 5 Apr 2025 17:39:28 -0400
Subject: [PATCH 01/43] ygot: init at 0.30.0 Co-authored-by: awwpotato
 <153149335+awwpotato@users.noreply.github.com>

---
 pkgs/by-name/yg/ygot/package.nix | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/yg/ygot/package.nix

diff --git a/pkgs/by-name/yg/ygot/package.nix b/pkgs/by-name/yg/ygot/package.nix
new file mode 100644
index 000000000000..4ae8cbf1015b
--- /dev/null
+++ b/pkgs/by-name/yg/ygot/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "ygot";
+  version = "0.30.0";
+
+  src = fetchFromGitHub {
+    owner = "openconfig";
+    repo = "ygot";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nV0vh4KZtXEMc8BNRkrRVwgb59KWahkqROxu9/7xP/E=";
+  };
+
+  vendorHash = "sha256-MxyjO/uptmBXz+JWgRcP/SWeEWyz9pNA9eM4Rul45cM=";
+
+  excludedPackages = [
+    "demo/*"
+    "exampleoc"
+    "integration_tests/"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall =
+    ''
+      # The normal binary names are far too generic
+      mv $out/bin/generator $out/bin/ygot_generator
+      mv $out/bin/proto_generator $out/bin/ygot_proto_generator
+    ''
+    + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+      let
+        emulator = stdenv.hostPlatform.emulator buildPackages;
+      in
+      ''
+        installShellCompletion --cmd gnmidiff \
+          --bash <(${emulator} $out/bin/gnmidiff completion bash) \
+          --zsh <(${emulator} $out/bin/gnmidiff completion zsh) \
+          --fish <(${emulator} $out/bin/gnmidiff completion fish)
+      ''
+    );
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Collection of Go utilities for interacting with YANG modules";
+    homepage = "https://github.com/openconfig/ygot";
+    changelog = "https://github.com/openconfig/ygot/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.haylin ];
+    mainProgram = "ygot_generator";
+  };
+})

From 942a3ba0c66b2c0344e143094481c34df34be5f2 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Wed, 15 Jan 2025 10:53:15 +0000
Subject: [PATCH 02/43] joplin-desktop: add multiarch update script

---
 pkgs/by-name/jo/joplin-desktop/package.nix    | 26 ++++-----------
 .../jo/joplin-desktop/release-data.json       | 15 +++++++++
 pkgs/by-name/jo/joplin-desktop/update.py      | 32 +++++++++++++++++++
 3 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/jo/joplin-desktop/release-data.json
 create mode 100755 pkgs/by-name/jo/joplin-desktop/update.py

diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
index 4eeb4fb028be..dc953f8dc1fa 100644
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -9,29 +9,13 @@
 
 let
   pname = "joplin-desktop";
-  version = "3.1.24";
+  inherit (releaseData) version;
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
 
-  suffix =
-    {
-      x86_64-linux = ".AppImage";
-      x86_64-darwin = ".dmg";
-      aarch64-darwin = "-arm64.dmg";
-    }
-    .${system} or throwSystem;
-
-  src = fetchurl {
-    url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
-    sha256 =
-      {
-        x86_64-linux = "sha256-ImFB4KwJ/vAHtZUbLAdnIRpd+o2ZaXKy9luw/jnPLSE=";
-        x86_64-darwin = "sha256-Of6VXX40tCis+ou26LtJKOZm/87P3rsTHtnvSDwF8VY=";
-        aarch64-darwin = "sha256-HtHuZQhIkiI8GrhB9nCOTAN1hOs+9POJFRIsRUNikYs=";
-      }
-      .${system} or throwSystem;
-  };
+  releaseData = lib.importJSON ./release-data.json;
+  src = fetchurl releaseData.${system} or throwSystem;
 
   appimageContents = appimageTools.extractType2 {
     inherit pname version src;
@@ -82,6 +66,8 @@ let
       substituteInPlace $out/share/applications/joplin.desktop \
         --replace-fail 'Exec=AppRun' 'Exec=joplin-desktop'
     '';
+
+    passthru.updateScript = ./update.py;
   };
 
   darwin = stdenv.mkDerivation {
@@ -108,6 +94,8 @@ let
       cp -R Joplin.app $out/Applications
       runHook postInstall
     '';
+
+    passthru.updateScript = ./update.py;
   };
 in
 if stdenv.hostPlatform.isDarwin then darwin else linux
diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json
new file mode 100644
index 000000000000..0416b67a8273
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-desktop/release-data.json
@@ -0,0 +1,15 @@
+{
+  "version": "3.1.24",
+  "x86_64-linux": {
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.1.24/Joplin-3.1.24.AppImage",
+    "sha256": "089drwwzxc2vysr74scripx5s6i1cw3jq6wmnl3z1zh9mkh42q92"
+  },
+  "x86_64-darwin": {
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.1.24/Joplin-3.1.24.dmg",
+    "sha256": "0mpi0ly4ivyr3q9vppngrvzndri896xyidlbzan2id1lgrfrbzir"
+  },
+  "aarch64-darwin": {
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.1.24/Joplin-3.1.24-arm64.dmg",
+    "sha256": "12wic91lab0j2n4z7x1yxf27a0scirqgchdq38y254j811jyxl8y"
+  }
+}
\ No newline at end of file
diff --git a/pkgs/by-name/jo/joplin-desktop/update.py b/pkgs/by-name/jo/joplin-desktop/update.py
new file mode 100755
index 000000000000..f96e26a59102
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-desktop/update.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p 'python3.withPackages(ps: [ps.requests ps.plumbum])' nix-prefetch
+import json
+import requests
+
+from pathlib import Path
+
+from plumbum.cmd import nix_prefetch_url
+
+HERE = Path(__file__).parent
+SUFFIXES = (
+    ("x86_64-linux", ".AppImage"),
+    ("x86_64-darwin", ".dmg"),
+    ("aarch64-darwin", "-arm64.dmg"),
+)
+
+latest = requests.get(
+    "https://api.github.com/repos/laurent22/joplin/releases/latest"
+).json()
+tag = latest["tag_name"]
+version = tag[1:]
+release = {
+    "version": version,
+}
+
+for arch, suffix in SUFFIXES:
+    url = f"https://github.com/laurent22/joplin/releases/download/v{version}/Joplin-{version}{suffix}"
+    release[arch] = {"url": url, "sha256": nix_prefetch_url(url).strip()}
+
+with HERE.joinpath("release-data.json").open("w") as fd:
+    json.dump(release, fd, indent=2)
+    fd.write("\n")

From bc3375196af1aad1aef766366d929665f0dfff2b Mon Sep 17 00:00:00 2001
From: Jairo Llopis <973709+yajo@users.noreply.github.com>
Date: Sat, 5 Apr 2025 09:35:52 +0100
Subject: [PATCH 03/43] joplin-desktop: fix desktop assets path

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

diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
index dc953f8dc1fa..2fcab1654d77 100644
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -61,8 +61,8 @@ let
     extraInstallCommands = ''
       wrapProgram $out/bin/joplin-desktop \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-      install -Dm644 ${appimageContents}/@joplinapp-desktop.desktop $out/share/applications/joplin.desktop
-      install -Dm644 ${appimageContents}/@joplinapp-desktop.png $out/share/pixmaps/joplin.png
+      install -Dm644 ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop
+      install -Dm644 ${appimageContents}/joplin.png $out/share/pixmaps/joplin.png
       substituteInPlace $out/share/applications/joplin.desktop \
         --replace-fail 'Exec=AppRun' 'Exec=joplin-desktop'
     '';

From c252ce32740d1efe70e617d8f4c061bdab8bf6b7 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Thu, 27 Feb 2025 17:35:22 +0000
Subject: [PATCH 04/43] joplin-desktop: 3.1.24 -> 3.2.13

Co-authored-by: HHR2020 <76608828+HHR2020@users.noreply.github.com>
---
 pkgs/by-name/jo/joplin-desktop/release-data.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json
index 0416b67a8273..3d0d7593ee53 100644
--- a/pkgs/by-name/jo/joplin-desktop/release-data.json
+++ b/pkgs/by-name/jo/joplin-desktop/release-data.json
@@ -1,15 +1,15 @@
 {
-  "version": "3.1.24",
+  "version": "3.2.13",
   "x86_64-linux": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.1.24/Joplin-3.1.24.AppImage",
-    "sha256": "089drwwzxc2vysr74scripx5s6i1cw3jq6wmnl3z1zh9mkh42q92"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.2.13/Joplin-3.2.13.AppImage",
+    "sha256": "06xmm2annf3i8qfi8hclac3lgfssb2f3sx06vgabgsn67i8gid20"
   },
   "x86_64-darwin": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.1.24/Joplin-3.1.24.dmg",
-    "sha256": "0mpi0ly4ivyr3q9vppngrvzndri896xyidlbzan2id1lgrfrbzir"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.2.13/Joplin-3.2.13.dmg",
+    "sha256": "1z9lp07z85jf1g2rwzn4q5kssfqqb921lfqgkjkjnz12padf3kpf"
   },
   "aarch64-darwin": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.1.24/Joplin-3.1.24-arm64.dmg",
-    "sha256": "12wic91lab0j2n4z7x1yxf27a0scirqgchdq38y254j811jyxl8y"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.2.13/Joplin-3.2.13-arm64.dmg",
+    "sha256": "0r7rfka60vrynwxdfk71mbhdwxv2rivxqc2qpzrhmz26h8vksm3h"
   }
-}
\ No newline at end of file
+}

From 7688f425bab8bd99b91dbaf9afae5b6f88a89f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 14 Apr 2025 00:58:28 +0200
Subject: [PATCH 05/43] python12Packages.textual-image: enable tests

---
 pkgs/development/python-modules/textual-image/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix
index 9449d2295752..90e866c8ad0c 100644
--- a/pkgs/development/python-modules/textual-image/default.nix
+++ b/pkgs/development/python-modules/textual-image/default.nix
@@ -9,6 +9,7 @@
   # tests
   pillow,
   pytestCheckHook,
+  syrupy,
 
   setuptools,
 }:
@@ -34,11 +35,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    syrupy
   ];
 
   pythonImportsCheck = [ "textual_image" ];
 
-  doCheck = false; # tests require [syrupy](https://github.com/syrupy-project/syrupy)
+  doCheck = true;
 
   meta = {
     description = "Render images in the terminal with Textual and rich";

From dd0f4e56fdc77114c9fe9733d7ae3c77ccc7abb2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 15 Apr 2025 09:07:47 -0500
Subject: [PATCH 06/43] weylus: Migrate to by-name

---
 .../graphics => by-name/we}/weylus/Cargo.lock            | 0
 .../weylus/default.nix => by-name/we/weylus/package.nix} | 0
 pkgs/top-level/all-packages.nix                          | 9 ---------
 3 files changed, 9 deletions(-)
 rename pkgs/{applications/graphics => by-name/we}/weylus/Cargo.lock (100%)
 rename pkgs/{applications/graphics/weylus/default.nix => by-name/we/weylus/package.nix} (100%)

diff --git a/pkgs/applications/graphics/weylus/Cargo.lock b/pkgs/by-name/we/weylus/Cargo.lock
similarity index 100%
rename from pkgs/applications/graphics/weylus/Cargo.lock
rename to pkgs/by-name/we/weylus/Cargo.lock
diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/by-name/we/weylus/package.nix
similarity index 100%
rename from pkgs/applications/graphics/weylus/default.nix
rename to pkgs/by-name/we/weylus/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b03ffcc2e61f..26ae2a60d331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1113,15 +1113,6 @@ with pkgs;
 
   fontbakery = with python3Packages; toPythonApplication fontbakery;
 
-  weylus = callPackage ../applications/graphics/weylus {
-    inherit (darwin.apple_sdk.frameworks)
-      ApplicationServices
-      Carbon
-      Cocoa
-      VideoToolbox
-      ;
-  };
-
   genealogos-api = genealogos-cli.override {
     crate = "api";
   };

From 9d93fe39b6d1af69b59d69a8aaadd1c98cb5c6d8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 15 Apr 2025 09:42:10 -0500
Subject: [PATCH 07/43] Update Cargo.lock

---
 pkgs/by-name/we/weylus/Cargo.lock  | 2027 +++++++++++++++-------------
 pkgs/by-name/we/weylus/package.nix |   21 +-
 2 files changed, 1068 insertions(+), 980 deletions(-)

diff --git a/pkgs/by-name/we/weylus/Cargo.lock b/pkgs/by-name/we/weylus/Cargo.lock
index 00a843910e0b..56f7e330b89b 100644
--- a/pkgs/by-name/we/weylus/Cargo.lock
+++ b/pkgs/by-name/we/weylus/Cargo.lock
@@ -2,6 +2,27 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -9,54 +30,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.18"
+name = "anstream"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
- "memchr",
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "anstyle"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
- "winapi",
+ "utf8parse",
 ]
 
 [[package]]
-name = "anyhow"
-version = "1.0.57"
+name = "anstyle-query"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "anstyle-wincon"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
+ "anstyle",
+ "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "atomic_refcell"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
+
 [[package]]
 name = "autocfg"
-version = "0.1.8"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "autopilot"
@@ -76,23 +114,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "base64"
-version = "0.9.3"
+name = "backtrace"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
- "byteorder",
- "safemem",
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide 0.8.0",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "base64"
-version = "0.10.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "bitflags"
@@ -100,6 +140,15 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -108,62 +157,64 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "block-buffer"
-version = "0.7.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
  "generic-array",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
 [[package]]
 name = "bytemuck"
-version = "1.9.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.1.0"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+
+[[package]]
+name = "captrs"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad312f1be0ea3cce9ad0cdbace33350ea0781f138d7b49bfe191df0aa83db1b"
+dependencies = [
+ "dxgcap",
+ "x11cap",
+]
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-expr"
-version = "0.10.2"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5"
+checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c"
 dependencies = [
  "smallvec",
+ "target-lexicon",
 ]
 
 [[package]]
@@ -172,40 +223,60 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "checked_int_cast"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
-
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
 dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
+ "clap_builder",
+ "clap_derive",
 ]
 
 [[package]]
-name = "cloudabi"
-version = "0.0.3"
+name = "clap_builder"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
 dependencies = [
- "bitflags",
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
 ]
 
+[[package]]
+name = "clap_complete"
+version = "4.5.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
 [[package]]
 name = "cmake"
-version = "0.1.48"
+version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
+checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
 dependencies = [
  "cc",
 ]
@@ -216,11 +287,11 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "block",
  "core-foundation 0.7.0",
  "core-graphics 0.19.2",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "objc",
 ]
@@ -231,6 +302,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
 [[package]]
 name = "core-foundation"
 version = "0.7.0"
@@ -243,11 +320,11 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
 dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.7",
  "libc",
 ]
 
@@ -259,9 +336,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core-graphics"
@@ -269,96 +346,103 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation 0.7.0",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
 ]
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags",
- "core-foundation 0.9.3",
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
- "bitflags",
- "core-foundation 0.9.3",
- "foreign-types",
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.4"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.8"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg 1.1.0",
- "cfg-if",
  "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "cfg-if",
- "lazy_static",
+ "generic-array",
+ "typenum",
 ]
 
 [[package]]
 name = "dbus"
-version = "0.9.5"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce"
+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
 dependencies = [
  "libc",
  "libdbus-sys",
@@ -375,79 +459,130 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
 [[package]]
 name = "digest"
-version = "0.8.1"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "generic-array",
+ "block-buffer",
+ "crypto-common",
 ]
 
 [[package]]
 name = "dirs"
-version = "4.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dxgcap"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18a3f3df51c509e7c8d2807c63abfecdea1a83def81baec83d68c6f5bb8ac654"
+dependencies = [
  "winapi",
+ "wio",
 ]
 
 [[package]]
 name = "either"
-version = "1.6.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
-name = "fake-simd"
-version = "0.1.2"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "fastwebsockets"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26da0c7b5cef45c521a6f9cdfffdfeb6c9f5804fbac332deb5ae254634c7a6be"
+dependencies = [
+ "base64",
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "pin-project",
+ "rand 0.8.5",
+ "sha1",
+ "simdutf8",
+ "thiserror",
+ "tokio",
+ "utf-8",
+]
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.8.0",
+]
 
 [[package]]
 name = "fltk"
-version = "1.3.6"
+version = "1.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ab2f73e2c40921098e1d6b8e82887b37823dee2412ffab147219562251e0c0"
+checksum = "f8f81f9ebf85aeaad76e43362cc2bb1d926e5daca1327dc0a094d00c86a95ebb"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "crossbeam-channel",
  "fltk-sys",
+ "once_cell",
  "paste",
  "ttf-parser",
 ]
 
 [[package]]
 name = "fltk-sys"
-version = "1.3.5"
+version = "1.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fef608d4752f3eec2dc30818be069ead5a6f20d173cb3b154776812041e465d"
+checksum = "30bbe32c3f9f72469e2cf2a62edc74ef990b81c2caf082f53fd67060ce0c9893"
 dependencies = [
  "cmake",
 ]
 
+[[package]]
+name = "fltk-theme"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03302d43154c9c51b4297a96f40c85ea913bb15ea27b6a38665284ddae8ac3d7"
+dependencies = [
+ "fltk",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -460,7 +595,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -470,41 +626,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
-name = "form_urlencoded"
-version = "1.0.1"
+name = "foreign-types-shared"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "matches",
- "percent-encoding 2.1.0",
+ "percent-encoding",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -512,24 +667,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "futures-sink"
-version = "0.3.21"
+name = "futures-macro"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
+ "futures-macro",
  "futures-task",
  "pin-project-lite",
  "pin-utils",
@@ -538,11 +705,12 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.12.4"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
+ "version_check",
 ]
 
 [[package]]
@@ -558,13 +726,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.6"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -578,61 +746,73 @@ dependencies = [
 ]
 
 [[package]]
-name = "glib"
-version = "0.15.11"
+name = "gimli"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd124026a2fa8c33a3d17a3fe59c103f2d9fa5bd92c19e029e037736729abeab"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+
+[[package]]
+name = "gio-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
 dependencies = [
- "bitflags",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "glib"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4"
+dependencies = [
+ "bitflags 2.6.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
  "futures-task",
+ "futures-util",
+ "gio-sys",
  "glib-macros",
  "glib-sys",
  "gobject-sys",
  "libc",
- "once_cell",
+ "memchr",
  "smallvec",
- "thiserror",
 ]
 
 [[package]]
 name = "glib-macros"
-version = "0.15.11"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
+checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab"
 dependencies = [
- "anyhow",
- "heck 0.4.0",
+ "heck",
  "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "glib-sys"
-version = "0.15.10"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
+checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
 dependencies = [
  "libc",
  "system-deps",
 ]
 
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
 [[package]]
 name = "gobject-sys"
-version = "0.15.10"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
+checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
 dependencies = [
  "glib-sys",
  "libc",
@@ -641,35 +821,35 @@ dependencies = [
 
 [[package]]
 name = "gstreamer"
-version = "0.18.8"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66363bacf5e4f6eb281564adc2902e44c52ae5c45082423e7439e9012b75456"
+checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140"
 dependencies = [
- "bitflags",
  "cfg-if",
  "futures-channel",
  "futures-core",
  "futures-util",
  "glib",
  "gstreamer-sys",
+ "itertools",
  "libc",
  "muldiv",
  "num-integer",
- "num-rational 0.4.0",
+ "num-rational 0.4.2",
  "once_cell",
  "option-operations",
  "paste",
- "pretty-hex",
+ "pin-project-lite",
+ "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "gstreamer-app"
-version = "0.18.7"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664adf6abc6546c1ad54492a067dcbc605032c9c789ce8f6f78cb9ddeef4b684"
+checksum = "e0c86915cc4cdfa030532301a46c725e0ce0c6c2b57a68c44ce9b34db587e552"
 dependencies = [
- "bitflags",
  "futures-core",
  "futures-sink",
  "glib",
@@ -677,14 +857,13 @@ dependencies = [
  "gstreamer-app-sys",
  "gstreamer-base",
  "libc",
- "once_cell",
 ]
 
 [[package]]
 name = "gstreamer-app-sys"
-version = "0.18.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b401f21d731b3e5de802487f25507fabd34de2dd007d582f440fb1c66a4fbb"
+checksum = "37066c1b93ba57aa070ebc1e0a564bc1a9adda78fb0850e624861fad46fd1448"
 dependencies = [
  "glib-sys",
  "gstreamer-base-sys",
@@ -695,11 +874,11 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base"
-version = "0.18.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224f35f36582407caf58ded74854526beeecc23d0cf64b8d1c3e00584ed6863f"
+checksum = "ed5d73cb5cbf229c8904fba5ff93b1863f186bccc062064c1b2a9000750cc06e"
 dependencies = [
- "bitflags",
+ "atomic_refcell",
  "cfg-if",
  "glib",
  "gstreamer",
@@ -709,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base-sys"
-version = "0.18.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a083493c3c340e71fa7c66eebda016e9fafc03eb1b4804cf9b2bad61994b078e"
+checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -722,9 +901,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-sys"
-version = "0.18.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3517a65d3c2e6f8905b456eba5d53bda158d664863aef960b44f651cb7d33e2"
+checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -734,11 +913,10 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video"
-version = "0.18.7"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9418adfc72dafa1ad9eb106527ce4804887d101027c4528ec28c7d29cc899519"
+checksum = "57332bca1ae7825a53fe57d993b63389f132d335aed691ac76f0ffe4304548e3"
 dependencies = [
- "bitflags",
  "cfg-if",
  "futures-channel",
  "glib",
@@ -747,13 +925,14 @@ dependencies = [
  "gstreamer-video-sys",
  "libc",
  "once_cell",
+ "thiserror",
 ]
 
 [[package]]
 name = "gstreamer-video-sys"
-version = "0.18.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33331b1675e73b5b000c796354278eca7fdde9327015971d9f41afe28b96e0dc"
+checksum = "0f5c334d143384e8dc714af948c2e5d7d12cb588fdcfb56f3bf37c24daf350ef"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -765,15 +944,15 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.13"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http",
  "indexmap",
  "slab",
@@ -784,53 +963,41 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "4.2.2"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b"
+checksum = "ce25b617d1375ef96eeb920ae717e3da34a02fc979fe632c75128350f9e1f74a"
 dependencies = [
- "log 0.4.17",
+ "log",
  "pest",
  "pest_derive",
- "quick-error",
  "serde",
  "serde_json",
+ "thiserror",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "http"
-version = "0.2.7"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -839,55 +1006,47 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
  "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.10.16"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-dependencies = [
- "base64 0.9.3",
- "httparse",
- "language-tags",
- "log 0.3.9",
- "mime",
- "num_cpus",
- "time",
- "traitobject",
- "typeable",
- "unicase",
- "url 1.7.2",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "h2",
  "http",
@@ -896,31 +1055,32 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "smallvec",
  "tokio",
- "tower-service",
- "tracing",
  "want",
 ]
 
 [[package]]
-name = "idna"
-version = "0.1.5"
+name = "hyper-util"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "matches",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -944,26 +1104,23 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.23.14"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
 dependencies = [
  "bytemuck",
- "byteorder",
- "color_quant",
- "num-iter",
- "num-rational 0.3.2",
+ "byteorder-lite",
  "num-traits",
- "png 0.16.8",
+ "png 0.17.13",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.8.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
- "autocfg 1.1.0",
+ "equivalent",
  "hashbrown",
 ]
 
@@ -978,18 +1135,33 @@ dependencies = [
 
 [[package]]
 name = "ipnetwork"
-version = "0.18.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355"
+checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.1"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[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.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jpeg-decoder"
@@ -1000,50 +1172,42 @@ dependencies = [
  "rayon",
 ]
 
-[[package]]
-name = "language-tags"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.125"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libdbus-sys"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
 dependencies = [
  "pkg-config",
 ]
 
 [[package]]
-name = "log"
-version = "0.3.9"
+name = "libredox"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "log 0.4.17",
+ "bitflags 2.6.0",
+ "libc",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lzw"
@@ -1060,68 +1224,64 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
-name = "memoffset"
-version = "0.6.5"
+name = "miniz_oxide"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "mime"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-dependencies = [
- "log 0.3.9",
+ "adler",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.3.7"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler32",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi",
  "libc",
- "log 0.4.17",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "muldiv"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3"
+checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
+
+[[package]]
+name = "no-std-net"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
 
 [[package]]
 name = "num-derive"
@@ -1136,21 +1296,20 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg 1.1.0",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -1161,47 +1320,35 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-rational"
-version = "0.3.2"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg 1.1.0",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
-dependencies = [
- "autocfg 1.1.0",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -1217,58 +1364,69 @@ dependencies = [
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.10.0"
+name = "object"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
-name = "opaque-debug"
-version = "0.2.3"
+name = "once_cell"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "option-operations"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d6113415f41b268f1195907427519769e40ee6f28cbb053795098a2c16f447"
+checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
 dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "paste"
-version = "1.0.7"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "percent-encoding"
-version = "1.0.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.1.3"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
 dependencies = [
+ "memchr",
+ "thiserror",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.1.0"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1276,33 +1434,53 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.1.3"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.1.3"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
 dependencies = [
- "maplit",
+ "once_cell",
  "pest",
- "sha-1",
+ "sha2",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -1312,35 +1490,24 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "pnet"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8750e073f82219c01e771133c64718d7685aef922da8a0d430a46aed05b6341a"
-dependencies = [
- "ipnetwork",
- "pnet_base",
- "pnet_datalink",
- "pnet_packet",
- "pnet_sys",
- "pnet_transport",
-]
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "pnet_base"
-version = "0.29.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8205fe084bd43a3af79b3155c19feddd62e733640498842e631a2ffe107d1538"
+checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7"
+dependencies = [
+ "no-std-net",
+]
 
 [[package]]
 name = "pnet_datalink"
-version = "0.29.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f85aef5e52e22ff06b1b11f2eb6d52959a9e0ecad3cb3f5cc2d78cadc077f0e"
+checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7"
 dependencies = [
  "ipnetwork",
  "libc",
@@ -1349,129 +1516,57 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "pnet_macros"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc3af95fed6dc318dfede3e81320f96ad5e237c6f7c4688108b19c8e67432d"
-dependencies = [
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "regex",
- "syn 1.0.94",
-]
-
-[[package]]
-name = "pnet_macros_support"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feaba58ba96abb218ec584d6caf0d3ff48922df05dbbeb1560553c197091b29e"
-dependencies = [
- "pnet_base",
-]
-
-[[package]]
-name = "pnet_packet"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f246edaaf1aaf82072d4cd38ee18bcc5dfc0464093f9ca39e4ac5962d68cf9d4"
-dependencies = [
- "glob",
- "pnet_base",
- "pnet_macros",
- "pnet_macros_support",
-]
-
 [[package]]
 name = "pnet_sys"
-version = "0.29.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028c87a5e3a48fc07df099a2025f2ef16add5993712e1494ba69a6707ee7ed06"
+checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b"
 dependencies = [
  "libc",
  "winapi",
 ]
 
-[[package]]
-name = "pnet_transport"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "950f2a7961e19d22e19e84ff0a6e0955013185fe149673499662633d02b41b7a"
-dependencies = [
- "libc",
- "pnet_base",
- "pnet_packet",
- "pnet_sys",
-]
-
 [[package]]
 name = "png"
 version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
- "deflate 0.7.20",
+ "deflate",
  "inflate",
 ]
 
 [[package]]
 name = "png"
-version = "0.16.8"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
- "deflate 0.8.6",
- "miniz_oxide",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide 0.7.4",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "pretty-hex"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "thiserror",
- "toml",
-]
-
-[[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 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
- "version_check 0.9.4",
-]
-
-[[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 1.0.38",
- "quote 1.0.18",
- "version_check 0.9.4",
+ "toml_edit",
 ]
 
 [[package]]
@@ -1480,34 +1575,27 @@ version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 dependencies = [
- "unicode-xid 0.1.0",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.38"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
- "unicode-xid 0.2.3",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "qrcode"
-version = "0.12.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f"
+checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec"
 dependencies = [
- "checked_int_cast",
- "image 0.23.14",
+ "image 0.25.2",
 ]
 
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
 [[package]]
 name = "quote"
 version = "0.6.13"
@@ -1519,30 +1607,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
- "proc-macro2 1.0.38",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi",
+ "proc-macro2 1.0.86",
 ]
 
 [[package]]
@@ -1555,17 +1624,18 @@ dependencies = [
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
- "rand_hc 0.2.0",
+ "rand_hc",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.1.1"
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -1579,20 +1649,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_core"
+name = "rand_chacha"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
- "rand_core 0.4.2",
+ "ppv-lite86",
+ "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -1603,12 +1668,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.1.0"
+name = "rand_core"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "rand_core 0.3.1",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -1620,140 +1685,48 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rayon"
-version = "1.5.2"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
- "autocfg 1.1.0",
- "crossbeam-deque",
  "either",
  "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.9.2"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.6",
- "redox_syscall",
+ "getrandom 0.2.15",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
-name = "regex"
-version = "1.5.5"
+name = "rustc-demangle"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scoped_threadpool"
@@ -1763,113 +1736,149 @@ checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.136"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.136"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.81"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
-name = "sha-1"
-version = "0.8.2"
+name = "serde_spanned"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
- "block-buffer",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
  "digest",
- "fake-simd",
- "opaque-debug",
 ]
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
-name = "slab"
-version = "0.4.6"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
-]
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
@@ -1879,68 +1888,66 @@ checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 dependencies = [
  "proc-macro2 0.4.30",
  "quote 0.6.13",
- "unicode-xid 0.1.0",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.94"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "unicode-xid 0.2.3",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "system-deps"
-version = "6.0.2"
+version = "7.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
 dependencies = [
  "cfg-expr",
- "heck 0.4.0",
+ "heck",
  "pkg-config",
  "toml",
  "version-compare",
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "target-lexicon"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
@@ -1956,96 +1963,101 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.18.2"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
+ "backtrace",
  "bytes",
  "libc",
- "memchr",
  "mio",
- "num_cpus",
- "once_cell",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.7.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.2"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "tower-service"
-version = "0.3.1"
+name = "toml_edit"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
 
 [[package]]
 name = "tracing"
-version = "0.1.34"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -2053,22 +2065,22 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.21"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.38",
- "quote 1.0.18",
- "syn 1.0.94",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
- "lazy_static",
+ "once_cell",
  "valuable",
 ]
 
@@ -2084,11 +2096,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.11"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
- "ansi_term",
+ "nu-ansi-term",
  "serde",
  "serde_json",
  "sharded-slab",
@@ -2097,113 +2109,80 @@ dependencies = [
  "tracing-serde",
 ]
 
-[[package]]
-name = "traitobject"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-
 [[package]]
 name = "try-lock"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ttf-parser"
-version = "0.15.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3"
-
-[[package]]
-name = "typeable"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
 
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicase"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-dependencies = [
- "version_check 0.1.5",
-]
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
-
 [[package]]
 name = "url"
-version = "1.7.2"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
-]
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna 0.2.3",
- "matches",
- "percent-encoding 2.1.0",
+ "idna",
+ "percent-encoding",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -2212,29 +2191,22 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "version-compare"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.1.5"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log 0.4.17",
  "try-lock",
 ]
 
@@ -2244,76 +2216,54 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "websocket"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723abe6b75286edc51d8ecabb38a2353f62a9e9b0588998b59111474f1dcd637"
-dependencies = [
- "hyper 0.10.16",
- "rand 0.6.5",
- "unicase",
- "url 1.7.2",
- "websocket-base",
-]
-
-[[package]]
-name = "websocket-base"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f3fd505ff930da84156389639932955fb09705b3dccd1a3d60c8e7ff62776"
-dependencies = [
- "base64 0.10.1",
- "bitflags",
- "byteorder",
- "rand 0.6.5",
- "sha-1",
-]
-
 [[package]]
 name = "weylus"
 version = "0.11.4"
 dependencies = [
  "autopilot",
- "bitflags",
+ "bitflags 2.6.0",
+ "bytes",
+ "captrs",
  "cc",
- "core-foundation 0.9.3",
- "core-graphics 0.22.3",
+ "clap",
+ "clap_complete",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
  "dbus",
  "dirs",
+ "fastwebsockets",
  "fltk",
+ "fltk-theme",
  "gstreamer",
  "gstreamer-app",
  "gstreamer-video",
  "handlebars",
- "hyper 0.14.18",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
  "image 0.22.5",
- "image 0.23.14",
+ "image 0.25.2",
  "num_cpus",
- "percent-encoding 2.1.0",
- "pnet",
+ "percent-encoding",
+ "pnet_datalink",
  "qrcode",
+ "rand 0.8.5",
  "serde",
  "serde_json",
- "structopt",
+ "signal-hook",
  "tokio",
  "toml",
  "tracing",
  "tracing-subscriber",
- "url 2.2.2",
- "websocket",
+ "url",
+ "winapi",
+ "wio",
 ]
 
 [[package]]
@@ -2340,53 +2290,198 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[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",
+ "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_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[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_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[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_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[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_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[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_msvc"
-version = "0.36.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c52ac009d615e79296318c1bcce2d422aaca15ad08515e344feeda07df67a587"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wio"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
+dependencies = [
+ "winapi",
+]
 
 [[package]]
 name = "x11"
-version = "2.19.1"
+version = "2.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd0565fa8bfba8c5efe02725b14dff114c866724eff2cfd44d76cea74bcd87a"
+checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
 dependencies = [
  "libc",
  "pkg-config",
 ]
+
+[[package]]
+name = "x11cap"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16ccedf556cb1f784d462dd8f24a7804f766d57c0051439d3e4052465263c399"
+dependencies = [
+ "libc",
+ "x11",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index 3aa61ec06d30..84503f5ad33e 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -19,21 +19,19 @@
   autoconf,
   libtool,
   typescript,
-  ApplicationServices,
-  Carbon,
-  Cocoa,
-  VideoToolbox,
+  wayland,
+  libxkbcommon,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "weylus";
-  version = "unstable-2022-06-07";
+  version = "unstable-2025-02-24";
 
   src = fetchFromGitHub {
     owner = "H-M-H";
     repo = pname;
-    rev = "b169a6be2bf3e8d105273d92f032cca5438de53a";
-    sha256 = "sha256-J9eVFIfmyBviVuT1MYKb5yoacbPqOAT3A8jahWv5qw8=";
+    rev = "5202806798ccca67c24da52ba51ee50b973b7089";
+    sha256 = "sha256-lx1ZVp5DkQiL9/vw6PAZ34Lge+K8dfEVh6vLnCUNf7M=";
   };
 
   buildInputs =
@@ -41,12 +39,6 @@ rustPlatform.buildRustPackage rec {
       ffmpeg
       x264
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ApplicationServices
-      Carbon
-      Cocoa
-      VideoToolbox
-    ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       dbus
       libva
@@ -64,6 +56,8 @@ rustPlatform.buildRustPackage rec {
       xorg.libXv
       pango
       libdrm
+      wayland
+      libxkbcommon
     ];
 
   nativeBuildInputs =
@@ -111,7 +105,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Use your tablet as graphic tablet/touch screen on your computer";
     mainProgram = "weylus";
     homepage = "https://github.com/H-M-H/Weylus";

From 1491c478345b794123c6310d91329325a5144d3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 20:24:41 +0000
Subject: [PATCH 08/43] buildkit: 0.20.2 -> 0.21.0

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

diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index 210e4d6f61cb..abd9b401f6ba 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.20.2";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-2zLXkiouPLmjxveoggsr+WUmdcZEN+FzeiVR1Dk6EA8=";
+    hash = "sha256-0QzbRswTPfO2U6lrClpAsH2QbTfE7JcMjv1Qt033UZs=";
   };
 
   vendorHash = null;

From 9c5857356fe7087c636a6f6d0a55891d0dbaf7bb Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 19 Apr 2025 17:01:20 -0600
Subject: [PATCH 09/43] picocrypt: 1.47 -> 1.48

---
 pkgs/by-name/pi/picocrypt/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index 82400038c397..3700983f5760 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo124Module,
+  buildGoModule,
   fetchFromGitHub,
   stdenv,
   copyDesktopItems,
@@ -13,20 +13,20 @@
   wrapGAppsHook3,
 }:
 
-buildGo124Module rec {
+buildGoModule (finalAttrs: {
   pname = "picocrypt";
-  version = "1.47";
+  version = "1.48";
 
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "Picocrypt";
-    tag = version;
-    hash = "sha256-O/n9dJz8cdJwldOXnsG8W8OZU5WeSmNys746HxRHvdc=";
+    tag = finalAttrs.version;
+    hash = "sha256-Gvh6t/jFRBCX+I9CYkXV265PiRSSvH6qAgkU0fA/v4A=";
   };
 
-  sourceRoot = "${src.name}/src";
+  sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-9xB0D5Og/eiWUZGMog6lBoze4GrdvBOtNAKcMc3AdIE=";
+  vendorHash = "sha256-HvtQFoAK4+DX2Mwzf5f39tTnxJcH7Dox/otlvPVczeA=";
 
   ldflags = [
     "-s"
@@ -60,7 +60,7 @@ buildGo124Module rec {
       name = "Picocrypt";
       exec = "picocrypt-gui";
       icon = "picocrypt";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
       desktopName = "Picocrypt";
       categories = [ "Utility" ];
     })
@@ -69,9 +69,9 @@ buildGo124Module rec {
   meta = {
     description = "Very small, very simple, yet very secure encryption tool, written in Go";
     homepage = "https://github.com/Picocrypt/Picocrypt";
-    changelog = "https://github.com/Picocrypt/Picocrypt/blob/${version}/Changelog.md";
+    changelog = "https://github.com/Picocrypt/Picocrypt/blob/${finalAttrs.version}/Changelog.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ ryand56 ];
     mainProgram = "picocrypt-gui";
   };
-}
+})

From 65506ebf0fcde3c871bf8b55985029cff3e6bba2 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Wed, 23 Apr 2025 00:47:38 +0300
Subject: [PATCH 10/43] nixos/unifi: refactor test and package

- use autoPatchElf
- correct supported platforms
- use finalAttrs and stdenvNoCC
- use runTest
- attest the status of the service
---
 nixos/tests/all-tests.nix         |  2 +-
 nixos/tests/unifi.nix             | 59 ++++++++++++-------------------
 pkgs/by-name/un/unifi/package.nix | 44 +++++++++++------------
 3 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a2924622576b..13701ca8765e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1395,7 +1395,7 @@ in
   ulogd = handleTest ./ulogd/ulogd.nix { };
   umurmur = handleTest ./umurmur.nix { };
   unbound = handleTest ./unbound.nix { };
-  unifi = handleTest ./unifi.nix { };
+  unifi = runTest ./unifi.nix;
   unit-php = runTest ./web-servers/unit-php.nix;
   unit-perl = handleTest ./web-servers/unit-perl.nix { };
   upnp.iptables = handleTest ./upnp.nix { useNftables = false; };
diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix
index a6ae0ab9fa58..ee3c8e1bdb84 100644
--- a/nixos/tests/unifi.nix
+++ b/nixos/tests/unifi.nix
@@ -1,45 +1,30 @@
-# Test UniFi controller
+{ lib, ... }:
 
 {
-  system ? builtins.currentSystem,
-  config ? {
-    allowUnfree = true;
-  },
-  pkgs ? import ../.. { inherit system config; },
-}:
+  name = "unifi";
 
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
+  meta.maintainers = with lib.maintainers; [
+    patryk27
+    zhaofengli
+  ];
 
-let
-  makeAppTest =
-    unifi:
-    makeTest {
-      name = "unifi-controller-${unifi.version}";
-      meta = with pkgs.lib.maintainers; {
-        maintainers = [
-          patryk27
-          zhaofengli
-        ];
-      };
+  node.pkgsReadOnly = false;
 
-      nodes.server = {
-        nixpkgs.config = config;
+  nodes.machine = {
+    nixpkgs.config.allowUnfree = true;
 
-        services.unifi = {
-          enable = true;
-          unifiPackage = unifi;
-          openFirewall = false;
-        };
-      };
+    services.unifi.enable = true;
+  };
 
-      testScript = ''
-        server.wait_for_unit("unifi.service")
-        server.wait_until_succeeds("curl -Lk https://localhost:8443 >&2", timeout=300)
-      '';
-    };
-in
-with pkgs;
-{
-  unifi8 = makeAppTest unifi8;
+  testScript = ''
+    import json
+
+    start_all()
+
+    machine.wait_for_unit("unifi.service")
+    machine.wait_for_open_port(8880)
+
+    status = json.loads(machine.succeed("curl --silent --show-error --fail-with-body http://localhost:8880/status"))
+    assert status["meta"]["rc"] == "ok"
+  '';
 }
diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index 4561fe4f17ff..26e8be2b802e 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -1,59 +1,55 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   dpkg,
   fetchurl,
   nixosTests,
   systemd,
+  autoPatchelfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "unifi-controller";
   version = "9.0.114";
 
   # see https://community.ui.com/releases / https://www.ui.com/download/unifi
   src = fetchurl {
-    url = "https://dl.ui.com/unifi/${version}/unifi_sysvinit_all.deb";
+    url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb";
     hash = "sha256-3xumIIzr+tx60kPhPfSs2Kz2iJ39Kt5934Vca/MpUu4=";
   };
 
-  nativeBuildInputs = [ dpkg ];
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    systemd
+  ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out
-    cd ./usr/lib/unifi
-    cp -ar dl lib webapps $out
+    cp -ar usr/lib/unifi/{dl,lib,webapps} $out
 
     runHook postInstall
   '';
 
-  postInstall =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      ''
-        patchelf --add-needed "${systemd}/lib/libsystemd.so.0" "$out/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so"
-      ''
-    else if stdenv.hostPlatform.system == "aarch64-linux" then
-      ''
-        patchelf --add-needed "${systemd}/lib/libsystemd.so.0" "$out/lib/native/Linux/aarch64/libubnt_sdnotify_jni.so"
-      ''
-    else
-      null;
-
-  passthru.tests = {
-    unifi = nixosTests.unifi;
-  };
+  passthru.tests = { inherit (nixosTests) unifi; };
 
   meta = with lib; {
-    homepage = "http://www.ubnt.com/";
+    homepage = "https://www.ui.com";
     description = "Controller for Ubiquiti UniFi access points";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.unfree;
-    platforms = platforms.unix;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with maintainers; [
       globin
       patryk27
     ];
   };
-}
+})

From fe87136b52bcecdc009f2dc189e3ed2111b06a6e Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 22:00:44 -0700
Subject: [PATCH 11/43] moon: modernize

---
 .../tools/build-managers/moon/default.nix     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index 746c35a1d53f..ab997d4bbfb0 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -2,24 +2,23 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  darwin,
-  stdenv,
   openssl,
   pkg-config,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moon";
   version = "1.34.3";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
-    repo = pname;
-    rev = "v${version}";
+    repo = "moon";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LLKHRybTSUhz5YfaV7scVASa6TJqkHDbpVfzL2bANtQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-Rx6g+J7Sh1G8ZrUP55oxrUwCyBp0WV67yG6+ql9J5QI=";
 
   env = {
@@ -27,22 +26,23 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = 1;
   };
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.SystemConfiguration
-    ];
+  buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];
 
   # Some tests fail, because test using internet connection and install NodeJS by example
   doCheck = false;
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Task runner and repo management tool for the web ecosystem, written in Rust";
     mainProgram = "moon";
     homepage = "https://github.com/moonrepo/moon";
-    license = licenses.mit;
-    maintainers = with maintainers; [ flemzord ];
+    changelog = "https://github.com/moonrepo/moon/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ flemzord ];
   };
-}
+})

From 5e17b5123db7e826b7dd72abceac6ed94eb0824b Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 22:02:54 -0700
Subject: [PATCH 12/43] moon: 1.34.3 -> 1.35.0

---
 pkgs/development/tools/build-managers/moon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index ab997d4bbfb0..8e5f78af5ee1 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moon";
-  version = "1.34.3";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "moon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LLKHRybTSUhz5YfaV7scVASa6TJqkHDbpVfzL2bANtQ=";
+    hash = "sha256-pUHmkO+OB29njWY3KGUVikRQ7gb3Jf3ht7RohHHFu14=";
   };
 
-  cargoHash = "sha256-Rx6g+J7Sh1G8ZrUP55oxrUwCyBp0WV67yG6+ql9J5QI=";
+  cargoHash = "sha256-5bj3K7OoeJfb17OD7jLi5/7Y6j8Q8DA0oH4J+ahLz2U=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";

From 6ef24f9e900d0b9d55119fc15f091fd95ff0d72c Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 22:03:50 -0700
Subject: [PATCH 13/43] moon: move to by-name

---
 .../moon/default.nix => by-name/mo/moon/package.nix}            | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/build-managers/moon/default.nix => by-name/mo/moon/package.nix} (100%)

diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/by-name/mo/moon/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/moon/default.nix
rename to pkgs/by-name/mo/moon/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 548a6291147d..0eb0e1a781bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8516,8 +8516,6 @@ with pkgs;
     '';
   };
 
-  moon = callPackage ../development/tools/build-managers/moon/default.nix { };
-
   mopsa = ocamlPackages.mopsa.bin;
 
   haskell-ci =

From 88dd31be02ba35f11cec6ec2a4c5309792c75415 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 22 Apr 2025 18:32:51 -0700
Subject: [PATCH 14/43] moon: 1.35.0 -> 1.35.1

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

diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix
index 8e5f78af5ee1..fb03e24b85e5 100644
--- a/pkgs/by-name/mo/moon/package.nix
+++ b/pkgs/by-name/mo/moon/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moon";
-  version = "1.35.0";
+  version = "1.35.1";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "moon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pUHmkO+OB29njWY3KGUVikRQ7gb3Jf3ht7RohHHFu14=";
+    hash = "sha256-/MKv+k6GZHpqnwheLYAbIAtIT8cZoiNg1EFUNQLbiQk=";
   };
 
-  cargoHash = "sha256-5bj3K7OoeJfb17OD7jLi5/7Y6j8Q8DA0oH4J+ahLz2U=";
+  cargoHash = "sha256-CyvcC46FUeEPcDvHiIBunnM4H4Esp2Q6GRhJZgXhlJk=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";

From e8148ea0957014994a5fd63350abdd80332ff9e9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 23 Apr 2025 09:07:51 +0200
Subject: [PATCH 15/43] python313Packages.publicsuffixlist: 1.0.2.20250417 ->
 1.0.2.20250423

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250423-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 e9aef26dae0f..cdda7f1ddfe6 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250417";
+  version = "1.0.2.20250423";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hIZcImPbnSWtr9PV3etARhOweu+lxrgpTp//PCV47O0=";
+    hash = "sha256-AV337Hvto1AYFcMS3uE/N8AtmNBYbsdnlAHIlc7xazc=";
   };
 
   build-system = [ setuptools ];

From a0954e1cbceb35cca8cf2d07bed93399d842896e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:15:04 +0200
Subject: [PATCH 16/43] wordpressPackages: update plugins and themes

---
 .../web-apps/wordpress/packages/plugins.json  | 170 +++++++++---------
 .../web-apps/wordpress/packages/themes.json   |  40 ++---
 2 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json
index d626c7c6a18b..05c6e1fc3ca4 100644
--- a/pkgs/servers/web-apps/wordpress/packages/plugins.json
+++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json
@@ -6,10 +6,10 @@
     "version": "2.5.2"
   },
   "akismet": {
-    "path": "akismet/tags/5.3.3",
-    "rev": "3186042",
-    "sha256": "1rxzy5qm55q7q1m7x73hxy5wx6cz5g4rsii228icbi5giyaldk6b",
-    "version": "5.3.3"
+    "path": "akismet/tags/5.3.7",
+    "rev": "3272824",
+    "sha256": "0vpvzp0hf9b5ga4snlbh3k6z4vqwzxgzhgz61n62g0qgxkgk0qv1",
+    "version": "5.3.7"
   },
   "antispam-bee": {
     "path": "antispam-bee/tags/2.11.7",
@@ -24,16 +24,16 @@
     "version": "2.21.08.31"
   },
   "breeze": {
-    "path": "breeze/tags/2.1.19",
-    "rev": "3188500",
-    "sha256": "0y9xaxdglsdh4724szpgn76pv46k0l159739jgapx9cc9s319cp5",
-    "version": "2.1.19"
+    "path": "breeze/tags/2.2.9",
+    "rev": "3270307",
+    "sha256": "19n5zrdswj4mi23355a13k4j194119nw70g95c0irxy78lv74zhm",
+    "version": "2.2.9"
   },
   "co-authors-plus": {
-    "path": "co-authors-plus/tags/3.6.3",
-    "rev": "3177076",
-    "sha256": "1ri2ibzr1da8sp7wclm1vyxb4k8661jiavvjn19pgkxwb5hycnan",
-    "version": "3.6.3"
+    "path": "co-authors-plus/tags/3.6.5",
+    "rev": "3273514",
+    "sha256": "1jmcimc58psxlkk3pl57l5270f7w26vsx23j3mdlxh455vj5iavf",
+    "version": "3.6.5"
   },
   "code-syntax-block": {
     "path": "code-syntax-block/tags/3.2.1",
@@ -42,10 +42,10 @@
     "version": "3.2.1"
   },
   "cookie-notice": {
-    "path": "cookie-notice/tags/2.4.18",
-    "rev": "3134111",
-    "sha256": "110g3jizsyy42vrzvhhzfdnvw6gx2vv2yn2kjgy3sspphzz0vdg8",
-    "version": "2.4.18"
+    "path": "cookie-notice/tags/2.5.6",
+    "rev": "3262965",
+    "sha256": "1h7avy7mni4cfvh672vnk6n4npz57mpgm8xssp089hn8vqj2d1zx",
+    "version": "2.5.6"
   },
   "disable-xml-rpc": {
     "path": "disable-xml-rpc/tags/1.0.1",
@@ -60,16 +60,16 @@
     "version": "1.4.0"
   },
   "gutenberg": {
-    "path": "gutenberg/tags/19.6.2",
-    "rev": "3188877",
-    "sha256": "1i8p2rdjh8vc4qgynlpzh652ciz1sicbr10a9zpamca30j9gsvn3",
-    "version": "19.6.2"
+    "path": "gutenberg/tags/20.6.0",
+    "rev": "3266305",
+    "sha256": "09sjm22lg5n07pi53xbaf47719zlp1nb7cmhkxd6pwdz3sik7xcx",
+    "version": "20.6.0"
   },
   "hcaptcha-for-forms-and-more": {
-    "path": "hcaptcha-for-forms-and-more/tags/4.7.1",
-    "rev": "3189857",
-    "sha256": "0kr1270af0visl2w4270pjf0063rswqpjly440hd801bkd9bdqfg",
-    "version": "4.7.1"
+    "path": "hcaptcha-for-forms-and-more/tags/4.12.0",
+    "rev": "3265103",
+    "sha256": "0b8blf03g8vaw1i22rl3swknyqwq28bv8fmk2fd6a64phrsbdpvj",
+    "version": "4.12.0"
   },
   "hello-dolly": {
     "path": "hello-dolly/tags/1.7.2",
@@ -78,16 +78,16 @@
     "version": "1.7.2"
   },
   "hkdev-maintenance-mode": {
-    "path": "hkdev-maintenance-mode/trunk",
-    "rev": "3098579",
-    "sha256": "1l8h3f4fmgjjnvk81vf35jmhdsnfc8j2gi3gqrb8mr2q3dbf9fkn",
-    "version": "3.0.2"
+    "path": "hkdev-maintenance-mode/tags/3.1.3",
+    "rev": "3252095",
+    "sha256": "1znf09ld180qkfzyxigm5xhzqvfrlvx4g4j0f66a9fny4kpfk9jq",
+    "version": "3.1.3"
   },
   "jetpack": {
-    "path": "jetpack/tags/14.0",
-    "rev": "3183818",
-    "sha256": "0rybckv1qi0skh9pg9r98zi0p36w2yqpqv1dn2wmpc9c03xpra4p",
-    "version": "14.0"
+    "path": "jetpack/tags/14.5",
+    "rev": "3265712",
+    "sha256": "0bibdqlv88hhk6xdlaq62264slqf0nild9mqzkbglzl2zybpfyjx",
+    "version": "14.5"
   },
   "jetpack-lite": {
     "path": "jetpack-lite/tags/3.0.3",
@@ -96,22 +96,22 @@
     "version": "3.0.3"
   },
   "lightbox-photoswipe": {
-    "path": "lightbox-photoswipe/tags/5.5.1",
-    "rev": "3186048",
-    "sha256": "0a47hccpq9b6cya8bccm3impxj0k5s2g8mga9jgrr1dysbr0gx31",
-    "version": "5.5.1"
+    "path": "lightbox-photoswipe/tags/5.6.1",
+    "rev": "3213779",
+    "sha256": "1p6w9bcb8irq38zsr2m14lnaq4hdjqvrcw7dr0603p00wnr9hc3k",
+    "version": "5.6.1"
   },
   "login-lockdown": {
     "path": "login-lockdown/tags/2.11",
-    "rev": "3187149",
-    "sha256": "0cihpih0rxz7da8s6rjlz9lha1hljfcg1bh5pn9a76j9pbqm23pp",
+    "rev": "3274659",
+    "sha256": "0hs8mv7w0fxad05fj5v5867azy4zd5x05918jq362f6qj18ci8xm",
     "version": "2.11"
   },
   "mailpoet": {
-    "path": "mailpoet/tags/5.3.7",
-    "rev": "3186516",
-    "sha256": "00xajzf3hvvhv0jvg6fagi0h64rsq60ccraj0xfxah6cs6zf5kr5",
-    "version": "5.3.7"
+    "path": "mailpoet/tags/5.10.1",
+    "rev": "3273602",
+    "sha256": "0kzvc7841v5zl10vvsqmywm1i4smic4vvb3kl03a905j2flsjwm3",
+    "version": "5.10.1"
   },
   "merge-minify-refresh": {
     "path": "merge-minify-refresh/trunk",
@@ -120,15 +120,15 @@
     "version": "2.12"
   },
   "opengraph": {
-    "path": "opengraph/tags/1.12.1",
-    "rev": "3173888",
-    "sha256": "0g0avalaijazwgny7ncdj94ghinvhn5n6xbwd2cvjqzv8rzcry7n",
-    "version": "1.12.1"
+    "path": "opengraph/tags/2.0.2",
+    "rev": "3246616",
+    "sha256": "1jphg0w6mm021kxypgz7hh04hyw7v7g95gdm35mq34z39h29hkbp",
+    "version": "2.0.2"
   },
   "simple-login-captcha": {
     "path": "simple-login-captcha/tags/1.3.6",
-    "rev": "3122028",
-    "sha256": "0j2gda5zsi48ra1w57v06ygyng438kjpaq67hb11mpzz8a7s0vav",
+    "rev": "3272733",
+    "sha256": "1p0lhhqn9bca900bdbp5lnzq8mj16s3bic039ndrqzhj1wd87fy1",
     "version": "1.3.6"
   },
   "simple-mastodon-verification": {
@@ -162,10 +162,10 @@
     "version": "1.2.3"
   },
   "webp-converter-for-media": {
-    "path": "webp-converter-for-media/tags/6.1.2",
-    "rev": "3175897",
-    "sha256": "06zaxd6lrngmivvgyw5pb5sd53gzvmr54pyavnia74gd0n3lkzyi",
-    "version": "6.1.2"
+    "path": "webp-converter-for-media/tags/6.2.1",
+    "rev": "3265172",
+    "sha256": "13affcpq23s3gjsd7mja86j3a7vgv4kyaca77gxjsp1nbiba9nk5",
+    "version": "6.2.1"
   },
   "webp-express": {
     "path": "webp-express/tags/0.25.9",
@@ -174,10 +174,10 @@
     "version": "0.25.9"
   },
   "wordpress-seo": {
-    "path": "wordpress-seo/tags/23.8",
-    "rev": "3182123",
-    "sha256": "1i2j998wggpj5bapkzvwqpry1nji94qg1d19h39wmq1fyw0yiyka",
-    "version": "23.8"
+    "path": "wordpress-seo/tags/24.9",
+    "rev": "3273107",
+    "sha256": "04b541yryi1xjkrj9ydr2yy7dasc1557f32asq6mppbyn2ia54xq",
+    "version": "24.9"
   },
   "worker": {
     "path": "worker/tags/4.9.20",
@@ -192,22 +192,22 @@
     "version": "3.0"
   },
   "wp-fail2ban": {
-    "path": "wp-fail2ban/tags/5.3.2",
-    "rev": "3131194",
-    "sha256": "1svp2a3xr6ajfhabz2n4rqcf9bzfr9dilc2n27ral9akc86lj1ii",
-    "version": "5.3.2"
+    "path": "wp-fail2ban/tags/5.4.0.1",
+    "rev": "3230788",
+    "sha256": "1lzm42lx810h1fpn9qfi9az4ssmxsysx6lpcpfs6y815a4ik0dc4",
+    "version": "5.4.0.1"
   },
   "wp-fail2ban-addon-contact-form-7": {
     "path": "wp-fail2ban-addon-contact-form-7/tags/2.0.0",
-    "rev": "3069647",
-    "sha256": "05qfh64dja3dbzs4z7y0gn9b0bm2a03babr3qkjn6g9v4wa6m36i",
+    "rev": "3150733",
+    "sha256": "0xixgpkibyp9diwnfdr5pyyf3z1ll9wkps5cdhpqcikaapdpj45f",
     "version": "2.0.0"
   },
   "wp-fastest-cache": {
-    "path": "wp-fastest-cache/tags/1.3.2",
-    "rev": "3181365",
-    "sha256": "0yh0vabig7yfyq98awb4nccp786rl1jcv9981s3shirr43ys4ylw",
-    "version": "1.3.2"
+    "path": "wp-fastest-cache/tags/1.3.6",
+    "rev": "3271461",
+    "sha256": "1m06zrpq8iya8pkra99ajkv74lqqfgwdv74ywjnf23h57cli609a",
+    "version": "1.3.6"
   },
   "wp-gdpr-compliance": {
     "path": "wp-gdpr-compliance/tags/2.0.22",
@@ -216,28 +216,28 @@
     "version": "2.0.22"
   },
   "wp-import-export-lite": {
-    "path": "wp-import-export-lite/tags/3.9.27",
-    "rev": "3189188",
-    "sha256": "001ncghhvggbvgxm5c3c14yhkg07c16caz79kb5dx8sa2k56zk2l",
-    "version": "3.9.27"
+    "path": "wp-import-export-lite/trunk",
+    "rev": "3274100",
+    "sha256": "1s7hqsh5xvwd84349a2rkxv3bqi7y86m5q6x0y7qgm889m3d2hli",
+    "version": "3.9.28"
   },
   "wp-mail-smtp": {
-    "path": "wp-mail-smtp/tags/4.2.0",
-    "rev": "3183227",
-    "sha256": "0f54pmap43f65wpvd7abp867bfk2wzf9kp5n13iq47mxjdickj80",
-    "version": "4.2.0"
+    "path": "wp-mail-smtp/tags/4.4.0",
+    "rev": "3251178",
+    "sha256": "0rg9rdd675zrc9x1vxb552v10gk0jk2lq6pkbd4kbcmh851r55zb",
+    "version": "4.4.0"
   },
   "wp-statistics": {
-    "path": "wp-statistics/tags/14.11.2",
-    "rev": "3182553",
-    "sha256": "1vpxa6kk6jlanhva5px46pg7kxrfaj33cs3z95bj18hr155v8vbv",
-    "version": "14.11.2"
+    "path": "wp-statistics/tags/14.13.1",
+    "rev": "3268590",
+    "sha256": "0xr04pa8f24lril2svd0g7hd4hgw6nvcv3ys5wvn32byjd8pxx2c",
+    "version": "14.13.1"
   },
   "wp-swiper": {
     "path": "wp-swiper/trunk",
-    "rev": "3179903",
-    "sha256": "016qb2ydh43wsdzba4wg57qm0q30kyrrx06qfssdv71269n8dfqr",
-    "version": "1.2.13"
+    "rev": "3220490",
+    "sha256": "091rl79z5y9qvvdlcfx9czfrrji0ifipkg7l02n91331fi02ij07",
+    "version": "1.2.17"
   },
   "wp-user-avatars": {
     "path": "wp-user-avatars/trunk",
@@ -246,9 +246,9 @@
     "version": "1.4.1"
   },
   "wpforms-lite": {
-    "path": "wpforms-lite/tags/1.9.2.1",
-    "rev": "3183825",
-    "sha256": "17h2p200vb0m3sw9xnslj9kj2p6asg04azrrki4kafigw7fgl66y",
-    "version": "1.9.2.1"
+    "path": "wpforms-lite/tags/1.9.4.2",
+    "rev": "3254748",
+    "sha256": "087iw17maiv84cmyv0lmpr8fafijr3m7xw36jdwbd3kfi57rwmsz",
+    "version": "1.9.4.2"
   }
 }
diff --git a/pkgs/servers/web-apps/wordpress/packages/themes.json b/pkgs/servers/web-apps/wordpress/packages/themes.json
index 4af383d56bc4..1073697d2e40 100644
--- a/pkgs/servers/web-apps/wordpress/packages/themes.json
+++ b/pkgs/servers/web-apps/wordpress/packages/themes.json
@@ -1,21 +1,21 @@
 {
   "twentynineteen": {
-    "path": "twentynineteen/3.0",
-    "rev": "248593",
-    "sha256": "0sjpkb3h7109svnfpvxha1xv3ga4plrhqr0xi28j8fp55fry2bl1",
-    "version": "3.0"
+    "path": "twentynineteen/3.1",
+    "rev": "267655",
+    "sha256": "0w6vq93s54j8c02613h9hmjjzs15aasazbi96c6k0ns8395dzl2i",
+    "version": "3.1"
   },
   "twentytwenty": {
-    "path": "twentytwenty/2.8",
-    "rev": "248599",
-    "sha256": "1qk4yhw3hcgb4nr8dpmb0ssvvq176xwqpnr8ad8xzhkz4qbaqcz3",
-    "version": "2.8"
+    "path": "twentytwenty/2.9",
+    "rev": "267656",
+    "sha256": "1hkbsy5w5qzbvlsaj16zwnmq0hzhnlqb6ikjyg0fliyddlxnjyi0",
+    "version": "2.9"
   },
   "twentytwentyfive": {
-    "path": "twentytwentyfive/1.0",
-    "rev": "248589",
-    "sha256": "00360gxmnzq4z5z2b7z1wpziwfb6x8nz74qv3c9fpri2d9k4356f",
-    "version": "1.0"
+    "path": "twentytwentyfive/1.2",
+    "rev": "267661",
+    "sha256": "1sm5ifdgnxgmg0pkaik98hnqmcfmjk552994a0gd4mpp137d3f1n",
+    "version": "1.2"
   },
   "twentytwentyfour": {
     "path": "twentytwentyfour/1.3",
@@ -24,10 +24,10 @@
     "version": "1.3"
   },
   "twentytwentyone": {
-    "path": "twentytwentyone/2.4",
-    "rev": "248601",
-    "sha256": "06sx6nx8v1bpc9csd718560fi9j7iazw1fb4kwfgckiq79kp8s7g",
-    "version": "2.4"
+    "path": "twentytwentyone/2.5",
+    "rev": "267659",
+    "sha256": "06jb3wx0mwfkv0yb1vi2prx9i13xw2lr3xb7qkv5vlc7dc08rb5r",
+    "version": "2.5"
   },
   "twentytwentythree": {
     "path": "twentytwentythree/1.6",
@@ -36,9 +36,9 @@
     "version": "1.6"
   },
   "twentytwentytwo": {
-    "path": "twentytwentytwo/1.9",
-    "rev": "248603",
-    "sha256": "0c7rx47n7kd5khrd7im4y9hf8bnwlwxhnrgcqhmwvcry60wzc7y2",
-    "version": "1.9"
+    "path": "twentytwentytwo/2.0",
+    "rev": "267660",
+    "sha256": "0b34rz0jpxzc0bc9plml0n4c54rlgzq9r7f9wx092yf0jiz9fr12",
+    "version": "2.0"
   }
 }

From 33730e48b8dc9466da323fac7c1d968446fcf134 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 12:06:14 +0000
Subject: [PATCH 17/43] wordpress: 6.7.2 -> 6.8

---
 nixos/tests/wordpress.nix                   | 1 +
 pkgs/servers/web-apps/wordpress/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix             | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index d639b3d6dfa2..0d789a4ac425 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -89,6 +89,7 @@ rec {
       { }
       [
         "6_7"
+        "6_8"
       ];
 
   testScript = ''
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index cb8cce6a97a7..0b275d67b683 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -1,8 +1,12 @@
 { callPackage }:
 builtins.mapAttrs (_: callPackage ./generic.nix) rec {
-  wordpress = wordpress_6_7;
+  wordpress = wordpress_6_8;
   wordpress_6_7 = {
     version = "6.7.2";
     hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY=";
   };
+  wordpress_6_8 = {
+    version = "6.8";
+    hash = "sha256-99vtxCPds/Lz6Y6RQPFyC/1tSo9Ic8hdouYvageN4Qo=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c61658d858f..44ec2590ad42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18997,6 +18997,7 @@ with pkgs;
   inherit (callPackage ../servers/web-apps/wordpress { })
     wordpress
     wordpress_6_7
+    wordpress_6_8
     ;
 
   wordpressPackages = recurseIntoAttrs (

From 0790ac9ce71f2ecab724d1c086da69b028ba81c5 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 22 Apr 2025 19:17:11 -0700
Subject: [PATCH 18/43] moon: add shell completions

---
 pkgs/by-name/mo/moon/package.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix
index fb03e24b85e5..7dcaa8428fa2 100644
--- a/pkgs/by-name/mo/moon/package.nix
+++ b/pkgs/by-name/mo/moon/package.nix
@@ -1,11 +1,14 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   openssl,
   pkg-config,
   versionCheckHook,
   nix-update-script,
+  installShellFiles,
+  buildPackages,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -27,7 +30,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   buildInputs = [ openssl ];
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      installShellCompletion --cmd moon \
+        --bash <(${emulator} $out/bin/moon completions --shell bash) \
+        --fish <(${emulator} $out/bin/moon completions --shell fish) \
+        --zsh <(${emulator} $out/bin/moon completions --shell zsh)
+    ''
+  );
 
   # Some tests fail, because test using internet connection and install NodeJS by example
   doCheck = false;

From 530c6f09c98e6a3ebfcea5b257667eeb65cf5568 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Wed, 23 Apr 2025 17:08:23 +0200
Subject: [PATCH 19/43] nixos/nextcloud: Disable web updater by default

Disables the "Open updater" button in the admin overview and makes sure it is not possible to update the instance through the web interface.
Nextcloud runs from the source code in the nix store and should not try to update itself manually.
The only way to update Nextcloud is to update nixpkgs and therefore the web updater must be disabled.
---
 nixos/modules/services/web-apps/nextcloud.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 1864c34ad765..5f34d74cd71f 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1376,6 +1376,7 @@ in
           ({
             datadirectory = lib.mkDefault "${datadir}/data";
             trusted_domains = [ cfg.hostName ];
+            "upgrade.disable-web" = true;
           })
           (lib.mkIf cfg.configureRedis {
             "memcache.distributed" = ''\OC\Memcache\Redis'';

From 73aff8e55cb2e1b34fdf9999eee0c20680d720b4 Mon Sep 17 00:00:00 2001
From: Matt Field <matt@mild.systems>
Date: Wed, 23 Apr 2025 15:40:40 +0100
Subject: [PATCH 20/43] maintainers: add mattfield

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 362e77baf983..27c70c7d010f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15028,6 +15028,17 @@
     githubId = 3139724;
     name = "Matteo Pacini";
   };
+  mattfield = {
+    email = "matt@mild.systems";
+    github = "mattfield";
+    githubId = 686826;
+    name = "Matt Field";
+    keys = [
+      {
+        fingerprint = "8BEE 1295 D9EC 9560 0273  7E57 45B8 21B5 CB29 C07A";
+      }
+    ];
+  };
   matthewbauer = {
     email = "mjbauer95@gmail.com";
     github = "matthewbauer";

From 869aae7927e42045befaa1bd91fb001c80781835 Mon Sep 17 00:00:00 2001
From: Matt Field <matt@mild.systems>
Date: Wed, 23 Apr 2025 17:19:57 +0100
Subject: [PATCH 21/43] fluxcd-operator: init at 0.19.0

---
 pkgs/by-name/fl/fluxcd-operator/package.nix | 66 +++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 pkgs/by-name/fl/fluxcd-operator/package.nix

diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix
new file mode 100644
index 000000000000..dac5909a448f
--- /dev/null
+++ b/pkgs/by-name/fl/fluxcd-operator/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  buildGo124Module,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+  stdenv,
+}:
+buildGo124Module (finalAttrs: {
+  pname = "fluxcd-operator";
+  version = "0.19.0";
+
+  src = fetchFromGitHub {
+    owner = "controlplaneio-fluxcd";
+    repo = "fluxcd-operator";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2AkO8nie2ep3ASy0hkM9JEryv0ekyRNPkCoZ3WgBQwU=";
+  };
+
+  vendorHash = "sha256-sQhp89AzICeu3oRVh3ys93PyeU5A24T36QwQsHxMSaY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.VERSION=${finalAttrs.version}"
+  ];
+
+  subPackages = [ "cmd/cli" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/flux-operator";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  env.CGO_ENABLED = 0;
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    mv $out/bin/cli $out/bin/flux-operator
+    for shell in bash fish zsh; do
+      installShellCompletion --cmd flux-operator \
+        --$shell <($out/bin/flux-operator completion $shell)
+    done
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Kubernetes controller for managing the lifecycle of Flux CD";
+    homepage = "https://fluxcd.control-plane.io/operator/";
+    downloadPage = "https://github.com/controlplaneio-fluxcd/flux-operator";
+    longDescription = ''
+      The Flux Operator is a Kubernetes CRD controller that manages the lifecycle of CNCF Flux CD
+      and the ControlPlane enterprise distribution. The operator extends Flux with self-service
+      capabilities and preview environments for GitLab and GitHub pull requests testing.
+    '';
+    changelog = "https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      mattfield
+    ];
+    mainProgram = "flux-operator";
+  };
+})

From 6dbd555f06266c98bc09fcae923a0124e57e7a68 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 24 Apr 2025 13:03:53 +0200
Subject: [PATCH 22/43] python313Packages.pyoverkiz: 1.17.0 -> 1.17.1

Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.17.0...refs/tags/v1.17.1

Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.17.1
---
 pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 44c1beab99bc..7166e055faa3 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.17.0";
+  version = "1.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${version}";
-    hash = "sha256-z7d6tQZX0F39O0hC7QuGBx3mKsL3Ga+2QaBVYdRkwNo=";
+    hash = "sha256-6M+bYpopcyOSV/lM8YR1bazoSsFpiXaHPYSCJReBmJ8=";
   };
 
   build-system = [ poetry-core ];

From 3d9679d45827fc18061e48803e4a1186f3153c0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 24 Apr 2025 13:04:22 +0200
Subject: [PATCH 23/43] python313Packages.pyswitchbot: 0.60.0 -> 0.60.1

Diff: https://github.com/Danielhiversen/pySwitchbot/compare/refs/tags/0.60.0...refs/tags/0.60.1

Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.60.1
---
 pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 1ddc28bd2748..510e3b618d50 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.60.0";
+  version = "0.60.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-wXf2uqIlzRQ+6vecT0Xk9pWqypRsHefFYMlijc5h1dg=";
+    hash = "sha256-ZOs/vWN0cfcx99kmAZixxFn9GpPZYvHkVJSkluBRwgk=";
   };
 
   build-system = [ setuptools ];

From 50dae1449f8d047403061425c75f78231507b1e7 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Thu, 24 Apr 2025 21:23:30 +0300
Subject: [PATCH 24/43] unifi: 9.0.114 -> 9.1.119

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

diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index 26e8be2b802e..072d537e080d 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -10,12 +10,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "unifi-controller";
-  version = "9.0.114";
+  version = "9.1.119";
 
   # see https://community.ui.com/releases / https://www.ui.com/download/unifi
   src = fetchurl {
     url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb";
-    hash = "sha256-3xumIIzr+tx60kPhPfSs2Kz2iJ39Kt5934Vca/MpUu4=";
+    hash = "sha256-YKioJZG8lnVCIh1hrMxFElBKLPHurxWiGJMHKDlX1yE=";
   };
 
   nativeBuildInputs = [

From a1b46954839fdbfffaaf62ebccfde8dffbdad71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 24 Apr 2025 11:59:44 -0700
Subject: [PATCH 25/43] vips: 8.16.0 -> 8.16.1

Diff: https://github.com/libvips/libvips/compare/refs/tags/v8.16.0...refs/tags/v8.16.1

Changelog: https://github.com/libvips/libvips/blob/refs/tags/v8.16.1/ChangeLog
---
 pkgs/by-name/vi/vips/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index 0c1785e560a6..1effb0c3042b 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -54,7 +54,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vips";
-  version = "8.16.0";
+  version = "8.16.1";
 
   outputs = [
     "bin"
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libvips";
     repo = "libvips";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cx657BEZecPeB9rCeVym3C/d+/u+YLJn9vwxfe8b0dM=";
+    hash = "sha256-F2ymfvqwuCtNtFIOLgXvqRWATSMaeV7EQKYyQalCNfc=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''

From 6fc3febc692102875cb588cca0b8ede4f6c38e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 23 Apr 2025 11:11:50 -0700
Subject: [PATCH 26/43] immich: 1.131.3 -> 1.132.1

Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.131.3...refs/tags/v1.132.1

Changelog: https://github.com/immich-app/immich/releases/tag/v1.132.0
           https://github.com/immich-app/immich/releases/tag/v1.132.1
---
 pkgs/by-name/im/immich/sources.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index c93d6b0b35d5..cf237afa0a06 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.131.3",
-  "hash": "sha256-ZSi9DfyGzkEOiCVEdLu16xzjbmwuMIodD9zMwW72Ppo=",
+  "version": "1.132.1",
+  "hash": "sha256-nZ7kG60TTOVB4yGUsRrcHuWwIamsWlJ7zBvJCP9d4zQ=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-FNIrVdEvibIWq7yeHU76PNoolwJPPuCtcL3X6OeZ67U=",
-      "version": "2.2.61"
+      "npmDepsHash": "sha256-PZOYCJ5FQboy5uVZCqJ4CfxDVSHburP4kxhi01HrKns=",
+      "version": "2.2.63"
     },
     "server": {
-      "npmDepsHash": "sha256-3557g6XH/FLXwZQ27IxgM55bzKrF+TLUBLI26PNjKec=",
-      "version": "1.131.3"
+      "npmDepsHash": "sha256-p46OKwRpk9n15201ImLMlDokezJPXD+GXUWtSHduGfU=",
+      "version": "1.132.1"
     },
     "web": {
-      "npmDepsHash": "sha256-DIsWAfkEhIYnomC1AFpl2vLFxREhe0ofWs6ntFk9qXA=",
-      "version": "1.131.3"
+      "npmDepsHash": "sha256-HEwmwn1DP+9WnqYSOcR2AoOLU7tTjwi2fN17Vq9cZVE=",
+      "version": "1.132.1"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-q0cg1yCZVM6DmvGYrI5fyGcA1fOyDhYZYvBsIPV05A8=",
-      "version": "1.131.3"
+      "npmDepsHash": "sha256-Mdn7pmYJmdizQlVINCme6wv6ocqyrBO6U4F5x2xJonc=",
+      "version": "1.132.1"
     },
     "geonames": {
-      "timestamp": "20250331194635",
-      "hash": "sha256-1YAHhoIH0xJvs9qYNekQF02NQROKlDZTa5bAQlUdE3s="
+      "timestamp": "20250424184923",
+      "hash": "sha256-f0IMmEEyw0JSm+u3zgcE4dtTfPpAKvhDFhlqA9F8cVg="
     }
   }
 }

From 7fcec2a2b8ed5b144c7308dc4522ed6304dac14f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 23:42:55 +0000
Subject: [PATCH 27/43] xan: 0.49.0 -> 0.49.3

---
 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 f74086e64433..f029cb82fea7 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xan";
-  version = "0.49.0";
+  version = "0.49.3";
 
   src = fetchFromGitHub {
     owner = "medialab";
     repo = "xan";
     tag = version;
-    hash = "sha256-tzbHIXmTyP7MQeIMVLV4soGg9oRL7bM73+kFqD5zIi0=";
+    hash = "sha256-2BEwMpI9vmhyZFZiEj8sHnVqCYGBULFORGxZgxdmr7M=";
   };
 
-  cargoHash = "sha256-kqgmfdRfuNhi8X5/oljrBTf4cg+tXuO5Uh7MtBsTtqg=";
+  cargoHash = "sha256-spKgZ8T94zhLIDhym5wQrhnW74KPgCMy5Y+3m/pX9/o=";
   useFetchCargoVendor = true;
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable

From 88b9e17776ae119d01846cb8837cb973ad9a4c07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 00:26:26 +0000
Subject: [PATCH 28/43] snac2: 2.74 -> 2.75

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

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 27921a048117..25071e37eb37 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.74";
+  version = "2.75";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-jFII9MP+jmtguqE+QMQLbDQ6tSuhie0FhXeSyf42AaQ=";
+    hash = "sha256-xy608ks9Z3eCjpE1M4U5r/Xi3ou8BuA4ljUDWgfTtoU=";
   };
 
   buildInputs = [

From 2a41fcabc1ba38f5ef220f362c52bb83bf331e95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 12:09:16 +0000
Subject: [PATCH 29/43] libretro-shaders-slang: 0-unstable-2025-04-14 ->
 0-unstable-2025-04-22

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

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 7546283c2732..7eccf72e5e6d 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-04-22";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "cacb61c9a3022c84057331063e31304933b61bdf";
-    hash = "sha256-dpqru8Qu1xZkHNKv6oF/T61/k6X2CWljUSVeJqxMvso=";
+    rev = "69e9e55679cd087e891a8536e45dc38134965822";
+    hash = "sha256-rDIqPtesPfehsZHgroEbpA3v3dt1zn9w6DqVb4iDUdA=";
   };
 
   dontConfigure = true;

From a3428ff60599656dc97446b3b37eed9210825a9d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 15:28:26 +0200
Subject: [PATCH 30/43] python312Packages.uproot: 5.6.0 -> 5.6.1

Diff: https://github.com/scikit-hep/uproot5/compare/refs/tags/v5.6.0...refs/tags/v5.6.1

Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.6.1
---
 pkgs/development/python-modules/uproot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 239de084d40a..008c4a08ba78 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "5.6.0";
+  version = "5.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
     tag = "v${version}";
-    hash = "sha256-9DObKSMGx6fgU6DHafqynd7XC36zdjzp24iyaugobw8=";
+    hash = "sha256-45u6Jky5NRrRVCEazte1gzAZfmFR9B/AYR2DHK85Rz0=";
   };
 
   build-system = [

From 7c066860bf8be3e3a2601d39afd6c8c7a7477bb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 13:51:35 +0000
Subject: [PATCH 31/43] gopass-summon-provider: 1.15.15 -> 1.15.16

---
 pkgs/tools/security/gopass/summon.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index 4d0116b22b50..8af6a90fe964 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gopass-summon-provider";
-  version = "1.15.15";
+  version = "1.15.16";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-summon-provider";
     rev = "v${version}";
-    hash = "sha256-yMua3BSl4u/1axLMmLIzjqj8wYvMMPTqmRgcuH1tqN0=";
+    hash = "sha256-ULt4sQwK7SbXXDafVQ/coEf6+tzqO6Cy6YKJIMl0Vzc=";
   };
 
-  vendorHash = "sha256-onpg0CRm5HSfMEejhn2ycnV1GuukX1SK4FZN/KjEiR4=";
+  vendorHash = "sha256-FE4ZZjXOWx4swj5FMNN7keZjK2BHkGF0deegbZaBak0=";
 
   subPackages = [ "." ];
 

From 67edeb8bb14235679c034a964e17ccca7087c211 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Fri, 25 Apr 2025 15:56:15 +0200
Subject: [PATCH 32/43] weblate: 5.11 -> 5.11.1

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

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index cbf965f8d0bc..aab867872bfa 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -26,7 +26,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.11";
+  version = "5.11.1";
 
   pyproject = true;
 
@@ -39,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-A1XnXr97DhAZpDlttsMTBjOgdSO/bEN5jfOgZrzcxQo=";
+    hash = "sha256-RUyJ/QbSbxl1A7Z+sFMSz9GwTDoV3fA5w27NCJO7bRI=";
   };
 
   patches = [
@@ -152,12 +152,6 @@ python.pkgs.buildPythonApplication rec {
     postgres = with python.pkgs; [ psycopg ];
   };
 
-  pythonRelaxDeps = [
-    "celery"
-    "rapidfuzz"
-    "weblate-schemas"
-  ];
-
   # We don't just use wrapGAppsNoGuiHook because we need to expose GI_TYPELIB_PATH
   GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" [
     pango

From 63c26aaad4fe6594774351c288055c1035be2646 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 09:56:25 +0000
Subject: [PATCH 33/43] python312Packages.weblate-language-data: 2025.3 ->
 2025.5

---
 .../python-modules/weblate-language-data/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix
index bf8f780f29cc..466b6cc4e708 100644
--- a/pkgs/development/python-modules/weblate-language-data/default.nix
+++ b/pkgs/development/python-modules/weblate-language-data/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "weblate-language-data";
-  version = "2025.3";
+  version = "2025.5";
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_language_data";
     inherit version;
-    hash = "sha256-1uZqqwJds+Q2yL2OP2dEEbp4sJmJN28gOYDDJ3fhBRA=";
+    hash = "sha256-+gT1630GfTd2lHD6dvrETaURwZY9RfS08HsYxMLVWko=";
   };
 
   build-system = [ setuptools ];

From b9cdfd696cc171b07abb0dde4ed732f96b09466c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 14:23:03 +0000
Subject: [PATCH 34/43] vimPlugins.nvim-spectre: 0-unstable-2025-01-13 ->
 0-unstable-2025-04-24

---
 .../vim/plugins/non-generated/nvim-spectre/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
index 047c08161334..6a01f22fe21e 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
@@ -7,12 +7,12 @@
   vimUtils,
 }:
 let
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-04-24";
   src = fetchFromGitHub {
     owner = "nvim-pack";
     repo = "nvim-spectre";
-    rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9";
-    sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY=";
+    rev = "4497feffb18db4bab6e698bcb695228c19421282";
+    hash = "sha256-pWSHOvV0VEouCyhrtn63k7+Lvs6reS81YJJCR3Ygnwg=";
   };
 
   spectre_oxi = rustPlatform.buildRustPackage {

From dc03df7ed4048bc86566257c5077851fd07727ac Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 16:50:40 +0200
Subject: [PATCH 35/43] faiss: 1.10.0 -> 1.11.0

Diff: https://github.com/facebookresearch/faiss/compare/refs/tags/v1.10.0...refs/tags/v1.11.0
---
 pkgs/by-name/fa/faiss/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix
index 5d6dfa5ad4be..940dff5185dc 100644
--- a/pkgs/by-name/fa/faiss/package.nix
+++ b/pkgs/by-name/fa/faiss/package.nix
@@ -25,7 +25,7 @@
 
 let
   pname = "faiss";
-  version = "1.10.0";
+  version = "1.11.0";
 
   inherit (cudaPackages) flags backendStdenv;
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     owner = "facebookresearch";
     repo = "faiss";
     tag = "v${version}";
-    hash = "sha256-TeoM8fKSZuV+2XnkwSz7dJh4piGU8mP1vQfCbRxJ3/Q=";
+    hash = "sha256-N8UkL+KS9Da6RtaHI9pY5gAzFtTSMJ9R5h4RSX9b1Ro=";
   };
 
   nativeBuildInputs =
@@ -106,6 +106,7 @@ stdenv.mkDerivation {
     description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research";
     mainProgram = "demo_ivfpq_indexing";
     homepage = "https://github.com/facebookresearch/faiss";
+    changelog = "https://github.com/facebookresearch/faiss/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ SomeoneSerge ];

From 214336134a5e2eb9af4e027a9d06e4d6f59113c9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 17:05:45 +0200
Subject: [PATCH 36/43] python312Packages.cwcwidth: fix on darwin, cleanup

---
 .../python-modules/cwcwidth/default.nix       | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index 757cfba7874c..c75afbef5cfa 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -1,49 +1,56 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   cython,
-  pytestCheckHook,
   setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "cwcwidth";
   version = "0.1.10";
-  format = "pyproject";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-dGh2D3LB9BB74bKyhUvAAEAeo2pp2u02+5ZqHhmnoSQ=";
+  src = fetchFromGitHub {
+    owner = "sebastinas";
+    repo = "cwcwidth";
+    tag = "v${version}";
+    hash = "sha256-JrzItV+nCpQCz9MM1pcq5FtGZOsWNbgAra6i5WT4Mcg=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     setuptools
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-  preCheck = ''
-    # Hack needed to make pytest + cython work
-    # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298
-    export HOME=$(mktemp -d)
-    cp -r $TMP/$sourceRoot/tests $HOME
-    pushd $HOME
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
-    # locale settings used by upstream, has the effect of skipping
-    # otherwise-failing tests on darwin
+  preCheck = ''
+    # prevent import shadow
+    rm -rf cwcwidth
+
+    # locale settings used by upstream, has the effect of skipping otherwise-failing tests on darwin
     export LC_ALL='C.UTF-8'
     export LANG='C.UTF-8'
   '';
-  postCheck = "popd";
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Despite setting the locales above, this test fails with:
+    # AssertionError: Tuples differ: (1, 1, 1, 1) != (1, 1, 1, 0)
+    "test_combining_spacing"
+  ];
 
   pythonImportsCheck = [ "cwcwidth" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python bindings for wc(s)width";
     homepage = "https://github.com/sebastinas/cwcwidth";
-    changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md";
-    license = licenses.mit;
+    changelog = "https://github.com/sebastinas/cwcwidth/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From b1d4b4b53e325b883b5148667319d165407eb59e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Apr 2025 17:44:58 +0200
Subject: [PATCH 37/43] python312Packages.translate-toolkit: 3.15.1 -> 3.15.2

Changelog: https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/3.15.2.html
---
 .../translate-toolkit/default.nix             | 63 +++++++++++--------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix
index 91d65d77ee00..3bbc202e25c5 100644
--- a/pkgs/development/python-modules/translate-toolkit/default.nix
+++ b/pkgs/development/python-modules/translate-toolkit/default.nix
@@ -1,73 +1,84 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
   setuptools-scm,
-  lxml,
+
+  # dependencies
   cwcwidth,
-  pytestCheckHook,
+  lxml,
+
+  # tests
+  aeidon,
+  charset-normalizer,
+  cheroot,
+  fluent-syntax,
+  gettext,
   iniparse,
-  vobject,
   mistletoe,
   phply,
   pyparsing,
+  pytestCheckHook,
   ruamel-yaml,
-  cheroot,
-  fluent-syntax,
-  aeidon,
-  charset-normalizer,
   syrupy,
-  gettext,
+  vobject,
 }:
 
 buildPythonPackage rec {
   pname = "translate-toolkit";
-  version = "3.15.1";
+  version = "3.15.2";
 
   pyproject = true;
-  build-system = [ setuptools-scm ];
 
-  src = fetchPypi {
-    pname = "translate_toolkit";
-    inherit version;
-    hash = "sha256-Omapbrcv6+A5fGb34xLdlmoh3QAXN1+5VxoCRdyX9mM=";
+  src = fetchFromGitHub {
+    owner = "translate";
+    repo = "translate";
+    tag = version;
+    hash = "sha256-HZ00ds3MUrtLb6WjxpCch8CPvOuadHJXZsJRQdqge0M=";
   };
 
+  build-system = [ setuptools-scm ];
+
   dependencies = [
-    lxml
     cwcwidth
+    lxml
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
+    aeidon
+    charset-normalizer
+    cheroot
+    fluent-syntax
+    gettext
     iniparse
-    vobject
     mistletoe
     phply
     pyparsing
+    pytestCheckHook
     ruamel-yaml
-    cheroot
-    fluent-syntax
-    aeidon
-    charset-normalizer
     syrupy
-    gettext
+    vobject
   ];
 
   disabledTests = [
     # Probably breaks because of nix sandbox
     "test_timezones"
+
     # Requires network
     "test_xliff_conformance"
   ];
 
   pythonImportsCheck = [ "translate" ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Useful localization tools for building localization & translation systems";
     homepage = "https://toolkit.translatehouse.org/";
     changelog = "https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/${version}.html";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ erictapen ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ erictapen ];
   };
 }

From 3853c9e8578df4f19c899d10a1eda3ea9b198fbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 16:36:55 +0000
Subject: [PATCH 38/43] polarity: latest-unstable-2025-04-14 ->
 latest-unstable-2025-04-16

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

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index c61c6579140b..274e9f8b1ad0 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-04-14";
+  version = "latest-unstable-2025-04-16";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "9ee17a9a167efdd660c4806e2d3cd5bc2b3177e1";
-    hash = "sha256-9MsPMQnqzePhxF9f9DgmZ9aq8TzLYi3jZA9HF2McVss=";
+    rev = "ba1e8861a8d32e4fad987b6dcb49d2804dce3cbe";
+    hash = "sha256-viwSbYxNcmxNEaPNNThjKxmQx5KO8bEV23KibnCwMQg=";
   };
 
   useFetchCargoVendor = true;

From 776edac76e253d3bc5a94edc4129a132d97f10d7 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 22 Apr 2025 20:44:51 +0200
Subject: [PATCH 39/43] apksigner: refactor meta, add FliegendeWurst as
 maintainer

Previous homepage redirects to new value.
---
 pkgs/by-name/ap/apksigner/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix
index 84391b020bdc..ce6f1ffa1faf 100644
--- a/pkgs/by-name/ap/apksigner/package.nix
+++ b/pkgs/by-name/ap/apksigner/package.nix
@@ -62,12 +62,17 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/lib/apksigner.jar"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool to sign and verify Android APKs";
     mainProgram = "apksigner";
-    homepage = "https://developer.android.com/studio/command-line/apksigner";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ linsui ] ++ lib.teams.android.members;
-    platforms = platforms.unix;
+    homepage = "https://developer.android.com/tools/apksigner";
+    downloadPage = "https://android.googlesource.com/platform/tools/apksig/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      linsui
+      fliegendewurst
+    ];
+    teams = [ lib.teams.android ];
+    platforms = lib.platforms.unix;
   };
 }

From dc491896af23c9bb869377c9e7ce1ecf9afc34c6 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 22 Apr 2025 20:44:51 +0200
Subject: [PATCH 40/43] apksigner: 34.0.5-unstable-2024-03-06 ->
 35.0.6-unstable-2024-11-15

This changes the package to the upstream's distribution archive.
---
 pkgs/by-name/ap/apksigner/deps.json   | 578 +++++++++++++++++++++++---
 pkgs/by-name/ap/apksigner/package.nix |  48 +--
 2 files changed, 544 insertions(+), 82 deletions(-)

diff --git a/pkgs/by-name/ap/apksigner/deps.json b/pkgs/by-name/ap/apksigner/deps.json
index a0f5ccb9c489..8cc534ae140d 100644
--- a/pkgs/by-name/ap/apksigner/deps.json
+++ b/pkgs/by-name/ap/apksigner/deps.json
@@ -1,24 +1,116 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https://jcenter.bintray.com": {
-  "com/google#google/1": {
-   "pom": "sha256-zW2xehGjHt55TMvR3w5Nl1D2QCNHMfIc/4hamZcnfoE="
+ "https://dl.google.com": {
+  "dl/android/maven2/androidx/annotation#annotation/1.5.0": {
+   "jar": "sha256-Jh+3wCEIWFALq2bTQ1SXKnUWarQYKt0oN4CwVRPW7Eo=",
+   "module": "sha256-TIT+7i24kf9rl9YToNQKuWzil7A0ppJ8qEefCegtfC4=",
+   "pom": "sha256-4pMlmZmt4HAXXEqreA0H1V0BhbtDpRWiT1iQ0CLhzAU="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/android#annotations/4.1.1.4": {
+   "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=",
+   "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng="
+  },
+  "com/google/api#api-common/2.10.0": {
+   "jar": "sha256-Dq1YL3+jxBQOhjbPxgMUdsK7LxAHb9P0OakBiDoUXyY=",
+   "pom": "sha256-epLvsCCqY6cYZuC1wNpRBdJfrh3YMxtPvpV5gstzfJ0="
+  },
+  "com/google/api#gapic-generator-java-pom-parent/2.19.0": {
+   "pom": "sha256-dis49MzAgcHaiOffE49+1XOepbigivOpB0PlatLOrgU="
+  },
+  "com/google/api#gax-grpc/2.27.0": {
+   "jar": "sha256-BJ7WlAxDd2B0aLFemBdckNrCQ/3cHqdrXKsq4SLdYOY=",
+   "pom": "sha256-ct6RfbdpiCvKGUoJh2AgIwKKYMVO43D2nBu/e/6RL+c="
+  },
+  "com/google/api#gax-httpjson/0.112.0": {
+   "jar": "sha256-GYL4bCXE46YPuHhzIe0ANP9Tra8YG/CTYJ9j7TtD1b8=",
+   "pom": "sha256-mja5Hi8kl1P7zcshG6z97kzIMjuTe1o3V5Qt0Sn/AwY="
+  },
+  "com/google/api#gax-parent/2.27.0": {
+   "pom": "sha256-36zNIaIPzIoNvn1S/akZh5UbADv3yv7ysTH+vdd/HJo="
+  },
+  "com/google/api#gax/2.27.0": {
+   "jar": "sha256-IFGFWHOE0Er5eWm1a7F69m+l3YieYhvPywYrfofJhQ4=",
+   "pom": "sha256-5tuvtvcdoq5RF1olhHoD/IZFqMwvuBMTTg2hdwZa4ac="
+  },
+  "com/google/api/grpc#grpc-google-common-protos/2.18.0": {
+   "jar": "sha256-j8v4L9wybri+S66NfSJ2bY1kiXEKrYm0R7KDI0X20xg=",
+   "pom": "sha256-SyTmH6k63B3hoi23gtzvnGI79qx3ZDIh8VJ70RFNSv4="
+  },
+  "com/google/api/grpc#grpc-google-iam-v1/1.13.0": {
+   "jar": "sha256-1b/fLrb7yp50a18XNkO0tzzI6Ofwfcw0v5BbJiGWkRk=",
+   "pom": "sha256-ek30qnkYxKAcjuu6lqCN5dBlrSOC0g4s1/wlFUUyzkk="
+  },
+  "com/google/api/grpc#proto-google-cloud-kms-v1/0.111.0": {
+   "jar": "sha256-L3nwQq3sTUjYbWjcjCMUNseJ05qAfaOzxL++nSoIjSs=",
+   "pom": "sha256-rnCdRQZTQge24UwBzB/N7gvYoi41UtWGxuGUIntqrFY="
+  },
+  "com/google/api/grpc#proto-google-common-protos/2.18.0": {
+   "jar": "sha256-XnfwFi+3Bfz0iLeHnoNppkJCmrz3tZecR35ktUaSklM=",
+   "pom": "sha256-m7sNr83dtembMtRQgJLH+4BQcs2f3utgKb2EpPKwq98="
+  },
+  "com/google/api/grpc#proto-google-iam-v1/1.13.0": {
+   "jar": "sha256-2HTNg7AF8tncQ5NmAe54D3VMTUxpYhcukKYYJV2poCQ=",
+   "pom": "sha256-vyLch8u8mx7Q2E2GNmMqAsdP/Jo9Wz+yTA6gW4P9ZaQ="
+  },
+  "com/google/auth#google-auth-library-bom/1.16.0": {
+   "pom": "sha256-JPx2runhD92FvXDMp3OgoXAGh6+BM+plxG8yS8R+Hfw="
+  },
+  "com/google/auth#google-auth-library-credentials/1.16.0": {
+   "jar": "sha256-tYqdGKn2CmYmFW5+VUOQs1jflcpfiuO8iVuGhfV8+HY=",
+   "pom": "sha256-PyZmDOenD4P3KRBeKjouOvy4R8e7atDGua5o/QXP/rQ="
+  },
+  "com/google/auth#google-auth-library-oauth2-http/1.16.0": {
+   "jar": "sha256-NXcWxdf5UNRXH5J0IWWItZgu2am4vrhWmwNCurcv+w4=",
+   "pom": "sha256-ubUIswklyQO/3jNpJM71TVRJJL8Pc9LSM8I28YvEdPA="
+  },
+  "com/google/auth#google-auth-library-parent/1.16.0": {
+   "pom": "sha256-PVbYHAAlOoH0bs/SLPCJaHxmX6UPtUEc864tWLmeNeQ="
+  },
+  "com/google/auto/value#auto-value-annotations/1.10.1": {
+   "jar": "sha256-pP4KIRkl6TioUQ10F2PuEXGhG/kx9Yke9NTuhPynK+I=",
+   "pom": "sha256-n7rMhpTRkE37TVrx5KVGD9ZMHKnQBJ0YFFQs0q0osEc="
+  },
+  "com/google/auto/value#auto-value-parent/1.10.1": {
+   "pom": "sha256-9y2jrhi84YuHRM1yM6qDSjLTvR4LRTsV9tujP3lzz+k="
+  },
+  "com/google/cloud#google-cloud-kms/2.20.0": {
+   "jar": "sha256-pNPghrGcOyoJ+TrdBX6ySxyigjmOEBw/2SbHISvBoLI=",
+   "pom": "sha256-DAaJz/1vXvxHRJDqDlTSU6m3xPskn0Pqqn04Y9yz2Mc="
+  },
+  "com/google/cloud#google-cloud-shared-config/1.5.5": {
+   "pom": "sha256-mLz9fSHahIoeXpTp4VJG+eHoe1bJ54zxfJsSOG4jrnM="
   },
   "com/google/code/findbugs#jsr305/3.0.2": {
    "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
    "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
   },
-  "com/google/errorprone#error_prone_annotations/2.2.0": {
-   "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=",
-   "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU="
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
   },
-  "com/google/errorprone#error_prone_parent/2.2.0": {
-   "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg="
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
   },
-  "com/google/gradle#osdetector-gradle-plugin/1.6.2": {
-   "jar": "sha256-hFw+/OY70j2WLyELE77rqwXE1YOJihsaf/uMez7X1dQ=",
-   "pom": "sha256-W/T2le0Rd+gFJFJbbloECl1+pLFhlrERCILGLmmlVeg="
+  "com/google/crypto/tink#tink-android/1.12.0": {
+   "jar": "sha256-p4a4yhHV+9D77QyT6KTJulr6arhS953M2BMjSl6ZUto=",
+   "pom": "sha256-qr8HB2wBaJTvmlxFIKP1m4+VhK87URpDZBzNnZudIPg="
+  },
+  "com/google/errorprone#error_prone_annotations/2.18.0": {
+   "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=",
+   "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
+  },
+  "com/google/errorprone#error_prone_annotations/2.22.0": {
+   "jar": "sha256-gqAnuGVB9Y0fnuAgzfa+voKsx6Jn08U6LqXNYzWTK70=",
+   "pom": "sha256-tyXFIVFBaOnCDTcZp2qgG1DlpygoWfTqhMJRz5+EIIA="
+  },
+  "com/google/errorprone#error_prone_parent/2.18.0": {
+   "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
+  },
+  "com/google/errorprone#error_prone_parent/2.22.0": {
+   "pom": "sha256-XSUivqg99aWBzNayJ2Nco04NOXt2ct50ispBVwgFc8c="
   },
   "com/google/guava#failureaccess/1.0.1": {
    "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
@@ -27,80 +119,274 @@
   "com/google/guava#guava-parent/26.0-android": {
    "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
   },
-  "com/google/guava#guava-parent/27.0.1-jre": {
-   "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY="
+  "com/google/guava#guava-parent/31.1-jre": {
+   "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw="
   },
-  "com/google/guava#guava/27.0.1-jre": {
-   "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=",
-   "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY="
+  "com/google/guava#guava-parent/32.0.1-jre": {
+   "pom": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo="
+  },
+  "com/google/guava#guava/31.1-jre": {
+   "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=",
+   "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI="
+  },
+  "com/google/guava#guava/32.0.1-jre": {
+   "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=",
+   "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo="
   },
   "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
    "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
   },
-  "com/google/j2objc#j2objc-annotations/1.1": {
-   "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=",
-   "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4="
+  "com/google/http-client#google-http-client-bom/1.42.3": {
+   "pom": "sha256-SllPSmi+keMqV7keI9plQGixLtIveYBfvNYiYfULR+w="
   },
-  "com/google/protobuf#protobuf-bom/3.8.0": {
-   "pom": "sha256-WjrGCFOIDEORPNXLY7Np626WRuHtDEgGnsmpMTd700c="
+  "com/google/http-client#google-http-client-bom/1.43.1": {
+   "pom": "sha256-eSc6FEsB1GX+f+tvJLN7Gfbv0mCOXvEviOY1sf3toEg="
   },
-  "com/google/protobuf#protobuf-gradle-plugin/0.8.11": {
-   "jar": "sha256-gFr+/pf6AYFXpWvxQtvuStIo0RSyq3s97le5fD4teHk=",
-   "pom": "sha256-RBeVBVv4AjSXKcjFWdrVcmi4C4tk6KPePK2lQmo45aA="
+  "com/google/http-client#google-http-client-gson/1.43.1": {
+   "jar": "sha256-AXQG5RBaMxR6sTuve0kf9T2Z5UpeK2G3zNZR4WQilpg=",
+   "pom": "sha256-EqhE8wvEQ29kCX2xTYNt7vxshmldPFpetmi76P8OaUE="
   },
-  "com/google/protobuf#protobuf-javalite/3.8.0": {
-   "jar": "sha256-HSWDsgkvIdvCnJCabwV+u4bYTkxU/LHXvAAmO4AaM/g=",
-   "pom": "sha256-4EnZCbCH/zokFi4H0KgIFE7BnnwK6Z1Ee0dZZ83361s="
+  "com/google/http-client#google-http-client-parent/1.43.1": {
+   "pom": "sha256-fOZP1l2/NuZ5y+SUhU79JODdC/xXe1umLNCV5q8u6xM="
   },
-  "com/google/protobuf#protobuf-parent/3.8.0": {
-   "pom": "sha256-cGPoFu/yyZcFW9KmbuLJtObNEvhcj8lW5UhweQmAHEU="
+  "com/google/http-client#google-http-client/1.43.1": {
+   "jar": "sha256-g043sK8s/oCyl75NalyP0MyrHQsT6bjXrJIejdLyUew=",
+   "pom": "sha256-21zBH3o7xj6nYyIPc6n1GO173MhAZ2Mt5VXeWQPtmPI="
   },
-  "com/google/protobuf#protoc/3.8.0": {
-   "pom": "sha256-0bqQU0Wx2o1GXQ0DCkzgiuVX0nz8krZiMvEN3ks4V9I="
+  "com/google/j2objc#j2objc-annotations/1.3": {
+   "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+   "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
   },
-  "com/google/protobuf/protoc/3.8.0/protoc-3.8.0-linux-x86_64": {
-   "exe": "sha256-eeGGIvawJqOETt7d5Fzw4M98+8emLCho2dgtvtYSZeQ="
+  "com/google/j2objc#j2objc-annotations/2.8": {
+   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
+   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
   },
-  "commons-lang#commons-lang/2.6": {
-   "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=",
-   "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE="
+  "com/google/protobuf#protobuf-bom/3.21.12": {
+   "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU="
+  },
+  "com/google/protobuf#protobuf-bom/3.25.3": {
+   "pom": "sha256-tG4/Jv4PRz/zMHfuEkX4jUuNs1zHn1VM0P2Td2akXlg="
+  },
+  "com/google/protobuf#protobuf-java-util/3.21.12": {
+   "jar": "sha256-mz2nSVlbZsrww1ZW+nc2c8YdtopqyzTOHKtbL/xxDF8=",
+   "pom": "sha256-PRUyjuLPonCuYhxzlMMcW/IKhXZLSYrW9ubHSkv8YVw="
+  },
+  "com/google/protobuf#protobuf-java-util/3.25.3": {
+   "jar": "sha256-uBPI1tVUy3HB6C0XHX+AcwrnQiKhhchjy+3wUHLIgVU=",
+   "pom": "sha256-mwLH87Tr551RO/JGiw1vgOEe8RQylMsDQHxgaV5qkEs="
+  },
+  "com/google/protobuf#protobuf-java/3.21.12": {
+   "jar": "sha256-Pz7b2pKGJGCA8+r1Yd1rDVorHxAI9pCRFchgnOrp34c=",
+   "pom": "sha256-CXiOUXdwUnUK3bE39cMbdwDlY6UsncRQlXqGVM/gVrU="
+  },
+  "com/google/protobuf#protobuf-java/3.25.3": {
+   "jar": "sha256-6Q2N25Y7IKlypqWbUJOt4rB8vlRsqzJ5qvQ4MmA4X1g=",
+   "pom": "sha256-we+sGuAPC7q2VkKOGWtjaYyRTQ3SK+EgcQvv/EgctUc="
+  },
+  "com/google/protobuf#protobuf-parent/3.21.12": {
+   "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g="
+  },
+  "com/google/protobuf#protobuf-parent/3.25.3": {
+   "pom": "sha256-vCdEYIzqOnotTNC3Thw/iBOMZM5aphudfwr9hGiCvno="
+  },
+  "com/google/re2j#re2j/1.6": {
+   "jar": "sha256-yLXDRy1NtZSoZbLkf4NdB/uLFBXuulWdzPsKaUXwM80=",
+   "pom": "sha256-DL7CO8gvuQDrXrYsX8LLXiObeKDrdl67CObwX6YVgDo="
+  },
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
+  "io/grpc#grpc-alts/1.54.0": {
+   "jar": "sha256-QuBz77s7BWtBMTUNw7YVjv2DwPRSkNXkxLjKE1e2dPA=",
+   "pom": "sha256-Wc0wTLw2SQmfETtEnYlKbtmFANL5T3r6NptcUgH+GcM="
+  },
+  "io/grpc#grpc-api/1.54.0": {
+   "jar": "sha256-NSGfOWFrmjPIxboZbh0ktJ4yHzREhgdT6EBVV1lUqjE=",
+   "pom": "sha256-iqKb2G5W60UzGTEwbPLlwghGzOs/diXB0JLo+HWcko8="
+  },
+  "io/grpc#grpc-auth/1.54.0": {
+   "jar": "sha256-uYtd/UbKUaJ/iRTEnqAMbC9Lncy+etrgHW2E9upCKwo=",
+   "pom": "sha256-rX6kJxBLu9zKyS0bfc39FXrGk85JRfE2Ub9qurIQkcE="
+  },
+  "io/grpc#grpc-bom/1.54.0": {
+   "pom": "sha256-wB1RhDKFZItNboB1O9UUDTdW1KnW4SAhTy1gkDlazOw="
+  },
+  "io/grpc#grpc-context/1.54.0": {
+   "jar": "sha256-m06EXYri30e2/Q4u3hFuRQ73kjy9OgkyBAJ4a+GeabE=",
+   "pom": "sha256-PYaGleq7bre/2dEP2Gs1eadI56H//daiqggiETog+Nc="
+  },
+  "io/grpc#grpc-core/1.54.0": {
+   "jar": "sha256-TXdLP8ITllVypPxK5R3B60vI0j4jKaGKdfA3yD439Sw=",
+   "pom": "sha256-oqzTg5rJXFBeqDlAkD1iyKJBZI6xugikVEPv+cKQ3I4="
+  },
+  "io/grpc#grpc-googleapis/1.54.0": {
+   "jar": "sha256-1+sx96NQTbxWX2v2IbnDl+RpmlgWFg7ag1VXdFbs+3U=",
+   "pom": "sha256-HmQDIfQAa3I7ur8CLWKQKmY0jWpdOwbdhQNysLsmES0="
+  },
+  "io/grpc#grpc-grpclb/1.54.0": {
+   "jar": "sha256-1NardVATbDs+tI6Yjz6DhPunQp75MZQ+B+SQ7NX16JU=",
+   "pom": "sha256-8IjegVQnmpBi85PnyDSsoWgICTmmSikpJ6caLI8HlkE="
+  },
+  "io/grpc#grpc-netty-shaded/1.54.0": {
+   "jar": "sha256-ttwhAzyT4l1E+CFS2PukMmv90xvU4gdfnSLe6AARhzM=",
+   "pom": "sha256-i+oJeBjOfkKMaKfSGDTrYD+yIBFph9Ts+nErHNRMb2w="
+  },
+  "io/grpc#grpc-protobuf-lite/1.54.0": {
+   "jar": "sha256-P32lYgFAtVuOB6EGWkMN0+Fef09UrRyjIWQoiDNY4wU=",
+   "pom": "sha256-3rGZlpJjBEb/ideQi1vfP5QYlTbVkveLiaXSeMIMY8c="
+  },
+  "io/grpc#grpc-protobuf/1.54.0": {
+   "jar": "sha256-YHmJNi3MEc3qF9Br45PE5CW+noqDQbIePw2++TMO2ZM=",
+   "pom": "sha256-XWefgulq6R3X5tBTvMXoixITOYwKr3NQoIEr1+7Y3bI="
+  },
+  "io/grpc#grpc-services/1.54.0": {
+   "jar": "sha256-fju+4YgrWDu88gdLePsz334Jv4Ymx6inpZSs0ppoM8s=",
+   "pom": "sha256-jcgkDnq8AfsuLraWhuIBFDuIthEW5M3DVzXKkucVwTM="
+  },
+  "io/grpc#grpc-stub/1.54.0": {
+   "jar": "sha256-r0gbqrjAHhEW+9bOWZFQOtgGSONrFIZBkv3ZK3v1J50=",
+   "pom": "sha256-AqilDzJx3oQos/0QN/dC6yu4ll/PIjHSEUEMWK00JAg="
+  },
+  "io/grpc#grpc-xds/1.54.0": {
+   "jar": "sha256-/mFHagVvHSFermdL52ussBXevRuybPdNnnbaGRlQxGk=",
+   "pom": "sha256-C+nz32pRbunKczoYxQ38ErVCaNfbYPG9IUpWxbNkL9k="
+  },
+  "io/netty#netty-buffer/4.1.100.Final": {
+   "jar": "sha256-Rih0tE7ngvvv7GQHjNpuuOe/nw4K9xqSjvTB8tVk9+4=",
+   "pom": "sha256-pKlxXeZ2+R2PiLQOt4c6DWN2mQIIZ5jTqJjKkwMlvTQ="
+  },
+  "io/netty#netty-codec-http/4.1.100.Final": {
+   "jar": "sha256-MmgR0knLDlVV544Cbod4NOeSJhw48GZtgEZEJmldlZA=",
+   "pom": "sha256-5rfLfsxp5E8SdyWkEk1Qh2M0+JZPx0d/xpSnSSqV/4o="
+  },
+  "io/netty#netty-codec-http2/4.1.100.Final": {
+   "jar": "sha256-I7SnQ1D0z41BuT+5PVK1BQZn2NU//8OFZyyG6rg7h0k=",
+   "pom": "sha256-4iMo6SZzeIbMW1eEC5GirtaP3oE6H1efmrWRF6KLmbw="
+  },
+  "io/netty#netty-codec/4.1.100.Final": {
+   "jar": "sha256-GAoB7WevOZYC4k/xwyhk5/V/V8Sg+l6as/6bDl6c8FE=",
+   "pom": "sha256-iRrXaSyRGjVqC573wlW8ZK/FJui/zK5vGMXtKRJJj3U="
+  },
+  "io/netty#netty-common/4.1.100.Final": {
+   "jar": "sha256-0pCDAfGsbykQkAdCRzwV1wF2XT1EZ6zbHuu53zqoKIU=",
+   "pom": "sha256-7/apmfoHAOALyd4Cj8yyoTEC57RJ87oqI6inaGAGMa8="
+  },
+  "io/netty#netty-handler/4.1.100.Final": {
+   "jar": "sha256-DhDlhMLn/ff0gE4Udg7ZhwA/G2KrmC9i6vE6mJJ5PTo=",
+   "pom": "sha256-RuVkerE0TF+u/+oM1QmRNGWAjAlGnQX1S3pWPpbZ1T4="
+  },
+  "io/netty#netty-parent/4.1.100.Final": {
+   "pom": "sha256-JXh90dBp/s0Q5HNgpQz2V7w5vtluqn53QAGI7vUFh0E="
+  },
+  "io/netty#netty-resolver/4.1.100.Final": {
+   "jar": "sha256-xCxIHHdunTZ6Rcw6Z6BvZYl9KAM06zCyNiuMVbdSP08=",
+   "pom": "sha256-Ti52vDcKBWTdt++pzyAydS4yj83QdRcOHB4jE/qO/cY="
+  },
+  "io/netty#netty-transport-classes-epoll/4.1.100.Final": {
+   "jar": "sha256-mrxLF7EhKzNmbq5OgBPQu3iporzQqaYhub0Gp+X8AFA=",
+   "pom": "sha256-bHkKddDuLakj/JXuMuvwGTqynytmeNms58AFqWdlT4s="
+  },
+  "io/netty#netty-transport-native-unix-common/4.1.100.Final": {
+   "jar": "sha256-XYiCMKBMSj5kfGTpM877ZP1JBW+Wm/tzTIo/zt8L6oo=",
+   "pom": "sha256-sWyNDgg/ZadLYRjCLtAsk9AbgIT2XB6sCPzm6BbVCxU="
+  },
+  "io/netty#netty-transport/4.1.100.Final": {
+   "jar": "sha256-sd7s7tqzc0zblZxV9L5atKZnqK7VkSH/k3Y/SUcPVHA=",
+   "pom": "sha256-n+Q/DqN6PO7cz/FXy6YQMx065VyJpfmkj7x11+FVnjw="
+  },
+  "io/opencensus#opencensus-api/0.31.1": {
+   "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=",
+   "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y="
+  },
+  "io/opencensus#opencensus-contrib-http-util/0.31.1": {
+   "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=",
+   "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s="
+  },
+  "io/opencensus#opencensus-proto/0.2.0": {
+   "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=",
+   "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI="
+  },
+  "io/perfmark#perfmark-api/0.26.0": {
+   "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=",
+   "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=",
+   "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto="
+  },
+  "javax/annotation#javax.annotation-api/1.3.2": {
+   "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=",
+   "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c="
   },
   "junit#junit/4.13": {
    "jar": "sha256-S4Uy9jvcDgZhUH+UfrMkqVTR26xjGtGciqmgD+7R2GM=",
    "pom": "sha256-mg3Ew/orCG5wgiZzfvS7N4R8PLHOTiA1F8CfYwWyJn4="
   },
-  "kr/motd/maven#os-maven-plugin/1.6.2": {
-   "jar": "sha256-OgxJXeHOvIP2e+qhd2p5NvAvEfKt3Th5WWp4sqhryqM=",
-   "pom": "sha256-bXDR8vJydzDXedMqH9L7seoI51pnpQotjn0P2zoqSvM="
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
   },
-  "org/apache#apache/7": {
-   "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU="
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
   },
-  "org/apache/commons#commons-parent/17": {
-   "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg="
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache/commons#commons-parent/34": {
+   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.14": {
+   "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
+   "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
+   "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.16": {
+   "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.16": {
+   "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
+   "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
   },
   "org/bouncycastle#bcprov-jdk15on/1.68": {
    "jar": "sha256-9zKkbI3n4iMvIAfGgqIdH0zIqKAUm2t71qoa/cZaD40=",
    "pom": "sha256-2QfezWhfnNlx5xvfbOWXzzqVt8j/ajSCNRv9irwXz+A="
   },
-  "org/checkerframework#checker-qual/2.5.2": {
-   "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=",
-   "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4="
+  "org/checkerframework#checker-qual/3.32.0": {
+   "jar": "sha256-tm4CXaCmv4Xwt/X9rcqDKjJ3H4WhLKwUAaPAzY/XPM0=",
+   "module": "sha256-zN7Nqhqu63g5UfanwY3Bk5XC4qXn93RQ1we41i6H3k8=",
+   "pom": "sha256-eVqIZSpu3vocMP26soASnkGDsaz5lKx0vkPz64qnfc8="
   },
-  "org/codehaus/mojo#animal-sniffer-annotations/1.17": {
-   "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=",
-   "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U="
+  "org/checkerframework#checker-qual/3.33.0": {
+   "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
+   "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
+   "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
   },
-  "org/codehaus/mojo#animal-sniffer-parent/1.17": {
-   "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8="
+  "org/codehaus/mojo#animal-sniffer-annotations/1.23": {
+   "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=",
+   "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc="
   },
-  "org/codehaus/mojo#mojo-parent/40": {
-   "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4="
+  "org/codehaus/mojo#animal-sniffer-parent/1.23": {
+   "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ="
   },
-  "org/conscrypt#conscrypt-openjdk-uber/2.5.1": {
-   "jar": "sha256-AfnHQstZKhUeLmK9U5eomAYoqWcAH82s1KpHRGeGhfM=",
-   "pom": "sha256-XivA41GARnUwxVpnqvq+XvmOBg7raY6a9tCw3N26lc0="
+  "org/codehaus/mojo#mojo-parent/74": {
+   "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM="
+  },
+  "org/conscrypt#conscrypt-openjdk-uber/2.5.2": {
+   "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=",
+   "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs="
   },
   "org/hamcrest#hamcrest-core/1.3": {
    "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
@@ -109,11 +395,191 @@
   "org/hamcrest#hamcrest-parent/1.3": {
    "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
   },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": {
+   "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=",
+   "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": {
+   "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=",
+   "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE="
+  },
+  "org/junit#junit-bom/5.10.0": {
+   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+  },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/reactivestreams#reactive-streams/1.0.4": {
+   "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
+   "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
+  },
+  "org/slf4j#slf4j-api/1.7.30": {
+   "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=",
+   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
+  },
+  "org/slf4j#slf4j-parent/1.7.30": {
+   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
+  },
   "org/sonatype/oss#oss-parent/7": {
    "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
   },
   "org/sonatype/oss#oss-parent/9": {
    "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/threeten#threetenbp/1.6.8": {
+   "jar": "sha256-5LHrPZDDilTH8zhP2pV+C1vwtBtAZypErosDy2yHzgY=",
+   "pom": "sha256-ztMznYANG7wB7mct+A5NqHUgrgKXuarI+MS33aI+SwI="
+  },
+  "software/amazon/awssdk#annotations/2.23.18": {
+   "pom": "sha256-u/NoQopTahMxql1Uvl5/dMme+HetPvY/5YRzf4DTpMU="
+  },
+  "software/amazon/awssdk#annotations/2.24.7": {
+   "jar": "sha256-S8kcmqIxIc1ZKHM3eo3KkOG5G5gaTSA+yIxYXJJtrCo=",
+   "pom": "sha256-MNwRu7T2as2U4FEa7tvDIoOuKlGzckjz3M6L0MNc1Vo="
+  },
+  "software/amazon/awssdk#apache-client/2.23.18": {
+   "jar": "sha256-bwCXzDSM6l4mgs964DnXNIxJaLzjyz5IRh0rCFTBuWA=",
+   "pom": "sha256-Sryz9iZpMOKTHR7oYgwXtEd14ALx06MOVK5rJrWAfWg="
+  },
+  "software/amazon/awssdk#auth/2.23.18": {
+   "jar": "sha256-M8GVspwMVYVYXst52xpvTgV2oEr9iv7A9uP5UDIQKjk=",
+   "pom": "sha256-5xBdSEiC3SfSt4OlyDiZaXSDqxvGmpt1aJh3wVy/8S8="
+  },
+  "software/amazon/awssdk#aws-core/2.23.18": {
+   "jar": "sha256-d5rCzOz3dSqGSqai1nTJplvIwXVNcm8hawUwXlwQHdw=",
+   "pom": "sha256-Nq6BlAcW/P8sKQ522m06sYt/4qvNy37mI0//QJa6apI="
+  },
+  "software/amazon/awssdk#aws-json-protocol/2.23.18": {
+   "jar": "sha256-fm4kjYFOEamqNkIdNyb3ocgmIfiKplFGzKLPj0qvVHg=",
+   "pom": "sha256-3zpiZb1Cca7+HoOaU/NaxTU2FQXAELhZTb903D/ThIQ="
+  },
+  "software/amazon/awssdk#aws-sdk-java-pom/2.23.18": {
+   "pom": "sha256-DdAF90kz/ezIfyWOAHi15vE3HEnDCSu99BBzegOs92E="
+  },
+  "software/amazon/awssdk#aws-sdk-java-pom/2.24.7": {
+   "pom": "sha256-pVxLnOskbbcG57vMlkFp9eOeNCmYmJCz7ZSer7WAqJg="
+  },
+  "software/amazon/awssdk#bom-internal/2.23.18": {
+   "pom": "sha256-EzVaaj68bODzg3vEWjIAH479BKI81AvpMDUFxxRpSDo="
+  },
+  "software/amazon/awssdk#bom-internal/2.24.7": {
+   "pom": "sha256-UvuCrqRzdmMYh/1two+aINZyzj7/you1rwOV9FXo2yI="
+  },
+  "software/amazon/awssdk#checksums-spi/2.23.18": {
+   "jar": "sha256-oxjGgwaqdDS4fZXniNlVi9HpsTv1BkYl9kCUrDmnJ5k=",
+   "pom": "sha256-iW8Gv9gFverLy9IcN2rXPFh3ifpDdt/pMYG2ovkrvo4="
+  },
+  "software/amazon/awssdk#checksums/2.23.18": {
+   "jar": "sha256-+kXnR8Mmw1n79nvEWpbREvnQQxprRtpxv3n7+fIfcxQ=",
+   "pom": "sha256-WK7sn8HcpnD+m/9nhkeMmb9sLfa7URxMssYVXEd8zKo="
+  },
+  "software/amazon/awssdk#core/2.23.18": {
+   "pom": "sha256-whHR/zyCuvajWz0YKmBaGAP4x6nI9BIpyQyjPUc3SzU="
+  },
+  "software/amazon/awssdk#core/2.24.7": {
+   "pom": "sha256-ZMbleXgYUo4ziEm41KmM5GnLpTtpMAJaUWluhdUihM0="
+  },
+  "software/amazon/awssdk#endpoints-spi/2.23.18": {
+   "jar": "sha256-OVfxld7QPPaUT1mpxJTeZmmB/te1ZmWU+ZBQqzO/s6I=",
+   "pom": "sha256-rGgFmHffZn1aMj825X+O6Dgli9hf7EAlgYbhdwx41DY="
+  },
+  "software/amazon/awssdk#http-auth-aws/2.23.18": {
+   "jar": "sha256-AiTCBorI2wsGy/v81fxRhJt4Wf0rgdN+BuKEwEjb9z0=",
+   "pom": "sha256-SZ3tLK1vEUB21usf0BlzpX+Xozz/jRiTB90yD97zDtk="
+  },
+  "software/amazon/awssdk#http-auth-spi/2.23.18": {
+   "jar": "sha256-9QgH9ykETUTdIKmmRsEPf315BqMRaJs7O4I+irl9T08=",
+   "pom": "sha256-JQhtFkAGGOZNI2v++xTkuDk0Agu/h7AOfYhyq5q7osA="
+  },
+  "software/amazon/awssdk#http-auth/2.23.18": {
+   "jar": "sha256-2EW616cSQdPU2M+T5ZWD/mLFn4oE+30kaNLNvCBeiEU=",
+   "pom": "sha256-7TEY+UtwlSyvNrROBP5LgsgZV92fMzAHlU11bFsISeY="
+  },
+  "software/amazon/awssdk#http-client-spi/2.23.18": {
+   "pom": "sha256-1TEyPV+1aJGyk4QuGcLyl+0bq9GdK8jjc4TYd2BDYhg="
+  },
+  "software/amazon/awssdk#http-client-spi/2.24.7": {
+   "jar": "sha256-CzaksEhfg5sPpIDVgL4mg+0fHyYdIwVDH+8WPuyqKaA=",
+   "pom": "sha256-fi5vVpujx2UZvZkoMVu0YIaqL7sfTkkox9R9HdUgDYg="
+  },
+  "software/amazon/awssdk#http-clients/2.23.18": {
+   "pom": "sha256-oUaoCeI7DcOEz19MbrlBF+KljXB2OhN07fUHKRxW2ZM="
+  },
+  "software/amazon/awssdk#http-clients/2.24.7": {
+   "pom": "sha256-4VlySxMbsOD1H+uAx6soz7WLj546GSgRBBgewnm2XVI="
+  },
+  "software/amazon/awssdk#identity-spi/2.23.18": {
+   "jar": "sha256-PoZDhNJz9EbpoNIhq3Jqkna1cUMEW0l7D0/pxi7qUc4=",
+   "pom": "sha256-r1rmx6GeTNQvGU4xumS5xiUPGTY9VzSCTvU15+2zKsQ="
+  },
+  "software/amazon/awssdk#json-utils/2.23.18": {
+   "jar": "sha256-+dslPsJnAc6pNxjie1wEPvdvBrqdDdE0U8sgJdG41Y4=",
+   "pom": "sha256-NN7X19+3TF9NfDB5RH2ocpyGp3iXis2XJEsXF9Ek2Js="
+  },
+  "software/amazon/awssdk#kms/2.23.18": {
+   "jar": "sha256-CGGjL6rC8iOhchxcXpT7eWo+PtRl+7CRUH2AJfmgVMo=",
+   "pom": "sha256-6viSKV9amkbB30ERWxRaALK8ZC2+ltCrvxYd+sWqh04="
+  },
+  "software/amazon/awssdk#metrics-spi/2.23.18": {
+   "pom": "sha256-KB0RG8RCazAERl/cnMHLQJi2lQ++fkh8XLV0hMGpyUw="
+  },
+  "software/amazon/awssdk#metrics-spi/2.24.7": {
+   "jar": "sha256-GrYI8X2pwQpTtAtkmvGryTcrOaeCAF+NIr4z1GAf/yM=",
+   "pom": "sha256-1IrYkDfvgMLQs9I/35sra/mFctZmtlQC3R/tLP7lsN4="
+  },
+  "software/amazon/awssdk#netty-nio-client/2.23.18": {
+   "jar": "sha256-r6+aUWrbxgE8DgskuGHDOuVuTX61LIj8aH6FFRKYk3Y=",
+   "pom": "sha256-a5+91SZtknAOAjzfcSxXS76r8Cidzn+npSFISd3LUIY="
+  },
+  "software/amazon/awssdk#profiles/2.23.18": {
+   "jar": "sha256-1x1EHZXQtrfvONfkFhzSxqMh8EWtSln7ydeH0lE1oaw=",
+   "pom": "sha256-gDr0geArwi5S818OLS5fMquSQuqNgZWJRHcXXy9+LRc="
+  },
+  "software/amazon/awssdk#protocol-core/2.23.18": {
+   "jar": "sha256-YRxqBiVDHXID1ge5A/wRXUQFPO3x7dRBy7xI+8tjF2E=",
+   "pom": "sha256-lcjiTtXLew0sWD3t31PXLYVpUWLDhi5Qp0ugKR91Sao="
+  },
+  "software/amazon/awssdk#protocols/2.23.18": {
+   "pom": "sha256-wmTssyedVEqWIg1rxnXgARiIMs5WmGdF54wRtMvgSbQ="
+  },
+  "software/amazon/awssdk#regions/2.23.18": {
+   "jar": "sha256-uGMn/39yXEmYI+SgQuIgX0TMIuCq3C7+hnyHrrCtXaY=",
+   "pom": "sha256-l16KuXCbR9v13/bIOTM3m5v7qr+ieMrn5MDuEAsa/os="
+  },
+  "software/amazon/awssdk#sdk-core/2.23.18": {
+   "jar": "sha256-5ZY7kCNgNwVBOpvtfog3UfUOACRqVKhoAjj4Xgd07hk=",
+   "pom": "sha256-1vPsBkbZdi4Pgkk9/eTvbB2ACe02mKp1/sobuXR3zAQ="
+  },
+  "software/amazon/awssdk#services/2.23.18": {
+   "pom": "sha256-qbegC61+DnRYnxo28oC4lmKco9rkzB3mLenDCZhQrAQ="
+  },
+  "software/amazon/awssdk#third-party-jackson-core/2.23.18": {
+   "jar": "sha256-4zLJO048lhRWhMVIpzDohFJlCXKiaT20ozrTLvP0xP0=",
+   "pom": "sha256-BXOfqKWU/kz3Nq22QKZa8GRBkMlQpMRkAiYELqTB5Ho="
+  },
+  "software/amazon/awssdk#third-party/2.23.18": {
+   "pom": "sha256-OM/sIB6RuoAiypK1qepIaptnSY8Z6MtXLcDavlCHpIQ="
+  },
+  "software/amazon/awssdk#url-connection-client/2.24.7": {
+   "jar": "sha256-1zbDWhwNA+d4w4LR04pFSml3Mf4SbH/P2PaWLYFo7Co=",
+   "pom": "sha256-5SMf1UBLK7EGkGRhX2bSiR2zXxbL1sIZaQgNVCKvPeY="
+  },
+  "software/amazon/awssdk#utils/2.23.18": {
+   "pom": "sha256-57JdScZbeYdG/9psUCriiqC0smxcKT2/G0fy6lF8bsI="
+  },
+  "software/amazon/awssdk#utils/2.24.7": {
+   "jar": "sha256-Mx09/XCVBuON4XdYr++IzBkfvkEuCC5Z83OzlDZMO+0=",
+   "pom": "sha256-iqyHgJjhBSQRB/2H7zmNOl6wWpOMsdLhuyBR2DtCuuM="
+  },
+  "software/amazon/eventstream#eventstream/1.0.1": {
+   "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=",
+   "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w="
   }
  }
 }
diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix
index ce6f1ffa1faf..b8ff6932a0d4 100644
--- a/pkgs/by-name/ap/apksigner/package.nix
+++ b/pkgs/by-name/ap/apksigner/package.nix
@@ -5,6 +5,7 @@
   jdk_headless,
   gradle_8,
   makeWrapper,
+  bashNonInteractive,
 }:
 let
   # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
@@ -12,36 +13,19 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "apksigner";
-  version = "34.0.5-unstable-2024-03-06";
+  # Major version is derived from the API version of the corresponding Android release.
+  # Patch version is derived from the release number.
+  # For example, Android 15 had releases starting at r24 -> r30 is patch 6.
+  version = "35.0.6";
 
   src = fetchgit {
     # use pname here because the final jar uses this as the filename
     name = pname;
     url = "https://android.googlesource.com/platform/tools/apksig";
-    rev = "ac5cbb07d87cc342fcf07715857a812305d69888";
-    hash = "sha256-sLAs7XEkhNkQjB/nhBODxI3QzxFvLWM1SBKDuXp6gvw=";
+    rev = "refs/tags/android-15.0.0_r30";
+    hash = "sha256-f/PggxvBv8nYUyL9Ukd4YVpunpRWbLL5UYsYhsiDWRE=";
   };
 
-  postPatch = ''
-    cat >> build.gradle <<EOF
-
-    apply plugin: 'application'
-    mainClassName = "com.android.apksigner.ApkSignerTool"
-    sourceSets.main.java.srcDirs = [ 'src/apksigner/java', 'src/main/java' ]
-    jar {
-        manifest { attributes "Main-Class": "com.android.apksigner.ApkSignerTool" }
-        from { (configurations.runtimeClasspath).collect { it.isDirectory() ? it : zipTree(it) } } {
-            exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/native/*.dll'
-        }
-        from('src/apksigner/java') {
-            include 'com/android/apksigner/*.txt'
-        }
-    }
-    tasks.named("processTestResources") { dependsOn("extractTestProto") }
-    EOF
-    sed -i -e '/conscrypt/s/testImplementation/implementation/' build.gradle
-  '';
-
   mitmCache = gradle.fetchDeps {
     inherit pname;
     data = ./deps.json;
@@ -56,10 +40,22 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
+  buildInputs = [
+    # required for startup script generated by Gradle
+    bashNonInteractive
+  ];
+
   installPhase = ''
-    install -Dm444 build/libs/apksigner.jar -t $out/lib
-    makeWrapper "${jdk_headless}/bin/java" "$out/bin/apksigner" \
-      --add-flags "-jar $out/lib/apksigner.jar"
+    runHook preInstall
+
+    mkdir -p $out/opt
+    tar xf build/distributions/apksigner.tar
+    mv apksigner $out/opt
+    mkdir -p $out/bin
+    makeWrapper $out/opt/apksigner/bin/apksigner $out/bin/apksigner \
+      --set JAVA_HOME ${jdk_headless.home}
+
+    runHook postInstall
   '';
 
   meta = {

From 61c08aaa057733d77496f54ad52fe03a5c5c0d07 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 23 Apr 2025 20:41:47 +0200
Subject: [PATCH 41/43] linux_xanmod: 6.12.23 -> 6.12.24

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 69749e01b9c2..af4ee673a79c 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.23";
-      hash = "sha256-OBsKzXcFLwqidotHDmPwKFtBX9zRC7DoDR4hhWZUv/E=";
+      version = "6.12.24";
+      hash = "sha256-W4c/MqkwWzLhun700MfT4RzmrHaXyQfKqJ2MKahTMP4=";
     };
     main = {
       version = "6.13.11";

From 683058211b07e2407c924a0f2b75ea5b6bc0ab44 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 23 Apr 2025 20:42:22 +0200
Subject: [PATCH 42/43] linux_xanmod_latest: 6.13.11 -> 6.13.12

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index af4ee673a79c..afaf8931f9d0 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-W4c/MqkwWzLhun700MfT4RzmrHaXyQfKqJ2MKahTMP4=";
     };
     main = {
-      version = "6.13.11";
-      hash = "sha256-hv93f1poaCmjdy2G39+T2crnYMS26FxD2Dn2hmTGZB8=";
+      version = "6.13.12";
+      hash = "sha256-O0sZ26nWfPfgCI9/J7mGZKtLzk9beawKEHoww1euoic=";
     };
   };
 

From ff0e1b3d462c6741833a884dbd38bc6ea9a882b1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 23 Apr 2025 00:42:15 +0100
Subject: [PATCH 43/43] endgame-singularity: 1.00 -> 1.00-unstable-2025-03-18

Latest release crashes in the middle of the game when base setup is
attempted. THe upstream has the fix from last year at:
https://github.com/singularity/singularity/commit/57013b621d641ae9b0b2554918807a88b7727b87

But needs a few backports to make it apply. Let's track `master` instead.
---
 pkgs/by-name/en/endgame-singularity/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/en/endgame-singularity/package.nix b/pkgs/by-name/en/endgame-singularity/package.nix
index 38b8a4fcab45..6712437c60be 100644
--- a/pkgs/by-name/en/endgame-singularity/package.nix
+++ b/pkgs/by-name/en/endgame-singularity/package.nix
@@ -5,17 +5,18 @@
   unzip,
   python3,
   enableDefaultMusicPack ? true,
+  unstableGitUpdater,
 }:
 
 let
   pname = "endgame-singularity";
-  version = "1.00";
+  version = "1.00-unstable-2025-03-18";
 
   main_src = fetchFromGitHub {
     owner = "singularity";
     repo = "singularity";
-    rev = "v${version}";
-    sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl";
+    rev = "8bbc2322ad1a0e83f78f5af731dfa97b6bd63f9c";
+    hash = "sha256-HiFE746JtGjZJbiKhB3ubfb376tJmz78jUfdu3/RQic=";
   };
 
   music_src = fetchurl {
@@ -44,6 +45,14 @@ python3.pkgs.buildPythonApplication {
           # ↑ we cannot glob on [...]/music, it doesn't exist yet
   '';
 
+  passthru = {
+    # for the updater
+    src = main_src;
+    updateScript = unstableGitUpdater {
+      tagPrefix = "v";
+    };
+  };
+
   meta = {
     homepage = "http://www.emhsoft.com/singularity/";
     description = "Simulation game about strong AI";