From 60270b0be261410e66cda73cc975e6b8a2ecd14d Mon Sep 17 00:00:00 2001
From: Emin <me@emin.chat>
Date: Mon, 2 Mar 2026 11:30:31 +0800
Subject: [PATCH 001/332] yosys: set YOSYS_PLUGIN_PATH

This allows `plugin -i slang.so` (and similar) to work in TCL scripts
without requiring an absolute path to the plugin.

Signed-off-by: Emin <me@emin.chat>
---
 pkgs/by-name/yo/yosys/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix
index 915812d9f7d0..5c2d4cb9c020 100644
--- a/pkgs/by-name/yo/yosys/package.nix
+++ b/pkgs/by-name/yo/yosys/package.nix
@@ -50,6 +50,7 @@ let
       postBuild = ''
         wrapProgram $out/bin/yosys \
           --set YOSYS_PATH $out/share/yosys \
+          --set YOSYS_PLUGIN_PATH ${pluginPath} \
           ${module_flags}
       '';
       meta.mainProgram = "yosys";

From 0172dbc5c52b9edebb5f0cf362d76f54ed084273 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 24 Mar 2026 03:34:19 +0100
Subject: [PATCH 002/332] python3Packages.duct-py: fix build

---
 pkgs/development/python-modules/duct-py/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/duct-py/default.nix b/pkgs/development/python-modules/duct-py/default.nix
index 27da99cb6319..3bb63cd26ae9 100644
--- a/pkgs/development/python-modules/duct-py/default.nix
+++ b/pkgs/development/python-modules/duct-py/default.nix
@@ -2,13 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pytestCheckHook,
+  ps,
 }:
 
 buildPythonPackage rec {
   pname = "duct-py";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oconnor663";
@@ -17,9 +19,14 @@ buildPythonPackage rec {
     hash = "sha256-i811nQB8CVJPYPR0Jdzpk64EXxrTMDIBpdDoUs9Xu/k=";
   };
 
+  build-system = [ hatchling ];
+
   pythonImportsCheck = [ "duct" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    ps
+  ];
 
   disabledTests = [
     # This test completely empties the environment then tries to run a Python command.

From 9b9a92eaa785c8ba203de2de0662b7362cabf7cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Apr 2026 04:32:04 +0000
Subject: [PATCH 003/332] mcaselector: 2.6.1 -> 2.7

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

diff --git a/pkgs/by-name/mc/mcaselector/package.nix b/pkgs/by-name/mc/mcaselector/package.nix
index 36e115891913..2c68d9a303cf 100644
--- a/pkgs/by-name/mc/mcaselector/package.nix
+++ b/pkgs/by-name/mc/mcaselector/package.nix
@@ -13,11 +13,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mcaselector";
-  version = "2.6.1";
+  version = "2.7";
 
   src = fetchurl {
     url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar";
-    hash = "sha256-yDTXD0CKjCi2DuJHmMuypeAY3sm3tJOmu2OWt4p+czM=";
+    hash = "sha256-pdJIQmoZhIfvQAHMGy0+IjQviMjFOrNsI69PHLQ9WpE=";
   };
 
   dontUnpack = true;

From 61d18372d6029e17fe5f2460041ebc145eddcb0e Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 22 Apr 2026 23:10:30 -0400
Subject: [PATCH 004/332] nixos/systemd/initrd: Remove with lib

---
 nixos/modules/system/boot/systemd/initrd.nix | 24 ++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 9727fe33d23c..a6c7d6f89f85 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -7,9 +7,29 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    filter
+    elem
+    filterAttrs
+    concatLists
+    mapAttrsToList
+    getBin
+    concatStringsSep
+    mkEnableOption
+    mkOption
+    types
+    literalExpression
+    mkIf
+    any
+    isBool
+    isString
+    optionalAttrs
+    mapAttrs'
+    nameValuePair
+    listToAttrs
+    ;
+
   inherit (utils) systemdUtils escapeSystemdPath;
   inherit (systemdUtils.unitOptions) unitOption;
   inherit (systemdUtils.lib)

From 983d84d401c1a6295a0eccacbfaa04e63b879f3b Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 22 Apr 2026 23:28:16 -0400
Subject: [PATCH 005/332] nixos/systemd/initrd: Check MODULES accurately

`config.system.build.kernel.config` is not actually accurate. When a
kconfig is specified in the `config` argument to `kernel/build.nix`
(a.k.a. `manualConfig` or `linuxManualConfig`), then `isSet` will
return `true` and other queries like `isYes` will be accurate. But if
a kconfig is not specified in that `config` argument, then `isSet`
will return `false` and other queries will be inaccurate, e.g. `isYes`
"MODULES"` can return `false` even though your `configfile` has it
enabled.

Note the difference between the `config` argument and the `configfile`
argument. The `configfile` is how the kernel will be actually built,
while `config` is merely passed through as a source of eval-time
information. Importantly, neither is derived from the other *in any
way*, unless `builtins.isPath configfile || allowImportFromDerivation`
in which case the default value for `config` is derived from reading
`configfile`.

The more generic `kernel/generic.nix` (a.k.a. `buildLinux`) creates
its `configfile` in a derivation, so it cannot be read at eval time by
default. It calls into `kernel/build.nix`, and only passes a `config`
with `CONFIG_MODULES`, `CONFIG_FW_LOADER`, and `CONFIG_RUST` set. So
almost nothing in `kernel.config` is accurate in the typical
case. `MODULES` happens to be one of the three that *is* accurate
typically, but regardless we obviously can't rely on that since a user
of `kernel/build.nix` is likely to mess it up. Even worse,
`structuredExtraConfig` is not incorporated into `kernel.config` at
all, which leads to the incredibly confusing scenario where a kconfig
is specified in `structuredExtraConfig` but still is not represented
accurately by these queries.

All of this is why, in most cases, the implementation of
`requiredKernelConfig` deliberately does absolutely nothing and
creates an empty list of assertions, and it's all extremely confusing.

With all that in mind:

TODO:

- The structured config used to generate the `configfile` should be
  reflected in the `config` argument to `kernel/build.nix`, and
  consequently `kernel.config`.
- The three kconfigs represented by `config` in `kernel/generic.nix`
  now, `CONFIG_MODULES`, `CONFIG_FW_LOADER`, and `CONFIG_RUST`, should
  be set in the structured config.
- Queries for kconfigs that we don't actually know the value of at
  eval time should fail to evaluate, rather than evaluating
  inaccurately.
- Most of the ways we use these eval-time queries should instead be
  done at build time, so they can use the complete `configfile` rather
  than the incomplete eval-time `config` value.
- The ones that we still want to happen at eval-time should be more
  prepared for the possibility that we can't know the value of
  arbitrary kconfigs at eval time.

---

Anyway, all that is to say: I'd like for this all to be better, but am
not willing to work on the kernel expressions myself at the moment, so
I thought I'd write down the reasons why this change was necessary,
and the extent of the problem.

We had already successfully considered this issue in one place in
`systemd/initrd.nix`, but it seems there are two more places where we
should have taken the same care.
---
 nixos/modules/system/boot/systemd/initrd.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index a6c7d6f89f85..f242cb8c6a5b 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -47,6 +47,12 @@ let
 
   cfg = config.boot.initrd.systemd;
 
+  withKmod =
+    let
+      kconfig = config.system.build.kernel.config;
+    in
+    kconfig.isSet "MODULES" -> kconfig.isYes "MODULES";
+
   upstreamUnits = [
     "basic.target"
     "breakpoint-pre-udev.service"
@@ -525,7 +531,7 @@ in
         pkgs.coreutils
         cfg.package
       ]
-      ++ lib.optional (config.system.build.kernel.config.isYes "MODULES") cfg.package.kmod
+      ++ lib.optional withKmod cfg.package.kmod
       ++ lib.optionals cfg.shell.enable [
         # bashInteractive is easier to use and also required by debug-shell.service
         pkgs.bashInteractive
@@ -575,7 +581,7 @@ in
       // optionalAttrs (config.environment.etc ? "modprobe.d/nixos.conf") {
         "/etc/modprobe.d/nixos.conf".source = config.environment.etc."modprobe.d/nixos.conf".source;
       }
-      // optionalAttrs (with config.system.build.kernel.config; isSet "MODULES" -> isYes "MODULES") {
+      // optionalAttrs withKmod {
         "/lib".source = "${config.system.build.modulesClosure}/lib";
 
         "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
@@ -660,7 +666,7 @@ in
           ) cfg.automounts
         );
 
-      services."modprobe@" = lib.mkIf (config.system.build.kernel.config.isYes "MODULES") {
+      services."modprobe@" = lib.mkIf withKmod {
         serviceConfig.ExecSearchPath = lib.makeBinPath [ cfg.package.kmod ];
       };
 

From 1d547fa09035a9392cb7a1e94b28b88c1675834d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 12:15:07 +0000
Subject: [PATCH 006/332] python3Packages.flufl-lock: 8.2.0 -> 9.1.0

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

diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix
index 8f0a68f996d2..0cf5218ddfbc 100644
--- a/pkgs/development/python-modules/flufl/lock.nix
+++ b/pkgs/development/python-modules/flufl/lock.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "flufl-lock";
-  version = "8.2.0";
+  version = "9.1.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "flufl_lock";
     inherit version;
-    hash = "sha256-FbMzw1+rGjayI4QAVyWK60zXnw+6+CwUTyPN9s8U1eM=";
+    hash = "sha256-jXPIjKt8mLeSZxApnBFivsfOJT+bnF8KLKgDf58kAjQ=";
   };
 
   build-system = [ hatchling ];

From 82c0c2cea4d63df222c68a63666ed9eaa221b593 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 May 2026 04:57:25 +0000
Subject: [PATCH 007/332] frr: 10.6.0 -> 10.6.1

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

diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index bd0dd47c3d2a..f3caad2e61d6 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -81,13 +81,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "frr";
-  version = "10.6.0";
+  version = "10.6.1";
 
   src = fetchFromGitHub {
     owner = "FRRouting";
     repo = "frr";
     rev = "frr-${finalAttrs.version}";
-    hash = "sha256-o0h9adGvb9FEcAMYrjrjTb7MMozdXriOsK6fE0fGjss=";
+    hash = "sha256-sSvw9tfVNUyQjEOELoUAIQkEvXg765MsWvVKM0gsYUc=";
   };
 
   # Without the std explicitly set, we may run into abseil-cpp

From 20cab336509bc7a4e67d8540f31815afac25a148 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 1 May 2026 18:11:49 +0200
Subject: [PATCH 008/332] portablemc: 4.4.1 -> 5.0.3

---
 pkgs/by-name/po/portablemc/package.nix        | 134 ++++++++++++------
 .../po/portablemc/use-builtin-java.patch      |  47 ------
 2 files changed, 87 insertions(+), 94 deletions(-)
 delete mode 100644 pkgs/by-name/po/portablemc/use-builtin-java.patch

diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 2e795d12a94e..cd22a688b430 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -1,96 +1,136 @@
 {
   lib,
   stdenv,
-  python3Packages,
   fetchFromGitHub,
-  installShellFiles,
-  jre,
 
+  rustPlatform,
+  pkg-config,
+  openssl,
+
+  makeWrapper,
+
+  addDriverRunpath,
+  alsa-lib,
+  glfw3-minecraft,
+  libGL,
+  libjack2,
+  libpulseaudio,
   libx11,
-  libxext,
   libxcursor,
+  libxext,
   libxrandr,
   libxxf86vm,
-  libpulseaudio,
-  libGL,
-  glfw,
   openal,
+  pipewire,
   udev,
+  vulkan-loader,
 
   textToSpeechSupport ? stdenv.hostPlatform.isLinux,
   flite,
+
+  pciutils,
+  xrandr,
+
+  jdk25,
+  jdk21,
+  jdk17,
+  jdk8,
+
+  # can be overriden to reduce the closure size
+  jvms ? [
+    jdk25
+    jdk21
+    jdk17
+    jdk8
+  ],
+
+  additionalLibs ? [ ],
+  additionalPrograms ? [ ],
 }:
 
 let
   # Copied from the `prismlauncher` package
   runtimeLibs = [
-    # lwjgl
-    libGL
-    glfw
-    openal
     (lib.getLib stdenv.cc.cc)
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ## native versions
+    glfw3-minecraft
+    openal
+
+    ## openal
+    alsa-lib
+    libjack2
+    libpulseaudio
+    pipewire
+
+    ## glfw
+    libGL
     libx11
-    libxext
     libxcursor
+    libxext
     libxrandr
     libxxf86vm
 
-    # lwjgl
-    libpulseaudio
+    udev # oshi
 
-    # oshi
-    udev
+    vulkan-loader # VulkanMod's lwjgl
   ]
-  ++ lib.optional textToSpeechSupport flite;
+  ++ lib.optional textToSpeechSupport flite
+  ++ additionalLibs;
+
+  # Copied from the `prismlauncher` package
+  runtimePrograms = [
+    pciutils # need lspci
+    xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+  ]
+  ++ additionalPrograms;
+
 in
-python3Packages.buildPythonApplication (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "portablemc";
-  version = "4.4.1";
-  pyproject = true;
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "theorzr";
     repo = "portablemc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KE1qf6aIcDjwKzrdKDUmriWfAt+vuriew6ixHKm0xs8=";
+    hash = "sha256-P/ah7pwOdbgRDgpvhEDcNA1RiDzG2nYZCR13vzljLd8=";
   };
 
-  patches = [
-    # Use the jre package provided by nixpkgs by default
-    ./use-builtin-java.patch
-  ];
+  dontUnpack = true;
 
-  nativeBuildInputs = [ installShellFiles ];
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-Ub9XVc6gcu6fEiOheew9Uh3LqdaSzVKITboDTK+MQUI=";
+  };
 
-  build-system = [ python3Packages.poetry-core ];
+  unwrapped = rustPlatform.buildRustPackage {
+    name = "portablemc-${finalAttrs.version}-unwrapped";
+    inherit (finalAttrs) src cargoDeps;
 
-  dependencies = [ python3Packages.certifi ];
+    nativeBuildInputs = [ pkg-config ];
 
-  # Note: Tests use networking, so we don't run them
+    buildInputs = [ openssl ];
+  };
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd portablemc \
-        --bash <($out/bin/portablemc show completion bash) \
-        --zsh <($out/bin/portablemc show completion zsh)
-  '';
+  strictDeps = true;
+  nativeBuildInputs = [ makeWrapper ];
 
-  preFixup = ''
-    makeWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeLibs}
-      --prefix PATH : ${lib.makeBinPath [ jre ]}
-    )
+  installPhase = ''
+    runHook preInstall
+
+    makeWrapper "$unwrapped/bin/portablemc" "$out/bin/portablemc" \
+      ${lib.optionalString stdenv.hostPlatform.isLinux ''
+        --prefix LD_LIBRARY_PATH : "${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" \
+        --prefix PATH : "${lib.makeBinPath runtimePrograms}" \
+      ''} \
+      --prefix PATH : ${lib.makeBinPath jvms}
+
+    runHook postInstall
   '';
 
   meta = {
     homepage = "https://github.com/theorzr/portablemc";
-    description = "Fast, reliable and cross-platform command-line Minecraft launcher and API for developers";
-    longDescription = ''
-      A fast, reliable and cross-platform command-line Minecraft launcher and API for developers.
-      Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt.
-      This launcher is compatible with the standard Minecraft directories.
-    '';
+    description = "Cross platform command line utility for launching Minecraft quickly and reliably with included support for Mojang versions and popular mod loaders";
     changelog = "https://github.com/theorzr/portablemc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     mainProgram = "portablemc";
diff --git a/pkgs/by-name/po/portablemc/use-builtin-java.patch b/pkgs/by-name/po/portablemc/use-builtin-java.patch
deleted file mode 100644
index a88d97bae9b5..000000000000
--- a/pkgs/by-name/po/portablemc/use-builtin-java.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/portablemc/standard.py b/portablemc/standard.py
-index f59c55d..0f017e1 100644
---- a/portablemc/standard.py
-+++ b/portablemc/standard.py
-@@ -843,6 +843,8 @@ class Version:
-         if jvm_major_version is not None and not isinstance(jvm_major_version, int):
-             raise ValueError("metadata: /javaVersion/majorVersion must be an integer")
- 
-+        return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_ARCH, jvm_major_version)
-+
-         if platform.system() == "Linux" and platform.libc_ver()[0] != "glibc":
-             return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_LIBC, jvm_major_version)
- 
-@@ -926,31 +928,10 @@ class Version:
-         builtin_path = shutil.which(jvm_bin_filename)
-         if builtin_path is None:
-             raise JvmNotFoundError(reason)
--        
--        try:
--            
--            # Get version of the JVM.
--            process = Popen([builtin_path, "-version"], bufsize=1, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
--            stdout, _stderr = process.communicate(timeout=1)
--
--            version_start = stdout.index(f"1.{major_version}" if major_version <= 8 else str(major_version))
--            version = None
--            
--            # Parse version by getting all character that are numeric or '.'.
--            for i, ch in enumerate(stdout[version_start:]):
--                if not ch.isnumeric() and ch not in (".", "_"):
--                    version = stdout[version_start:i]
--                    break
--            
--            if version is None:
--                raise ValueError()
--
--        except (TimeoutExpired, ValueError):
--            raise JvmNotFoundError(JvmNotFoundError.BUILTIN_INVALID_VERSION)
- 
-         self._jvm_path = Path(builtin_path)
--        self._jvm_version = version
--        watcher.handle(JvmLoadedEvent(version, JvmLoadedEvent.BUILTIN))
-+        self._jvm_version = "nixpkgs"
-+        watcher.handle(JvmLoadedEvent("nixpkgs", JvmLoadedEvent.BUILTIN))
- 
-     def _download(self, watcher: Watcher) -> None:
-         

From c4b0fa64b33a9147f0f3f9af93cd1a4f024e80b2 Mon Sep 17 00:00:00 2001
From: Frederic Ruget <fred@atlant.is>
Date: Wed, 1 Apr 2026 14:03:16 +0000
Subject: [PATCH 009/332] yb: 0.1.0 -> 0.4.2, rewrite in Rust

The Python implementation has been replaced by a Rust rewrite.
This updates the package definition accordingly:

- Switch from buildPythonApplication to rustPlatform.buildRustPackage
- Cargo workspace lives in rust/ subdirectory (cargoRoot = rust)
- System dependency is now pcsclite only (no more opensc, openssl,
  yubico-piv-tool, yubikey-manager)
- Install shell completions (bash, zsh, fish) via installShellFiles
- Install man pages via yb-gen-man helper binary
- Add passthru.tests.integration: NixOS VM test using vsmartcard-vpcd
  and piv-authenticator to exercise the full PIV stack without hardware
- Add nix-update-script for automated version updates
---
 nixos/tests/all-tests.nix      |   1 +
 nixos/tests/yb.nix             |  54 +++++++++
 pkgs/by-name/yb/yb/package.nix | 198 ++++++++++++++++++++++-----------
 3 files changed, 185 insertions(+), 68 deletions(-)
 create mode 100644 nixos/tests/yb.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b276d07786bc..1fc6c9f29f39 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1811,6 +1811,7 @@ in
   xterm = runTest ./xterm.nix;
   xxh = runTest ./xxh.nix;
   yarr = runTest ./yarr.nix;
+  yb = pkgs.callPackage ./yb.nix { inherit (pkgs.yb.passthru) ybPivHarnessTests testFixtures; };
   ydotool = import ./ydotool.nix {
     inherit (pkgs) lib;
     inherit runTest;
diff --git a/nixos/tests/yb.nix b/nixos/tests/yb.nix
new file mode 100644
index 000000000000..696ee8170ab8
--- /dev/null
+++ b/nixos/tests/yb.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  pkgs,
+  ybPivHarnessTests,
+  testFixtures,
+}:
+
+pkgs.testers.nixosTest {
+  name = "yb-integration-tests";
+  meta.maintainers = with lib.maintainers; [ douzebis ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.pcscd = {
+        enable = true;
+        plugins = [
+          pkgs.ccid
+          pkgs.vsmartcard-vpcd
+        ];
+      };
+
+      environment.systemPackages = [
+        pkgs.yb
+        ybPivHarnessTests
+      ];
+    };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("pcscd.socket")
+
+    # Tier-2: virtual smart card PIV tests (each test gets a fresh
+    # RAM-backed card via vsmartcard-vpcd). Serialised to avoid
+    # concurrent vpcd connections.
+    out = machine.succeed("RUST_TEST_THREADS=1 hardware_piv_tests 2>&1")
+    print(out)
+    if "test result: ok" not in out:
+      raise Exception("hardware_piv_tests failed:\n" + out)
+
+    # Tier-2: CLI subprocess tests against the Nix-built yb binary.
+    # YB_FIXTURE_DIR points to fixtures in the nix store (the build-sandbox
+    # path baked into CARGO_MANIFEST_DIR is gone at VM runtime).
+    out = machine.succeed(
+      "RUST_TEST_THREADS=1"
+      + " YB_BIN=${pkgs.yb}/bin/yb"
+      + " YB_FIXTURE_DIR=${testFixtures}"
+      + " yb_cli_tests 2>&1"
+    )
+    print(out)
+    if "test result: ok" not in out:
+      raise Exception("yb_cli_tests failed:\n" + out)
+  '';
+}
diff --git a/pkgs/by-name/yb/yb/package.nix b/pkgs/by-name/yb/yb/package.nix
index b96acb2db702..198e7cc97dc9 100644
--- a/pkgs/by-name/yb/yb/package.nix
+++ b/pkgs/by-name/yb/yb/package.nix
@@ -1,97 +1,159 @@
 {
   lib,
-  python3Packages,
+  rustPlatform,
   fetchFromGitHub,
-  opensc,
-  openssl,
-  yubico-piv-tool,
-  yubikey-manager,
+  installShellFiles,
+  versionCheckHook,
+  pcsclite,
+  pkg-config,
+  runCommand,
+  llvmPackages,
+  nix-update-script,
+  nixosTests,
+  stdenv,
 }:
 
-python3Packages.buildPythonApplication (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yb";
-  version = "0.1.0";
-  pyproject = true;
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "douzebis";
     repo = "yb";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Eq3qFDzi/G4qQ3UUZWyl42zMYAO2C0ipV2yXxt2EAUw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gX9s1R/75ipaPJFPTBMR2riIxMmw1KfuURx2Up6ovOM=";
   };
 
-  build-system = with python3Packages; [
-    setuptools
-    wheel
-  ];
+  cargoRoot = "rust";
 
-  dependencies = with python3Packages; [
-    click
-    cryptography
-    prompt-toolkit
-    pyscard
-    pyyaml
-    yubikey-manager
-  ];
+  cargoHash = "sha256-J91BH0eXuTtGZCSWWLYGM5KHtBjczD1Qu5PxIXAnFRI=";
 
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-  ];
-
-  buildInputs = [
-    opensc
-    openssl
-    yubico-piv-tool
-    yubikey-manager
-  ];
-
-  makeWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    "${lib.makeBinPath [
-      opensc
-      openssl
-      yubico-piv-tool
-      yubikey-manager
-    ]}"
-    "--set"
-    "LD_LIBRARY_PATH"
-    "${yubico-piv-tool}/lib"
-  ];
-
-  pythonImportsCheck = [
+  # Build and test only the yb crate (not the yb-piv-harness test harness,
+  # which requires a virtual smart card and runs in the NixOS VM test below).
+  buildAndTestSubdir = "rust/yb";
+  cargoBuildFlags = [
+    "-p"
     "yb"
+    "--features"
+    "self-test"
+  ];
+  cargoTestFlags = [
+    "-p"
+    "yb"
+    "--features"
+    "self-test"
   ];
 
-  # Run subset of tests that don't require YubiKey hardware
-  doCheck = true;
-  enabledTestPaths = [
-    "tests"
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
   ];
 
+  buildInputs = lib.optionals stdenv.isLinux [ pcsclite ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # Bash completion: patch two clap_complete quirks:
+    #   1. Add `compopt -o filenames` so path arguments complete correctly.
+    #   2. Replace $2 (bash-tokenized word) with the actual typed text up to
+    #      the cursor, so arguments with spaces (e.g. --reader "Yubico YubiKey
+    #      OTP+FIDO+CCID 00 00") complete correctly.
+    YB_COMPLETE=bash $out/bin/yb > _yb.bash
+    substituteInPlace _yb.bash \
+      --replace-fail '    ) )' '    ) )
+    compopt -o filenames 2>/dev/null' \
+      --replace-fail 'words[COMP_CWORD]="$2"' 'local _cur="''${COMP_LINE:0:''${COMP_POINT}}"
+        _cur="''${_cur##* }"
+        words[COMP_CWORD]="''${_cur}"'
+    installShellCompletion --cmd yb \
+      --bash _yb.bash \
+      --zsh  <(YB_COMPLETE=zsh  $out/bin/yb) \
+      --fish <(YB_COMPLETE=fish $out/bin/yb)
+
+    # Man pages (generated by the yb-gen-man helper binary, also in this crate).
+    $out/bin/yb-gen-man $out/share/man/man1
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru =
+    let
+      # Fixture files needed by yb_cli_tests at VM runtime. rustPlatform vendors
+      # the entire workspace but strips non-Rust files, so the compile-time
+      # CARGO_MANIFEST_DIR path for fixtures is gone at VM time. We ship them as
+      # a separate store path and inject YB_FIXTURE_DIR in the testScript.
+      testFixtures = runCommand "yb-test-fixtures" { } ''
+        mkdir -p $out
+        cp ${finalAttrs.src}/rust/yb-core/tests/fixtures/with_key.yaml $out/with_key.yaml
+        cp ${finalAttrs.src}/rust/yb-core/tests/fixtures/default.yaml  $out/default.yaml
+      '';
+
+      # Compile the harness test binaries (--no-run: compiled but not executed
+      # here; the testScript in tests.nix invokes them directly).
+      ybPivHarnessTests = rustPlatform.buildRustPackage {
+        pname = "yb-piv-harness-tests";
+        inherit (finalAttrs)
+          version
+          src
+          cargoRoot
+          cargoHash
+          ;
+
+        buildAndTestSubdir = "rust";
+
+        nativeBuildInputs = [
+          pkg-config
+          llvmPackages.libclang
+        ];
+        buildInputs = lib.optionals stdenv.isLinux [ pcsclite ];
+
+        LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+        BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.versions.major llvmPackages.release_version}/include";
+
+        # Skip the normal build — we only want the test binaries.
+        buildPhase = ''
+          (cd rust && cargo test --no-run \
+            -p yb-piv-harness --features integration-tests \
+            --offline --release)
+        '';
+
+        doCheck = false;
+
+        installPhase = ''
+          mkdir -p $out/bin
+          (cd rust && for name in hardware_piv_tests yb_cli_tests; do
+            bin=$(find target/release/deps -maxdepth 1 -name "$name-*" ! -name "*.d" -type f)
+            if [ -z "$bin" ] || [ ! -f "$bin" ]; then
+              echo "ERROR: could not find $name binary" >&2
+              exit 1
+            fi
+            cp "$bin" $out/bin/$name
+          done)
+        '';
+      };
+    in
+    {
+      inherit ybPivHarnessTests testFixtures;
+      tests.integration = nixosTests.yb;
+      updateScript = nix-update-script { };
+    };
+
   meta = {
-    description = "CLI tool for securely storing and retrieving binary blobs using YubiKey";
+    description = "Secure blob storage on a YubiKey";
     longDescription = ''
-      yb is a command-line tool that provides secure blob storage using a YubiKey device.
-      It leverages the YubiKey's PIV (Personal Identity Verification) application to store
-      encrypted or unencrypted binary data in custom PIV data objects. The tool uses hybrid
-      encryption (ECDH + AES-256-CBC) to protect sensitive data with hardware-backed
-      cryptographic keys.
-
-      Features:
-      - Hardware-backed encryption using YubiKey PIV
-      - ~36 KB storage capacity (expandable to ~48 KB)
-      - PIN-protected management key mode
-      - Multi-device support with interactive selection
-      - Shell auto-completion for blob names
-      - Glob pattern filtering
+      Command-line tool for storing encrypted binary blobs on a YubiKey using
+      the PIV application. Uses hybrid encryption (ECDH + AES-256-GCM) with
+      hardware-backed keys, supports PIN-protected management key setup
+      (--protect), glob-pattern blob listing, and shell completions for bash,
+      zsh, and fish.
     '';
     homepage = "https://github.com/douzebis/yb";
     changelog = "https://github.com/douzebis/yb/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ douzebis ];
     mainProgram = "yb";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 })

From 985762a92f3df34bba4cc9c85abaaeefb892ada2 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Mon, 4 May 2026 23:37:10 -0700
Subject: [PATCH 010/332] lttv: drop

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

diff --git a/pkgs/by-name/lt/lttv/package.nix b/pkgs/by-name/lt/lttv/package.nix
deleted file mode 100644
index c55200acf6a7..000000000000
--- a/pkgs/by-name/lt/lttv/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  pkg-config,
-  glib,
-  gtk2,
-  popt,
-  babeltrace,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "lttv";
-  version = "1.5";
-
-  src = fetchurl {
-    url = "https://lttng.org/files/packages/lttv-${finalAttrs.version}.tar.bz2";
-    sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
-  };
-
-  patches = [
-    # fix build with gcc14:
-    (fetchpatch {
-      name = "lttv-c99-compatibility-fix.patch";
-      url = "https://git.lttng.org/?p=lttv.git;a=patch;h=6b9d59fe4cc1dc943501ab6ede93856b2f06c3ce";
-      hash = "sha256-zcLHBri0i10NGkgiZT6QRZbixffYvkzLaFBeC/ESF/U=";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    glib
-    gtk2
-    popt
-    babeltrace
-  ];
-
-  meta = {
-    description = "Graphical trace viewer for LTTng trace files";
-    homepage = "https://lttng.org/";
-    # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
-    # The rest of the LTTV package is distributed under the GNU GPL v2.
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-    ];
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.bjornfor ];
-  };
-
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2e8656dbd5d0..d87d3cdca999 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1298,6 +1298,7 @@ mapAliases {
   log4shell-detector = throw "'log4shell-detector' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
   lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30
   LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
+  lttv = throw "'lttv' has been removed, as it is broken and unmaintained. Upstream suggests using 'tracecompass' or 'babeltrace2' instead"; # Added 2026-05-04
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
   luminanceHDR = throw "'luminanceHDR' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
   lunarvim = throw "'lunarvim' has been removed since it was abandoned upstream and relied on an older version of 'neovim' to work properly"; # Added 2026-02-05

From c8642334e43f70e0e10074204c9fe3659513409b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 May 2026 18:49:13 +0000
Subject: [PATCH 011/332] alacritty-theme: 0-unstable-2026-02-13 ->
 0-unstable-2026-05-01

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

diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
index 09435f3d4689..9ffd9a2cf597 100644
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alacritty-theme";
-  version = "0-unstable-2026-02-13";
+  version = "0-unstable-2026-05-01";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "dcd837532011fcfc6941d0dc84b3271888309ee8";
-    hash = "sha256-NkGM9rS1FQUDlFRXqGM9dlUMy7cwKxcSz+vFjQs+Tgg=";
+    rev = "2749b407b597790e6f08b218c2bc2acdf66210a0";
+    hash = "sha256-vcacyCQ8XqnDUQ/rx+FBdcKHDfvkxUszIJRZZsvauag=";
     sparseCheckout = [ "themes" ];
   };
 

From 1abd4ccdd3780b9df08ef2a8de86733b9d7aae70 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 7 May 2026 08:24:46 +0200
Subject: [PATCH 012/332] mailmanPackages.postorius: 1.3.10 -> 1.3.13

Even though the previous version worked fine with our current Django,
this version adds a tight version check, so we have to backport the
unreleased loosening of that check.
---
 pkgs/servers/mail/mailman/postorius.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index aabcf02e5115..f25a2ac011a8 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -10,12 +10,12 @@ with python3.pkgs;
 
 buildPythonPackage (finalAttrs: {
   pname = "postorius";
-  version = "1.3.10";
-  format = "setuptools";
+  version = "1.3.13";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-GmbIqO+03LgbUxJ1nTStXrYN3t2MfvzbeYRAipfTW1o=";
+    hash = "sha256-YC3vXEhSkA1J6K2VGWojNOE8MeSdnAhZMkh558UTGiI=";
   };
 
   patches = [
@@ -25,9 +25,20 @@ buildPythonPackage (finalAttrs: {
       excludes = [ "src/postorius/doc/news.rst" ];
       hash = "sha256-M8C7mO/KoVhl1YtZ5x3wqL+aBkepJ/7NoIRUmd0JpiM=";
     })
+
+    (fetchpatch {
+      name = "django-5.2.patch";
+      url = "https://gitlab.com/mailman/postorius/-/commit/0468ab0329df85b89e6b5d9f7b4d1805f47450c9.patch";
+      excludes = [
+        ".gitlab-ci.yml"
+        "src/postorius/doc/news.rst"
+      ];
+      hash = "sha256-4yk7hLF6cRfS7Kelr49LPeVfrqvNoX1jxTy8sdGrMAk=";
+    })
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ pdm-backend ];
+  dependencies = [
     django-mailman3
     readme-renderer
   ]

From 1441da331a16ef4dc4ca0c2686e96f7f818f38ce Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 7 May 2026 08:41:32 +0200
Subject: [PATCH 013/332] mailman: 3.3.9 -> 3.3.10

---
 pkgs/servers/mail/mailman/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix
index 75cd2331ff87..fac9ea19cf35 100644
--- a/pkgs/servers/mail/mailman/package.nix
+++ b/pkgs/servers/mail/mailman/package.nix
@@ -12,16 +12,16 @@ with python3.pkgs;
 
 buildPythonPackage (finalAttrs: {
   pname = "mailman";
-  version = "3.3.9";
+  version = "3.3.10";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo=";
+    hash = "sha256-DeR4/PMm8l2TGTjDdE5hxc1nWWtG5bHjuyq/mdVEVjI=";
   };
 
   build-system = with python3.pkgs; [
-    setuptools
+    pdm-backend
   ];
 
   dependencies = with python3.pkgs; [
@@ -71,6 +71,11 @@ buildPythonPackage (finalAttrs: {
       --replace /usr/sbin/postmap ${postfix}/bin/postmap
     substituteInPlace src/mailman/config/schema.cfg \
       --replace /usr/bin/lynx ${lynx}/bin/lynx
+
+    # Backport of
+    # https://gitlab.com/mailman/mailman/-/commit/3a22537382d41ab3e46b859054547755963b069d.patch
+    substituteInPlace pyproject.toml \
+      --replace-fail '"nntplib;' '"standard-nntplib;'
   '';
 
   # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping

From 6e732d98d828ceefa6435f48fef9ddc8120886cf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 7 May 2026 09:14:27 +0200
Subject: [PATCH 014/332] mailmanPackages.python3.pkgs.django-allauth: 0.63.6
 -> 65.16.1

As far as I can tell, the released version of django-mailman3 is not
affected by any of the issues that have required further fixes for
newer allauth, since they're all for the Fedora provider, which in
this version doesn't use allauth at all.
---
 .../python-modules/django-mailman3/default.nix    | 15 +++++++++++++--
 pkgs/servers/mail/mailman/python.nix              | 13 -------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 467867a3cead..f6099fb25799 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -41,6 +41,18 @@ buildPythonPackage rec {
       ];
       hash = "sha256-gSFczuNLlMclqixOu6ElS0BewUTGyhP6RXtE/waLzyo=";
     })
+
+    (fetchpatch {
+      # Only needed so the next one applies.
+      name = "allauth-64-1.patch";
+      url = "https://gitlab.com/mailman/django-mailman3/-/commit/96f3f3bf0c718395ccd1b0d539a40d627522a9c4.patch";
+      hash = "sha256-xgQu70DkbPz+ULRFgKeJTbx/Tq2PLEyGgrncf26ChA4=";
+    })
+    (fetchpatch {
+      name = "allauth-64-2.patch";
+      url = "https://gitlab.com/mailman/django-mailman3/-/commit/cfdacb9195ce266e5ae23307b31304898369f696.patch";
+      hash = "sha256-6mwGSw31Q0+APwdGFe0JE0gBigdo453HZZ6JApqgtTE=";
+    })
   ];
 
   pythonRelaxDeps = [ "django-allauth" ];
@@ -77,7 +89,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/mailman/django-mailman3";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ qyliss ];
-    broken =
-      lib.versionAtLeast django-allauth.version "65.0.0" || lib.versionAtLeast django.version "5.3";
+    broken = lib.versionAtLeast django.version "5.3";
   };
 }
diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index 9a1b7b094413..c470f72e7f4c 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -27,19 +27,6 @@ lib.fix (
             [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291
           */
           django = super.django_5;
-
-          django-allauth = super.django-allauth.overrideAttrs (
-            new:
-            { src, ... }:
-            {
-              version = "0.63.6";
-              src = src.override {
-                tag = new.version;
-                hash = "sha256-13/QbA//wyHE9yMB7Jy/sJEyqPKxiMN+CZwSc4U6okU=";
-              };
-              patches = [ ];
-            }
-          );
         })
 
         overlay;

From 36bb671a2b7d0769223e8162313710c9b7330f87 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 28 Apr 2026 12:55:00 -0700
Subject: [PATCH 015/332] python3Packages.langchain-anthropic: fix changelog
 link

---
 pkgs/development/python-modules/langchain-anthropic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index af748fb30dea..c35a5debb7cd 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -75,7 +75,7 @@ buildPythonPackage (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/langchain-ai/langchain-anthropic/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/langchain-ai/langchain/releases/tag/${finalAttrs.src.tag}";
     description = "Build LangChain applications with Anthropic";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/anthropic";
     license = lib.licenses.mit;

From a85cee2e313ebcb63bb3970297de607f5fb12b64 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 28 Apr 2026 12:57:29 -0700
Subject: [PATCH 016/332] python3Packages.langchain-perplexity: migrate to
 finalAttrs

---
 .../python-modules/langchain-perplexity/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix
index 00c410464b0a..15f1c51a091d 100644
--- a/pkgs/development/python-modules/langchain-perplexity/default.nix
+++ b/pkgs/development/python-modules/langchain-perplexity/default.nix
@@ -21,7 +21,7 @@
   gitUpdater,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "langchain-perplexity";
   version = "1.1.0";
   pyproject = true;
@@ -29,11 +29,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-perplexity==${version}";
+    tag = "langchain-perplexity==${finalAttrs.version}";
     hash = "sha256-bm7sIa62CIvsYNDdaN+XZKpRnCv5bg9kPZ1Ym8utFcM=";
   };
 
-  sourceRoot = "${src.name}/libs/partners/perplexity";
+  sourceRoot = "${finalAttrs.src.name}/libs/partners/perplexity";
 
   build-system = [ hatchling ];
 
@@ -69,7 +69,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/langchain-ai/langchain-perplexity/releases/tag/${src.tag}";
+    changelog = "https://github.com/langchain-ai/langchain-perplexity/releases/tag/${finalAttrs.src.tag}";
     description = "Build LangChain applications with Perplexity";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/perplexity";
     license = lib.licenses.mit;
@@ -77,4 +77,4 @@ buildPythonPackage rec {
       sarahec
     ];
   };
-}
+})

From 6a07a01894265816a6cb964050d5904d2a9ed0c5 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 28 Apr 2026 13:01:49 -0700
Subject: [PATCH 017/332] python3Packages.langchain-perplexity: fix changelog
 link

---
 .../development/python-modules/langchain-perplexity/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix
index 15f1c51a091d..8704e3615b8f 100644
--- a/pkgs/development/python-modules/langchain-perplexity/default.nix
+++ b/pkgs/development/python-modules/langchain-perplexity/default.nix
@@ -69,7 +69,7 @@ buildPythonPackage (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/langchain-ai/langchain-perplexity/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/langchain-ai/langchain/releases/tag/${finalAttrs.src.tag}";
     description = "Build LangChain applications with Perplexity";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/perplexity";
     license = lib.licenses.mit;

From 7fa538f8b4ab04b24dbedbb2ddb0806ea88d2c56 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 28 Apr 2026 13:03:57 -0700
Subject: [PATCH 018/332] python3Packages.langchain-xai: fix changelog link

---
 pkgs/development/python-modules/langchain-xai/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix
index ab01b237473e..36fc76d6557f 100644
--- a/pkgs/development/python-modules/langchain-xai/default.nix
+++ b/pkgs/development/python-modules/langchain-xai/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenvNoCC,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -72,7 +71,7 @@ buildPythonPackage (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/langchain-ai/langchain-xai/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/langchain-ai/langchain/releases/tag/${finalAttrs.src.tag}";
     description = "Build LangChain applications with X AI";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/xai";
     license = lib.licenses.mit;

From 1af7691a7913780847ebfae030e075f068c3057a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 9 May 2026 00:15:30 +0200
Subject: [PATCH 019/332] gnome-2048: 3.38.2 -> 50.2

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gnome-2048/package.nix | 58 +++++++++++++++-----------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-2048/package.nix b/pkgs/by-name/gn/gnome-2048/package.nix
index 95c714747d45..f901180442b3 100644
--- a/pkgs/by-name/gn/gnome-2048/package.nix
+++ b/pkgs/by-name/gn/gnome-2048/package.nix
@@ -1,38 +1,39 @@
 {
   lib,
-  stdenv,
+  rustPlatform,
   fetchurl,
-  fetchpatch,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
   meson,
   vala,
   pkg-config,
   ninja,
   itstool,
-  clutter-gtk,
-  libgee,
-  libgnome-games-support,
   gnome,
-  gtk3,
+  gtk4,
+  libadwaita,
+  stdenv,
+  rustc,
+  cargo,
+  desktop-file-utils,
+  writableTmpDirAsHomeHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "gnome-twenty-forty-eight";
-  version = "3.38.2";
+  pname = "gnome-2048";
+  version = "50.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4nNn9cCaATZYHTNfV5E6r1pfGA4ymcxcGjDYWD55rmg=";
+    url = "mirror://gnome/sources/gnome-2048/${lib.versions.major finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
+    hash = "sha256-bRXfaKYSjPDJnlmJCK+MZntzPcQAPvTSHUtMSkK9Lak=";
   };
 
-  patches = [
-    # Fix build with meson 0.61
-    # https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-2048/-/commit/194e22699f7166a016cd39ba26dd719aeecfc868.patch";
-      hash = "sha256-Qpn/OJJwblRm5Pi453aU2HwbrNjsf+ftmSnns/5qZ9E=";
-    })
-  ];
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-OcuhISJhm8uvcJjki86FSNiT5AoqUrILZaHcn1oZVtk=";
+  };
+
+  strictDeps = true;
+  __structuredArgs = true;
 
   nativeBuildInputs = [
     itstool
@@ -40,16 +41,25 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     vala
-    wrapGAppsHook3
+    wrapGAppsHook4
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    desktop-file-utils
   ];
 
   buildInputs = [
-    clutter-gtk
-    libgee
-    libgnome-games-support
-    gtk3
+    gtk4
+    libadwaita
   ];
 
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    rustPlatform.cargoCheckHook
+  ];
+
+  doCheck = true;
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-2048";

From ed37b9e2e258005a8798bbefe27774dc69c06a70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 May 2026 13:24:00 +0000
Subject: [PATCH 020/332] cosmic-ext-tweaks: 0.2.0 -> 0.2.2

---
 pkgs/by-name/co/cosmic-ext-tweaks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix
index 541470b9af6b..0f717e340523 100644
--- a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-ext-tweaks";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "tweaks";
     tag = finalAttrs.version;
-    hash = "sha256-0P/KtfNUlS6E68aR3uLHJ2D4aMAdc05Svl6xSEG8XJA=";
+    hash = "sha256-kREYDT42Xh/APrZAs3uho6Mw2MNEGeG0jc00I2yQemI=";
   };
 
-  cargoHash = "sha256-Zl7c/3q5J+9y1vRJdR77NJ6y62bV1bxaVMuiyxDbLX4=";
+  cargoHash = "sha256-mC19GLLHrjqYXl052HoNFscz9zzQWVBBm0OxzXoUd8U=";
 
   nativeBuildInputs = [
     libcosmicAppHook

From 0405900330dbd6537f35e156d5ca30ee17329727 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 10:37:53 +0000
Subject: [PATCH 021/332] python3Packages.slixmpp-omemo: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/slixmpp-omemo/default.nix b/pkgs/development/python-modules/slixmpp-omemo/default.nix
index b5cd50447020..d725bd12ca37 100644
--- a/pkgs/development/python-modules/slixmpp-omemo/default.nix
+++ b/pkgs/development/python-modules/slixmpp-omemo/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "slixmpp-omemo";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "slixmpp-omemo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UL7rIzuG33yIB+mvgcgC19cBrNobLi15bRaJjWrDNF4=";
+    hash = "sha256-jecnNQu2FNG+d1FzXjLwmbgPi2oDovAAS/MopfY5+Bo=";
   };
 
   build-system = [ setuptools ];

From 790f5f5bd09ae18a80541289c98d022ccf5d7863 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 20:58:45 +0000
Subject: [PATCH 022/332] kubernetes-helmPlugins.helm-unittest: 1.0.3 -> 1.1.0

---
 .../networking/cluster/helm/plugins/helm-unittest.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index 936af3913b05..48f7914cd0d5 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "1.0.3";
+  version = "1.1.0";
 in
 buildGoModule {
   pname = "helm-unittest";
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "helm-unittest";
     repo = "helm-unittest";
     tag = "v${version}";
-    hash = "sha256-wArRsC52ga485rpm8ns99NY/qUZ/FImK4C/L1q460HI=";
+    hash = "sha256-tSagZzAEaJRNZwflrqoyuIMWmt3oCsyHPHwctNTrtVM=";
   };
 
-  vendorHash = "sha256-dkAzmFvLbhbIYCKsk1+TfckdNkNh6OkpDabJDDSwXJM=";
+  vendorHash = "sha256-LZOvss6wiZZi5USuXfivqtt69dTKzEmm7lM2LUDACfY=";
 
   # NOTE: Remove the install and upgrade hooks.
   postPatch = ''

From 06095519a4dadf15e5a9fc8ab16c60af25181280 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 11 May 2026 08:44:00 +0000
Subject: [PATCH 023/332] sngrep: 1.8.2 -> 1.8.3

---
 .../sn/sngrep/fix-sng_strncpy-declaration.patch   | 15 +++++++++++++++
 pkgs/by-name/sn/sngrep/package.nix                | 13 ++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/sn/sngrep/fix-sng_strncpy-declaration.patch

diff --git a/pkgs/by-name/sn/sngrep/fix-sng_strncpy-declaration.patch b/pkgs/by-name/sn/sngrep/fix-sng_strncpy-declaration.patch
new file mode 100644
index 000000000000..5f2aa4d573f6
--- /dev/null
+++ b/pkgs/by-name/sn/sngrep/fix-sng_strncpy-declaration.patch
@@ -0,0 +1,15 @@
+--- a/src/util.h
++++ b/src/util.h
+@@ -58,6 +58,12 @@
+ char *
+ sng_basename(const char *name);
+ 
++/**
++ * @brief Wrapper for strncpy
++ */
++char *
++sng_strncpy(char *dst, const char *src, size_t len);
++
+ /**
+  * @brief Compare two timeval structures
+  *
diff --git a/pkgs/by-name/sn/sngrep/package.nix b/pkgs/by-name/sn/sngrep/package.nix
index 67eb2b6ff149..a0033a48bfa5 100644
--- a/pkgs/by-name/sn/sngrep/package.nix
+++ b/pkgs/by-name/sn/sngrep/package.nix
@@ -4,32 +4,35 @@
   autoconf,
   automake,
   fetchFromGitHub,
+  libgcrypt,
   libpcap,
   ncurses,
   openssl,
   pcre,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sngrep";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "irontec";
     repo = "sngrep";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE=";
+    hash = "sha256-4DLbQ3OOMvJw37n3jVuztG49HlPbWrfxByi6g6AvELQ=";
   };
 
   nativeBuildInputs = [
     autoconf
     automake
+    pkg-config
   ];
 
   buildInputs = [
+    libgcrypt
     libpcap
     ncurses
-    ncurses
     openssl
     pcre
   ];
@@ -42,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-openssl"
   ];
 
+  patches = [
+    ./fix-sng_strncpy-declaration.patch
+  ];
+
   preConfigure = ''
     ./bootstrap.sh
   '';

From 39491085ac742bd75762eda01209ac15099f1347 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 21:36:29 +0000
Subject: [PATCH 024/332] butler: 15.26.1 -> 15.27.0

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

diff --git a/pkgs/by-name/bu/butler/package.nix b/pkgs/by-name/bu/butler/package.nix
index ed8e4b6ed3ef..4a2585465853 100644
--- a/pkgs/by-name/bu/butler/package.nix
+++ b/pkgs/by-name/bu/butler/package.nix
@@ -7,20 +7,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "butler";
-  version = "15.26.1";
+  version = "15.27.0";
 
   src = fetchFromGitHub {
     owner = "itchio";
     repo = "butler";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/Sdk9uYWjYtJFvc/xmrewgHlC+6cpqPoUP22xIfowj8=";
+    hash = "sha256-AnyZhfBjajWAM/pzCQjHOjY3sOQzU20y+LWHBZxbU3Y=";
   };
 
   buildInputs = [ brotli ];
 
   doCheck = false; # disabled because the tests don't work in a non-FHS compliant environment.
 
-  vendorHash = "sha256-8f4EVARMtdzXL3YxGimgLM/A7BF/GOaEoxffkQ1SlHw=";
+  vendorHash = "sha256-zDovN9J6IOE3TrXP60PPcsIc0PpXyEaqSR8i4i9MiHk=";
 
   meta = {
     description = "Command-line itch.io helper";

From 2476d919584a3ee62711659e69d4c6e4942bb38d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:30:39 +0200
Subject: [PATCH 025/332] athens: 0.17.0 -> 0.17.1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/at/athens/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index c93a9bfd8819..fdd5cbab063c 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -10,14 +10,14 @@
 
 buildGo126Module (finalAttrs: {
   pname = "athens";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = applyPatches {
     src = fetchFromGitHub {
       owner = "gomods";
       repo = "athens";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-4KCPYqLtqz46zr5+LB4CyG4ZQrjQaPgMEhCuGOWIJKg=";
+      hash = "sha256-hNk0hW7R7HdE4Wt1KuKSIUarRGKbtbFqQbfls1HXTqI=";
     };
     # Trim the patch version, not needed anyway.
     postPatch = ''

From bd0b3186d70b0fb3224ad97a39fd961f3a974d4e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:35:30 +0200
Subject: [PATCH 026/332] dnf5: 5.4.1.0 -> 5.4.2.1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/dn/dnf5/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix
index af75caef3538..08cdfed6669c 100644
--- a/pkgs/by-name/dn/dnf5/package.nix
+++ b/pkgs/by-name/dn/dnf5/package.nix
@@ -35,7 +35,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnf5";
-  version = "5.4.1.0";
+  version = "5.4.2.1";
 
   outputs = [
     "out"
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rpm-software-management";
     repo = "dnf5";
     tag = finalAttrs.version;
-    hash = "sha256-wvWOQyY7K9fCds2am8gYpjw9mPl7IbOdHT92b8pwonc=";
+    hash = "sha256-Z+k47LC3gaBQ3y3090MLsSvPKlwPUVrYEBboKhskTik=";
   };
 
   nativeBuildInputs = [

From 363af103b55161635a553e1e69fa5c2bfd4b5975 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:45:47 +0200
Subject: [PATCH 027/332] python3Packages.azure-mgmt-cognitiveservices: 14.1.0
 -> 15.0.0b1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-cognitiveservices/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index f98d7eef34a1..dc1e286405f8 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cognitiveservices";
-  version = "14.1.0";
+  version = "15.0.0b1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_mgmt_cognitiveservices";
     inherit version;
-    hash = "sha256-kVGRN00K20Q4Y8IKrqLJ87nVWKhJrCt48VIkkmL9yvg=";
+    hash = "sha256-3ydbAI1IkiIuwnQbd6829kZv9IgFkqTFwG155l58JFQ=";
   };
 
   build-system = [ setuptools ];

From 1576c77f8ce652a5b09dd6df6867d628b0a61326 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:47:09 +0200
Subject: [PATCH 028/332] python3Packages.azure-mgmt-containerservice: 41.0.0
 -> 41.1.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index c6e36e97f98a..c688420e3ce8 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "41.0.0";
+  version = "41.1.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_mgmt_containerservice";
     inherit version;
-    hash = "sha256-mDDQpCcwYJyXoTOpE+LK/70WPU0/8xWvw6dnKCIqP2E=";
+    hash = "sha256-fssuY+hzZgEv2nwT02uv9qKqWZ/GeSUqKWB2M+0YbKg=";
   };
 
   build-system = [ setuptools ];

From 36f084b69c6c8543d040517f0298729678573084 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:47:30 +0200
Subject: [PATCH 029/332] azure-cli: 2.85.0 -> 2.86.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 8ced980fbff2..01c2a4516808 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.85.0";
+  version = "2.86.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     tag = "azure-cli-${version}";
-    hash = "sha256-fNch6QiiHffyHOHw30dlRoe5UFvGVIZkneULjNihGdU=";
+    hash = "sha256-3C39e9C3m9M0faGUgOEWo66fFGDytfGohgUYX55VN8g=";
   };
 
   # put packages that needs to be overridden in the py package scope

From 30cd33b9e3a3e12fd34666603aab3053785c68a7 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:01 +0200
Subject: [PATCH 030/332] azure-cli-extensions.azure-changesafety: init at
 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index df571b6d90cf..e2a0e01c03b5 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -153,6 +153,13 @@
     "hash": "sha256-sdk0uNtQX6yBiEboywNE8FAreY1pBiimah0PdmCDRYg=",
     "description": "Microsoft Azure Command-Line Tools AutomationClient Extension"
   },
+  "azure-changesafety": {
+    "pname": "azure-changesafety",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-ZR2Bm9U9C4rXrCfPVGRu65MBFjZ4iUtXS44l+ClJXsY=",
+    "description": "Microsoft Azure Command-Line Tools ChangeSafety Extension"
+  },
   "azure-firewall": {
     "pname": "azure-firewall",
     "version": "2.1.1",

From 91714e733caaaab7f52de327be99aafb7a4c7b10 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:02 +0200
Subject: [PATCH 031/332] azure-cli-extensions.horizondb: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index e2a0e01c03b5..ec380b3b9483 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -580,6 +580,13 @@
     "hash": "sha256-VTL1/L/UfORNWvyY0hvSJrvoz5zHabLPFX/sEdQaLhI=",
     "description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension"
   },
+  "horizondb": {
+    "pname": "horizondb",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/horizondb-1.0.0b1-py2.py3-none-any.whl",
+    "hash": "sha256-bvjD6FSGjkuMjnc1XYnglbzd2cLMDuwRiPW9+7n6efA=",
+    "description": "Microsoft Azure Command-Line Tools HorizonDB Extension"
+  },
   "hpc-cache": {
     "pname": "hpc-cache",
     "version": "0.1.6",

From 1e59b8fc1a4ac9dc01deed129b59006fa202884b Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:03 +0200
Subject: [PATCH 032/332] azure-cli-extensions.planetarycomputer: init at
 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index ec380b3b9483..f42bef69f6cc 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -867,6 +867,13 @@
     "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=",
     "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"
   },
+  "planetarycomputer": {
+    "pname": "planetarycomputer",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/planetarycomputer-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-FPvUcZx5yHHB2du7F6ulDjoNsNCek2HtuVMJd6g0mBE=",
+    "description": "Microsoft Azure Command-Line Tools Planetary Computer Extension"
+  },
   "portal": {
     "pname": "portal",
     "version": "1.0.0b2",

From 883cf1952c4b1ba5633dcd950f003bf818ea80c0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:04 +0200
Subject: [PATCH 033/332] azure-cli-extensions.cdn: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index f42bef69f6cc..8186fe5ba623 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -209,6 +209,13 @@
     "hash": "sha256-w+HDLtCIAIhlFTpR4iUMEKPC2vInPWWmMTX0VT9q1lg=",
     "description": "Microsoft Azure Command-Line Tools Carbon Extension"
   },
+  "cdn": {
+    "pname": "cdn",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cdn-1.0.0b1-py2.py3-none-any.whl",
+    "hash": "sha256-YybIrCjZnZQ0IFgOZbm4JfMnXNC/Sah8YaZuss1M5B4=",
+    "description": "Microsoft Azure Command-Line Tools CDN and AFD Extension"
+  },
   "change-analysis": {
     "pname": "change-analysis",
     "version": "0.1.0",

From 6c0b50787e6581e303949a19ed643b08c5443f00 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:06 +0200
Subject: [PATCH 034/332] azure-cli-extensions.fileshares: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 8186fe5ba623..699518e0814e 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -496,6 +496,13 @@
     "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=",
     "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension"
   },
+  "fileshares": {
+    "pname": "fileshares",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshares-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-IrJwPQaMuX9VItIEkJzK3cmANHzU50fIaWn2s32nDVk=",
+    "description": "Commands for managing Azure file shares, snapshots, and private endpoint connections"
+  },
   "firmwareanalysis": {
     "pname": "firmwareanalysis",
     "version": "2.0.1",

From bab11b3553ac08971ef6610d52018123a39a1712 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:07 +0200
Subject: [PATCH 035/332] azure-cli-extensions.relationship: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 699518e0814e..7b88288fa9e6 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -944,6 +944,13 @@
     "hash": "sha256-i0w0dd8MNUTbzCjkh161sWPXK0Cv9CUKr9rZQYDD+ZU=",
     "description": "Microsoft Azure Command-Line Tools AzureQuotaExtensionAPI Extension"
   },
+  "relationship": {
+    "pname": "relationship",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/relationship-1.0.0b1-py2.py3-none-any.whl",
+    "hash": "sha256-pEXG6+Gf/JlzjeQGw0VadoArnX+2yjhYVMxg78Qg06g=",
+    "description": "Microsoft Azure Command-Line Tools Relationship Extension"
+  },
   "reservation": {
     "pname": "reservation",
     "version": "0.3.1",

From c456b7265d91e64d73fb019e62bd4030d33dd0e1 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:08 +0200
Subject: [PATCH 036/332] azure-cli-extensions.servicegroup: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 7b88288fa9e6..d74128962484 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1007,6 +1007,13 @@
     "hash": "sha256-VRFUS040KwOkpCY2F8YD2HRCrVF5zp2MDR/RCRX5O3o=",
     "description": "Microsoft Azure Command-Line Tools Sentinel Extension"
   },
+  "servicegroup": {
+    "pname": "servicegroup",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/servicegroup-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-6vOfQdjX+/4Sba1qswxVcDBy+xLCgNOEG01wLL10GvQ=",
+    "description": "Microsoft Azure Command-Line Tools ServiceGroup Extension"
+  },
   "sftp": {
     "pname": "sftp",
     "version": "1.0.0b2",

From ca9fd058330cf71b59127cdf492d9e84cde3347e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:09 +0200
Subject: [PATCH 037/332] azure-cli-extensions.stream-analytics: 1.0.2 -> 1.0.3

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index d74128962484..73ade0c407c5 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1100,9 +1100,9 @@
   },
   "stream-analytics": {
     "pname": "stream-analytics",
-    "version": "1.0.2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.2-py3-none-any.whl",
-    "hash": "sha256-HAkhteF4LaAO3YnOrWHvHJ+9K6Kd4ns9GCcnDXDJtLg=",
+    "version": "1.0.3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.3-py3-none-any.whl",
+    "hash": "sha256-FFRNCsg9Put3GcARODA6HpwGXbWfD1kb7qDvc+/TAkg=",
     "description": "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension"
   },
   "subscription": {

From dbf3e9bcfdc945c31b8471efabef6cd4db0e8eec Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:11 +0200
Subject: [PATCH 038/332] azure-cli-extensions.aks-preview: 20.0.0b1 ->
 20.0.0b8

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 73ade0c407c5..05c89ce0c770 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -50,9 +50,9 @@
   },
   "aks-preview": {
     "pname": "aks-preview",
-    "version": "20.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b1-py2.py3-none-any.whl",
-    "hash": "sha256-arH7mhRieuEn5s2G8dpZsqk/RKyuslEphOi62FviS7U=",
+    "version": "20.0.0b8",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b8-py2.py3-none-any.whl",
+    "hash": "sha256-ugLew461nhWWg73OZJW7g/xblclV5IfNHKm1it6j+Dc=",
     "description": "Provides a preview for upcoming AKS features"
   },
   "alb": {

From 99cc119214af0f93869f83b4283afaaafd217607 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:12 +0200
Subject: [PATCH 039/332] azure-cli-extensions.managednetworkfabric: 9.1.1 ->
 10.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 05c89ce0c770..4a18c7335871 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -722,10 +722,10 @@
   },
   "managednetworkfabric": {
     "pname": "managednetworkfabric",
-    "version": "9.1.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-9.1.1-py3-none-any.whl",
-    "hash": "sha256-bLPE5Spy4Lhtv6ZEWx2E2nLRqkrZ/LfJVmDQWjqEZi0=",
-    "description": "Support for managednetworkfabric commands based on 2025-07-15 API version"
+    "version": "10.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-10.0.0b1-py3-none-any.whl",
+    "hash": "sha256-7veSgSJp7isa+JwAiep+3dMTJFLohIAHNcF9UVIFaNc=",
+    "description": "Support for managednetworkfabric commands based on 2026-01-15-preview API version"
   },
   "managementpartner": {
     "pname": "managementpartner",

From 5617423db9d540cf3cdac4d27ece89c09a188621 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:13 +0200
Subject: [PATCH 040/332] azure-cli-extensions.front-door: 2.1.0 -> 2.2.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 4a18c7335871..4fb813af629a 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -533,9 +533,9 @@
   },
   "front-door": {
     "pname": "front-door",
-    "version": "2.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.1.0-py3-none-any.whl",
-    "hash": "sha256-7aa9A+tq+qXzMuabG9McHkXpU3TRZVjQWDbmuHTTsFk=",
+    "version": "2.2.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.2.0-py3-none-any.whl",
+    "hash": "sha256-5vj/OzbfMmv/SI8qS659o+QiMfPofoBCJR/mQV3XZNE=",
     "description": "Manage networking Front Doors"
   },
   "fzf": {

From 56744081b6ec909d5b290272230169556eeca22f Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:14 +0200
Subject: [PATCH 041/332] azure-cli-extensions.acrtransfer: 1.1.1b1 -> 2.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 4fb813af629a..15d32c909189 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -22,9 +22,9 @@
   },
   "acrtransfer": {
     "pname": "acrtransfer",
-    "version": "1.1.1b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-1.1.1b1-py3-none-any.whl",
-    "hash": "sha256-9rbBiFCxK0cInu5puF5y2kAYcQ7xFa/X3/va5n5i/J0=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-2.0.0-py3-none-any.whl",
+    "hash": "sha256-nG+BxgBHoi4hCF/j4wLbpOlI2MIKB8JjdJoz2LRD+iE=",
     "description": "Microsoft Azure Command-Line Tools Acrtransfer Extension"
   },
   "ad": {

From a5a923af33bf4fe3ac0f05b05a6ebaa6e23fe391 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:16 +0200
Subject: [PATCH 042/332] azure-cli-extensions.monitor-pipeline-group: 1.0.0b2
 -> 1.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 15d32c909189..55e74df0577f 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -785,9 +785,9 @@
   },
   "monitor-pipeline-group": {
     "pname": "monitor-pipeline-group",
-    "version": "1.0.0b2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b2-py3-none-any.whl",
-    "hash": "sha256-skfHQJ7vGnKZtaDmAGmjPLtuxNfyHE44pxi1Usl9X9s=",
+    "version": "1.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0-py3-none-any.whl",
+    "hash": "sha256-oVPbg8B2TMiHSNKMakl45zkfJenXX5el0tEjirIi9/k=",
     "description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension"
   },
   "multicloud-connector": {

From ec082e7ee30801117e81af5bf91ab7c640af6ba6 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:17 +0200
Subject: [PATCH 043/332] azure-cli-extensions.sftp: 1.0.0b2 -> 1.0.0b3

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 55e74df0577f..ea1d55becfb0 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1016,9 +1016,9 @@
   },
   "sftp": {
     "pname": "sftp",
-    "version": "1.0.0b2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/sftp-1.0.0b2-py3-none-any.whl",
-    "hash": "sha256-3ugWIeKK9U8vKgFMbQfMKXxbgW+zO9IB6lPYJFHZm/E=",
+    "version": "1.0.0b3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/sftp-1.0.0b3-py3-none-any.whl",
+    "hash": "sha256-hCpM/ZAJjn4hLElyLzwZzthR4OF36tPDevC2UlR0q0U=",
     "description": "Secure access to Azure Storage blob data via SFTP with SSH certificates"
   },
   "site": {

From 10a085e55e15fa56d72b6d1b6c419049a29c7d80 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:18 +0200
Subject: [PATCH 044/332] azure-cli-extensions.fleet: 1.9.0 -> 1.10.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index ea1d55becfb0..048714eee4da 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -512,9 +512,9 @@
   },
   "fleet": {
     "pname": "fleet",
-    "version": "1.9.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.9.0-py3-none-any.whl",
-    "hash": "sha256-5CsWYP0r2UfUTekKDsqWBNonDOPaR5TrhxZDF7hAtXI=",
+    "version": "1.10.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.0-py3-none-any.whl",
+    "hash": "sha256-hgAwdLExAvKR0G9Ey81rTSa2QLxeoMnUZ7KRaCYhfM8=",
     "description": "Microsoft Azure Command-Line Tools Fleet Extension"
   },
   "fluid-relay": {

From ebbf4d940818d01323aa890245c393baf83e4d3d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:19 +0200
Subject: [PATCH 045/332] azure-cli-extensions.maintenance: 1.7.0b2 -> 2.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 048714eee4da..64fb06d914c5 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -708,9 +708,9 @@
   },
   "maintenance": {
     "pname": "maintenance",
-    "version": "1.7.0b2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b2-py3-none-any.whl",
-    "hash": "sha256-ebiJ8U5FyRLG9VHBGB75AqkjPVars8kGxWnjUCMiiCI=",
+    "version": "2.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-2.0.0b1-py3-none-any.whl",
+    "hash": "sha256-ax3HeCaCq9p5fokc9W3y2XtVHsRYNTZQRkNfXqwpPGk=",
     "description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension"
   },
   "managedccfs": {

From 444601a5cbe9c1eb307edcdd78449b17d314fcfd Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:21 +0200
Subject: [PATCH 046/332] azure-cli-extensions.azure-firewall: 2.1.1 -> 2.2.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 64fb06d914c5..3c84b59e4779 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -162,9 +162,9 @@
   },
   "azure-firewall": {
     "pname": "azure-firewall",
-    "version": "2.1.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.1.1-py2.py3-none-any.whl",
-    "hash": "sha256-gjt7/Ba38xrpdRyc4oybPbqmhOqZ8Ik/dNP8XRzm4Wc=",
+    "version": "2.2.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.2.0-py2.py3-none-any.whl",
+    "hash": "sha256-f1ZxkLZVI4+kzUmwOnY8hMaR/nuxqnLM92xlLQG3rIw=",
     "description": "Manage Azure Firewall resources"
   },
   "azurelargeinstance": {

From 75e1b3609e34a80ec7b1eddef3859cd3915ee05a Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:22 +0200
Subject: [PATCH 047/332] azure-cli-extensions.stack-hci-vm: 1.13.0 -> 1.14.5

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 3c84b59e4779..f4bc4bfbc75d 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1044,9 +1044,9 @@
   },
   "stack-hci-vm": {
     "pname": "stack-hci-vm",
-    "version": "1.13.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.13.0-py3-none-any.whl",
-    "hash": "sha256-/GKJy7+iT33evnZ4UpNXB9GNBWtiLIOJXhk5VZowIos=",
+    "version": "1.14.5",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.14.5-py3-none-any.whl",
+    "hash": "sha256-JE2Qq5OPy+AnTn4GxFeDhiyuCnUV3v1ciu7AqP2TwR4=",
     "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
   },
   "standbypool": {

From bb581c1d7a3a3549682f66f0d2d1451f30f87fe9 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:23 +0200
Subject: [PATCH 048/332] azure-cli-extensions.databricks: 1.3.1 -> 1.3.2

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index f4bc4bfbc75d..05d43b26f32e 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -323,9 +323,9 @@
   },
   "databricks": {
     "pname": "databricks",
-    "version": "1.3.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.3.1-py3-none-any.whl",
-    "hash": "sha256-D6+Sbp49vxPP/IENPPn6TSL3qhwgBZyWBB3KjSgjdCc=",
+    "version": "1.3.2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.3.2-py3-none-any.whl",
+    "hash": "sha256-iGI+Fk/kVT2/4CspDu/r2UlDrXimUWWx9IAknnNjqhg=",
     "description": "Microsoft Azure Command-Line Tools DatabricksClient Extension"
   },
   "datadog": {

From 9cb673f91403ef996bd497d38689cd71d27506d0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:24 +0200
Subject: [PATCH 049/332] azure-cli-extensions.dataprotection: 1.9.0 -> 1.10.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 05d43b26f32e..2db4ba1f14fa 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -351,9 +351,9 @@
   },
   "dataprotection": {
     "pname": "dataprotection",
-    "version": "1.9.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.9.0-py3-none-any.whl",
-    "hash": "sha256-YGJlWG4VPvcyKJ2qOnkgt1JYXqPF9LTrnvdTkIZcF30=",
+    "version": "1.10.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.10.0-py3-none-any.whl",
+    "hash": "sha256-cssrKqmWbQv3qlr8A3GUNklnIGOQ9V2x3e+YWpXeCvQ=",
     "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension"
   },
   "datashare": {

From 880c1f077924b5b45a9a405d613ad5b821a9a1d3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 09:48:26 +0200
Subject: [PATCH 050/332] azure-cli-extensions.quantum: 1.0.0b12 -> 1.0.0b13

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 2db4ba1f14fa..9b8e401f8b39 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -925,9 +925,9 @@
   },
   "quantum": {
     "pname": "quantum",
-    "version": "1.0.0b12",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b12-py3-none-any.whl",
-    "hash": "sha256-9tjBvpu1F2/2JYKUD2IbxUckYofUH0rEnimkpRXF2wY=",
+    "version": "1.0.0b13",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b13-py3-none-any.whl",
+    "hash": "sha256-zNyvYvtJY2AgASUoMvN/cCXWIOJ1d3JEQ7G/tuyV/o4=",
     "description": "Microsoft Azure Command-Line Tools Quantum Extension"
   },
   "qumulo": {

From 413f6819598656567569d1a541597b935ab14913 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 10:57:51 +0200
Subject: [PATCH 051/332] speedtest-tracker: 1.13.10 -> 1.14.1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/sp/speedtest-tracker/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/speedtest-tracker/package.nix b/pkgs/by-name/sp/speedtest-tracker/package.nix
index e27192d78402..a70114b31142 100644
--- a/pkgs/by-name/sp/speedtest-tracker/package.nix
+++ b/pkgs/by-name/sp/speedtest-tracker/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "speedtest-tracker";
-  version = "1.13.10";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "alexjustesen";
     repo = "speedtest-tracker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X/ShdTGAb7qPqYlZ71rxGzAetPRexlaDQ4AYvwouddc=";
+    hash = "sha256-YI/LHTynR9AiC1MhXdO788imIUB/XndXozIepXkeuyc=";
   };
 
   buildInputs = [ php84 ];
@@ -35,13 +35,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = false;
     strictDeps = true;
-    vendorHash = "sha256-fS0Wstv6uHOE5WaDWSL4nbgpHCLM442zmPoER7ZRhfg=";
+    vendorHash = "sha256-Xu8Zsz5FkXiyotOZRwA9KPMHapMThmQQdVdanRGzaJc=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-qWBVonPKqyB6OrDkR1ihtVac/b0Qd++Q/W4nk/VPm9E=";
+    hash = "sha256-Ys3hCLLjoIrno9ztSh/m2xz1HiTn20g3Vu/Pnymy/Fc=";
   };
 
   preInstall = ''

From 9cfe720998b12e95563d02ec2d81de669726c6cb Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 11:17:14 +0200
Subject: [PATCH 052/332] u-root-cmds: add missing cmds

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/u-/u-root-cmds/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/u-/u-root-cmds/package.nix b/pkgs/by-name/u-/u-root-cmds/package.nix
index 946f0ffe1b6e..e5d0053929fa 100644
--- a/pkgs/by-name/u-/u-root-cmds/package.nix
+++ b/pkgs/by-name/u-/u-root-cmds/package.nix
@@ -14,6 +14,7 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/core/backoff"
     "cmds/core/base64"
     "cmds/core/basename"
+    "cmds/core/bind"
     "cmds/core/blkid"
     "cmds/core/brctl"
     "cmds/core/cat"
@@ -57,6 +58,7 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/core/losetup"
     "cmds/core/ls"
     "cmds/core/lsdrivers"
+    "cmds/core/lsfd"
     "cmds/core/lsmod"
     "cmds/core/man"
     "cmds/core/md5sum"
@@ -73,6 +75,7 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/core/nohup"
     "cmds/core/ntpdate"
     "cmds/core/pci"
+    "cmds/core/pidof"
     "cmds/core/ping"
     "cmds/core/poweroff"
     "cmds/core/printenv"
@@ -106,12 +109,14 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/core/true"
     "cmds/core/truncate"
     "cmds/core/ts"
+    "cmds/core/tsort"
     "cmds/core/tty"
     "cmds/core/umount"
     "cmds/core/uname"
     "cmds/core/uniq"
     "cmds/core/unmount"
     "cmds/core/unshare"
+    "cmds/core/update-rc.d"
     "cmds/core/uptime"
     "cmds/core/watchdog"
     "cmds/core/watchdogd"
@@ -126,6 +131,7 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/exp/bootvars"
     "cmds/exp/bzimage"
     "cmds/exp/cbmem"
+    "cmds/exp/cmd2pkg"
     "cmds/exp/console"
     "cmds/exp/crc"
     "cmds/exp/disk_unlock"
@@ -163,6 +169,7 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/exp/readpe"
     "cmds/exp/run"
     "cmds/exp/rush"
+    "cmds/exp/serial"
     "cmds/exp/smbios_transfer"
     "cmds/exp/smn"
     "cmds/exp/srvfiles"
@@ -174,6 +181,7 @@ u-root.overrideAttrs (prevAttrs: {
     "cmds/exp/tcpdump"
     "cmds/exp/tcz"
     "cmds/exp/tftp"
+    "cmds/exp/tftpd"
     "cmds/exp/traceroute"
     "cmds/exp/uefiboot"
     "cmds/exp/vboot"

From 42f3d8339c7311d09cf07761049ce9be0f3b7391 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 14 May 2026 11:24:26 +0200
Subject: [PATCH 053/332] mkuimage: 0-unstable-2025-09-05 ->
 0-unstable-2026-04-13, unbreak

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/mk/mkuimage/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mk/mkuimage/package.nix b/pkgs/by-name/mk/mkuimage/package.nix
index 1e7d1dc4140d..789b41d306a5 100644
--- a/pkgs/by-name/mk/mkuimage/package.nix
+++ b/pkgs/by-name/mk/mkuimage/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule {
   pname = "mkuimage";
-  version = "0-unstable-2025-09-05";
+  version = "0-unstable-2026-04-13";
 
   src = fetchFromGitHub {
     owner = "u-root";
     repo = "mkuimage";
-    rev = "9a40452f5d3ba67f236a83de54fa2c40f797b68b";
-    hash = "sha256-asC4j2DXkQnx6BZntxA8hSaM2k6p0CxraHYq3bK9vNQ=";
+    rev = "72394cd98f39c9190dcc4f2a601902d43af1ae6e";
+    hash = "sha256-0XY2oTwdKEFVbOMTnxoKoM9OoJm9Y+R/3z04VZwk2T8=";
   };
 
-  vendorHash = "sha256-KX9uv5m4N4+7gOgjhotRac9sz8tWSJ1krq98RWdsbzg=";
+  vendorHash = "sha256-PmfHdl0GG84kPPUgKiLwhKvcgbbwJLFMnX1cI//U5T8=";
 
   subPackages = [
     "cmd/gentpldeps"
@@ -53,6 +53,5 @@ buildGoModule {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ katexochen ];
     mainProgram = "mkuimage";
-    broken = true;
   };
 }

From 29b4c0de08275715434abf1c65e07dfd85cbaa73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 May 2026 19:08:02 +0000
Subject: [PATCH 054/332] python3Packages.nodriver: 0.48.1 -> 0.50.3

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

diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix
index 8dd60efd35ce..06b1780e74ba 100644
--- a/pkgs/development/python-modules/nodriver/default.nix
+++ b/pkgs/development/python-modules/nodriver/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "nodriver";
-  version = "0.48.1";
+  version = "0.50.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SsjNiLavEzwm3BV/t49asXRipZtKDaMwTjrxK75LQ0M=";
+    hash = "sha256-JMpojYZG74/61cjOZYBOXnZxp3mtJqJNdvZGXVZmxjE=";
   };
 
   patches = [

From fc30fae3af156930a9efd82c0dde6cff5b0afaa9 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Fri, 15 May 2026 17:01:01 +0200
Subject: [PATCH 055/332] maintainers: remove toschmidt

---
 maintainers/maintainer-list.nix        | 6 ------
 pkgs/by-name/ma/mailspring/package.nix | 5 +----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 065c165477ee..2cb02af91132 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28091,12 +28091,6 @@
     githubId = 50843046;
     name = "tornax";
   };
-  toschmidt = {
-    email = "tobias.schmidt@in.tum.de";
-    github = "toschmidt";
-    githubId = 27586264;
-    name = "Tobias Schmidt";
-  };
   totalchaos = {
     email = "basil.keeler@outlook.com";
     github = "totalchaos05";
diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix
index 368ce147f253..9367f14ef4cc 100644
--- a/pkgs/by-name/ma/mailspring/package.nix
+++ b/pkgs/by-name/ma/mailspring/package.nix
@@ -17,10 +17,7 @@ let
       Mailspring's sync engine runs locally, but its source is not open.
     '';
     mainProgram = "mailspring";
-    maintainers = with lib.maintainers; [
-      toschmidt
-      wrench-exile-legacy
-    ];
+    maintainers = with lib.maintainers; [ wrench-exile-legacy ];
     platforms = [
       "x86_64-linux"
       "aarch64-darwin"

From eb9859ba29b2d4f9338f9c2338b03c55c2bb7580 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Wed, 13 May 2026 19:13:25 -0400
Subject: [PATCH 056/332] emilua: fix fallback allocator on aarch64-linux

Assisted-by: Codex:gpt-5.5
---
 .../interpreters/emilua/default.nix           | 13 ++++
 .../emilua/use-luajit-default-allocator.patch | 65 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/interpreters/emilua/use-luajit-default-allocator.patch

diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix
index f31f3e1d8f49..f039c64cde8b 100644
--- a/pkgs/development/interpreters/emilua/default.nix
+++ b/pkgs/development/interpreters/emilua/default.nix
@@ -73,6 +73,19 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "version_suffix" "-nixpkgs1")
   ];
 
+  patches = [
+    # https://gitlab.com/emilua/emilua/-/commit/9f3964f22b2289c98b64a1af729712a862459aeb
+    # The above commit added a fallback allocator that just calls `realloc` from
+    # libc, which is fine on x86 because Linux userspace pointers are 47 bits on
+    # x86-64 and that aligns perfectly with LuaJIT's NaN-tagging representation:
+    # https://github.com/LuaJIT/LuaJIT/issues/49
+    # But on ARM64, Linux userspace pointers are 48 bits, so libc does not
+    # provide an allocator that can be safely used for LuaJIT. To fix that, we
+    # delete the libc-based allocator and instead use LuaJIT's own default
+    # allocator as the fallback, which is what Emilua did before the regression.
+    ./use-luajit-default-allocator.patch
+  ];
+
   postPatch = ''
     patchShebangs src/emilua_gperf.awk --interpreter '${lib.getExe gawk} -f'
   '';
diff --git a/pkgs/development/interpreters/emilua/use-luajit-default-allocator.patch b/pkgs/development/interpreters/emilua/use-luajit-default-allocator.patch
new file mode 100644
index 000000000000..c19bb0522819
--- /dev/null
+++ b/pkgs/development/interpreters/emilua/use-luajit-default-allocator.patch
@@ -0,0 +1,65 @@
+diff --git a/src/allocator.cpp b/src/allocator.cpp
+index cb80c99..c41ed4e 100644
+--- a/src/allocator.cpp
++++ b/src/allocator.cpp
+@@ -9,25 +9,6 @@ namespace emilua {
+ 
+ namespace interprocess = boost::interprocess;
+ 
+-static inline
+-void* do_std_alloc(void* ptr, std::size_t osize, std::size_t nsize)
+-{
+-    if (nsize == 0) {
+-        // free_sized only appeared in C23
+-        free(ptr);
+-        return nullptr;
+-    } else {
+-        // even in C23, we don't have realloc_sized() to pass osize along
+-        auto ret = realloc(ptr, nsize);
+-        if (nsize <= osize) {
+-            // According to Programming in Lua 3rd edition § 32.1 ¶ 8, Lua is
+-            // unable to recover from allocation shrinking failures.
+-            assert(ret);
+-        }
+-        return ret;
+-    }
+-}
+-
+ general_purpose_allocator::general_purpose_allocator(
+     std::shared_ptr<void> block, std::size_t block_size)
+     : block{std::move(block)}
+@@ -50,17 +31,8 @@ lua_Alloc general_purpose_allocator::get_lua_allocator()
+             ptr, osize, nsize);
+     };
+ 
+-    static constexpr auto use_c_allocator = [](
+-        void* /*ud*/, void* ptr, std::size_t osize, std::size_t nsize
+-    ) -> void* {
+-        return do_std_alloc(ptr, osize, nsize);
+-    };
+-
+-    if (allocator) {
+-        return use_boost_allocator;
+-    } else {
+-        return use_c_allocator;
+-    }
++    assert(allocator);
++    return use_boost_allocator;
+ }
+ 
+ void general_purpose_allocator::allow_reserved_zone()
+diff --git a/src/core.cpp b/src/core.cpp
+index 8cb4365..fb63706 100644
+--- a/src/core.cpp
++++ b/src/core.cpp
+@@ -183,7 +183,9 @@ vm_context::vm_context(
+     , lua_errmem(false)
+     , exit_request(false)
+     , alloc{memory_resource, memory_resource_size}
+-    , L_(lua_newstate(alloc.get_lua_allocator(), &alloc))
++    , L_(memory_resource
++         ? lua_newstate(alloc.get_lua_allocator(), &alloc)
++         : luaL_newstate())
+     , current_fiber_(nullptr)
+ {
+     if (!L_)

From 606f0993af07dadc2fefdd86d297fcdaa3e1425e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 18:18:20 +0000
Subject: [PATCH 057/332] python3Packages.langgraph-runtime-inmem: 0.28.0 ->
 0.28.1

---
 .../python-modules/langgraph-runtime-inmem/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
index 40082663db52..97efcb9aeaf9 100644
--- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-runtime-inmem";
-  version = "0.28.0";
+  version = "0.28.1";
   pyproject = true;
 
   # Not available in any repository
   src = fetchPypi {
     pname = "langgraph_runtime_inmem";
     inherit (finalAttrs) version;
-    hash = "sha256-4CU2UItcFU8YokJAZjr3wjifQ8tPu6yZWicXtM/kDS8=";
+    hash = "sha256-lFfLJVVN9psEruTfnaEXLNH6e8nLWQqegH8vnkXsjr0=";
   };
 
   build-system = [ hatchling ];

From 3dbbca0371adce474db6c3cce87d06e1853df310 Mon Sep 17 00:00:00 2001
From: KPCCoiL <4506345+KPCCoiL@users.noreply.github.com>
Date: Sat, 16 May 2026 15:29:48 +0900
Subject: [PATCH 058/332] _4th: fix editor for 64bit systems

Use headers in `sources/include{32, 64}` to fix the builtin editor, as suggested by `README`.
The problem is described in the FAQ section of the [manual](https://thebeez.home.xs4all.nl/4tH/4tHmanual.pdf).
Although the manual suggests regenerating the headers (section 27.8), the required headers seem to be already in the distirbution.
---
 pkgs/by-name/_4/_4th/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/_4/_4th/package.nix b/pkgs/by-name/_4/_4th/package.nix
index b0a291f9f761..325b497f082d 100644
--- a/pkgs/by-name/_4/_4th/package.nix
+++ b/pkgs/by-name/_4/_4th/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontConfigure = true;
 
+  preBuild = ''
+    cp sources/include${if stdenv.hostPlatform.is64bit then "64" else "32"}/* sources/
+    make -C sources clean
+  '';
+
   makeFlags = [
     "-C sources"
     "CC:=$(CC)"

From 7a267684883fa452c03ed63f7a529ee0edac6986 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <mail@jackr.eu>
Date: Sat, 16 May 2026 11:23:27 +0200
Subject: [PATCH 059/332] chess-tui: 2.5.1 -> 2.7.0

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

diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix
index 11ee29dec0ab..fcaed57dc550 100644
--- a/pkgs/by-name/ch/chess-tui/package.nix
+++ b/pkgs/by-name/ch/chess-tui/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chess-tui";
-  version = "2.5.1";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "thomas-mauran";
     repo = "chess-tui";
     tag = finalAttrs.version;
-    hash = "sha256-jO3pa4N7XNyKQCbPjFByYmLlOtrrdpzS5lkxU9giE+w=";
+    hash = "sha256-BGJOPsePE5S5ySrOg63cNKn9pT+7MmDLHZrW3YhUFz8=";
   };
 
-  cargoHash = "sha256-9LXg4zX/irLt2MCq7V0dQA3o1QRqGgfRcX4HneNGAns=";
+  cargoHash = "sha256-n9rjr5vUK619XIfuHIlf+lxUAeTbhTAzmdysliKNOFY=";
 
   checkFlags = [
     # assertion failed: result.is_ok()

From f1edd9ca124230187361286122e1becca17e6d51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 May 2026 11:32:40 +0000
Subject: [PATCH 060/332] angie: 1.11.3 -> 1.11.5

---
 pkgs/servers/http/angie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix
index c5e5e3f817c7..ee4dd5c50979 100644
--- a/pkgs/servers/http/angie/default.nix
+++ b/pkgs/servers/http/angie/default.nix
@@ -9,11 +9,11 @@
 
 callPackage ../nginx/generic.nix args rec {
   pname = "angie";
-  version = "1.11.3";
+  version = "1.11.5";
 
   src = fetchurl {
     url = "https://download.angie.software/files/angie-${version}.tar.gz";
-    hash = "sha256-CPqZ0YqQ9zhnSzAPZIZ0BgRa1cUY6VLNJOP/2wwUEX0=";
+    hash = "sha256-tfKXxt8qdLnQCRp83XR//9LQ4dC+Q2MtphwcdTnbIEM=";
   };
 
   configureFlags = lib.optionals withAcme [

From 1b8d3b18a1bccb73a92e7d8f3f4ba9fa7dee83e6 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 16 May 2026 15:14:51 +0000
Subject: [PATCH 061/332] nav: 1.5.0 -> 1.5.2

---
 pkgs/by-name/na/nav/package.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/nav/package.nix b/pkgs/by-name/na/nav/package.nix
index 72b5577c752b..58b7b178fd94 100644
--- a/pkgs/by-name/na/nav/package.nix
+++ b/pkgs/by-name/na/nav/package.nix
@@ -4,18 +4,21 @@
   fetchurl,
   autoPatchelfHook,
   libxcrypt-legacy,
+  zlib,
+  testers,
+  nav,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nav";
-  version = "1.5.0";
+  version = "1.5.2";
 
   src = fetchurl {
     url = "https://github.com/Jojo4GH/nav/releases/download/v${finalAttrs.version}/nav-${stdenv.hostPlatform.parsed.cpu.name}-unknown-linux-gnu.tar.gz";
     sha256 =
       {
-        x86_64-linux = "sha256-LQdw8/V1KFNM6TY1rFt/RiZuiRQXM+8HNGkJXDrE/mw=";
-        aarch64-linux = "sha256-SMcdnUxKbJ5GXB358WglIMiPHWsn1uVnjN9UiL3V6dk=";
+        x86_64-linux = "sha256-/A6IZRX8v8yKfcxYxo0gxbsZri2dgTs8YH7H2LauaBE=";
+        aarch64-linux = "sha256-YNS/P6TU7qLPn39X6GyUtjBw7GXOi2btd3AV+etpUhQ=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
@@ -26,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     stdenv.cc.cc.lib
     libxcrypt-legacy
+    zlib
   ];
 
   installPhase = ''
@@ -37,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.tests = {
+    version = testers.testVersion {
+      package = nav;
+    };
+  };
+
   passthru.updateScript = ./update.sh;
 
   meta = {

From 0f345cc540b1c800cd616970a0ce4ec1f3d2122f Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 16 May 2026 08:42:26 -0700
Subject: [PATCH 062/332] speedify: 15.8.2-12611 -> 16.7.0-12929

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

diff --git a/pkgs/by-name/sp/speedify/package.nix b/pkgs/by-name/sp/speedify/package.nix
index 9d83ca8c86fd..592d86ada965 100644
--- a/pkgs/by-name/sp/speedify/package.nix
+++ b/pkgs/by-name/sp/speedify/package.nix
@@ -3,17 +3,18 @@
   stdenv,
   dpkg,
   fetchurl,
-  procps,
-  net-tools,
+  libgcc,
+  libnetfilter_conntrack,
   autoPatchelfHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "speedify";
-  version = "15.8.2-12611";
+  # Find latest version within https://apt.connectify.me/dists/speedify/main/binary-amd64/Packages.gz
+  version = "16.7.0-12928";
 
   src = fetchurl {
     url = "https://apt.connectify.me/pool/main/s/speedify/speedify_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-61GQZkXBe3EQpOUODpL60SCHJO0FGqvpL9xFn+q+kPs=";
+    hash = "sha256-A77LYBGLAgoRFV64/ZmpTL76NQx6xHq0a7leDYi9Izg=";
   };
 
   nativeBuildInputs = [
@@ -22,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    procps
-    net-tools
+    libgcc
+    libnetfilter_conntrack
   ];
 
   installPhase = ''

From 0e4ba7d27b6bba08edb569615e978a921943d1eb Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 16 May 2026 13:55:59 +0000
Subject: [PATCH 063/332] pokefinder: 4.3.1 -> 4.3.2

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

diff --git a/pkgs/by-name/po/pokefinder/package.nix b/pkgs/by-name/po/pokefinder/package.nix
index 931aa676ce42..3aaabf75cbef 100644
--- a/pkgs/by-name/po/pokefinder/package.nix
+++ b/pkgs/by-name/po/pokefinder/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pokefinder";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "Admiral-Fish";
     repo = "PokeFinder";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-tItPvA0f2HnY7SUSnb7A5jGwbRs7eQoS4vibBomZ9pw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-viObYX9W1bUzwGyf7rI1gQeB9OHlLfj5Uny0js/1f6M=";
     fetchSubmodules = true;
   };
 
@@ -27,6 +27,32 @@ stdenv.mkDerivation (finalAttrs: {
     ./set-desktop-file-name.patch
   ];
 
+  postPatch = ''
+        substituteInPlace CMakeLists.txt \
+          --replace-fail 'set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")' ""
+        substituteInPlace Core/CMakeLists.txt \
+          --replace-fail 'if (APPLE)' 'if (FALSE)'
+        substituteInPlace Core/RNG/SHA1.cpp \
+          --replace-fail '#include "SHA1.hpp"' '#include "SHA1.hpp"
+    #include <algorithm>'
+
+        mkdir -p Core/Resources/compression
+        touch Core/Resources/compression/__init__.py
+        cat <<EOF > Core/Resources/compression/zstd.py
+    import zstandard as zstd
+
+    def compress(data, level=3):
+        cctx = zstd.ZstdCompressor(level=level)
+        return cctx.compress(data)
+
+    def decompress(data):
+        dctx = zstd.ZstdDecompressor()
+        return dctx.decompress(data)
+    EOF
+  '';
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch "-flax-vector-conversions";
+
   installPhase = ''
     runHook preInstall
   ''

From 226ee6a4af79db45096a66151839aac46ba4cdce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 16 May 2026 18:35:45 +0200
Subject: [PATCH 064/332] mcporter: 0.10.2 -> 0.11.1

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

diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix
index cffa8b07821f..02f62f804dfa 100644
--- a/pkgs/by-name/mc/mcporter/package.nix
+++ b/pkgs/by-name/mc/mcporter/package.nix
@@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcporter";
-  version = "0.10.2";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "steipete";
     repo = "mcporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1wBdYetYu+R04Fl50KR3zZK3QO6S95GV+PEO9k3Thhc=";
+    hash = "sha256-fhIU5z0H6piHNNHSQ3UQW6IqCdpCTjTxngT7AwQm5S0=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From 77927c92982fd1f97d4839e2d8e3f86d72828c4a Mon Sep 17 00:00:00 2001
From: soyouzpanda <soyouzpanda@soyouzpanda.fr>
Date: Wed, 21 May 2025 16:24:40 +0200
Subject: [PATCH 065/332] python3Packages.django-ltree: init at 0.6.0

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

diff --git a/pkgs/development/python-modules/django-ltree/default.nix b/pkgs/development/python-modules/django-ltree/default.nix
new file mode 100644
index 000000000000..dcc0f5e59489
--- /dev/null
+++ b/pkgs/development/python-modules/django-ltree/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "django-ltree";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mariocesar";
+    repo = "django-ltree";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XN2znH9bNU8jaY2HC8qmSR6VqShcEFGAtNtb/5aLgic=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    django
+  ];
+
+  pythonImportsCheck = [
+    "django_ltree"
+  ];
+
+  meta = {
+    description = "An ltree extension implementation to support hierarchical tree-like data using the native Postgres extension ltree in django models";
+    homepage = "https://github.com/mariocesar/django-ltree";
+    changelog = "https://github.com/mariocesar/django-ltree/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ soyouzpanda ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93360c36724f..8ac3bcb9dbcd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4272,6 +4272,8 @@ self: super: with self; {
     callPackage ../development/python-modules/django-login-required-middleware
       { };
 
+  django-ltree = callPackage ../development/python-modules/django-ltree { };
+
   django-mailbox = callPackage ../development/python-modules/django-mailbox { };
 
   django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };

From ac1ab1e95cef47b517431d0dfef8a05ba6a6d63a Mon Sep 17 00:00:00 2001
From: soyouzpanda <soyouzpanda@soyouzpanda.fr>
Date: Thu, 23 Apr 2026 20:13:53 +0200
Subject: [PATCH 066/332] python3Packages.djangorestframework-api-key: init at
 3.1.0

---
 .../djangorestframework-api-key/default.nix   | 73 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/djangorestframework-api-key/default.nix

diff --git a/pkgs/development/python-modules/djangorestframework-api-key/default.nix b/pkgs/development/python-modules/djangorestframework-api-key/default.nix
new file mode 100644
index 000000000000..35f3880322e5
--- /dev/null
+++ b/pkgs/development/python-modules/djangorestframework-api-key/default.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  dj-database-url,
+  django,
+  django-test-migrations,
+  djangorestframework,
+  packaging,
+  pytest-cov-stub,
+  pytest-django,
+  pytest-dotenv,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "djangorestframework-api-key";
+  version = "3.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "florimondmanca";
+    repo = "djangorestframework-api-key";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TyYSO3OQslipl2T5BtsTABaTJD4HMCX61TOZXNR+lXE=";
+  };
+
+  # Use python-dotenv instead of django-dotenv
+  # as django-dotenv has not been maintained for
+  # years.
+  patchPhase = ''
+    runHook prePatch
+
+    substituteInPlace tests/conftest.py test_project/manage.py \
+      --replace-fail 'read_dotenv' 'load_dotenv'
+
+    runHook postPatch
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    django
+    djangorestframework
+    packaging
+  ];
+
+  nativeCheckInputs = [
+    dj-database-url
+    django-test-migrations
+    pytest-cov-stub
+    pytest-django
+    pytest-dotenv
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "rest_framework_api_key"
+  ];
+
+  meta = {
+    description = "API key permissions for Django REST Framework";
+    homepage = "https://github.com/florimondmanca/djangorestframework-api-key";
+    changelog = "https://github.com/florimondmanca/djangorestframework-api-key/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ soyouzpanda ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ac3bcb9dbcd..d82e367a44ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4501,6 +4501,10 @@ self: super: with self; {
 
   djangorestframework = callPackage ../development/python-modules/djangorestframework { };
 
+  djangorestframework-api-key =
+    callPackage ../development/python-modules/djangorestframework-api-key
+      { };
+
   djangorestframework-camel-case =
     callPackage ../development/python-modules/djangorestframework-camel-case
       { };

From b1e31c41f82334fcb3cee62d852e7d6a8d23abe2 Mon Sep 17 00:00:00 2001
From: soyouzpanda <soyouzpanda@soyouzpanda.fr>
Date: Thu, 22 May 2025 21:45:10 +0200
Subject: [PATCH 067/332] lasuite-drive: init at 0.18.0

---
 pkgs/by-name/la/lasuite-drive/frontend.nix    |  48 ++++++
 pkgs/by-name/la/lasuite-drive/mail.nix        |  42 +++++
 pkgs/by-name/la/lasuite-drive/package.nix     | 152 ++++++++++++++++++
 .../la/lasuite-drive/pyproject_build.patch    |  24 +++
 .../la/lasuite-drive/secure_settings.patch    |  36 +++++
 5 files changed, 302 insertions(+)
 create mode 100644 pkgs/by-name/la/lasuite-drive/frontend.nix
 create mode 100644 pkgs/by-name/la/lasuite-drive/mail.nix
 create mode 100644 pkgs/by-name/la/lasuite-drive/package.nix
 create mode 100644 pkgs/by-name/la/lasuite-drive/pyproject_build.patch
 create mode 100644 pkgs/by-name/la/lasuite-drive/secure_settings.patch

diff --git a/pkgs/by-name/la/lasuite-drive/frontend.nix b/pkgs/by-name/la/lasuite-drive/frontend.nix
new file mode 100644
index 000000000000..5ed9033ec82e
--- /dev/null
+++ b/pkgs/by-name/la/lasuite-drive/frontend.nix
@@ -0,0 +1,48 @@
+{
+  src,
+  version,
+  meta,
+  stdenv,
+  fetchYarnDeps,
+  nodejs,
+  fixup-yarn-lock,
+  yarn,
+  yarnConfigHook,
+  yarnBuildHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lasuite-drive-frontend";
+  inherit src version;
+
+  sourceRoot = "${finalAttrs.src.name}/src/frontend";
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
+    hash = "sha256-yUKJp6yUTxpvkaA+YuQC3r1t4LBvuYMv1xesLewbK/U=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    fixup-yarn-lock
+    yarn
+    yarnConfigHook
+    yarnBuildHook
+  ];
+
+  strictDeps = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r apps/drive/out/ $out
+
+    runHook postInstall
+  '';
+
+  __structuredAttrs = true;
+
+  meta = meta // {
+    description = "A collaborative file sharing and document management platform that scales. Built with Django and React. Opensource alternative to Sharepoint or Google Drive";
+  };
+})
diff --git a/pkgs/by-name/la/lasuite-drive/mail.nix b/pkgs/by-name/la/lasuite-drive/mail.nix
new file mode 100644
index 000000000000..e30e55cbaa34
--- /dev/null
+++ b/pkgs/by-name/la/lasuite-drive/mail.nix
@@ -0,0 +1,42 @@
+{
+  src,
+  version,
+  meta,
+  stdenv,
+  fetchYarnDeps,
+  nodejs,
+  yarnConfigHook,
+  yarnBuildHook,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lasuite-drive-mail";
+  inherit src version;
+
+  sourceRoot = "${finalAttrs.src.name}/src/mail";
+
+  postPatch = ''
+    substituteInPlace bin/html-to-plain-text bin/mjml-to-html \
+      --replace-fail \
+        '../backend/core/templates/mail' \
+        '${placeholder "out"}'
+  '';
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/src/mail/yarn.lock";
+    hash = "sha256-UPIb9QJk+zC8wYeBeDnmlGLhHDhsEOoT+qquFM1XyqU=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarnConfigHook
+    yarnBuildHook
+  ];
+
+  dontInstall = true;
+
+  __structuredAttrs = true;
+
+  meta = meta // {
+    description = "HTML mail templates for LaSuite Drive";
+  };
+})
diff --git a/pkgs/by-name/la/lasuite-drive/package.nix b/pkgs/by-name/la/lasuite-drive/package.nix
new file mode 100644
index 000000000000..7f608fb95846
--- /dev/null
+++ b/pkgs/by-name/la/lasuite-drive/package.nix
@@ -0,0 +1,152 @@
+{
+  callPackage,
+  lib,
+  python3,
+  stdenv,
+  fetchFromGitHub,
+}:
+let
+  version = "0.18.0";
+
+  src = fetchFromGitHub {
+    owner = "suitenumerique";
+    repo = "drive";
+    tag = "v${version}";
+    hash = "sha256-JoOHbwZR4salfLB9Gg7kfRMDcDA/Srn8qwUqLAZtsz8=";
+  };
+
+  meta = {
+    homepage = "https://github.com/suitenumerique/drive";
+    changelog = "https://github.com/suitenumerique/drive/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ soyouzpanda ];
+    platforms = lib.platforms.linux;
+  };
+
+  mail = callPackage ./mail.nix { inherit src version meta; };
+  frontend = callPackage ./frontend.nix { inherit src version meta; };
+
+  python = python3.override {
+    self = python;
+    packageOverrides = (self: super: { django = super.django_5; });
+  };
+
+in
+python.pkgs.buildPythonApplication (finalAttrs: {
+  pname = "lasuite-drive";
+  pyproject = true;
+  inherit version src;
+
+  sourceRoot = "${finalAttrs.src.name}/src/backend";
+
+  patches = [
+    # Support configuration throught environment variables for SECURE_*
+    ./secure_settings.patch
+    # Fix some build fields on pyproject
+    ./pyproject_build.patch
+  ];
+
+  build-system = with python.pkgs; [ uv-build ];
+
+  dependencies =
+    with python.pkgs;
+    [
+      boto3
+      brotli
+      celery
+      defusedxml
+      dj-database-url
+      django
+      django-configurations
+      django-cors-headers
+      django-countries
+      django-debug-toolbar
+      django-extensions
+      django-filter
+      django-lasuite
+      django-ltree
+      django-parler
+      django-pydantic-field
+      django-redis
+      django-storages
+      django-timezone-field
+      djangorestframework
+      djangorestframework-api-key
+      dockerflow
+      drf-spectacular
+      drf-spectacular-sidecar
+      drf-standardized-errors
+      easy-thumbnails
+      factory-boy
+      gunicorn
+      jsonschema
+      markdown
+      mozilla-django-oidc
+      nested-multipart-parser
+      posthog
+      psycopg
+      pydantic
+      pyjwt
+      python-magic
+      redis
+      requests
+      sentry-sdk
+      url-normalize
+      whitenoise
+    ]
+    ++ celery.optional-dependencies.redis
+    ++ django-storages.optional-dependencies.s3;
+
+  pythonRelaxDeps = true;
+
+  postPatch = ''
+    # Put assets inside a data directory
+    # so uv will copy the assets directory
+    # entirely
+    mkdir data
+    mv assets data
+  ''
+  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace impress/settings.py \
+      --replace-fail \
+        "gethostname()" \
+        "gethostname() + '.local'"
+  '');
+  __darwinAllowLocalNetworking = true;
+
+  postBuild = ''
+    export DATA_DIR=$(pwd)/data
+    ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic --no-input --clear
+  '';
+
+  postInstall =
+    let
+      pythonPath = python.pkgs.makePythonPath finalAttrs.passthru.dependencies;
+    in
+    ''
+      mkdir -p $out/{bin,share}
+      cp ./manage.py $out/bin/.manage.py
+      cp -r data/static $out/share
+      chmod +x $out/bin/.manage.py
+      makeWrapper $out/bin/.manage.py $out/bin/drive \
+        --prefix PYTHONPATH : "${pythonPath}"
+      makeWrapper ${lib.getExe python.pkgs.celery} $out/bin/celery \
+        --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}"
+      makeWrapper ${lib.getExe python.pkgs.gunicorn} $out/bin/gunicorn \
+        --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}"
+
+      mkdir -p $out/${python.sitePackages}/core/templates
+      ln -sv ${mail}/ $out/${python.sitePackages}/core/templates/mail
+    '';
+
+  passthru = {
+    inherit mail frontend;
+  };
+
+  __structuredAttrs = true;
+
+  meta = meta // {
+    description = "A collaborative file sharing and document management platform that scales. Built with Django and React. Opensource alternative to Sharepoint or Google Drive";
+    mainProgram = "drive";
+  };
+})
diff --git a/pkgs/by-name/la/lasuite-drive/pyproject_build.patch b/pkgs/by-name/la/lasuite-drive/pyproject_build.patch
new file mode 100644
index 000000000000..062b1e6b4b59
--- /dev/null
+++ b/pkgs/by-name/la/lasuite-drive/pyproject_build.patch
@@ -0,0 +1,24 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index ba8f5362..ddc40c83 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,7 +2,7 @@
+ # drive package
+ #
+ [build-system]
+-requires = ["uv_build>=0.11.7,<0.12.0"]
++requires = ["uv_build"]
+ build-backend = "uv_build"
+ 
+ [project]
+@@ -102,6 +102,9 @@ constraint-dependencies = [
+ 
+ [tool.uv.build-backend]
+ module-root = ""
++module-name = ["core", "demo", "drive", "e2e", "wopi"]
++data = ["data"]
++namespace = true
+ source-exclude = [
+     "**/tests/**",
+     "**/test_*.py",
+
diff --git a/pkgs/by-name/la/lasuite-drive/secure_settings.patch b/pkgs/by-name/la/lasuite-drive/secure_settings.patch
new file mode 100644
index 000000000000..9eb2b43f345c
--- /dev/null
+++ b/pkgs/by-name/la/lasuite-drive/secure_settings.patch
@@ -0,0 +1,36 @@
+diff --git a/drive/settings.py b/drive/settings.py
+index 82f4d31..3d66c23 100755
+--- a/drive/settings.py
++++ b/drive/settings.py
+@@ -775,19 +775,24 @@ class Production(Base):
+     #
+     # In other cases, you should comment the following line to avoid security issues.
+     # SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+-    SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+-    SECURE_HSTS_SECONDS = 60
+-    SECURE_HSTS_PRELOAD = True
+-    SECURE_HSTS_INCLUDE_SUBDOMAINS = True
+-    SECURE_SSL_REDIRECT = True
++    SECURE_PROXY_SSL_HEADER = values.TupleValue(("HTTP_X_FORWARDED_PROTO", "https"),
++                                                environ_name="SECURE_PROXY_SSL_HEADER")
++    SECURE_HSTS_SECONDS = values.IntegerValue(
++        60, environ_name="SECURE_HSTS_SECONDS")
++    SECURE_HSTS_PRELOAD = values.BooleanValue(
++        True, environ_name="SECURE_HSTS_PRELOAD")
++    SECURE_HSTS_INCLUDE_SUBDOMAINS = values.BooleanValue(
++        True, environ_name="SECURE_HSTS_INCLUDE_SUBDOMAINS")
++    SECURE_SSL_REDIRECT = values.BooleanValue(
++        True, environ_name="SECURE_SSL_REDIRECT")
+     SECURE_REDIRECT_EXEMPT = [
+         "^__lbheartbeat__",
+         "^__heartbeat__",
+     ]
+ 
+     # Modern browsers require to have the `secure` attribute on cookies with `Samesite=none`
+-    CSRF_COOKIE_SECURE = True
+-    SESSION_COOKIE_SECURE = True
++    CSRF_COOKIE_SECURE = values.BooleanValue(True, environ_name="CSRF_COOKIE_SECURE")
++    SESSION_COOKIE_SECURE = values.BooleanValue(True, environ_name="SESSION_COOKIE_SECURE")
+ 
+     # Privacy
+     SECURE_REFERRER_POLICY = "same-origin"

From 18853ec7c5d6bce4c96494925f53d84decac146a Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 17 May 2026 07:11:31 +0000
Subject: [PATCH 068/332] praat: 6.4.63 -> 6.4.65

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

diff --git a/pkgs/by-name/pr/praat/package.nix b/pkgs/by-name/pr/praat/package.nix
index 08b5e00ceef1..78ee87bb9771 100644
--- a/pkgs/by-name/pr/praat/package.nix
+++ b/pkgs/by-name/pr/praat/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "praat";
-  version = "6.4.63";
+  version = "6.4.65";
 
   src = fetchFromGitHub {
     owner = "praat";
     repo = "praat.github.io";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-96fw5WRk1/zex65hcRdmx0wq2FTVett3FRDPhmsZr6g=";
+    hash = "sha256-v4cAFLSJllrNgTm6ewR40HYvdi8a1bZcEBz/BTdFsxA=";
   };
 
   strictDeps = true;
@@ -44,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   configurePhase = ''
     runHook preConfigure
 
-    cp makefiles/makefile.defs.linux.pulse-gcc.${
-      if stdenv.hostPlatform.isLittleEndian then "LE" else "BE"
-    } makefile.defs
+    cp makefiles/makefile.defs.linux.pulse-gcc makefile.defs
 
     runHook postConfigure
   '';

From d0375d5e8f1fc7d50994c77fe829ed7e7927c0a2 Mon Sep 17 00:00:00 2001
From: poz <poz@poz.pet>
Date: Sun, 17 May 2026 18:43:24 +0200
Subject: [PATCH 069/332] ironbar: 0.18.0 -> 0.19.0

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

diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 7dfade94684e..8e4e1f47191c 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -12,7 +12,6 @@
   gtk4-layer-shell,
   adwaita-icon-theme,
   libxkbcommon,
-  openssl,
   pkg-config,
   hicolor-icon-theme,
   rustPlatform,
@@ -33,16 +32,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "ironbar";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "ironbar";
     rev = "v${version}";
-    hash = "sha256-vhkNdvzY9xd8qmKgKtpVRTdvmS1QxnGKDFCpttqX1GE=";
+    hash = "sha256-9UPBSOgiyBOlUYZlx+xQN5PTPwDWCDdYKdCAhigzHwA=";
   };
 
-  cargoHash = "sha256-ptzq0407IaNrXXiksQKXDUbs2wPTz4GHtnCG49EbOcY=";
+  cargoHash = "sha256-ticVPKKfQnz21LpegKDwAtizi7bavIPEmpXsrZdRN48=";
 
   buildInputs = [
     gtk4
@@ -58,7 +57,6 @@ rustPlatform.buildRustPackage rec {
     systemd
     dbus
   ]
-  ++ lib.optionals (hasFeature "http") [ openssl ]
   ++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
   ++ lib.optionals (hasFeature "cairo") [ luajit ]
   ++ lib.optionals (hasFeature "keyboard") [

From 7d500eae46368cf1497ec145945c250852ab769f Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Sun, 17 May 2026 19:49:55 +0300
Subject: [PATCH 070/332] kicadAddons.kikit, kicadAddons.kikit-library: fix
 unreproducability

---
 pkgs/by-name/ki/kicad/addons/kikit.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ki/kicad/addons/kikit.nix b/pkgs/by-name/ki/kicad/addons/kikit.nix
index 9dbf40c26f5b..5fdf94c3e8f8 100644
--- a/pkgs/by-name/ki/kicad/addons/kikit.nix
+++ b/pkgs/by-name/ki/kicad/addons/kikit.nix
@@ -7,6 +7,7 @@
   python3,
   addonName,
   addonPath,
+  strip-nondeterminism,
 }:
 let
   # This python is only used when building the package, it's not the python
@@ -38,12 +39,14 @@ stdenv.mkDerivation {
     python
     bc
     zip
+    strip-nondeterminism
   ];
   propagatedBuildInputs = [ kikit-module ];
 
   buildPhase = ''
     patchShebangs scripts/setJson.py
     make ${targetSpec.makeTarget}
+    strip-nondeterminism --type zip build/${targetSpec.resultZip}
   '';
 
   installPhase = ''

From b17599a0313fd1c1d598a6c2d2c3dbbcce65c1ea Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 17 May 2026 13:12:40 +0200
Subject: [PATCH 071/332] bite: 0.3 -> 0.43

Diff: https://github.com/WINSDK/bite/compare/V0.3...v0.43
Changelog: https://github.com/WINSDK/bite/releases/tag/v0.43
---
 pkgs/by-name/bi/bite/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bi/bite/package.nix b/pkgs/by-name/bi/bite/package.nix
index a7032f8db0cf..a74b819c65e1 100644
--- a/pkgs/by-name/bi/bite/package.nix
+++ b/pkgs/by-name/bi/bite/package.nix
@@ -21,16 +21,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bite";
-  version = "0.3";
+  version = "0.43";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "WINSDK";
     repo = "bite";
-    rev = "V${finalAttrs.version}";
-    hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-akwkTV1bZJ3GcEtObyF+qN5IkBRoXdztUSOghjQy7A0=";
   };
 
-  cargoHash = "sha256-ESGX1hnDnU2taKQXre4AQRzQxTC7W+0cEIoQPPC9Lfs=";
+  cargoHash = "sha256-OlxUHYTbljWGWdiceBmW3J0oB4w0/5izgNnwCafV6xY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -90,7 +92,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Disassembler focused on comprehensive rust support";
     homepage = "https://github.com/WINSDK/bite";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ vinnymeller ];
+    maintainers = with lib.maintainers; [
+      vinnymeller
+      kybe236
+    ];
     mainProgram = "bite";
   };
 })

From 620ac1d040d409ccb096be424a67c178ccf6a9c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 20:05:21 +0000
Subject: [PATCH 072/332] roave-backward-compatibility-check: 8.20.0 -> 8.21.0

---
 .../ro/roave-backward-compatibility-check/package.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 92df6bc019d7..afd30beb1191 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.20.0";
+  version = "8.21.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     tag = finalAttrs.version;
-    hash = "sha256-skLTpDak2mgltZpDrNLQXw00omLW/xW5hBPNuX/noSc=";
+    hash = "sha256-kCs9lDvbhUacOH4bEAZjm2LzHSvJnVMR9lzmt00GgTw=";
   };
 
-  vendorHash = "sha256-v8Wv5BK9r3zYst1P0AcpkYCcl0iBvWt+UL2+fEF8Ahw=";
+  vendorHash = "sha256-68KE/ieWYST/jQMaaK5lLqBLEmI4YhYPOE4XuXNMfqM=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From c862dfdeacff502dc043637030b4216dd6c92a8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 08:18:20 +0000
Subject: [PATCH 073/332] python3Packages.bayesian-optimization: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
index 555652ea68db..5e718d05d23f 100644
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "bayesian-optimization";
-  version = "3.2.1";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bayesian-optimization";
     repo = "BayesianOptimization";
     tag = "v${version}";
-    hash = "sha256-pTtwuBQUdVsi98nndEyY9mawGiTwjgiD05EsQwQFiPo=";
+    hash = "sha256-w1L4W99OaNknFtdsdkjJXsdOCmjtYvOG7Iy9z9EXFf0=";
   };
 
   postPatch = ''

From 899ab28096b77ef2c9364f9e65e85f0605e1c8dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 12:07:44 +0000
Subject: [PATCH 074/332] octavePackages.datatypes: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix
index 4bdeb14888d4..59ad7b8388b0 100644
--- a/pkgs/development/octave-modules/datatypes/default.nix
+++ b/pkgs/development/octave-modules/datatypes/default.nix
@@ -7,13 +7,13 @@
 
 buildOctavePackage rec {
   pname = "datatypes";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "pr0m1th3as";
     repo = "datatypes";
     tag = "release-${version}";
-    sha256 = "sha256-qgFYyRMrdWhbHBvOEsDAetpllr5yyhtoEB+7Ri6zbSI=";
+    sha256 = "sha256-WyuL1xDRw4QPouJbJ8op8mh2fLOBfPLUnp4syKmyYLE=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };

From 078e2e0b1e27ab140f5bc1e9b412835c2c3148d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 13:16:28 +0000
Subject: [PATCH 075/332] python3Packages.langgraph-store-mongodb: 0.2.0 ->
 0.3.0

---
 .../python-modules/langgraph-store-mongodb/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-store-mongodb/default.nix b/pkgs/development/python-modules/langgraph-store-mongodb/default.nix
index 953906a2e0a9..fcae0393fe2a 100644
--- a/pkgs/development/python-modules/langgraph-store-mongodb/default.nix
+++ b/pkgs/development/python-modules/langgraph-store-mongodb/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-store-mongodb";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-mongodb";
     tag = "libs/langgraph-store-mongodb/v${finalAttrs.version}";
-    hash = "sha256-IXISxo3mC0/FkjGdHTmin6z/fk71ecto+L+VZ6VFdeE=";
+    hash = "sha256-uivrfCTUu7Pq/ncAGH6HUzgyOGRcOzsQ+SVN6wW33tQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/langgraph-store-mongodb";

From 537a5f5e2757e73ed5533f083dde582aaf08b9fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 13:17:49 +0000
Subject: [PATCH 076/332] python3Packages.langgraph-checkpoint-mongodb: 0.3.1
 -> 0.4.0

---
 .../python-modules/langgraph-checkpoint-mongodb/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix
index f16e5a605c15..837a8e42e8a1 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-checkpoint-mongodb";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-mongodb";
     tag = "libs/langgraph-checkpoint-mongodb/v${finalAttrs.version}";
-    hash = "sha256-vCiZ6Mp6aHmSEkLbeM6qTLJaxH0uoAdq80olTT5saX0=";
+    hash = "sha256-AdTAyMHNzkuvNB7DsbWxAxNKNqSxdgYwIB5UHBAAxZc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/langgraph-checkpoint-mongodb";

From fc4ff99d24ee5dfa1a9f001118d14727fcc7e6ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 17:33:15 +0000
Subject: [PATCH 077/332] hyprlandPlugins.hy3: 0.54.2.1 -> 0.55.0

---
 .../window-managers/hyprwm/hyprland-plugins/hy3.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
index 7b940e7de165..96ee95fa2b44 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
@@ -8,13 +8,13 @@
 }:
 mkHyprlandPlugin (finalAttrs: {
   pluginName = "hy3";
-  version = "0.54.2.1";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "outfoxxed";
     repo = "hy3";
     tag = "hl${finalAttrs.version}";
-    hash = "sha256-qKh+SPgmUNy5p22+hFPM7nNI3izjP6fG1fOX8YRa1f8=";
+    hash = "sha256-P3wwiIfqo89evW7xzI+wOI/qM1WPZBiiSmGNtBmYeVk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 786e381e7d18d5562af6634ca3d23c5fafd5cfb0 Mon Sep 17 00:00:00 2001
From: Bogdan Burlacu <bogdan.burlacu@pm.me>
Date: Mon, 18 May 2026 23:36:27 +0300
Subject: [PATCH 078/332] cppitertools: 2.1 -> 2.3

---
 pkgs/by-name/cp/cppitertools/package.nix | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix
index 90a73ff7f9d9..4fe9b2958964 100644
--- a/pkgs/by-name/cp/cppitertools/package.nix
+++ b/pkgs/by-name/cp/cppitertools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cppitertools";
-  version = "2.1";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "ryanhaining";
     repo = "cppitertools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mii4xjxF1YC3H/TuO/o4cEz8bx2ko6U0eufqNVw5LNA=";
+    hash = "sha256-1lHpy+9e17lP/58EEIzrmyBwbmMD665ypDJtkSFrN9E=";
   };
 
   __structuredAttrs = true;
@@ -25,13 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
   # tests. The CMake system defines tests and install targets, including a
   # cppitertools-config.cmake, which is really helpful for downstream consumers
   # to detect this package since it has no pkg-config.
-  # However the CMake system also specifies the entire source repo as an install
-  # target, including support files, the build directory, etc.
-  # We can't simply take cppitertools-config.cmake for ourselves because before
-  # install it's placed in non-specific private CMake subdirectory of the build
-  # directory.
-  # Therefore, we instead simply patch CMakeLists.txt to make the target that
-  # installs the entire directory non-default, and then install the headers manually.
 
   strictDeps = true;
 
@@ -47,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   # files that are also in that repo.
   cmakeBuildDir = "cmake-build";
 
-  includeInstallDir = "${placeholder "out"}/include/cppitertools";
   cmakeInstallDir = "${placeholder "out"}/share/cmake";
 
   # This version of cppitertools considers itself as having used the default value,
@@ -58,12 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [ "-Dcppitertools_INSTALL_CMAKE_DIR=${finalAttrs.cmakeInstallDir}" ];
 
-  prePatch = ''
-    # Mark the `.` install target as non-default.
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "  DIRECTORY ." "  DIRECTORY . EXCLUDE_FROM_ALL"
-  ''
-  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+  prePatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
     # Required for tests.
     cp ${lib.getDev catch2}/include/catch2/catch.hpp test/
   '';
@@ -77,11 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    # Install the -config.cmake files.
     cmake --install . "--prefix=$out"
-    # Install the headers.
-    mkdir -p "$includeInstallDir"
-    cp -r ../*.hpp ../internal "$includeInstallDir"
     runHook postInstall
   '';
 

From 4db82c49bb763943f10db80a85ef3279fae4b767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 21:51:18 +0000
Subject: [PATCH 079/332] python3Packages.python-kadmin-rs: 0.7.0 -> 0.7.2

---
 .../development/python-modules/python-kadmin-rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-kadmin-rs/default.nix b/pkgs/development/python-modules/python-kadmin-rs/default.nix
index 35ccf09e80dc..393313189c24 100644
--- a/pkgs/development/python-modules/python-kadmin-rs/default.nix
+++ b/pkgs/development/python-modules/python-kadmin-rs/default.nix
@@ -10,19 +10,19 @@
 }:
 buildPythonPackage rec {
   pname = "python-kadmin-rs";
-  version = "0.7.0";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "authentik-community";
     repo = "kadmin-rs";
     rev = "kadmin/version/${version}";
-    hash = "sha256-7aRbpQblRFoCmuZJgm2mrGoUNL0BBcIpzlKblCnHVPc=";
+    hash = "sha256-zl0N6cIcRFsShKOc3aazYsTlEBXpnymP9nsdaBky1OE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-dzTcB5GfeUbgikznq4YFEzZ75z0zvz4I1/+5UCQ0e2o=";
+    hash = "sha256-NXPc8hssmMXcmuK15oF5CIV+cUAmRoml6BXYhIkRdvI=";
   };
 
   # The include directories of krb5 and heimdal contain overlapping paths.

From 8532f8d63d434764023635759dbb6a0036a761fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 00:20:42 +0000
Subject: [PATCH 080/332] vscode-extensions.ms-python.flake8: 2026.4.0 ->
 2026.6.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix
index a228ae85084d..272cfbb11de3 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "flake8";
-    version = "2026.4.0";
-    hash = "sha256-2o6a0wPYVFa+XWQoKBxKcWxlH8IPOzKxtXNt7qUi9mM=";
+    version = "2026.6.0";
+    hash = "sha256-n++DEjZsNY3YkvldyWuk3dCYgFbIxqMOun42lWEHGog=";
   };
 
   meta = {

From 488117ab3c7cf9a00a0a7edcc44aca6f1fca099f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 00:40:39 +0000
Subject: [PATCH 081/332] python3Packages.ansible-core: 2.20.5 -> 2.21.0

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

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index eb3dcf16e611..c812c039ed9f 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ansible-core";
-  version = "2.20.5";
+  version = "2.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     owner = "ansible";
     repo = "ansible";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AU6LTKqtBMW2s+0a0HsMrkXDqaWbcEqbtG3dp/5bQOA=";
+    hash = "sha256-I0XEEGyTMQMpGTApbzVzHRuRAALl+C28GfpW4CeeTIA=";
   };
 
   postPatch = ''

From ef1aae85d117e8b45778f24a693011852dfa4007 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Tue, 19 May 2026 14:36:50 +0700
Subject: [PATCH 082/332] python3Packages.clickhouse-cityhash: relax cython
 upper bound

---
 .../python-modules/clickhouse-cityhash/default.nix           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix
index a34f16c53378..e3662b5c325a 100644
--- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix
+++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix
@@ -32,6 +32,11 @@ buildPythonPackage rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=3.0,<3.1" "Cython>=3.0"
+  '';
+
   doCheck = false;
 
   pythonImportsCheck = [ "clickhouse_cityhash" ];

From d795c3c57435dd3071c97a1c607bd53c0a527b66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 09:12:00 +0000
Subject: [PATCH 083/332] python3Packages.gguf: 9101 -> 9222

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

diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix
index 8a3fcd81928e..d4a4e30e0bf6 100644
--- a/pkgs/development/python-modules/gguf/default.nix
+++ b/pkgs/development/python-modules/gguf/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gguf";
-  version = "9101";
+  version = "9222";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-dQ0KsUsiTYJXtWuU16yTbHiyWCspw5WofQVjvrY2OVc=";
+    hash = "sha256-LIGtXaO53Y3Ze0x6uevb2vzcKHbyj2o/8ZHvyZ22uo4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/gguf-py";

From 06da1d00991486bc402362cfc98350cdc43f48dd Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Tue, 19 May 2026 10:19:49 -0400
Subject: [PATCH 084/332] ballerburg: fix Darwin build

Assisted-by: Codex:gpt-5.5
---
 pkgs/by-name/ba/ballerburg/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/ba/ballerburg/package.nix b/pkgs/by-name/ba/ballerburg/package.nix
index 1c3a003b68aa..355ef471140b 100644
--- a/pkgs/by-name/ba/ballerburg/package.nix
+++ b/pkgs/by-name/ba/ballerburg/package.nix
@@ -34,6 +34,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ SDL ];
 
+  # CMake's default framework search order on Darwin finds Kernel.framework
+  # headers while detecting SDL 1.2, which makes standard includes like
+  # <string.h> resolve to the wrong SDK header and breaks the build.
+  # Keep this package on the old Nixpkgs search order without restoring it
+  # globally: https://github.com/NixOS/nixpkgs/pull/455592
+  # CMake docs: https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_FRAMEWORK.html
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_FIND_FRAMEWORK=LAST"
+  ];
+
   desktopItems = [
     (makeDesktopItem {
       name = "Ballerburg";

From a31af32aba1f5307516430e9587cb5e008f721fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Sat, 16 May 2026 16:18:01 -0400
Subject: [PATCH 085/332] endless-sky: added maintainer

---
 pkgs/by-name/en/endless-sky/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index a33b87f1e4d2..3073e049527c 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       _360ied
       lilacious
+      philocalyst
     ];
     platforms = lib.platforms.linux; # Maybe other non-darwin Unix
   };

From b07de494a9f939f72c8bbdaf1a88c694f413fb1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 19 May 2026 16:39:21 -0400
Subject: [PATCH 086/332] endless-sky: meta expansion

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

diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index 3073e049527c..2ee41e32bb33 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -68,8 +68,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
+    longDescription = ''
+      Endless Sky is a sandbox-style space exploration game. You start as the captain
+      of a tiny spaceship and can choose what to do from there. The game includes a
+      major plot line and many minor missions, but you can play as a merchant, bounty
+      hunter, or explorer entirely at your own discretion. Trade goods between star
+      systems, upgrade your ship, recruit a fleet, and uncover alien civilisations
+      beyond the boundaries of human space.
+    '';
     mainProgram = "endless-sky";
     homepage = "https://endless-sky.github.io/";
+    changelog = "https://github.com/endless-sky/endless-sky/blob/v${finalAttrs.version}/changelog";
     license = with lib.licenses; [
       gpl3Plus
       cc-by-sa-30
@@ -81,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
       lilacious
       philocalyst
     ];
-    platforms = lib.platforms.linux; # Maybe other non-darwin Unix
+    platforms = lib.platforms.all;
   };
 })

From 5f4f745104cddc7fa223627a28c441075ce8b5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 19 May 2026 16:39:44 -0400
Subject: [PATCH 087/332] endless-sky: full darwin support

---
 pkgs/by-name/en/endless-sky/package.nix | 61 ++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index 2ee41e32bb33..038294f7d0a4 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -16,6 +16,8 @@
   libmad,
   libuuid,
   minizip,
+  libicns,
+  apple-sdk_15,
   nix-update-script,
 }:
 
@@ -30,23 +32,44 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-QXLIHAAdpK6lvKv0471KsiB+B06RKUfYoUNYKi8NAlg=";
   };
 
-  patches = [
+  patches = lib.optionals stdenv.hostPlatform.isLinux [
     ./fixes.patch
   ];
 
-  postPatch = ''
-    # the trailing slash is important!!
-    # endless sky naively joins the paths with string concatenation
-    # so it's essential that there be a trailing slash on the resources path
-    substituteInPlace source/Files.cpp \
-      --replace-fail '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/"
-  '';
+  postPatch =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      # the trailing slash is important!!
+      # endless sky naively joins the paths with string concatenation
+      # so it's essential that there be a trailing slash on the resources path
+      substituteInPlace source/Files.cpp \
+        --replace-fail '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # iconutil is a macOS SDK tool unavailable in the nix sandbox;
+      # replace with png2icns from libicns for equivalent icns generation
+      substituteInPlace CMakeLists.txt \
+        --replace-fail \
+          'iconutil -c icns -o icons/endless-sky.icns icons/endless-sky.iconset' \
+          'png2icns icons/endless-sky.icns icons/endless-sky.iconset/icon_16x16.png icons/endless-sky.iconset/icon_32x32.png icons/endless-sky.iconset/icon_128x128.png icons/endless-sky.iconset/icon_256x256.png icons/endless-sky.iconset/icon_512x512.png'
+
+      # cmake's find_path(UUID_INCLUDE uuid/uuid.h) resolves to
+      # Kernel.framework/Headers and adds it with -I, shadowing libcxx's
+      # stddef.h. uuid/uuid.h is already in usr/include/uuid/ via the SDK
+      # sysroot, so no explicit include dir is needed.
+      substituteInPlace CMakeLists.txt \
+        --replace-fail \
+          'target_include_directories(ExternalLibraries INTERFACE "''${UUID_INCLUDE}")' \
+          ""
+    '';
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
     cmake
     pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
   ];
 
   buildInputs = [
@@ -55,15 +78,31 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libjpeg
     libogg
-    libx11
     flac
-    glew
     openal
     libmad
-    libuuid
     minizip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libx11
+    glew
+    libuuid
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
   ];
 
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeBool "ES_USE_VCPKG" false)
+    (lib.cmakeBool "ES_CREATE_BUNDLE" true)
+  ];
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p "$out/Applications" "$out/bin"
+    mv "$out/Endless Sky.app" "$out/Applications/"
+    ln -s "$out/Applications/Endless Sky.app/Contents/MacOS/Endless Sky" "$out/bin/endless-sky"
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From bfd5edcf86ea3886fb1cd241dbda35794cacaac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 10 May 2026 22:17:10 +0200
Subject: [PATCH 088/332] nixos/pihole-ftl: fix systemd.enableStrictShellChecks

---
 .../networking/pihole-ftl-setup-script.nix        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/pihole-ftl-setup-script.nix b/nixos/modules/services/networking/pihole-ftl-setup-script.nix
index 944d180dda17..8aa7761c3b26 100644
--- a/nixos/modules/services/networking/pihole-ftl-setup-script.nix
+++ b/nixos/modules/services/networking/pihole-ftl-setup-script.nix
@@ -19,6 +19,7 @@ let
 in
 ''
   # Can't use -u (unset) because api.sh uses API_URL before it is set
+  set +u
   set -eo pipefail
   pihole="${lib.getExe pihole}"
   jq="${lib.getExe pkgs.jq}"
@@ -29,22 +30,24 @@ in
   if [ ! -f '${cfg.settings.files.gravity}' ]; then
     $pihole -g
     # Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one
-    ${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})
+    ${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN "$(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})"
   fi
 
+  # shellcheck disable=SC1091
   source ${pihole}/share/pihole/advanced/Scripts/api.sh
+  # shellcheck disable=SC1091
   source ${pihole}/share/pihole/advanced/Scripts/utils.sh
 
   any_failed=0
 
   addList() {
-    local payload="$1"
+    local payload="$1" result type error
 
     echo "Adding list: $payload"
-    local type=$($jq -r '.type' <<< "$payload")
-    local result=$(PostFTLData "lists?type=$type" "$payload")
+    type=$($jq -r '.type' <<< "$payload")
+    result=$(PostFTLData "lists?type=$type" "$payload")
 
-    local error="$($jq '.error' <<< "$result")"
+    error="$($jq '.error' <<< "$result")"
     if [[ "$error" != "null" ]]; then
         echo "Error: $error"
         any_failed=1
@@ -62,7 +65,7 @@ in
     echo "Added list ID $id: $result"
   }
 
-  for i in 1 2 3; do
+  for _ in 1 2 3; do
     (TestAPIAvailability) && break
     echo "Retrying API shortly..."
     ${lib.getExe' pkgs.coreutils "sleep"} .5s

From 021c5a9e3dc50fa758f7dcf9b26442f9bee00c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 11 May 2026 02:55:39 +0200
Subject: [PATCH 089/332] nixos/pihole: fix /api/padd?full=true endpoint
 returning an error

---
 .../modules/services/networking/pihole-ftl.nix  | 17 ++++++++++++-----
 nixos/modules/services/web-apps/pihole-web.nix  |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix
index 3840d6fefd12..2280ff4231f5 100644
--- a/nixos/modules/services/networking/pihole-ftl.nix
+++ b/nixos/modules/services/networking/pihole-ftl.nix
@@ -491,11 +491,18 @@ in
 
     users.groups.${cfg.group} = { };
 
-    environment.etc."pihole/pihole.toml" = {
-      source = settingsFile;
-      user = cfg.user;
-      group = cfg.group;
-      mode = "400";
+    environment.etc = {
+      "pihole/pihole.toml" = {
+        source = settingsFile;
+        user = cfg.user;
+        group = cfg.group;
+        mode = "400";
+      };
+
+      "pihole/versions".text = ''
+        CORE_VERSION=${cfg.piholePackage.src.src.tag}
+        FTL_VERSION=${cfg.package.src.tag}
+      '';
     };
 
     environment.systemPackages = [ cfg.pihole ];
diff --git a/nixos/modules/services/web-apps/pihole-web.nix b/nixos/modules/services/web-apps/pihole-web.nix
index 90c78b5299d5..43895b4c45a2 100644
--- a/nixos/modules/services/web-apps/pihole-web.nix
+++ b/nixos/modules/services/web-apps/pihole-web.nix
@@ -89,6 +89,8 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    environment.etc."pihole/versions".text = "WEB_VERSION=${cfg.package.src.tag}";
+
     services.pihole-ftl.settings.webserver = {
       domain = cfg.hostName;
       port = cfg.ports;

From 3486aa836d52b0ce9ea0bf5a88c7bbe06fc02c0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 02:59:50 +0000
Subject: [PATCH 090/332] mdbook: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index 66c14abfb130..fa23ac200d96 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -8,7 +8,7 @@
   installShellFiles,
 }:
 let
-  version = "0.5.2";
+  version = "0.5.3";
 in
 rustPlatform.buildRustPackage rec {
   inherit version;
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "mdBook";
     tag = "v${version}";
-    hash = "sha256-gyjD47ZR9o2lIxipzesyJ6mxb9J9W+WS77TNWhKHP6U=";
+    hash = "sha256-RMJQn58hshBGQSpu30NdUOb3Prywn6NfhauSzFZ35xQ=";
   };
 
-  cargoHash = "sha256-230KljOUSrDy8QCQki7jvJvdAsjVlUEjKDNVyTF4tWs=";
+  cargoHash = "sha256-LlImOjTQjMQURQ81Gn73v+DEHXqyyiz39K9T+MrE7S0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f8bd1063a31ed207972d422e5a9c214010dcff74 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 20 May 2026 08:50:33 +0300
Subject: [PATCH 091/332] netron: 8.8.2 -> 9.0.8

Includes a bump to Electon 42.
See #521305.
---
 pkgs/by-name/ne/netron/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix
index 2b4ae77e6b9f..c8b3f3552b3d 100644
--- a/pkgs/by-name/ne/netron/package.nix
+++ b/pkgs/by-name/ne/netron/package.nix
@@ -2,30 +2,30 @@
   lib,
   stdenv,
   buildNpmPackage,
-  electron_39,
+  electron_42,
   fetchFromGitHub,
   jq,
   makeDesktopItem,
 }:
 
 let
-  electron = electron_39;
+  electron = electron_42;
   description = "Visualizer for neural network, deep learning and machine learning models";
   icon = "netron";
 
 in
 buildNpmPackage (finalAttrs: {
   pname = "netron";
-  version = "8.8.2";
+  version = "9.0.8";
 
   src = fetchFromGitHub {
     owner = "lutzroeder";
     repo = "netron";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DeI82vixVJwAfYYUOTTZCeRTYvmkAutuQQm1fCdj8fs=";
+    hash = "sha256-vWzifB8A0VzzSkPVrcFtrR/tLBeFh1n+xwefhNo4PDQ=";
   };
 
-  npmDepsHash = "sha256-HyqfrkO9Cbo6KVY1QuA4i6od6M7ZQaIfkUWA2P/bvfI=";
+  npmDepsHash = "sha256-3Vaoym7o3sTmEHTNTG90i/NgdJ2x+skJ1slpp0dmv64=";
 
   nativeBuildInputs = [ jq ];
 

From c470399a628169b35f77bf5aaa247bff02e668d1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 20 May 2026 18:13:23 +0700
Subject: [PATCH 092/332] gaw: fix build with gcc 15

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

diff --git a/pkgs/by-name/ga/gaw/package.nix b/pkgs/by-name/ga/gaw/package.nix
index 0269c21f82d6..fc43efe26fbb 100644
--- a/pkgs/by-name/ga/gaw/package.nix
+++ b/pkgs/by-name/ga/gaw/package.nix
@@ -78,6 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ gtk3 ];
 
+  # K&R-style function declarations break under gcc 15's C23 default.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   meta = {
     description = "Gtk Analog Wave viewer";
     mainProgram = "gaw";

From abb997a98ca910bea92aeca82576e0c0e6d23b66 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 20 May 2026 18:39:23 +0700
Subject: [PATCH 093/332] groestlcoind: fix inverted cmakeFlags

---
 pkgs/applications/blockchains/groestlcoin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix
index d140f19b3cf8..6a0f4fd9ef14 100644
--- a/pkgs/applications/blockchains/groestlcoin/default.nix
+++ b/pkgs/applications/blockchains/groestlcoin/default.nix
@@ -90,9 +90,9 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "BUILD_BENCH" false)
     (lib.cmakeBool "WITH_ZMQ" true)
-    (lib.cmakeBool "WITH_USDT" (stdenv.hostPlatform.isLinux))
-    (lib.cmakeBool "ENABLE_WALLET" (!withWallet))
-    (lib.cmakeBool "BUILD_GUI" (!withGui))
+    (lib.cmakeBool "WITH_USDT" stdenv.hostPlatform.isLinux)
+  ]
+  ++ lib.optionals (!withWallet) [
     (lib.cmakeBool "ENABLE_WALLET" false)
   ]
   ++ lib.optionals withGui [

From c3bc7171270031473628e6243c1b0fc9d3a8e647 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 20 May 2026 11:50:30 +0000
Subject: [PATCH 094/332] xcbeautify: 3.1.1 -> 3.2.1

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

diff --git a/pkgs/by-name/xc/xcbeautify/package.nix b/pkgs/by-name/xc/xcbeautify/package.nix
index 71a40ef0a008..59b8895979d5 100644
--- a/pkgs/by-name/xc/xcbeautify/package.nix
+++ b/pkgs/by-name/xc/xcbeautify/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xcbeautify";
-  version = "3.1.1";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${stdenv.hostPlatform.darwinArch}-apple-macosx.zip";
     hash = lib.getAttr stdenv.hostPlatform.darwinArch {
-      arm64 = "sha256-YJnQ7VDjQK3w2pweEDpiBF5sZsHc94ZECpeDu0ncxp8=";
-      x86_64 = "sha256-LRyA9uODhYFxAc6RtWi6zmkSaPm/dAaSqzmbV0bRWWk=";
+      arm64 = "sha256-7TKXLkG8OqGViPiw9KAgnvcMZjrWC79K2Eot5zNV1jc=";
+      x86_64 = "sha256-umXo78Lr6MbxM5Oq64ig/4SSeNlIDuFJav+qPbeBrG4=";
     };
   };
 

From 1023d5dafaca347b9aafad9bc2bcfe51b4063813 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 9 Apr 2026 23:07:48 +0200
Subject: [PATCH 095/332] gram: init at 2.1.0

---
 pkgs/by-name/gr/gram/package.nix | 202 +++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 pkgs/by-name/gr/gram/package.nix

diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix
new file mode 100644
index 000000000000..06bb142a33ef
--- /dev/null
+++ b/pkgs/by-name/gr/gram/package.nix
@@ -0,0 +1,202 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromCodeberg,
+  cmake,
+  pkg-config,
+  protobuf,
+  fontconfig,
+  libgit2,
+  openssl,
+  sqlite,
+  zlib,
+  zstd,
+  libxkbcommon,
+  wayland,
+  libxcb,
+  stdenv,
+  libGL,
+  vulkan-loader,
+  envsubst,
+  nix-update-script,
+  cargo-about,
+  versionCheckHook,
+  cargo-bundle,
+  git,
+  testers,
+  writableTmpDirAsHomeHook,
+
+  buildRemoteServer ? true,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gram";
+  version = "2.1.0";
+
+  outputs = [
+    "out"
+  ]
+  ++ lib.optionals buildRemoteServer [
+    "remote_server"
+  ];
+
+  src = fetchFromCodeberg {
+    owner = "GramEditor";
+    repo = "gram";
+    tag = finalAttrs.version;
+    hash = "sha256-9MfNGl0bk8RBkYutHFMnAEiAQVnUBQguQUkyt+O0vnY=";
+  };
+
+  postPatch = ''
+    # The generate-licenses script wants a specific version of cargo-about eventhough
+    # newer versions work just as well.
+    substituteInPlace script/generate-licenses \
+      --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
+  '';
+
+  cargoHash = "sha256-sUSkXYZ81CFwxzDiT0Va0VnWVKlVS683DVHLZeoSJ4w=";
+
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cargo-about
+    cmake
+    pkg-config
+    protobuf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cargo-bundle
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [
+    libgit2
+    openssl
+    sqlite
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    fontconfig
+    libxcb
+    libxkbcommon
+  ];
+
+  cargoBuildFlags = [
+    "--package=gram"
+    "--package=cli"
+  ]
+  ++ lib.optionals buildRemoteServer [ "--package=remote_server" ];
+
+  # Required on darwin because we don't have access to the proprietary Metal shader compiler.
+  buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
+
+  env = {
+    ALLOW_MISSING_LICENSES = true;
+    OPENSSL_NO_VENDOR = true;
+    LIBGIT2_NO_VENDOR = true;
+    LIBSQLITE3_SYS_USE_PKG_CONFIG = true;
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+    RELEASE_VERSION = finalAttrs.version;
+  };
+
+  preBuild = ''
+    bash script/generate-licenses
+  '';
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  useNextest = true;
+
+  remoteServerExecutableName = "gram-remote-server-stable-${finalAttrs.version}";
+  installPhase = ''
+    runHook preInstall
+
+    release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # cargo-bundle expects the binary in target/release
+    mv $release_target/gram target/release/gram
+
+    pushd crates/gram
+    # Note that this is GNU sed, while Gram's bundle-mac uses BSD sed
+    sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
+    export CARGO_BUNDLE_SKIP_BUILD=true
+    app_path=$(cargo bundle --release | xargs)
+    popd
+
+    mkdir -p $out/Applications $out/bin
+    # Gram expects git next to its own binary
+    ln -s ${lib.getExe git} $app_path/Contents/MacOS/git
+    mv $release_target/cli $app_path/Contents/MacOS/cli
+    mv $app_path $out/Applications/
+
+    # Physical location of the CLI must be inside the app bundle as this is used
+    # to determine which app to start
+    ln -s $out/Applications/Gram.app/Contents/MacOS/cli $out/bin/gram
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm755 $release_target/gram $out/libexec/gram-editor
+    install -Dm755 $release_target/cli $out/bin/gram
+
+    install -Dm644 $src/crates/gram/resources/app.liten.Gram.svg $out/share/icons/hicolor/scalable/apps/app.liten.Gram.svg
+    install -Dm644 $src/crates/gram/resources/app.liten.Gram-symbolic.svg $out/share/icons/hicolor/scalable/apps/app.liten.Gram-symbolic.svg
+
+    # See https://codeberg.org/GramEditor/gram/src/branch/main/crates/gram/resources/gram.desktop.in
+    (
+      export DO_STARTUP_NOTIFY="true"
+      export APP_CLI="gram"
+      export APP_ICON="app.liten.Gram"
+      export APP_NAME="Gram"
+      export APP_ARGS="%U"
+      mkdir -p "$out/share/applications"
+      ${lib.getExe envsubst} < "crates/gram/resources/gram.desktop.in" > "$out/share/applications/app.liten.Gram.desktop"
+    )
+  ''
+  + lib.optionalString buildRemoteServer ''
+    install -Dm755 $release_target/remote_server $remote_server/bin/${finalAttrs.remoteServerExecutableName}
+  ''
+  + ''
+    runHook postInstall
+  '';
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf $out/libexec/gram-editor --add-rpath ${
+      lib.makeLibraryPath [
+        libGL
+        vulkan-loader
+        wayland
+      ]
+    }
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      remoteServerVersion = testers.testVersion {
+        package = finalAttrs.finalPackage.remote_server;
+        command = "${finalAttrs.remoteServerExecutableName} version";
+      };
+    };
+  };
+
+  meta = {
+    description = "Powerful and modern source code editor";
+    homepage = "https://gram-editor.com";
+    changelog = "https://codeberg.org/GramEditor/gram/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      niklaskorz
+    ];
+    mainProgram = "gram";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})

From 8d7c2731f94a4595bbfa4d8e44cf5f0536bfb543 Mon Sep 17 00:00:00 2001
From: twoneis <git@chpu.eu>
Date: Wed, 20 May 2026 15:56:43 +0200
Subject: [PATCH 096/332] sharkey: 2025.4.6 -> 2025.4.7

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

diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix
index 899c6dc7224e..f16090d19c7f 100644
--- a/pkgs/by-name/sh/sharkey/package.nix
+++ b/pkgs/by-name/sh/sharkey/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sharkey";
-  version = "2025.4.6";
+  version = "2025.4.7";
 
   src = fetchFromGitLab {
     domain = "activitypub.software";
     owner = "TransFem-org";
     repo = "Sharkey";
     tag = finalAttrs.version;
-    hash = "sha256-TtwlveTIjzDYpFR+F5c0If6E1D2E5MI9I2IoDIV0u7E=";
+    hash = "sha256-Gfn/oB9cc7LCeQxrfxuCmF7Z9A3VUGZwnhBip07c0kY=";
     fetchSubmodules = true;
   };
 

From bb23a160a1da7fc90f5e22b5e59d4cc1d7ad153e Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 19 May 2026 03:51:49 +0200
Subject: [PATCH 097/332] Revert "nixos/gdm: fix greeter permissions"

This reverts commit 13759bea6c03703470e59213004e06c22819e7fc.
---
 nixos/modules/services/display-managers/gdm.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index 79eb5b4537cc..38b9f919bab2 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -44,10 +44,6 @@ let
   defaultSessionName = config.services.displayManager.defaultSession;
 
   setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { };
-
-  greeterEnvFile = pkgs.writeText "gdm-greeter-env" ''
-    DCONF_PROFILE=gdm
-  '';
 in
 
 {
@@ -456,12 +452,6 @@ in
               settings.conffile = "/etc/pam/environment";
               settings.readenv = 0;
             }
-            {
-              name = "env-greeter";
-              control = "required";
-              modulePath = "${config.security.pam.package}/lib/security/pam_env.so";
-              settings.envfile = greeterEnvFile;
-            }
             {
               name = "systemd";
               control = "optional";

From c535b510e3240c0943e691cc22d9ca4499e5d98c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 15:14:22 +0000
Subject: [PATCH 098/332] samrewritten: 1.2.3 -> 1.3.4

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

diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix
index f282f60c539c..22c6dc8bfba5 100644
--- a/pkgs/by-name/sa/samrewritten/package.nix
+++ b/pkgs/by-name/sa/samrewritten/package.nix
@@ -15,16 +15,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "samrewritten";
-  version = "1.2.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "PaulCombal";
     repo = "SamRewritten";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UHq09i0f7tLgAMIEA+GrLqKxzdsFmUrp3iIGAM+MXJ0=";
+    hash = "sha256-5SXek64kccyUs+vSyA8QCX+UpRSm0aDEZwULYZgmIUw=";
   };
 
-  cargoHash = "sha256-jPCF+wIb+DESph5dtF80NV7ydxWm09BQyf4eO2BKmNI=";
+  cargoHash = "sha256-sL6kIkYWnD7QKw/RGMDS9ZZK/LcKtYjFr5pQ6758IuQ=";
 
   # Tests require network access and a running Steam client. Skipping.
   doCheck = false;

From a75c018d6536a115d00b905866096d51eaf11efd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 20 May 2026 23:54:27 +0800
Subject: [PATCH 099/332] mate-screensaver: 1.28.0 -> 1.28.1

https://github.com/mate-desktop/mate-screensaver/compare/v1.28.0...v1.28.1
---
 pkgs/by-name/ma/mate-screensaver/package.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ma/mate-screensaver/package.nix b/pkgs/by-name/ma/mate-screensaver/package.nix
index 31e8cc3eb96d..aa3ca2d74205 100644
--- a/pkgs/by-name/ma/mate-screensaver/package.nix
+++ b/pkgs/by-name/ma/mate-screensaver/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
   pkg-config,
   gettext,
   gtk3,
@@ -9,6 +11,7 @@
   libxscrnsaver,
   libnotify,
   libxml2,
+  mate-common,
   mate-desktop,
   mate-menus,
   mate-panel,
@@ -20,17 +23,22 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mate-screensaver";
-  version = "1.28.0";
+  version = "1.28.1";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-screensaver-${finalAttrs.version}.tar.xz";
-    sha256 = "ag8kqPhKL5XhARSrU+Y/1KymiKVf3FA+1lDgpBDj6nA=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "mate-screensaver";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MTu5W+JBBlFzsv/IbygaE3+i7Df1YRGGoeZNSSSwbXM=";
   };
 
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
     pkg-config
     gettext
     libxml2 # provides xmllint
+    mate-common # mate-common.m4 macros
     wrapGAppsHook3
   ];
 
@@ -53,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   passthru.updateScript = gitUpdater {
-    url = "https://git.mate-desktop.org/mate-screensaver";
     odd-unstable = true;
     rev-prefix = "v";
   };

From dcfb5bae7942f87511f0f091289fd8aac41469d9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 20 May 2026 19:21:33 +0700
Subject: [PATCH 100/332] libjson-rpc-cpp: fix build with jsoncpp 1.9.7

---
 pkgs/by-name/li/libjson-rpc-cpp/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
index b522c1a08cf1..004e35dc39de 100644
--- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix
+++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
@@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" \
       --replace-fail "cmake_policy(SET CMP0042 OLD)" ""
+
+    # jsoncpp 1.9.7 dropped char const*/String const& overloads in favor of std::string_view.
+    substituteInPlace cmake/CMakeCompilerSettings.cmake \
+      --replace-fail "-std=c++11" "-std=c++17"
   '';
 
   preConfigure = ''

From 5f46a5137ec76f1f43dc1af785c94fd3ed2f14a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 16:10:33 +0000
Subject: [PATCH 101/332] skills: 1.5.1 -> 1.5.7

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

diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix
index 9a8cabd2aa40..a291a5a570e7 100644
--- a/pkgs/by-name/sk/skills/package.nix
+++ b/pkgs/by-name/sk/skills/package.nix
@@ -14,20 +14,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "skills";
-  version = "1.5.1";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "vercel-labs";
     repo = "skills";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JVJeottMyjxdiGPS7O4QsshKdbwbYcKMvwe/PB7I/Zw=";
+    hash = "sha256-Dzp0Gx+EcO7daxLTZ0QpMu4EEYdDWWEE8b5RF4Fv9QM=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     fetcherVersion = 3;
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    hash = "sha256-0CS6BTjTj/TAnMNahTk4Vt/0/2eMxmCGUV9PwI8l4Ao=";
+    hash = "sha256-3GSa4ze859dRA4Yrxw8r3rwZKn7FMSjBMvpz1HTDobU=";
   };
 
   nativeBuildInputs = [

From 83750df37f5ced7d41a0a00311104c212bfb29f2 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 20 May 2026 19:09:11 +0200
Subject: [PATCH 102/332] matrix-synapse-unwrapped: 1.152.1 -> 1.153.0

Release notes: https://github.com/element-hq/synapse/releases/tag/v1.153.0
Full changelog: https://github.com/element-hq/synapse/compare/v1.152.1...v1.153.0
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index f9f6ce65e275..2eb9d4c9018a 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -14,19 +14,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.152.1";
+  version = "1.153.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-81nqT6/TuqtQjjqnT6O+72WCCPlZ9JJKbWczMh6mbcU=";
+    hash = "sha256-2/KzRPUMfOOmI8j8WZsVU2ubNxidTb+FW0MZF+ktSSQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-RwUsiS6JM5dmqquKVtyaBp67DYZys6Uecy0V6AabTk4=";
+    hash = "sha256-Cu5bXS6BprXr/dwkNXDjcP9hOfqQddoC5BxOus4rteM=";
   };
 
   build-system =

From 5418e5e4bab4d815f8b0171a9e04ad317773a48e Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 20 May 2026 11:36:05 -0700
Subject: [PATCH 103/332] brave: 1.90.122 -> 1.90.124

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

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 6baac4bca078..7a942dac78f0 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.90.122";
+  version = "1.90.124";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-RjmldIesTEVkIlLM9+nHGb4sPjLGKhJTOtLLBsJLYN8=";
+      hash = "sha256-+ZJxwwL5jPO49anc+6aBA5jlAsFw7BSHt6lXjFseJ3c=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-jeEFsbXmPykkzOBIdB4Oe9towuwSHjApa485w2NO6A8=";
+      hash = "sha256-mcqe531FqdBVIgZrQLOVDgIi2JBPSKadD4fCLQMimwI=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-0QH9hJGCXRjSRANLPp3ivLvKfbH3qIfFs8i/p5BduKE=";
+      hash = "sha256-u3KmZffPQpHzS9IxZ7UsL7D6ETGJxExil20vmD6flMo=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-CZhfmjMbXwDizEk6xNzIZfGhiCUwHrJ/V1mqoCMV7TM=";
+      hash = "sha256-jSWamdWVBCR9uPY/i0awwdhTG3pD/iVdJIeYBnG747k=";
     };
   };
 

From 1ae2bf8dd23236306434186b69e324ddc75bbd37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 18:39:32 +0000
Subject: [PATCH 104/332] nbping: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/by-name/nb/nbping/package.nix b/pkgs/by-name/nb/nbping/package.nix
index 4c88714fe89c..da50cdb5eb4c 100644
--- a/pkgs/by-name/nb/nbping/package.nix
+++ b/pkgs/by-name/nb/nbping/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "nbping";
-  version = "0.6.1";
+  version = "0.7.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "hanshuaikang";
     repo = "Nping";
     tag = "v${version}";
-    hash = "sha256-6eUsvNMQoJ5TUWPkOlmcJqdmxaXoBStnhiXiya+0nV8=";
+    hash = "sha256-rGWYvYJs6vkG+HQuT4NJGMUUG9QzIhyJThgDWTC6/JI=";
   };
 
-  cargoHash = "sha256-6+drbq9dQ5/Atzoz9VPS4BoYEPeM5OqPXUuM1AXP72g=";
+  cargoHash = "sha256-6AdqPm07lbMzeqihQC3mCoBYZ1cduGo1rCvYsF+4XL4=";
 
   meta = {
     description = "Ping Tool in Rust with Real-Time Data and Visualizations";

From aee42bad0c2f02183b146805683548b79db13c79 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 14 May 2026 14:23:09 +0200
Subject: [PATCH 105/332] python3Packages.xdis: 6.1.8 -> 6.3.0

Changelog: https://github.com/rocky/python-xdis/releases/tag/6.3.0
Diff: https://github.com/rocky/python-xdis/compare/6.1.8...6.3.0
---
 .../python-modules/xdis/default.nix           | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index a5ca14400421..39a50ce8511a 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   click,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   setuptools,
   six,
@@ -10,16 +11,31 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "6.1.8";
+  version = "6.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rocky";
     repo = "python-xdis";
     tag = version;
-    hash = "sha256-sAL2D7Rg/iyob2nawXX/b5F/uOGCMsb1q0ZnPLIfh6o=";
+    hash = "sha256-k1SawlgbItbWe8J2pAxYOku/4CHyzWH3UR1j3kBZy1Q=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "python-3.13.13.patch";
+      url = "https://github.com/rocky/python-xdis/commit/f2c46c8c89898157c2345c0a026a2d31f14e7ea9.patch";
+      includes = [ "xdis/magics.py" ];
+      hash = "sha256-+k3mbiAmM69Pl7k0Wogx+qpib5+p3Gn/pSpnDn5e6pE=";
+    })
+    (fetchpatch {
+      name = "python-3.14.4.patch";
+      url = "https://github.com/rocky/python-xdis/commit/36a1a2442c224e3bfca776f727a5e262968855a4.patch";
+      includes = [ "xdis/magics.py" ];
+      hash = "sha256-q+MX737Xn+iUObuV5IirnT71/0W6JH0TgtmS1cqR0x4=";
+    })
+  ];
+
   build-system = [
     setuptools
   ];

From f8a5f278f73ca13b96afa51e265c577b4e629e7f Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 14 May 2026 14:24:25 +0200
Subject: [PATCH 106/332] python3Packages.uncompyle6: fix build with xdis 6.3

---
 pkgs/development/python-modules/uncompyle6/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
index d58e1916717b..562ad1a9d7a2 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   setuptools,
   spark-parser,
   xdis,
@@ -20,6 +21,14 @@ buildPythonPackage rec {
     hash = "sha256-eLdk1MhDsEVfs5223rQhpI1dPruEZTe6ZESv4QfE68E=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "support-xdis-6.3-api.patch";
+      url = "https://github.com/rocky/python-uncompyle6/commit/62372825c62044428c29a9ce86b5afa81e93c5ae.patch";
+      hash = "sha256-z11AKF5RC4gibUbH3hI2Rsbn8VDg49SnKfqV4TuVnjc=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 3fbc6fca7ac94ed64c7be6324941d647a5e5efb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 22:39:21 +0000
Subject: [PATCH 107/332] mpvScripts.modernz: 0.3.2 -> 0.3.3

---
 pkgs/by-name/mp/mpv/scripts/modernz.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mp/mpv/scripts/modernz.nix b/pkgs/by-name/mp/mpv/scripts/modernz.nix
index 95b3791556c2..b1e96ef65519 100644
--- a/pkgs/by-name/mp/mpv/scripts/modernz.nix
+++ b/pkgs/by-name/mp/mpv/scripts/modernz.nix
@@ -8,14 +8,14 @@
 }:
 buildLua (finalAttrs: {
   pname = "modernz";
-  version = "0.3.2";
+  version = "0.3.3";
 
   scriptPath = "modernz.lua";
   src = fetchFromGitHub {
     owner = "Samillion";
     repo = "ModernZ";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HUbS5L0kuYYm9HZ0BEzsqFQii3PQlZtzPiVRF/rDbcY=";
+    hash = "sha256-cz6yb0jQiqmzRPo1YSsnPWLshGPzBeq39DhBv7tGJqs=";
   };
 
   nativeBuildInputs = [ installFonts ];

From 902945c826bec457857fc07e3da24f2d6943889a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 23:02:30 +0000
Subject: [PATCH 108/332] vscode-extensions.charliermarsh.ruff: 2026.40.0 ->
 2026.42.0

---
 .../vscode/extensions/charliermarsh.ruff/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
index 36798a664240..1c8de2a22a0e 100644
--- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-uksu5DyarhCxPBk8U4oD9FwQ9/1lXyu6J/J82KdCzwM=";
+          hash = "sha256-Jma7CafP5MCMmPdfxJLaOtQJsinfZUPmPZs2DhkV4k8=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-OkPCfpuPzxM4j2LtnR4V6C1XphGbGEFOL7oc6y7E26g=";
+          hash = "sha256-rNtisGPnKAWVnKNc1enOSwMeU2IBS89GWgem6SEQ7/o=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-2FE0ajMBkInNg57yn+LxHHO5CqbRa92uvZLGp1uIKw0=";
+          hash = "sha256-0HGbwuy0SgPY4Ojp3+rhRxGz4TnVmE8PKjbzxMcAeIM=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-3GtSW0druCSS06nSStKtGsD9OQzMWD8T2nNgxhoXjc0=";
+          hash = "sha256-G3HphZX5yTr1sNwjEWA1ZEGR87/gwUmuxGmzHEn9NNg=";
         };
       };
     in
     {
       name = "ruff";
       publisher = "charliermarsh";
-      version = "2026.40.0";
+      version = "2026.42.0";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 9ef736f8a86fe8ea7bb0ac92f0e1306490d9d894 Mon Sep 17 00:00:00 2001
From: Chahatpreet Singh <c@chahat.dev>
Date: Sun, 10 May 2026 23:13:05 +0000
Subject: [PATCH 109/332] python3Packages.nengo: 4.0.0 -> 4.1.0

Upstream 4.1.0 drops the `setuptools<64` build-system pin from
pyproject.toml that was breaking the build against current nixpkgs
setuptools.
---
 .../development/python-modules/nengo/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix
index 144568fd080e..2d65b48c8122 100644
--- a/pkgs/development/python-modules/nengo/default.nix
+++ b/pkgs/development/python-modules/nengo/default.nix
@@ -10,21 +10,21 @@
   scikit-learn,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nengo";
-  version = "4.0.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nengo";
     repo = "nengo";
-    tag = "v${version}";
-    sha256 = "sha256-b9mPjKdewIqIeRrddV1/M3bghSyox7Lz6VbfSLCHZjA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yZDnttXU5qMmQwFESkhQb06BXcqPEiPYl54azS5b284=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
   ]
   ++ lib.optionals scipySupport [ scipy ]
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for creating and simulating large-scale brain models";
     homepage = "https://nengo.ai/";
-    license = lib.licenses.unfreeRedistributable;
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
-}
+})

From 49c1b2ee83100c9cbff901dd03d3d8d248790612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Wed, 20 May 2026 13:52:09 +0200
Subject: [PATCH 110/332] onnxruntime: add CoreML support on Darwin

Add optional CoreML execution provider for macOS builds. Fetches
coremltools, FP16, and psimd as external sources via CMake's
FetchContent. Tests are disabled when CoreML is enabled.
---
 pkgs/by-name/on/onnxruntime/package.nix | 36 ++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 08514fbd6c7c..0bfb17de83b2 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -25,6 +25,7 @@
   cudaSupport ? config.cudaSupport,
   ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
   rocmSupport ? config.rocmSupport,
+  coremlSupport ? stdenv.hostPlatform.isDarwin,
   withFullProtobuf ? false,
   cudaPackages ? { },
   rocmPackages,
@@ -80,6 +81,30 @@ let
     hash = "sha256-YqgzCyNywixebpHGx16tUuczmFS5pjCz5WjR89mv9eI=";
   };
 
+  coremltools-src = fetchFromGitHub {
+    name = "coremltools-src";
+    owner = "apple";
+    repo = "coremltools";
+    tag = "7.1";
+    hash = "sha256-kajQFHpl+4UK6fp+rM8TP0GiqIFYXPVFc2x1p19rBSw=";
+  };
+
+  fp16-src = fetchFromGitHub {
+    name = "fp16-src";
+    owner = "Maratyszcza";
+    repo = "FP16";
+    rev = "0a92994d729ff76a58f692d3028ca1b64b145d91";
+    hash = "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=";
+  };
+
+  psimd-src = fetchFromGitHub {
+    name = "psimd-src";
+    owner = "Maratyszcza";
+    repo = "psimd";
+    rev = "072586a71b55b7f8c584153d223e95687148a900";
+    hash = "sha256-lV+VZi2b4SQlRYrhKx9Dxc6HlDEFz3newvcBjTekupo=";
+  };
+
   isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild;
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
@@ -263,6 +288,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
     (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
     (lib.cmakeBool "onnxruntime_USE_MIGRAPHX" rocmSupport)
+    (lib.cmakeBool "onnxruntime_USE_COREML" coremlSupport)
     (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
   ]
   ++ lib.optionals pythonSupport [
@@ -284,6 +310,12 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     # Incompatible with packaged version, far too slow to build vendored version
     (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL" false)
     (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false)
+  ]
+  ++ lib.optionals coremlSupport [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_COREMLTOOLS" "${coremltools-src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FP16" "${fp16-src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PSIMD" "${psimd-src}")
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") # needed for psimd
   ];
 
   env =
@@ -314,6 +346,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     !(
       cudaSupport
       || rocmSupport
+      || coremlSupport
       # cross-compiled test binaries can't execute on the build platform
       || (effectiveStdenv.hostPlatform != effectiveStdenv.buildPlatform)
       || builtins.elem effectiveStdenv.buildPlatform.system [
@@ -337,7 +370,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     install -m644 -Dt $out/include \
       ../include/onnxruntime/core/framework/provider_options.h \
       ../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \
-      ../include/onnxruntime/core/session/onnxruntime_*.h
+      ../include/onnxruntime/core/session/onnxruntime_*.h \
+      ../include/onnxruntime/core/providers/coreml/coreml_provider_factory.h
   '';
 
   # See comments in `cudaPackages.nccl`

From a81eafb1a60b93b76e8601de6a33dc0e992985a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 06:56:02 +0000
Subject: [PATCH 111/332] deezer-desktop: 7.1.190 -> 7.1.200

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

diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix
index ed5f26625d17..9690ea77bfba 100644
--- a/pkgs/by-name/de/deezer-desktop/package.nix
+++ b/pkgs/by-name/de/deezer-desktop/package.nix
@@ -8,15 +8,15 @@
 }:
 
 let
-  version = "7.1.190";
+  version = "7.1.200";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
-      hash = "sha256-XoZRlFMiN5VVp3vkTwGDMekhW1KzmvuN9oYTXZFn6B4=";
+      hash = "sha256-FrAFUkxv4/GGhDO/2g+0Kym1LCV+YoIee7rmOAw17/Q=";
     };
     aarch64-linux = fetchurl {
       url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
-      hash = "sha256-ChPuz8wd3SOxRmxM5bEbz3paBw7pfIVfSY23nasRI4A=";
+      hash = "sha256-FcP4jAVvIA71GCtVoWEIA4AynsHOAn0/zt3rNB6Q25Y=";
     };
   };
 

From af0c591f0aca88484435ab28373957d6c5eb0a3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 07:32:38 +0000
Subject: [PATCH 112/332] python3Packages.primp: 1.2.3 -> 1.3.0

---
 .../python-modules/primp/Cargo.lock           | 601 +++++++++---------
 .../python-modules/primp/default.nix          |   4 +-
 2 files changed, 309 insertions(+), 296 deletions(-)

diff --git a/pkgs/development/python-modules/primp/Cargo.lock b/pkgs/development/python-modules/primp/Cargo.lock
index 7ddd4110acf7..059b2c31fcc3 100644
--- a/pkgs/development/python-modules/primp/Cargo.lock
+++ b/pkgs/development/python-modules/primp/Cargo.lock
@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "asn1-rs"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
+checksum = "b7f43a50ac4fdca5df8e885c21b835997f0a1cdee65494a6847694a98652d9d8"
 dependencies = [
  "asn1-rs-derive 0.6.0",
  "asn1-rs-impl",
@@ -165,9 +165,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1"
+checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac"
 dependencies = [
  "compression-codecs",
  "compression-core",
@@ -200,9 +200,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.16.3"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
+checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00"
 dependencies = [
  "aws-lc-sys",
  "untrusted 0.7.1",
@@ -211,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.40.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
+checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4"
 dependencies = [
  "cc",
  "cmake",
@@ -233,6 +233,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5"
 
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "2.11.1"
@@ -280,9 +289,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.60"
+version = "1.2.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -290,12 +299,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -348,18 +351,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.61"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52fa72306bb30daf11bc97773431628e5b4916e97aaa74b7d3f625d4d495da02"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.61"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2071365c5c56eae7d77414029dde2f4f4ba151cf68d5a3261c9a40de428ace93"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -367,9 +370,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e78417baa3b3114dc0e95e7357389a249c4da97c3c2b540700079db6171bfd7"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "cmake"
@@ -392,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "compression-codecs"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7"
+checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf"
 dependencies = [
  "brotli",
  "compression-core",
@@ -406,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "compression-core"
-version = "0.4.31"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789"
 
 [[package]]
 name = "cookie"
@@ -423,9 +426,9 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc4bff745c9b4c7fb1e97b25d13153da2bc7796260141df62378998d070207f"
+checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206"
 dependencies = [
  "cookie",
  "document-features",
@@ -564,9 +567,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "data-encoding"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
 
 [[package]]
 name = "der-parser"
@@ -588,7 +591,7 @@ version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
 dependencies = [
- "asn1-rs 0.7.1",
+ "asn1-rs 0.7.2",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -598,9 +601,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
  "powerfmt",
 ]
@@ -652,18 +655,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "enum-as-inner"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.2"
@@ -892,6 +883,25 @@ dependencies = [
  "wasip3",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "h3"
 version = "0.0.8"
@@ -951,6 +961,12 @@ dependencies = [
  "foldhash 0.2.0",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -970,49 +986,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
-name = "hickory-proto"
-version = "0.25.2"
+name = "hickory-net"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502"
+checksum = "e2295ed2f9c31e471e1428a8f88a3f0e1f4b27c15049592138d1eebe9c35b183"
 dependencies = [
  "async-trait",
+ "bytes",
  "cfg-if",
  "data-encoding",
- "enum-as-inner",
  "futures-channel",
  "futures-io",
  "futures-util",
+ "h2",
+ "hickory-proto",
+ "http",
  "idna",
  "ipnet",
- "once_cell",
- "rand 0.9.4",
- "ring",
+ "jni",
+ "rand 0.10.1",
+ "rustls",
  "thiserror 2.0.18",
  "tinyvec",
  "tokio",
+ "tokio-rustls",
+ "tracing",
+ "url",
+ "webpki-roots",
+]
+
+[[package]]
+name = "hickory-proto"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bab31817bfb44672a252e97fe81cd0c18d1b2cf892108922f6818820df8c643"
+dependencies = [
+ "data-encoding",
+ "idna",
+ "ipnet",
+ "jni",
+ "once_cell",
+ "prefix-trie",
+ "rand 0.10.1",
+ "ring",
+ "thiserror 2.0.18",
+ "tinyvec",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "hickory-resolver"
-version = "0.25.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a"
+checksum = "f0d58d28879ceecde6607729660c2667a081ccdc082e082675042793960f178c"
 dependencies = [
  "cfg-if",
  "futures-util",
+ "hickory-net",
  "hickory-proto",
  "ipconfig",
+ "ipnet",
+ "jni",
  "moka",
+ "ndk-context",
  "once_cell",
  "parking_lot",
- "rand 0.9.4",
+ "rand 0.10.1",
  "resolv-conf",
+ "rustls",
  "smallvec",
+ "system-configuration 0.7.0",
  "thiserror 2.0.18",
  "tokio",
+ "tokio-rustls",
  "tracing",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -1141,12 +1190,13 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -1154,9 +1204,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1167,9 +1217,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -1181,15 +1231,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
  "icu_collections",
  "icu_locale_core",
@@ -1201,15 +1251,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -1239,9 +1289,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1249,12 +1299,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
  "serde",
  "serde_core",
 ]
@@ -1286,6 +1336,9 @@ name = "ipnet"
 version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "ipnetwork"
@@ -1296,16 +1349,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "iri-string"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "is-terminal"
 version = "0.4.17"
@@ -1334,27 +1377,32 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jni"
-version = "0.21.1"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
 dependencies = [
- "cesu8",
  "cfg-if",
  "combine",
- "jni-sys 0.3.1",
+ "jni-macros",
+ "jni-sys",
  "log",
- "thiserror 1.0.69",
+ "simd_cesu8",
+ "thiserror 2.0.18",
  "walkdir",
- "windows-sys 0.45.0",
+ "windows-link",
 ]
 
 [[package]]
-name = "jni-sys"
-version = "0.3.1"
+name = "jni-macros"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
 dependencies = [
- "jni-sys 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
 ]
 
 [[package]]
@@ -1388,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.95"
+version = "0.3.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
+checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -1412,9 +1460,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.185"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libm"
@@ -1581,6 +1629,12 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -1624,9 +1678,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-integer"
@@ -1672,7 +1726,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
 dependencies = [
- "asn1-rs 0.7.1",
+ "asn1-rs 0.7.2",
 ]
 
 [[package]]
@@ -1693,15 +1747,14 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.78"
+version = "0.10.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38c4372413cdaaf3cc79dd92d29d7d9f5ab09b51b10dded508fb90bb70b9222"
+checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
 dependencies = [
  "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
- "once_cell",
  "openssl-macros",
  "openssl-sys",
 ]
@@ -1734,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.114"
+version = "0.9.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13ce1245cd07fcc4cfdb438f7507b0c7e4f3849a69fd84d52374c66d83741bb6"
+checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
 dependencies = [
  "cc",
  "libc",
@@ -1831,18 +1884,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.11"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.11"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1855,12 +1908,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
 [[package]]
 name = "pkg-config"
 version = "0.3.33"
@@ -1963,6 +2010,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "prefix-trie"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7"
+dependencies = [
+ "either",
+ "ipnet",
+ "num-traits",
+]
+
 [[package]]
 name = "pretty_env_logger"
 version = "0.5.0"
@@ -1985,7 +2043,7 @@ dependencies = [
 
 [[package]]
 name = "primp"
-version = "1.2.3"
+version = "1.3.0"
 dependencies = [
  "criterion",
  "http",
@@ -2001,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "primp-h2"
-version = "0.4.13"
+version = "0.4.14"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2026,7 +2084,7 @@ dependencies = [
 
 [[package]]
 name = "primp-hyper"
-version = "1.8.1"
+version = "1.9.0"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2041,7 +2099,6 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "pin-utils",
  "pretty_env_logger",
  "primp-h2",
  "serde",
@@ -2057,7 +2114,7 @@ dependencies = [
 
 [[package]]
 name = "primp-hyper-rustls"
-version = "0.27.7"
+version = "0.27.9"
 dependencies = [
  "cfg-if",
  "http",
@@ -2068,8 +2125,6 @@ dependencies = [
  "primp-rustls",
  "primp-tokio-rustls",
  "rustls-native-certs",
- "rustls-pemfile",
- "rustls-pki-types",
  "rustls-platform-verifier",
  "tokio",
  "tower-service",
@@ -2078,7 +2133,7 @@ dependencies = [
 
 [[package]]
 name = "primp-hyper-util"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "base64",
  "bytes",
@@ -2096,7 +2151,7 @@ dependencies = [
  "pretty_env_logger",
  "primp-hyper",
  "socket2",
- "system-configuration",
+ "system-configuration 0.6.1",
  "tokio",
  "tokio-test",
  "tower-layer",
@@ -2108,7 +2163,7 @@ dependencies = [
 
 [[package]]
 name = "primp-python"
-version = "1.2.3"
+version = "1.3.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2118,9 +2173,7 @@ dependencies = [
  "http",
  "indexmap",
  "mime",
- "once_cell",
  "primp",
- "primp-h2",
  "pyo3",
  "pyo3-async-runtimes",
  "pyo3-log",
@@ -2130,14 +2183,12 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "typed-builder",
  "url",
- "webpki-root-certs",
 ]
 
 [[package]]
 name = "primp-reqwest"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "base64",
  "brotli",
@@ -2199,7 +2250,7 @@ dependencies = [
 
 [[package]]
 name = "primp-rustls"
-version = "0.23.38"
+version = "0.23.40"
 dependencies = [
  "aws-lc-rs",
  "base64",
@@ -2232,13 +2283,13 @@ dependencies = [
 
 [[package]]
 name = "primp-tokio-rustls"
-version = "0.26.4"
+version = "0.26.5"
 dependencies = [
  "argh",
  "futures-util",
  "lazy_static",
  "primp-rustls",
- "rcgen 0.14.7",
+ "rcgen 0.14.8",
  "tokio",
  "webpki-roots",
 ]
@@ -2366,11 +2417,11 @@ dependencies = [
 
 [[package]]
 name = "quickcheck"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+checksum = "95c589f335db0f6aaa168a7cd27b1fc6920f5e1470c804f814d9cd6e62a0f70b"
 dependencies = [
- "rand 0.8.6",
+ "rand 0.10.1",
 ]
 
 [[package]]
@@ -2557,21 +2608,21 @@ dependencies = [
  "ring",
  "rustls-pki-types",
  "time",
- "yasna",
+ "yasna 0.5.2",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.14.7"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b99e0098aa4082912d4c649628623db6aba77335e4f4569ff5083a6448b32e"
+checksum = "57f6d249aad744e274e682777a50283a225a32705394ee6d5fcc01efa25e4055"
 dependencies = [
  "pem",
  "ring",
  "rustls-pki-types",
  "time",
  "x509-parser 0.18.1",
- "yasna",
+ "yasna 0.6.0",
 ]
 
 [[package]]
@@ -2638,6 +2689,15 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rusticata-macros"
 version = "4.1.0"
@@ -2662,11 +2722,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.38"
+version = "0.23.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21"
+checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
 dependencies = [
  "aws-lc-rs",
+ "log",
  "once_cell",
  "rustls-pki-types",
  "rustls-webpki",
@@ -2686,20 +2747,11 @@ dependencies = [
  "security-framework",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
  "web-time",
  "zeroize",
@@ -2707,9 +2759,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
+checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0"
 dependencies = [
  "core-foundation 0.10.1",
  "core-foundation-sys",
@@ -2741,9 +2793,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.12"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -2789,9 +2841,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "3.6.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
  "bitflags",
  "core-foundation 0.10.1",
@@ -2894,10 +2946,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
 [[package]]
-name = "siphasher"
-version = "1.0.2"
+name = "simd_cesu8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "siphasher"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "slab"
@@ -3005,6 +3073,17 @@ dependencies = [
  "system-configuration-sys",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
+]
+
 [[package]]
 name = "system-configuration-sys"
 version = "0.6.0"
@@ -3034,7 +3113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.2",
  "once_cell",
  "rustix",
  "windows-sys 0.61.2",
@@ -3101,9 +3180,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.45"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
@@ -3116,15 +3195,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -3167,9 +3246,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.52.1"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -3203,6 +3282,16 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.18"
@@ -3257,9 +3346,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
  "async-compression",
  "bitflags",
@@ -3269,13 +3358,13 @@ dependencies = [
  "http",
  "http-body",
  "http-body-util",
- "iri-string",
  "pin-project-lite",
  "tokio",
  "tokio-util",
  "tower",
  "tower-layer",
  "tower-service",
+ "url",
 ]
 
 [[package]]
@@ -3342,26 +3431,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "typed-builder"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9d30e3a08026c78f246b173243cf07b3696d274debd26680773b6773c2afc7"
-dependencies = [
- "typed-builder-macro",
-]
-
-[[package]]
-name = "typed-builder-macro"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c36781cc0e46a83726d9879608e4cf6c2505237e263a8eb8c24502989cfdb28"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "unicase"
 version = "2.9.0"
@@ -3424,11 +3493,11 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.20.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.2",
  "js-sys",
  "wasm-bindgen",
 ]
@@ -3472,11 +3541,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen 0.46.0",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -3490,9 +3559,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.118"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
+checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3505,9 +3574,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.68"
+version = "0.4.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
+checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3515,9 +3584,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.118"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
+checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3525,9 +3594,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.118"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
+checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -3538,18 +3607,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.118"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
+checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.68"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb55e2540ad1c56eec35fd63e2aea15f83b11ce487fd2de9ad11578dfc047ea"
+checksum = "af5ec93229ad9ccd0a545a516dec76dc276613f278f6a91aa6b463d5b33d42d0"
 dependencies = [
  "async-trait",
  "cast",
@@ -3569,9 +3638,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.68"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf0ca1bd612b988616bac1ab34c4e4290ef18f7148a1d8b7f31c150080e9295"
+checksum = "3c81b9fef827e575e0e54431736d1baa0d700315d8c62cfef1f61fa3aad0cbeb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3580,9 +3649,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-shared"
-version = "0.2.118"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cda5ecc67248c48d3e705d3e03e00af905769b78b9d2a1678b663b8b9d4472"
+checksum = "4f4d8ae7ad5440360e9799dfd42857d126454a88441ddf72d288ef83fa47f527"
 
 [[package]]
 name = "wasm-encoder"
@@ -3633,9 +3702,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.95"
+version = "0.3.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
+checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3753,15 +3822,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -3789,21 +3849,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -3837,12 +3882,6 @@ dependencies = [
  "windows_x86_64_msvc 0.53.1",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -3855,12 +3894,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -3873,12 +3906,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -3903,12 +3930,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -3921,12 +3942,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -3939,12 +3954,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -3957,12 +3966,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -3975,12 +3978,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
-[[package]]
-name = "wit-bindgen"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -3990,6 +3987,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -4098,7 +4101,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d43b0f71ce057da06bc0851b23ee24f3f86190b07203dd8f567d0b706a185202"
 dependencies = [
- "asn1-rs 0.7.1",
+ "asn1-rs 0.7.2",
  "data-encoding",
  "der-parser 10.0.0",
  "lazy_static",
@@ -4119,6 +4122,16 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yasna"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5f6765e852b9b4dc8e2a76843e4d64d1cea8e79bcde0b6901aea8e7c7f08282"
+dependencies = [
+ "bit-vec",
+ "time",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.2"
@@ -4164,9 +4177,9 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index dca64249d902..2553e37d0e7a 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "primp";
-  version = "1.2.3";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "primp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W5wjsuehTIdrImBVkmcEptiEE0CtlHJZ0kAbP3f3TTg=";
+    hash = "sha256-U97m1oiLFuFRJLjScaFOARiFLqr4KzEgvlYTfRomsbw=";
   };
 
   # The Cargo.lock is not pushed upstream

From 9479879fdc73251fb54343a5a190d7c47b8975ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 07:57:08 +0000
Subject: [PATCH 113/332] python3Packages.django-markdownify: 0.9.6 -> 0.9.7

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

diff --git a/pkgs/development/python-modules/django-markdownify/default.nix b/pkgs/development/python-modules/django-markdownify/default.nix
index 9069a0ee39fd..7e48c9b19448 100644
--- a/pkgs/development/python-modules/django-markdownify/default.nix
+++ b/pkgs/development/python-modules/django-markdownify/default.nix
@@ -12,14 +12,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "django-markdownify";
-  version = "0.9.6";
+  version = "0.9.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwinmatijsen";
     repo = "django-markdownify";
     tag = finalAttrs.version;
-    hash = "sha256-L/N0jjxBz7aQletOg+qairgq4utifPz4oqjT9AcljLI=";
+    hash = "sha256-Zl6t/ja/VAYrVOM6xkjcayn+vCss6JLQr+vBGsGGp+k=";
   };
 
   build-system = [ setuptools ];

From d00feeb02ab602c2a5504110ca5f0684bf24adf3 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 21 May 2026 10:00:10 +0200
Subject: [PATCH 114/332] pnpmConfigHook: add instructions for
 ERR_PNPM_LOCKFILE_CONFIG_MISMATCH

See https://github.com/NixOS/nixpkgs/pull/505103#issuecomment-4496933583

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh
index f9c19341d00b..1f47be89c23d 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh
+++ b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh
@@ -90,6 +90,9 @@ pnpmConfigHook() {
         echo "2. Build the derivation and wait for it to fail with a hash mismatch"
         echo "3. Copy the 'got: sha256-' value back into the pnpmDeps.hash field"
         echo
+        echo "If you see ERR_PNPM_LOCKFILE_CONFIG_MISMATCH above this, try changing the pnpm version"
+        echo "Found 'pnpm' with version '$pnpmVersion'"
+        echo
 
         exit 1
     fi

From 34132068512cbd546cf63c4d20e0ab9f1b0841a9 Mon Sep 17 00:00:00 2001
From: AiroPi <47398145+AiroPi@users.noreply.github.com>
Date: Sat, 16 May 2026 19:03:53 +0200
Subject: [PATCH 115/332] whatsapp-for-mac: 2.26.10.18 -> 2.26.19.17

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

diff --git a/pkgs/by-name/wh/whatsapp-for-mac/package.nix b/pkgs/by-name/wh/whatsapp-for-mac/package.nix
index d9cef26bc0db..afb42a53d69e 100644
--- a/pkgs/by-name/wh/whatsapp-for-mac/package.nix
+++ b/pkgs/by-name/wh/whatsapp-for-mac/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "whatsapp-for-mac";
-  version = "2.26.10.18";
+  version = "2.26.19.17";
 
   src = fetchzip {
     extension = "zip";
     name = "WhatsApp.app";
     url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=master";
-    hash = "sha256-cQB2AF/emNHtSpf1DrjCV+yds8kbD2Lv9UTkAo7CZlM=";
+    hash = "sha256-jR8Hi4IWSfPvCthe/zH6mACQYQsGLcBmj2m8vwXX8Do=";
   };
 
   dontConfigure = true;

From faf51d116245a6841b9fbed183fa532441610eaf Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Thu, 30 Apr 2026 18:07:40 +0200
Subject: [PATCH 116/332] autopush-rs: init at 1.81.3

---
 pkgs/by-name/au/autopush-rs/package.nix | 120 ++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 pkgs/by-name/au/autopush-rs/package.nix

diff --git a/pkgs/by-name/au/autopush-rs/package.nix b/pkgs/by-name/au/autopush-rs/package.nix
new file mode 100644
index 000000000000..9865718a041b
--- /dev/null
+++ b/pkgs/by-name/au/autopush-rs/package.nix
@@ -0,0 +1,120 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
+  pkg-config,
+  cmake,
+  openssl,
+  libffi,
+  grpc,
+  nix-update-script,
+  python3Packages,
+}:
+let
+  #script to generate the fernet key
+  fernetKey =
+    {
+      src,
+      version,
+    }:
+    python3Packages.buildPythonApplication {
+      pname = "fernet_key";
+      inherit version src;
+
+      __structuredAttrs = true;
+
+      format = "other";
+
+      # this would run the upstream docker makefile
+      dontBuild = true;
+
+      dependencies = [ python3Packages.cryptography ];
+
+      installPhase = ''
+        mkdir -p $out/bin
+        echo "#!/usr/bin/env python3" |  \
+        cat - $src/scripts/fernet_key.py > $out/bin/fernet_key
+        chmod +x $out/bin/fernet_key
+      '';
+
+      postFixup = ''
+        wrapPythonPrograms
+      '';
+    };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "autopush";
+  version = "1.81.3";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  outputs = [
+    "out"
+    "fernet"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = "autopush-rs";
+    tag = finalAttrs.version;
+    hash = "sha256-DP02mcEMoQoJqi5rw5eSuep0i7zeJ0LLYsakikt9hho=";
+  };
+
+  cargoHash = "sha256-LqmuUtFF30TO6iw7LPFB7yJGrzrhh7R0OKCWMhe/OjU=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+    cmake
+  ];
+
+  buildInputs = [
+    openssl
+    libffi
+    grpc
+  ];
+
+  # by default only google bigtable is supported as a db
+  buildNoDefaultFeatures = true;
+  buildFeatures = [
+    "postgres"
+    "redis"
+    "reliable_report"
+  ];
+
+  env = {
+    #needed for bingen to find libc
+    BINDGEN_EXTRA_CLANG_ARGS = "-I${stdenv.cc.libc.dev}/include";
+    CMAKE_POLICY_VERSION_MINIMUM = "3.5";
+  };
+
+  #check build fails
+  doCheck = false;
+
+  postInstall = ''
+    mkdir -p $fernet/bin
+    ln -s ${fernetKey { inherit (finalAttrs) src version; }}/bin/fernet_key $fernet/bin/fernet_key
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Mozilla Push server and Push Endpoint";
+    homepage = "https://mozilla-services.github.io/autopush-rs/index.html";
+    changelog = "https://github.com/mozilla-services/autopush-rs/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.linux;
+    maintainers = [
+      lib.maintainers.zimward
+    ];
+    # install the fernet_key script in devshells as users will only use it once most likely
+    outputsToInstall = [
+      "out"
+      "fernet"
+    ];
+  };
+})

From 129bbf2f8ed5cdf4c6d89afc34e042b85b94dc8f Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Thu, 30 Apr 2026 18:07:40 +0200
Subject: [PATCH 117/332] autopush-rs: add modular service

---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/autopush-rs.nix                   | 60 ++++++++++++
 pkgs/by-name/au/autopush-rs/package.nix       | 16 +++
 .../au/autopush-rs/service-autoconnect.nix    | 96 ++++++++++++++++++
 .../au/autopush-rs/service-autoendpoint.nix   | 98 +++++++++++++++++++
 5 files changed, 271 insertions(+)
 create mode 100644 nixos/tests/autopush-rs.nix
 create mode 100644 pkgs/by-name/au/autopush-rs/service-autoconnect.nix
 create mode 100644 pkgs/by-name/au/autopush-rs/service-autoendpoint.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 56c496713f21..bdf99f3a51f9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -245,6 +245,7 @@ in
   authelia = runTest ./authelia.nix;
   auto-cpufreq = runTest ./auto-cpufreq.nix;
   autobrr = runTest ./autobrr.nix;
+  autopush-rs = runTest ./autopush-rs.nix;
   autosuspend = runTest ./autosuspend.nix;
   avahi = runTest {
     imports = [ ./avahi.nix ];
diff --git a/nixos/tests/autopush-rs.nix b/nixos/tests/autopush-rs.nix
new file mode 100644
index 000000000000..e1075bd3d17f
--- /dev/null
+++ b/nixos/tests/autopush-rs.nix
@@ -0,0 +1,60 @@
+{ lib, ... }:
+{
+  _class = "nixosTest";
+  name = "autopush-rs";
+
+  nodes = {
+    machine =
+      { pkgs, config, ... }:
+      {
+        environment.systemPackages = [
+          pkgs.curl
+        ];
+
+        services.redis.servers.autopush-rs = {
+          enable = true;
+          port = 6000;
+        };
+        system.services.autopush-autoconnect = {
+          imports = [
+            pkgs.autopush-rs.services.autoconnect
+          ];
+          autoconnect.settings = {
+            #do not use this key in production!!!
+            crypto_key = "[fZQX8jgdESUYFTYfWw3Dv5RRMuwYJPPaaPcbUgHM69Q=]";
+            db_dsn = "redis://localhost:${toString config.services.redis.servers.autopush-rs.port}";
+            port = 8000;
+          };
+        };
+        system.services.autopush-autoendpoint = {
+          imports = [
+            pkgs.autopush-rs.services.autoendpoint
+          ];
+          autoendpoint.settings = {
+            #do not use this key in production!!!
+            crypto_key = "[fZQX8jgdESUYFTYfWw3Dv5RRMuwYJPPaaPcbUgHM69Q=]";
+            db_dsn = "redis://localhost:${toString config.services.redis.servers.autopush-rs.port}";
+            port = 8080;
+          };
+        };
+
+        networking.firewall.allowedTCPPorts = [
+          8080
+          8000
+        ];
+      };
+  };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("multi-user.target")
+    machine.wait_for_unit("autopush-autoconnect.service")
+    machine.wait_for_unit("autopush-autoendpoint.service")
+    machine.wait_for_open_port(8080)
+    machine.wait_for_open_port(8000)
+    machine.succeed("curl -s -f http://localhost:8080/health")
+    machine.succeed("curl -s -f http://localhost:8000/health")
+  '';
+
+  meta.maintainers = with lib.maintainers; [ zimward ];
+}
diff --git a/pkgs/by-name/au/autopush-rs/package.nix b/pkgs/by-name/au/autopush-rs/package.nix
index 9865718a041b..08c946b5d6a4 100644
--- a/pkgs/by-name/au/autopush-rs/package.nix
+++ b/pkgs/by-name/au/autopush-rs/package.nix
@@ -1,5 +1,7 @@
 {
   lib,
+  pkgs,
+  nixosTests,
   fetchFromGitHub,
   rustPlatform,
   stdenv,
@@ -99,6 +101,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   passthru = {
+    tests = nixosTests.autopush-rs;
+    services.autoconnect = {
+      imports = [
+        (lib.modules.importApply ./service-autoconnect.nix { inherit pkgs; })
+      ];
+      package = finalAttrs.finalPackage.out;
+    };
+    services.autoendpoint = {
+      imports = [
+        (lib.modules.importApply ./service-autoendpoint.nix { inherit pkgs; })
+      ];
+      package = finalAttrs.finalPackage.out;
+    };
+
     updateScript = nix-update-script { };
   };
 
diff --git a/pkgs/by-name/au/autopush-rs/service-autoconnect.nix b/pkgs/by-name/au/autopush-rs/service-autoconnect.nix
new file mode 100644
index 000000000000..eca44eee4b87
--- /dev/null
+++ b/pkgs/by-name/au/autopush-rs/service-autoconnect.nix
@@ -0,0 +1,96 @@
+#v Non-module dependencies (`importApply`)
+{ pkgs }:
+
+# Service module
+{
+  lib,
+  options,
+  config,
+  ...
+}:
+let
+  cfg = config.autoconnect;
+  tomlFmt = pkgs.formats.toml { };
+in
+{
+  _class = "service";
+  options = {
+    package = lib.mkPackageOption pkgs "autopush-rs.out" { };
+    autoconnect.settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = tomlFmt.type;
+        options = {
+          db_dsn = lib.mkOption {
+            description = "Endpoint of the database server.";
+            type = lib.types.str;
+            default = "";
+            example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}";
+          };
+        };
+      };
+      default = { };
+      description = "";
+    };
+  };
+  config =
+    let
+      configFile = tomlFmt.generate "autoconnect.toml" cfg.settings;
+    in
+    {
+      process.argv = [
+        "${config.package}/bin/autoconnect"
+        "-c"
+        (toString configFile)
+      ];
+    }
+    // lib.optionalAttrs (options ? systemd) {
+      systemd.service = {
+        after = [ "network.target" ];
+        wants = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Restart = "on-failure";
+
+          #hardening
+          MemoryDenyWriteExecute = true;
+          StateDirectoryMode = 0700;
+          UMask = 077;
+          DynamicUser = true;
+          PrivateUsers = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          ProtectSystem = "full";
+          ProtectHome = true;
+          NoNewPrivileges = true;
+          RuntimeDirectoryMode = 755;
+          ProtectHostname = true;
+          ProtectClock = true;
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectKernelLogs = true;
+          ProtectControlGroups = true;
+          RestrictNamespaces = true;
+          LockPersonality = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          RemoveIPC = true;
+          SystemCallArchitectures = "native";
+
+          ProtectProc = "invisible";
+          ProcSubset = "pid";
+
+          SystemCallFilter = [
+            "~@clock"
+            "~@cpu-emulation"
+            "~@debug"
+            "~@module"
+            "~@mount"
+            "~@obsolete"
+            "~@raw-io"
+            "~@reboot"
+            "~@swap"
+          ];
+        };
+      };
+    };
+}
diff --git a/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix b/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix
new file mode 100644
index 000000000000..d4c87dff54a7
--- /dev/null
+++ b/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix
@@ -0,0 +1,98 @@
+# Non-module dependencies (`importApply`)
+{ pkgs }:
+
+# Service module
+{
+  lib,
+  config,
+  options,
+  ...
+}:
+let
+  cfg = config.autoendpoint;
+  tomlFmt = pkgs.formats.toml { };
+in
+{
+  _class = "service";
+  options = {
+    package = lib.mkPackageOption pkgs "autopush-rs.out" { };
+    autoendpoint = {
+      settings = lib.mkOption {
+        type = lib.types.submodule {
+          freeformType = tomlFmt.type;
+          options = {
+            db_dsn = lib.mkOption {
+              description = "Endpoint of the database server.";
+              type = lib.types.str;
+              default = "";
+              example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}";
+            };
+          };
+        };
+        default = { };
+        description = "";
+      };
+    };
+  };
+  config =
+    let
+      configFile = tomlFmt.generate "autoendpoint.toml" cfg.settings;
+    in
+    {
+      process.argv = [
+        "${config.package}/bin/autoendpoint"
+        "-c"
+        (toString configFile)
+      ];
+    }
+    // lib.optionalAttrs (options ? systemd) {
+      systemd.service = {
+        after = [ "network.target" ];
+        wants = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Restart = "on-failure";
+
+          #hardening
+          MemoryDenyWriteExecute = true;
+          StateDirectoryMode = 0700;
+          UMask = 077;
+          DynamicUser = true;
+          PrivateUsers = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          ProtectSystem = "full";
+          ProtectHome = true;
+          NoNewPrivileges = true;
+          RuntimeDirectoryMode = 755;
+          ProtectHostname = true;
+          ProtectClock = true;
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectKernelLogs = true;
+          ProtectControlGroups = true;
+          RestrictNamespaces = true;
+          LockPersonality = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          RemoveIPC = true;
+          SystemCallArchitectures = "native";
+
+          ProtectProc = "invisible";
+          ProcSubset = "pid";
+
+          SystemCallFilter = [
+            "~@clock"
+            "~@cpu-emulation"
+            "~@debug"
+            "~@module"
+            "~@mount"
+            "~@obsolete"
+            "~@raw-io"
+            "~@reboot"
+            "~@swap"
+          ];
+        };
+      };
+    };
+}

From e49ebae197047ca0c3937c0815bb33ddd9ffa430 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 09:26:07 +0000
Subject: [PATCH 118/332] selene: 0.30.1 -> 0.31.0

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

diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index 070a5668835b..44bd7e7f6c8c 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "selene";
-  version = "0.30.1";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "kampfkarren";
     repo = "selene";
     tag = finalAttrs.version;
-    hash = "sha256-6NjEE5r9vILnWIyALN8b3aiYWJ9hGzAoYEv+lxNL32Y=";
+    hash = "sha256-1VxFhr/PxMVQktf1pfhCPEnEi9RF2nTM4p8vYJnPLAk=";
   };
 
-  cargoHash = "sha256-0BZroMbaRtpfOf2p33S830T2V+/eobezX0HVsZ/qtnI=";
+  cargoHash = "sha256-Hv/2F3xBbnYw6GAMUd7nYyZl7pTIuQlgGh6+r3OFglw=";
 
   nativeBuildInputs = lib.optionals robloxSupport [
     pkg-config

From 7d0f6bc2125668435dee53730ac2f067fce5494b Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Thu, 21 May 2026 11:48:51 +0200
Subject: [PATCH 119/332] bind: 9.20.22 -> 9.20.23

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

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index aa435fcb2feb..2f12ebf30ea0 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.22";
+  version = "9.20.23";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
-    hash = "sha256-y6kv9jG5SWVfR1/ktUKQ9oYP0AcNOZ8iefZDfA04PsY=";
+    hash = "sha256-XUR1rtP55QDvVUsrFNlyvbg9M94hSps76SkY6kaQg3E=";
   };
 
   outputs = [

From 7e4267372848579e8cc27e51d1b1366f9fbfcfa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 11:10:42 +0000
Subject: [PATCH 120/332] androidenv.test-suite: 46e2779744ab55bb ->
 db5315e3cae30188

---
 pkgs/development/mobile/androidenv/repo.json | 1492 ++++++++++--------
 1 file changed, 876 insertions(+), 616 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 52edb004c401..633c0b7a10cf 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -90,7 +90,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -154,7 +154,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -230,7 +230,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -276,7 +276,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -352,7 +352,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -398,7 +398,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -476,7 +476,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -568,7 +568,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -660,7 +660,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -752,7 +752,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -844,7 +844,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -936,7 +936,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1028,7 +1028,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1212,7 +1212,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1304,7 +1304,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1396,7 +1396,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1460,7 +1460,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1524,7 +1524,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1588,7 +1588,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1652,7 +1652,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1716,7 +1716,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1780,7 +1780,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1845,7 +1845,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1876,7 +1876,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1907,7 +1907,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1936,7 +1936,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -1986,7 +1986,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2012,7 +2012,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2048,7 +2048,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2077,7 +2077,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2106,7 +2106,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2144,7 +2144,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2173,7 +2173,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2202,7 +2202,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2231,7 +2231,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2260,7 +2260,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2289,7 +2289,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20569,
+      "last-available-day": 20594,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2329,7 +2329,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -2373,7 +2373,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -2419,7 +2419,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -2471,7 +2471,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -2520,7 +2520,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -2568,7 +2568,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -2612,7 +2612,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -2658,7 +2658,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -2710,7 +2710,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -2766,7 +2766,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -2803,7 +2803,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -2847,7 +2847,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -2893,7 +2893,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -2945,7 +2945,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3001,7 +3001,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3038,7 +3038,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3082,7 +3082,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3136,7 +3136,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3188,7 +3188,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3244,7 +3244,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3288,7 +3288,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3334,7 +3334,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -3386,7 +3386,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -3442,7 +3442,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -3486,7 +3486,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -3532,7 +3532,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -3584,7 +3584,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -3633,7 +3633,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -3670,7 +3670,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -3709,7 +3709,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -3753,7 +3753,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -3797,7 +3797,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -3841,7 +3841,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -3880,7 +3880,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -3932,7 +3932,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -3984,7 +3984,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4036,7 +4036,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4085,7 +4085,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4124,7 +4124,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4168,7 +4168,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4212,7 +4212,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4256,7 +4256,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4295,7 +4295,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -4347,7 +4347,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -4399,7 +4399,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -4451,7 +4451,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -4500,7 +4500,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -4544,7 +4544,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -4583,7 +4583,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -4627,7 +4627,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -4671,7 +4671,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -4715,7 +4715,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -4754,7 +4754,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -4806,7 +4806,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -4858,7 +4858,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -4910,7 +4910,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -4966,7 +4966,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5005,7 +5005,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5049,7 +5049,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5093,7 +5093,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5137,7 +5137,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5183,7 +5183,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5235,7 +5235,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -5287,7 +5287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -5341,7 +5341,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -5397,7 +5397,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -5443,7 +5443,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -5487,7 +5487,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -5526,7 +5526,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -5570,7 +5570,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -5614,7 +5614,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -5653,7 +5653,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -5705,7 +5705,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -5757,7 +5757,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -5809,7 +5809,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -5863,7 +5863,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -5934,7 +5934,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -5980,7 +5980,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6031,7 +6031,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6075,7 +6075,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6119,7 +6119,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6170,7 +6170,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6237,7 +6237,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -6304,7 +6304,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -6373,7 +6373,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -6429,7 +6429,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -6480,7 +6480,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -6524,7 +6524,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -6568,7 +6568,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -6619,7 +6619,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -6686,7 +6686,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -6755,7 +6755,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -6816,7 +6816,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -6861,7 +6861,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -6907,7 +6907,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -6995,7 +6995,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7032,7 +7032,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7083,7 +7083,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7217,7 +7217,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7276,7 +7276,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -7343,7 +7343,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -7410,7 +7410,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -7471,7 +7471,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -7531,7 +7531,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -7570,7 +7570,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -7633,7 +7633,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -7696,7 +7696,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -7747,7 +7747,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -7861,7 +7861,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -7920,7 +7920,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8001,7 +8001,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8082,7 +8082,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8143,7 +8143,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8203,7 +8203,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8249,7 +8249,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -8293,7 +8293,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -8332,7 +8332,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -8381,7 +8381,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -8432,7 +8432,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -8499,7 +8499,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -8566,7 +8566,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -8632,7 +8632,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -8713,7 +8713,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -8794,7 +8794,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -8865,7 +8865,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -8975,7 +8975,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9024,7 +9024,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9085,7 +9085,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9152,7 +9152,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9228,7 +9228,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -9295,7 +9295,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -9356,7 +9356,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -9409,7 +9409,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -9464,7 +9464,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -9513,7 +9513,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -9574,7 +9574,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -9641,7 +9641,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -9717,7 +9717,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -9798,7 +9798,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -9859,7 +9859,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -9912,7 +9912,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -9977,7 +9977,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10036,7 +10036,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10082,7 +10082,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10126,7 +10126,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10177,7 +10177,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10226,7 +10226,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -10287,7 +10287,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -10354,7 +10354,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -10423,7 +10423,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -10490,7 +10490,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -10565,7 +10565,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -10614,7 +10614,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -10677,7 +10677,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -10737,7 +10737,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -10777,7 +10777,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -10814,7 +10814,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -10865,7 +10865,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -10914,7 +10914,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -10975,7 +10975,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11043,7 +11043,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11113,7 +11113,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11182,7 +11182,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11245,7 +11245,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -11298,7 +11298,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -11367,7 +11367,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -11416,7 +11416,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -11457,7 +11457,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -11489,7 +11489,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -11535,7 +11535,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -11580,7 +11580,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -11627,7 +11627,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -11685,7 +11685,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -11745,7 +11745,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -11803,7 +11803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -11863,7 +11863,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -11925,7 +11925,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -11973,9 +11973,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "7062de5c4d849728d9e5e06b1f189c1dd1e341e4",
-              "size": 1485616113,
-              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-35-ext15_playstore_r02.zip"
+              "sha1": "18d0e0be69d9883321d547ce099897196a7d646c",
+              "size": 1516199389,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-35-ext15_playstore_r03.zip"
             }
           ],
           "dependencies": {
@@ -11991,13 +11991,13 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-arm64-v8a",
           "path": "system-images/android-35-ext15/android-automotive/arm64-v8a",
           "revision": "35x-android-automotive-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -12026,9 +12026,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "7487c1fca63109186fdbce4f50e67c228b6a0db1",
-              "size": 1537658008,
-              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-35-ext15_playstore_r02.zip"
+              "sha1": "75df7f594424350bbdb59ef31c9b2e98951993f1",
+              "size": 1567573000,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-35-ext15_playstore_r03.zip"
             }
           ],
           "dependencies": {
@@ -12044,13 +12044,13 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-x86_64",
           "path": "system-images/android-35-ext15/android-automotive/x86_64",
           "revision": "35x-android-automotive-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -12087,7 +12087,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12120,7 +12120,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12167,7 +12167,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12216,7 +12216,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12267,7 +12267,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12316,7 +12316,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12351,9 +12351,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "ca735f3742729a7c7d74e5ed6016373a71c38f98",
-              "size": 963944531,
-              "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-36_r03.zip"
+              "sha1": "ceb1dfcc6a28dbd9dbade780428cf7bafb1c65ef",
+              "size": 970375839,
+              "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-36_r04.zip"
             }
           ],
           "dependencies": {
@@ -12362,20 +12362,20 @@
                 "path": "emulator"
               },
               "min-revision:0": {
-                "major:0": "28",
-                "micro:2": "6",
-                "minor:1": "1"
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
               }
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
           "revision": "36-android-tv-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:4": "arm64-v8a",
@@ -12396,9 +12396,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "92ea1bfc1e4eeeda14d01c9d119d4b77047562c3",
-              "size": 953483981,
-              "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-36_r03.zip"
+              "sha1": "8974daead1422bf53179c86e488ce4f36d1e1c64",
+              "size": 962491358,
+              "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-36_r04.zip"
             }
           ],
           "dependencies": {
@@ -12407,20 +12407,20 @@
                 "path": "emulator"
               },
               "min-revision:0": {
-                "major:0": "28",
-                "micro:2": "6",
-                "minor:1": "1"
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
               }
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
           "revision": "36-android-tv-x86",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:4": "x86",
@@ -12435,6 +12435,51 @@
               "id:0": "android-tv"
             }
           }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "76ce3bce72a6834949ec880de38c3890f9b5fa11",
+              "size": 990109855,
+              "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86_64-36_r04.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Android TV Intel x86_64 Atom System Image",
+          "last-available-day": 20594,
+          "license": "android-sdk-license",
+          "name": "system-image-36-android-tv-x86_64",
+          "path": "system-images/android-36/android-tv/x86_64",
+          "revision": "36-android-tv-x86_64",
+          "revision-details": {
+            "major:0": "4"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Android TV",
+              "id:0": "android-tv"
+            }
+          }
         }
       },
       "android-wear": {
@@ -12449,7 +12494,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -12482,7 +12527,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -12529,7 +12574,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-default-arm64-v8a",
           "path": "system-images/android-36/default/arm64-v8a",
@@ -12574,7 +12619,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-default-x86_64",
           "path": "system-images/android-36/default/x86_64",
@@ -12621,7 +12666,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -12670,7 +12715,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -12721,7 +12766,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
@@ -12770,7 +12815,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -12821,7 +12866,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -12874,7 +12919,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -12919,7 +12964,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-arm64-v8a",
           "path": "system-images/android-36.1/android-wear-signed/arm64-v8a",
@@ -12952,7 +12997,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-x86_64",
           "path": "system-images/android-36.1/android-wear-signed/x86_64",
@@ -12999,7 +13044,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_ps16k/arm64-v8a",
@@ -13057,7 +13102,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis_ps16k/x86_64",
@@ -13117,7 +13162,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13175,7 +13220,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -13345,7 +13390,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -13394,7 +13439,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -13445,7 +13490,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -13494,7 +13539,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -13523,6 +13568,74 @@
       }
     },
     "37.0": {
+      "android-wear": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "08d0809c491cc76c1b5058bc00f3ba50fae15f24",
+              "size": 1256631526,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-37.0_signed_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 7.0 - Preview ARM 64 v8a System Image (signed)",
+          "last-available-day": 20594,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-37.0-android-wear-arm64-v8a",
+          "path": "system-images/android-37.0/android-wear-signed/arm64-v8a",
+          "revision": "37.0-android-wear-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "37.0",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "22",
+            "tag:3": {
+              "display:1": "Wear OS 7.0 - Preview",
+              "id:0": "android-wear"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "64f6853e0c366b37463a200266bce8a33786e50b",
+              "size": 1284186525,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-37.0_signed_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 7.0 - Preview Intel x86_64 Atom System Image (signed)",
+          "last-available-day": 20594,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-37.0-android-wear-x86_64",
+          "path": "system-images/android-37.0/android-wear-signed/x86_64",
+          "revision": "37.0-android-wear-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "37.0",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "22",
+            "tag:3": {
+              "display:1": "Wear OS 7.0 - Preview",
+              "id:0": "android-wear"
+            }
+          }
+        }
+      },
       "google_apis": {
         "arm64-v8a": {
           "archives": [
@@ -13547,7 +13660,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_ps16k/arm64-v8a",
@@ -13604,7 +13717,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis-x86_64",
           "path": "system-images/android-37.0/google_apis_ps16k/x86_64",
@@ -13663,7 +13776,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/arm64-v8a",
@@ -13720,7 +13833,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis_playstore-x86_64",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/x86_64",
@@ -13781,7 +13894,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a",
@@ -13831,7 +13944,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis/x86_64",
@@ -13883,7 +13996,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a",
@@ -13933,7 +14046,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64",
@@ -13985,7 +14098,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -14039,7 +14152,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -14097,13 +14210,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_ps16k/arm64-v8a",
           "revision": "CANARY-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "11"
+            "major:0": "12"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -14160,13 +14273,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis_ps16k/x86_64",
           "revision": "CANARY-google_apis-x86_64",
           "revision-details": {
-            "major:0": "11"
+            "major:0": "12"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -14225,13 +14338,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "CANARY-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "11"
+            "major:0": "12"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -14288,13 +14401,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
           "revision": "CANARY-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "11"
+            "major:0": "12"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -14353,7 +14466,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -14407,7 +14520,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -14447,9 +14560,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "6cb74af3f08d97d1474be7189c78d126e5651b04",
-              "size": 2202341861,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r01.zip"
+              "sha1": "e551eb79e394c92b1e0c85d1652c854eac1d5f1e",
+              "size": 2092738741,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r03.zip"
             }
           ],
           "dependencies": {
@@ -14465,15 +14578,16 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/arm64-v8a",
           "revision": "CinnamonBun-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "1"
+            "major:0": "3"
           },
           "type-details": {
+            "abi:7": "arm64-v8a",
             "abi:8": "arm64-v8a",
             "api-level:0": "37.0",
             "base-extension:3": "true",
@@ -14481,7 +14595,7 @@
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -14494,6 +14608,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:6": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:7": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -14505,9 +14623,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "8e91601915fc96eec2cf5c6289aab9e4f7bc689a",
-              "size": 2182107073,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r01.zip"
+              "sha1": "465447b3734cb2f0303bf1bcf12896c56748cc96",
+              "size": 2077393654,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r03.zip"
             }
           ],
           "dependencies": {
@@ -14523,15 +14641,16 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/x86_64",
           "revision": "CinnamonBun-google_apis-x86_64",
           "revision-details": {
-            "major:0": "1"
+            "major:0": "3"
           },
           "type-details": {
+            "abi:7": "x86_64",
             "abi:8": "x86_64",
             "api-level:0": "37.0",
             "base-extension:3": "true",
@@ -14539,7 +14658,7 @@
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -14552,6 +14671,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:6": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:7": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -14565,9 +14688,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "616bfdbcfe269f9d87335248e94ca0d7a6907c1a",
-              "size": 2319960319,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r01.zip"
+              "sha1": "b40a5a2447d25c674defd1ec66565170a4c7b994",
+              "size": 2207675228,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r03.zip"
             }
           ],
           "dependencies": {
@@ -14583,15 +14706,16 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "CinnamonBun-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "1"
+            "major:0": "3"
           },
           "type-details": {
+            "abi:7": "arm64-v8a",
             "abi:8": "arm64-v8a",
             "api-level:0": "37.0",
             "base-extension:3": "true",
@@ -14599,7 +14723,7 @@
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -14612,6 +14736,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:6": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:7": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -14623,9 +14751,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "2085a225d35c8e2d1d1ec72253effc99bd059936",
-              "size": 2323444922,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r01.zip"
+              "sha1": "351236f16aacc5130b34640a20b84c22e7ea39cb",
+              "size": 2204767310,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r03.zip"
             }
           ],
           "dependencies": {
@@ -14641,15 +14769,16 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20569,
+          "last-available-day": 20594,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/x86_64",
           "revision": "CinnamonBun-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "1"
+            "major:0": "3"
           },
           "type-details": {
+            "abi:7": "x86_64",
             "abi:8": "x86_64",
             "api-level:0": "37.0",
             "base-extension:3": "true",
@@ -14657,7 +14786,7 @@
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -14670,6 +14799,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:6": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:7": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -15250,6 +15383,7 @@
     }
   },
   "latest": {
+    "build": "0.1.0",
     "build-tools": "37.0.0",
     "cmake": "4.1.2",
     "cmdline-tools": "20.0",
@@ -15261,7 +15395,7 @@
     "skiaparser": "8",
     "sources": "37.0",
     "tools": "26.1.1",
-    "fingerprint": "46e2779744ab55bb"
+    "fingerprint": "db5315e3cae30188"
   },
   "licenses": {
     "android-googletv-license": [
@@ -15296,6 +15430,84 @@
     ]
   },
   "packages": {
+    "build": {
+      "0.0.10-rc01": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "bbaecf0ed6ed984f39a46ecf03806b4eba008552",
+            "size": 54545329,
+            "url": "https://dl.google.com/android/repository/lume-daemon-linux_x64-15462315.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "6c8aa92efdc874379bcb3d0e638488aa3b73c55a",
+            "size": 53468025,
+            "url": "https://dl.google.com/android/repository/lume-daemon-darwin_x64-15462315.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "f551b20c7e350ecef16c904fe924c158c3bbf407",
+            "size": 51937048,
+            "url": "https://dl.google.com/android/repository/lume-daemon-darwin_aarch64-15462315.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "5188f24c7bdabbabebb1bc0bbf29d8c29abe6488",
+            "size": 52962096,
+            "url": "https://dl.google.com/android/repository/lume-daemon-windows_x64-15462315.zip"
+          }
+        ],
+        "displayName": "Lightbuild",
+        "last-available-day": 20594,
+        "license": "android-sdk-preview-license",
+        "name": "build",
+        "path": "build/lightbuild/0.0.10-alpha01",
+        "revision": "0.0.10-rc01",
+        "revision-details": {
+          "major:0": "0",
+          "micro:2": "10",
+          "minor:1": "0",
+          "preview:3": "01"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "0.1.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "all",
+            "sha1": "126fdb3e284f850fd617ba89ddae918620a73e0f",
+            "size": 98951,
+            "url": "https://dl.google.com/android/repository/templates-sdk-package-15429553.zip"
+          }
+        ],
+        "displayName": "Android Project Templates",
+        "last-available-day": 20594,
+        "license": "android-sdk-license",
+        "name": "build",
+        "path": "build/templates",
+        "revision": "0.1.0",
+        "revision-details": {
+          "major:0": "0",
+          "micro:2": "0",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      }
+    },
     "build-tools": {
       "17.0.0": {
         "archives": [
@@ -15329,7 +15541,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15378,7 +15590,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15427,7 +15639,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15476,7 +15688,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15525,7 +15737,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15574,7 +15786,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15623,7 +15835,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15672,7 +15884,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15721,7 +15933,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -15769,7 +15981,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -15817,7 +16029,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15866,7 +16078,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15915,7 +16127,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15964,7 +16176,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16013,7 +16225,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16062,7 +16274,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16110,7 +16322,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16159,7 +16371,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16207,7 +16419,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16256,7 +16468,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -16304,7 +16516,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -16352,7 +16564,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -16400,7 +16612,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -16448,7 +16660,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -16496,7 +16708,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -16544,7 +16756,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -16592,7 +16804,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -16640,7 +16852,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -16688,7 +16900,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -16736,7 +16948,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -16784,7 +16996,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -16832,7 +17044,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -16880,7 +17092,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -16928,7 +17140,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -16976,7 +17188,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -17024,7 +17236,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -17072,7 +17284,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17120,7 +17332,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17168,7 +17380,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17216,7 +17428,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17266,7 +17478,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17316,7 +17528,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -17364,7 +17576,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -17412,7 +17624,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -17460,7 +17672,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -17508,7 +17720,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17558,7 +17770,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17608,7 +17820,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17658,7 +17870,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -17706,7 +17918,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -17754,7 +17966,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -17802,7 +18014,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -17850,7 +18062,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -17898,7 +18110,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -17946,7 +18158,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -17987,7 +18199,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -18028,7 +18240,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -18069,7 +18281,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18111,7 +18323,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18152,7 +18364,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18193,7 +18405,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18234,7 +18446,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18275,7 +18487,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -18316,7 +18528,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -18358,7 +18570,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -18400,7 +18612,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -18442,7 +18654,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -18483,7 +18695,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -18525,7 +18737,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -18567,7 +18779,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -18609,7 +18821,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -18651,7 +18863,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -18692,7 +18904,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -18733,7 +18945,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -18775,7 +18987,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -18817,7 +19029,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -18859,7 +19071,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -18901,7 +19113,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -18942,7 +19154,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -18984,7 +19196,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0",
@@ -19025,7 +19237,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc1",
@@ -19067,7 +19279,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc2",
@@ -19118,7 +19330,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -19159,7 +19371,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -19200,7 +19412,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19241,7 +19453,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -19282,7 +19494,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -19323,7 +19535,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -19364,7 +19576,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -19405,7 +19617,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -19446,7 +19658,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -19487,7 +19699,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -19528,7 +19740,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -19576,7 +19788,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -19617,7 +19829,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -19658,7 +19870,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -19699,7 +19911,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -19740,7 +19952,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -19781,7 +19993,7 @@
           }
         ],
         "displayName": "CMake 4.1.2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.2",
@@ -19824,7 +20036,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -19864,7 +20076,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -19904,7 +20116,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -19944,7 +20156,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -19984,7 +20196,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -20024,7 +20236,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -20065,7 +20277,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -20106,7 +20318,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -20146,7 +20358,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -20187,7 +20399,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20227,7 +20439,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20267,7 +20479,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -20308,7 +20520,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -20349,7 +20561,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -20389,7 +20601,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/20.0",
@@ -20429,7 +20641,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -20469,7 +20681,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -20509,7 +20721,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -20549,7 +20761,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -20589,7 +20801,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -20629,7 +20841,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -20669,7 +20881,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -21936,7 +22148,7 @@
           }
         ],
         "displayName": "Android Emulator",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
@@ -22095,6 +22307,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.6.9": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "ab4680f37109d1d3615cd23908f4d42b3a5eba91",
+            "size": 347200337,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15442530.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "a4776c5879fdd96d2237243404e2bbab4e445a14",
+            "size": 462110582,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15442530.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "843bb2181a480fc303303209d47d630c5ff7d4dd",
+            "size": 396321167,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15442530.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "0031c469a804eb08a4e238b07327c4fed90a469e",
+            "size": 429273107,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15442530.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20594,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.6.9",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "9",
+          "minor:1": "6"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -22220,7 +22480,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -22282,7 +22542,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -22344,7 +22604,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -22406,7 +22666,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22469,7 +22729,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -22531,7 +22791,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22595,7 +22855,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22659,7 +22919,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -22721,7 +22981,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -22769,7 +23029,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -22818,7 +23078,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -22866,7 +23126,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -22922,7 +23182,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -22978,7 +23238,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -23033,7 +23293,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -23089,7 +23349,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -23144,7 +23404,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -23199,7 +23459,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -23254,7 +23514,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -23310,7 +23570,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -23365,7 +23625,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -23420,7 +23680,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -23476,7 +23736,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -23532,7 +23792,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -23588,7 +23848,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -23637,7 +23897,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -23686,7 +23946,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -23735,7 +23995,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -23783,7 +24043,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -23831,7 +24091,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -23879,7 +24139,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -23928,7 +24188,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -23977,7 +24237,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -24026,7 +24286,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -24074,7 +24334,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -24123,7 +24383,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -24172,7 +24432,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -24221,7 +24481,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -24270,7 +24530,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -24318,7 +24578,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -24366,7 +24626,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -24414,7 +24674,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -24456,7 +24716,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -24498,7 +24758,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -24539,7 +24799,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -24580,7 +24840,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -24621,7 +24881,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -24662,7 +24922,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -24704,7 +24964,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -24746,7 +25006,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -24787,7 +25047,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -24828,7 +25088,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -24869,7 +25129,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -24910,7 +25170,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -24952,7 +25212,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -24994,7 +25254,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -25036,7 +25296,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -25077,7 +25337,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -25118,7 +25378,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -25159,7 +25419,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -25201,7 +25461,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -25243,7 +25503,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -25285,7 +25545,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -25327,7 +25587,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -25368,7 +25628,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 30.0.14904198",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/30.0.14904198",
@@ -25433,7 +25693,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25495,7 +25755,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25557,7 +25817,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25619,7 +25879,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25682,7 +25942,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25744,7 +26004,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25808,7 +26068,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25872,7 +26132,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25934,7 +26194,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25982,7 +26242,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26031,7 +26291,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26079,7 +26339,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26135,7 +26395,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26191,7 +26451,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26246,7 +26506,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26302,7 +26562,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26357,7 +26617,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26412,7 +26672,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26467,7 +26727,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26523,7 +26783,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26578,7 +26838,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26633,7 +26893,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26689,7 +26949,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26745,7 +27005,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26801,7 +27061,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27010,7 +27270,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -27039,7 +27299,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -27077,7 +27337,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -27115,7 +27375,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -27153,7 +27413,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -27191,7 +27451,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -27229,7 +27489,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -27267,7 +27527,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -27305,7 +27565,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -27343,7 +27603,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -27381,7 +27641,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -27433,7 +27693,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27472,7 +27732,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -27510,7 +27770,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -27548,7 +27808,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -27586,7 +27846,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -27624,7 +27884,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -27662,7 +27922,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -27700,7 +27960,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -27738,7 +27998,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -27776,7 +28036,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -27814,7 +28074,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -27866,7 +28126,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27905,7 +28165,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -27943,7 +28203,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -27981,7 +28241,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -28019,7 +28279,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -28058,7 +28318,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -28092,7 +28352,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28137,7 +28397,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -28170,7 +28430,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -28208,7 +28468,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -28241,7 +28501,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -28274,7 +28534,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -28307,7 +28567,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -28340,7 +28600,7 @@
           }
         ],
         "displayName": "Android SDK Platform 37.0",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-37.0",
@@ -28388,7 +28648,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28441,7 +28701,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28494,7 +28754,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28533,7 +28793,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -28571,7 +28831,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -28609,7 +28869,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -28647,7 +28907,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava-ext19",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava-ext19",
@@ -28675,19 +28935,19 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "ed3b7cc69b5e8e66cbed77d1e4dda6629bbabf4b",
-            "size": 57118318,
-            "url": "https://dl.google.com/android/repository/platform-CANARY_r11.zip"
+            "sha1": "4dce9f080c83d91e897897655cbcbeb0f6831c2a",
+            "size": 67539465,
+            "url": "https://dl.google.com/android/repository/platform-CANARY_r12.zip"
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
         "revision": "CANARY",
         "revision-details": {
-          "major:0": "11"
+          "major:0": "12"
         },
         "type-details": {
           "api-level:0": "37.0",
@@ -28709,28 +28969,28 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "cd25c57fb97e11c02ca33d5d7c82cf543e1a1d46",
-            "size": 67416452,
-            "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r01.zip"
+            "sha1": "56d364675ab0874416f431b774a39e5624e5f164",
+            "size": 67396651,
+            "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r02.zip"
           }
         ],
-        "displayName": "Android SDK Platform CinnamonBun",
-        "last-available-day": 20569,
+        "displayName": "Android SDK Platform CinnamonBun-ext23",
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
-        "path": "platforms/android-CinnamonBun",
+        "path": "platforms/android-CinnamonBun-ext23",
         "revision": "CinnamonBun",
         "revision-details": {
-          "major:0": "1"
+          "major:0": "3"
         },
         "type-details": {
-          "api-level:0": "37.0",
-          "base-extension:3": "true",
+          "api-level:0": "37.0x",
+          "base-extension:3": "false",
           "codename:1": "CinnamonBun",
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
-          "extension-level:2": "22",
+          "extension-level:2": "23",
           "layoutlib:4": {
             "element-attributes": {
               "api": "15"
@@ -28780,7 +29040,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28898,7 +29158,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -29019,7 +29279,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -29111,7 +29371,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -29138,7 +29398,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -29167,7 +29427,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -29195,7 +29455,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -29223,7 +29483,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -29251,7 +29511,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -29279,7 +29539,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -29307,7 +29567,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -29335,7 +29595,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -29363,7 +29623,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -29391,7 +29651,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -29419,7 +29679,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -29447,7 +29707,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -29475,7 +29735,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -29503,7 +29763,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -29531,7 +29791,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -29559,7 +29819,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -29587,7 +29847,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -29615,7 +29875,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -29643,7 +29903,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -29671,7 +29931,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -29700,7 +29960,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -29729,7 +29989,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -29758,7 +30018,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -29786,7 +30046,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -29814,7 +30074,7 @@
           }
         ],
         "displayName": "Sources for Android 37.0",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-37.0",
@@ -29882,7 +30142,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20569,
+        "last-available-day": 20594,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",

From 670c599645c4e755f5b56503e097a07440daa3f0 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <mail@jackr.eu>
Date: Wed, 20 May 2026 11:00:40 +0200
Subject: [PATCH 121/332] borgbackup: remove llfuse dependency

---
 pkgs/by-name/bo/borgbackup/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index eed4f1dcc91f..9300650bace2 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -70,11 +70,15 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     acl
   ];
 
-  dependencies = with python.pkgs; [
-    msgpack
-    packaging
-    (if stdenv.hostPlatform.isLinux then pyfuse3 else llfuse)
-  ];
+  dependencies =
+    with python.pkgs;
+    [
+      msgpack
+      packaging
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      pyfuse3
+    ];
 
   makeWrapperArgs = [
     ''--prefix PATH ':' "${openssh}/bin"''

From 3b3ca57419492333a8cf445368118ac9d7f5e492 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <mail@jackr.eu>
Date: Wed, 20 May 2026 10:50:37 +0200
Subject: [PATCH 122/332] python313Packages.llfuse: drop

---
 .../python-modules/llfuse/default.nix         | 67 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/development/python-modules/llfuse/default.nix

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
deleted file mode 100644
index 433b33e9b9d1..000000000000
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  cython,
-  fuse,
-  pkg-config,
-  pytestCheckHook,
-  python,
-  setuptools,
-  which,
-}:
-
-buildPythonPackage rec {
-  pname = "llfuse";
-  version = "1.5.2";
-
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "python-llfuse";
-    repo = "python-llfuse";
-    tag = "release-${version}";
-    hash = "sha256-PFnY+gmm1tjZhptc27XTE9yxF0IaJ+U4Ng/OGhNDDPI=";
-  };
-
-  nativeBuildInputs = [
-    cython
-    pkg-config
-    setuptools
-  ];
-
-  buildInputs = [ fuse ];
-
-  preConfigure = ''
-    substituteInPlace setup.py \
-        --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'"
-  '';
-
-  preBuild = ''
-    ${python.pythonOnBuildForHost.interpreter} setup.py build_cython
-  '';
-
-  # On Darwin, the test requires macFUSE to be installed outside of Nix.
-  doCheck = !stdenv.hostPlatform.isDarwin;
-  nativeCheckInputs = [
-    pytestCheckHook
-    which
-  ];
-
-  disabledTests = [
-    "test_listdir" # accesses /usr/bin
-  ];
-
-  meta = {
-    description = "Python bindings for the low-level FUSE API";
-    homepage = "https://github.com/python-llfuse/python-llfuse";
-    changelog = "https://github.com/python-llfuse/python-llfuse/raw/release-${src.tag}/Changes.rst";
-    license = lib.licenses.lgpl2Plus;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      bjornfor
-      dotlambda
-    ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a7520ae5352d..79e44346d83f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -316,6 +316,7 @@ mapAliases {
   llama-index-readers-llama-parse = throw "'llama-index-readers-llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25
   llama-parse = throw "'llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25
   llamaindex-py-client = throw "'llamaindex-pyclient' has been removed as it was removed from upstream"; # Added 2026-04-03
+  llfuse = throw "'llfuse' hase been removed, as it depends on fuse2, and is no longer developed. Please use 'mfusepy' instead"; # Added 2026-05-20
   lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
   logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
   loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 358f80d4d22b..4bb73a5991c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9258,8 +9258,6 @@ self: super: with self; {
 
   llama-stack-client = callPackage ../development/python-modules/llama-stack-client { };
 
-  llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; };
-
   llguidance = callPackage ../development/python-modules/llguidance { };
 
   llm = callPackage ../development/python-modules/llm { };

From e8d3585438e80dc5527e7de7617fa21a17c832ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 13:02:12 +0000
Subject: [PATCH 123/332] python3Packages.cyscale: 0.3.2 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/cyscale/default.nix b/pkgs/development/python-modules/cyscale/default.nix
index ac55c72ae78e..61b0c62a7d45 100644
--- a/pkgs/development/python-modules/cyscale/default.nix
+++ b/pkgs/development/python-modules/cyscale/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyscale";
-  version = "0.3.2";
+  version = "0.4.0";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: {
     owner = "latent-to";
     repo = "cyscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L75xuo4LWfTMs1XYV8zSPtmxqgjWin9wcALDUjz5L1k=";
+    hash = "sha256-QkIyb00/KIVicdX/k3UhjGSvcwQ+yxcSAkMlC7tVpLM=";
   };
 
   build-system = [ setuptools ];

From 9ccaa6cd7c745d21c0918b0c9723fdcf44cadb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 21 May 2026 17:21:16 +0200
Subject: [PATCH 124/332] sherpa-onnx: fix darwin runtime linking to
 onnxruntime

Set DYLD_FALLBACK_LIBRARY_PATH during checkPhase and add an rpath to
the Python extension so it can locate the onnxruntime dylib on Darwin.
---
 pkgs/by-name/sh/sherpa-onnx/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/sh/sherpa-onnx/package.nix b/pkgs/by-name/sh/sherpa-onnx/package.nix
index b09d89265c8b..bc584ff8a08f 100644
--- a/pkgs/by-name/sh/sherpa-onnx/package.nix
+++ b/pkgs/by-name/sh/sherpa-onnx/package.nix
@@ -191,6 +191,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export DYLD_FALLBACK_LIBRARY_PATH=${lib.getLib onnxruntime}/lib
+  '';
+
   # Use ctest directly because the default `make check` target includes clang-tidy.
   checkPhase = ''
     runHook preCheck
@@ -202,6 +206,10 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $python
     cp -r ../sherpa-onnx/python/sherpa_onnx $python/
     rm $out/lib/_sherpa_onnx*.so
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install_name_tool -add_rpath ${lib.getLib onnxruntime}/lib \
+        $python/sherpa_onnx/lib/_sherpa_onnx*.so
+    ''}
   '';
 
   passthru = {

From d93d8ef251d1cee9d6b6f7adfc15c70f14045513 Mon Sep 17 00:00:00 2001
From: Dan Xin <davinci42.cn@gmail.com>
Date: Thu, 21 May 2026 23:26:09 +0800
Subject: [PATCH 125/332] crush: 0.65.3 -> 0.70.0

Diff: https://github.com/charmbracelet/crush/compare/v0.65.3...v0.70.0

Changelog: https://github.com/charmbracelet/crush/releases/tag/v0.70.0
Signed-off-by: Dan Xin <davinci42.cn@gmail.com>
---
 pkgs/by-name/cr/crush/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 08a1470d2162..10db3c225a5c 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -11,16 +11,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "crush";
-  version = "0.65.3";
+  version = "0.70.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X+bCwpyAFUkM1ljj5I6w6gts6b6IWYm1d4veV0mR0gA=";
+    hash = "sha256-rLLgGes902mZvya2rcTCNji0FR2AlMzA4vdYieHZIoc=";
   };
 
-  vendorHash = "sha256-moVpfFscZLz7mQw+pqaG132k9KTNyRdKOFNNd0RN1oo=";
+  vendorHash = "sha256-3fYDFzBN5lDDnc2rziHOc7SMvesdAevsxIY2xUU3hms=";
 
   ldflags = [
     "-s"
@@ -39,6 +39,7 @@ buildGo126Module (finalAttrs: {
         "TestOpenAIClientStreamChoices"
         "TestGrepWithIgnoreFiles"
         "TestSearchImplementations"
+        "TestDispatch_BinaryPassthroughExecutes"
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

From e8019539903b73d2ac5691d10aa362da0a19567f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 21 May 2026 17:31:05 +0200
Subject: [PATCH 126/332] sdnotify-wrapper: drop

Now included with s6.
---
 nixos/modules/services/desktops/seatd.nix     |   3 +-
 pkgs/development/skaware-packages/default.nix |  10 +-
 .../sdnotify-wrapper/default.nix              |  47 -----
 .../sdnotify-wrapper/sdnotify-wrapper.c       | 174 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   1 -
 6 files changed, 10 insertions(+), 226 deletions(-)
 delete mode 100644 pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
 delete mode 100644 pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c

diff --git a/nixos/modules/services/desktops/seatd.nix b/nixos/modules/services/desktops/seatd.nix
index bedcc9a43120..939b9f338af9 100644
--- a/nixos/modules/services/desktops/seatd.nix
+++ b/nixos/modules/services/desktops/seatd.nix
@@ -40,7 +40,6 @@ in
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       seatd
-      sdnotify-wrapper
     ];
     users.groups.seat = lib.mkIf (cfg.group == "seat") { };
 
@@ -55,7 +54,7 @@ in
         Type = "notify";
         NotifyAccess = "all";
         SyslogIdentifier = "seatd";
-        ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
+        ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
         RestartSec = 1;
         Restart = "always";
       };
diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix
index b0877ada8c36..0ae8c4d43865 100644
--- a/pkgs/development/skaware-packages/default.nix
+++ b/pkgs/development/skaware-packages/default.nix
@@ -1,4 +1,8 @@
-{ lib, pkgs }:
+{
+  lib,
+  pkgs,
+  config,
+}:
 
 lib.makeScope pkgs.newScope (
   self:
@@ -22,7 +26,6 @@ lib.makeScope pkgs.newScope (
     # libs
     skalibs = callPackage ./skalibs { };
     skalibs_2_10 = callPackage ./skalibs/2_10.nix { };
-    sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
 
     # s6 tooling
     s6 = callPackage ./s6 { };
@@ -40,4 +43,7 @@ lib.makeScope pkgs.newScope (
     s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages;
     s6-rc-man-pages = self.s6-rc.passthru.manpages;
   }
+  // lib.optionalAttrs config.allowAliases {
+    sdnotify-wrapper = throw "sdnotify-wrapper has been removed in favour of s6-notify-socket-from-fd in the s6 package";
+  }
 )
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
deleted file mode 100644
index d9fa940a3294..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  runCommandCC,
-  skalibs,
-}:
-
-let
-  # From https://skarnet.org/software/misc/sdnotify-wrapper.c,
-  # which is unversioned.
-  src = ./sdnotify-wrapper.c;
-
-in
-runCommandCC "sdnotify-wrapper"
-  {
-
-    outputs = [
-      "bin"
-      "doc"
-      "out"
-    ];
-
-    meta = {
-      homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c";
-      description = "Use systemd sd_notify without having to link against libsystemd";
-      mainProgram = "sdnotify-wrapper";
-      platforms = lib.platforms.linux;
-      license = lib.licenses.isc;
-      maintainers = with lib.maintainers; [ Profpatsch ];
-    };
-
-  }
-  ''
-    mkdir -p $bin/bin
-    mkdir $out
-
-    # the -lskarnet has to come at the end to support static builds
-    $CC \
-      -o $bin/bin/sdnotify-wrapper \
-      -I${skalibs.dev}/include \
-      -L${skalibs.lib}/lib \
-      ${src} \
-      -lskarnet
-
-    mkdir -p $doc/share/doc/sdnotify-wrapper
-    # copy the documentation comment
-    sed -ne '/Usage:/,/*\//p' ${src} > $doc/share/doc/sdnotify-wrapper/README
-  ''
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
deleted file mode 100644
index 3ad3cbc69063..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Copyright: (C)2015-2020 Laurent Bercot.  http://skarnet.org/
-   ISC license. See http://opensource.org/licenses/ISC
-
-   Build-time requirements: skalibs.  https://skarnet.org/software/skalibs/
-   Run-time requirements: none, if you link skalibs statically.
-
-   Compilation:
-     gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet
-   Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically.
-   Adapt gcc's -I and -L options to your skalibs installation paths.
-
-   Usage: if a daemon would be launched by systemd as "foobard args...",
-   launch it as "sdnotify-wrapper foobard args..." instead, and you can now
-   tell systemd that this daemon supports readiness notification.
-
-   Instead of using sd_notify() and having to link against the systemd
-   library, the daemon notifies readiness by writing whatever it wants
-   to a file descriptor (by default: stdout), then a newline. (Then it
-   should close that file descriptor.) The simplest way is something like
-   int notify_readiness() { write(1, "\n", 1) ; close(1) ; }
-   This mechanism is understandable by any notification readiness framework.
-
-   Readiness notification occurs when the newline is written, not when
-   the descriptor is closed; but since sdnotify-wrapper stops reading
-   after the first newline and will exit, any subsequent writes will
-   fail and it's best to simply close the descriptor right away.
-
-   sdnotify-wrapper sees the notification when it occurs and sends it
-   to systemd using the sd_notify format.
-
-   Options:
-     -d fd: the daemon will write its notification on descriptor fd.
-     Default is 1.
-     -f: do not doublefork. Use if the daemon waits for children it does
-     not know it has (for instance, superservers do this). When in doubt,
-     do not use that option, or you may have a zombie hanging around.
-     -t timeout: if the daemon has not sent a notification after timeout
-     milliseconds, give up and exit; systemd will not be notified.
-     -k: keep the NOTIFY_SOCKET environment variable when execing into the
-     daemon. By default, the variable is unset: the daemon should not need it.
-
-   Notes:
-     sdnotify-wrapper does not change the daemon's pid. It runs as a
-     (grand)child of the daemon.
-     If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper
-     does nothing - it only execs into the daemon.
-     sdnotify-wrapper is more liberal than sd_notify(). It will accept
-     a relative path in NOTIFY_SOCKET.
-*/
-
-
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <skalibs/uint64.h>
-#include <skalibs/types.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/tai.h>
-#include <skalibs/iopause.h>
-#include <skalibs/djbunix.h>
-#include <skalibs/socket.h>
-#include <skalibs/exec.h>
-
-#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
-#define dieusage() strerr_dieusage(100, USAGE)
-
-#define VAR "NOTIFY_SOCKET"
-
-static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path)
-{
-  struct sockaddr_un sa ;
-  size_t l = strlen(path) ;
-  if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ;
-  memset(&sa, 0, sizeof sa) ;
-  sa.sun_family = AF_UNIX ;
-  memcpy(sa.sun_path, path, l+1) ;
-  if (path[0] == '@') sa.sun_path[0] = 0 ;
-  return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ;
-}
-
-static inline void notify_systemd (pid_t pid, char const *socketpath)
-{
-  size_t n = 16 ;
-  char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ;
-  int fd = ipc_datagram_b() ;
-  if (fd < 0) strerr_diefu1sys(111, "create socket") ;
-  n += pid_fmt(fmt + n, pid) ;
-  fmt[n++] = '\n' ;
-  if (!ipc_sendto(fd, fmt, n, socketpath))
-    strerr_diefu2sys(111, "send notification message to ", socketpath) ;
-  close(fd) ;
-}
-
-static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s)
-{
-  char dummy[4096] ;
-  iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ;
-  tain deadline ;
-  tain_now_g() ;
-  if (timeout) tain_from_millisecs(&deadline, timeout) ;
-  else deadline = tain_infinite_relative ;
-  tain_add_g(&deadline, &deadline) ;
-  for (;;)
-  {
-    int r = iopause_g(&x, 1, &deadline) ;
-    if (r < 0) strerr_diefu1sys(111, "iopause") ;
-    if (!r) return 99 ;
-    r = sanitize_read(fd_read(fd, dummy, 4096)) ;
-    if (r < 0)
-      if (errno == EPIPE) return 1 ;
-      else strerr_diefu1sys(111, "read from parent") ;
-    else if (r && memchr(dummy, '\n', r)) break ;
-  }
-  close(fd) ;
-  notify_systemd(pid, s) ;
-  return 0 ;
-}
-
-int main (int argc, char const *const *argv)
-{
-  char const *s = getenv(VAR) ;
-  unsigned int fd = 1 ;
-  unsigned int timeout = 0 ;
-  int df = 1, keep = 0 ;
-  PROG = "sdnotify-wrapper" ;
-  {
-    subgetopt l = SUBGETOPT_ZERO ;
-    for (;;)
-    {
-      int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
-      if (opt == -1) break ;
-      switch (opt)
-      {
-        case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ;
-        case 'f' : df = 0 ; break ;
-        case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
-        case 'k' : keep = 1 ; break ;
-        default : dieusage() ;
-      }
-    }
-    argc -= l.ind ; argv += l.ind ;
-  }
-  if (!argc) dieusage() ;
-
-  if (!s) xexec(argv) ;
-  else
-  {
-    pid_t parent = getpid() ;
-    pid_t child ;
-    int p[2] ;
-    if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ;
-    child = df ? doublefork() : fork() ;
-    if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ;
-    else if (!child)
-    {
-      PROG = "sdnotify-wrapper (child)" ;
-      close(p[1]) ;
-      return run_child(p[0], timeout, parent, s) ;
-    }
-    close(p[0]) ;
-    if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
-    if (keep) xexec(argv) ;
-    else xmexec_m(argv, VAR, sizeof(VAR)) ;
-  }
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ce7143892a57..4588473d7ce6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1880,6 +1880,7 @@ mapAliases {
   SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
+  sdnotify-wrapper = skawarePackages.sdnotify-wrapper;
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
   semantik = throw "'semantik' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 998020dfd661..ca983dbfc1b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7232,7 +7232,6 @@ with pkgs;
     s6-portable-utils-man-pages
     s6-rc
     s6-rc-man-pages
-    sdnotify-wrapper
     skalibs
     skalibs_2_10
     tipidee

From b0f46bf022edae4da0614fae5f13b7130cb5ccfe Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 18 May 2026 12:38:18 +0200
Subject: [PATCH 127/332] execline: avoid deprecated API in wrapper

---
 pkgs/development/skaware-packages/execline/execlineb-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/skaware-packages/execline/execlineb-wrapper.c b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c
index c8e91813b774..7daff48894f2 100644
--- a/pkgs/development/skaware-packages/execline/execlineb-wrapper.c
+++ b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c
@@ -10,7 +10,7 @@
 
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/exec.h>
 

From 3e53789295f5290a1b5949f7f12ac245bccf58de Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 21 May 2026 17:47:03 +0200
Subject: [PATCH 128/332] aliases: remove outdated comment

Fixes: 72b60a91f1a0 ("aliases: remove outdated and header comments")
---
 pkgs/top-level/aliases.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ce7143892a57..734381b46283 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2,7 +2,6 @@ lib: self: super:
 
 ### Deprecated aliases - for backward compatibility
 ### Please maintain this list in ASCIIbetical ordering.
-### Hint: the "sections" are delimited by ### <letter> ###
 
 # These aliases should not be used within nixpkgs, but exist to improve
 # backward compatibility in projects outside of nixpkgs. See the

From b07305823393e93af763459ad78072eb6b60588c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=91=E5=A3=AB=E5=A7=AC?= <2067834160@qq.com>
Date: Thu, 21 May 2026 23:47:21 +0800
Subject: [PATCH 129/332] python3Packages.jedi-language-server: fix test with
 jedi 0.20.0

---
 .../python-modules/jedi-language-server/default.nix           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index 05374f57690e..ee63c0a81d29 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -37,6 +37,10 @@ buildPythonPackage rec {
     poetry-core
   ];
 
+  pythonRelaxDeps = [
+    "jedi"
+  ];
+
   dependencies = [
     docstring-to-markdown
     jedi

From 3fb5cf873d8eab026954ca596e4e662fb96efbd8 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 19 May 2026 04:15:50 +0200
Subject: [PATCH 130/332] nixos/gdm: update `gdm-greeter` user homes

This fixes gdm not being able to save config changes made on the log-in
screen, such as turning on accessibility options. The new values for the
`gdm-greeter{-2,-3,-4,-5}` users map onto what userdbd would create for us.
We need writable home directories to interact with `dbus`, as well as to
populate the `/run/gdm/home/gdm-greeter/.config/environment.d/` files.

`gnome-inital-setup-done` is now seemingly called `gdm.ran-initial-setup`:
https://gitlab.gnome.org/GNOME/gdm/-/blob/gnome-50/daemon/gdm-manager.c?ref_type=heads#L64
---
 .../modules/services/display-managers/gdm.nix | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index 38b9f919bab2..8013fbde9031 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -44,6 +44,20 @@ let
   defaultSessionName = config.services.displayManager.defaultSession;
 
   setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { };
+
+  greeterUsers = lib.genAttrs' [ null 1 2 3 4 ] (
+    i:
+    let
+      # adding 1 to create `gdm-greeter{-2,-3,-4,-5}`
+      suffix = lib.optionalString (i != null) "-${toString (i + 1)}";
+    in
+    lib.nameValuePair "gdm-greeter${suffix}" {
+      isSystemUser = true;
+      uid = 60578 + (if i == null then 0 else i);
+      group = "gdm";
+      home = "/run/gdm/home/gdm-greeter${suffix}";
+    }
+  );
 in
 
 {
@@ -196,24 +210,8 @@ in
           group = "gdm";
           description = "GDM user";
         };
-
-        gdm-greeter = {
-          isSystemUser = true;
-          uid = 60578;
-          group = "gdm";
-          home = "/run/gdm";
-        };
       }
-
-      (lib.genAttrs' [ 1 2 3 4 ] (
-        i:
-        lib.nameValuePair "gdm-greeter-${toString i}" {
-          isSystemUser = true;
-          uid = 60578 + i;
-          group = "gdm";
-          home = "/run/gdm-${toString i}";
-        }
-      ))
+      greeterUsers
     ];
 
     users.groups.gdm.gid = config.ids.gids.gdm;
@@ -255,17 +253,20 @@ in
       };
     };
 
-    systemd.tmpfiles.rules = [
-      "d /run/gdm/.config 0711 gdm gdm"
-    ]
-    ++ lib.optionals config.services.pulseaudio.enable [
-      "d /run/gdm/.config/pulse 0711 gdm gdm"
-      "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
-    ]
-    ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
-      # Create stamp file for gnome-initial-setup to prevent it starting in GDM.
-      "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
-    ];
+    systemd.tmpfiles.rules =
+      lib.optionals config.services.pulseaudio.enable (
+        lib.concatLists (
+          lib.mapAttrsToList (name: user: [
+            "d ${user.home}/.config 0711 ${name} gdm"
+            "d ${user.home}/.config/pulse 0711 ${name} gdm"
+            "L+ ${user.home}/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
+          ]) greeterUsers
+        )
+      )
+      ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
+        # Create stamp file for gnome-initial-setup to prevent it starting in GDM.
+        "f /run/gdm/gdm.ran-initial-setup 0711 gdm gdm - yes"
+      ];
 
     # Otherwise GDM will not be able to start correctly and display Wayland sessions
     systemd.packages = [

From e663513dffb5a1e55d5a35f1d000c3f51a2f03da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 17:21:06 +0000
Subject: [PATCH 131/332] mattermost: 11.7.0 -> 11.7.1

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

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index f7cbb3295385..922a2836ad19 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -25,10 +25,10 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(11\\.7\\.[0-9]+)$";
-    version = "11.7.0";
-    srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg=";
-    vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4=";
-    npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc=";
+    version = "11.7.1";
+    srcHash = "sha256-9eI9tX6qHEEzm7aro7ky2JORfAmqbjmrmxABFVTZzW8=";
+    vendorHash = "sha256-xu399pAtIJUIns+GhKFlDR0crWV+8HiN9Wf38EMu5q8=";
+    npmDepsHash = "sha256-M+yoCLR4yT30n3rhqZu1z8zeWas+5VniP4aaIJPz6VU=";
   },
   ...
 }:

From 35b7c1ee11b665b702afb2a82e3965bb22fe35b1 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 21 May 2026 19:46:06 +0200
Subject: [PATCH 132/332] ruff: 0.15.13 -> 0.15.14

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.15.14
Diff: https://github.com/astral-sh/ruff/compare/0.15.13...0.15.14

Automation notice:
I used https://github.com/Mic92/nix-update (nix-update ruff --version
0.15.14) to edit the version number and fetch hashes more quickly.
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index bc1345b250c4..08d40e4e30ff 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.15.13";
+  version = "0.15.14";
 
   __structuredAttrs = true;
 
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-Sr5eD5aZP+1/wbRHQjampWbWea+rXshcwOfCr4JCvxA=";
+    hash = "sha256-Z8UhVS+YbYAxVWodU/I+p3Ns5/EpmzBTChcbkvJwe6Y=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-3y7kqhAUXZ+Ui6quGEDSRXrh3ii9NJLoFWnGX/Mp0l4=";
+  cargoHash = "sha256-GnRC5jXySAna7uAKPDtpPQUJe8AKqVSU+ynmGKZtfTs=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 102913e76f1e34d601c77eacd1dbc6f56acc18b1 Mon Sep 17 00:00:00 2001
From: Martin Fischer <martin@push-f.com>
Date: Thu, 21 May 2026 19:37:20 +0200
Subject: [PATCH 133/332] sqlint: update deps to fix build failure

Also add a --help smoke test.
---
 pkgs/by-name/sq/sqlint/Gemfile.lock | 12 ++++++----
 pkgs/by-name/sq/sqlint/gemset.nix   | 34 ++++++++++++++++++++++++-----
 pkgs/by-name/sq/sqlint/package.nix  | 10 ++++++++-
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sq/sqlint/Gemfile.lock b/pkgs/by-name/sq/sqlint/Gemfile.lock
index 9359528117d1..6392331c2da8 100644
--- a/pkgs/by-name/sq/sqlint/Gemfile.lock
+++ b/pkgs/by-name/sq/sqlint/Gemfile.lock
@@ -1,9 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    google-protobuf (3.25.5)
-    pg_query (4.2.3)
-      google-protobuf (>= 3.22.3)
+    bigdecimal (4.1.2)
+    google-protobuf (4.35.0)
+      bigdecimal
+      rake (~> 13.3)
+    pg_query (6.2.2)
+      google-protobuf (>= 3.25.3)
+    rake (13.4.2)
     sqlint (0.3.0)
       pg_query (>= 1)
 
@@ -14,4 +18,4 @@ DEPENDENCIES
   sqlint
 
 BUNDLED WITH
-   2.4.20
+   2.7.2
diff --git a/pkgs/by-name/sq/sqlint/gemset.nix b/pkgs/by-name/sq/sqlint/gemset.nix
index dd8ce2f48e5c..50320b075c61 100644
--- a/pkgs/by-name/sq/sqlint/gemset.nix
+++ b/pkgs/by-name/sq/sqlint/gemset.nix
@@ -1,13 +1,27 @@
 {
-  google-protobuf = {
+  bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3";
+      sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk";
       type = "gem";
     };
-    version = "3.25.5";
+    version = "4.1.2";
+  };
+  google-protobuf = {
+    dependencies = [
+      "bigdecimal"
+      "rake"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "038cqc1kzxl22m3jfspkdpg0dxskga9jvgwclb4pivcjqxi62d4m";
+      type = "gem";
+    };
+    version = "4.35.0";
   };
   pg_query = {
     dependencies = [ "google-protobuf" ];
@@ -15,10 +29,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w";
+      sha256 = "0vwvfxz4gp5xqrv4jwyqigfkpldjqp6mbzvskapwiyncc10ijv1i";
       type = "gem";
     };
-    version = "4.2.3";
+    version = "6.2.2";
+  };
+  rake = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb";
+      type = "gem";
+    };
+    version = "13.4.2";
   };
   sqlint = {
     dependencies = [ "pg_query" ];
diff --git a/pkgs/by-name/sq/sqlint/package.nix b/pkgs/by-name/sq/sqlint/package.nix
index 8c0d754ce960..9a0de27935c1 100644
--- a/pkgs/by-name/sq/sqlint/package.nix
+++ b/pkgs/by-name/sq/sqlint/package.nix
@@ -2,6 +2,8 @@
   lib,
   bundlerApp,
   bundlerUpdateScript,
+  runCommand,
+  sqlint,
 }:
 
 bundlerApp {
@@ -10,7 +12,13 @@ bundlerApp {
 
   exes = [ "sqlint" ];
 
-  passthru.updateScript = bundlerUpdateScript "sqlint";
+  passthru = {
+    updateScript = bundlerUpdateScript "sqlint";
+    tests.help = runCommand "sqlint-help-test" { } ''
+      ${sqlint}/bin/sqlint --help
+      touch $out
+    '';
+  };
 
   meta = {
     description = "Simple SQL linter";

From 59d054945fe4163e2b3ad75cc954e9071d96095c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 18:50:06 +0000
Subject: [PATCH 134/332] go-jet: 2.14.1 -> 2.15.0

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

diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix
index 87f7d7ba2a90..c7d7e9068c18 100644
--- a/pkgs/by-name/go/go-jet/package.nix
+++ b/pkgs/by-name/go/go-jet/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-jet";
-  version = "2.14.1";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "go-jet";
     repo = "jet";
     rev = "v${version}";
-    sha256 = "sha256-BwhatFakmd2ksLQv7OLwvkuDHqnZI4HRnldfyJhR+i8=";
+    sha256 = "sha256-f3BqcXRugw19LQI3Jz8v1dY0bLUhtFKeVBsfQ9rZEow=";
   };
 
-  vendorHash = "sha256-fgYZULAz3orhK637cJNYK7bw9hsQ9PuLH1nMDLVwoGM=";
+  vendorHash = "sha256-NSuZNq5nHuekzEgjG+x8ieb8dkKmWeZNERP6759f01Q=";
 
   subPackages = [ "cmd/jet" ];
 

From fef5d0f72d1ee1f044e127bc8918787ead94c0b8 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 21 May 2026 20:46:52 +0200
Subject: [PATCH 135/332] libmamba: 2.4.0 -> 2.6.2

changelog: https://github.com/mamba-org/mamba/blob/2.6.2/CHANGELOG.md

diff: https://github.com/mamba-org/mamba/compare/2.4.0...2.6.2
---
 pkgs/by-name/li/libmamba/package.nix                   | 7 +++++--
 pkgs/by-name/ma/mamba-cpp/package.nix                  | 2 ++
 pkgs/development/python-modules/libmambapy/default.nix | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index bd063f6cee84..ad6052e1061a 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -12,6 +12,7 @@
   reproc,
   libsolv,
   curl,
+  msgpack-c,
   libarchive,
   zstd,
   nix-update-script,
@@ -21,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.4.0";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     tag = finalAttrs.version;
-    hash = "sha256-ojcAS5NYAhklACrBkmSHRPNiVLjUR/umll0vhoFnFBs=";
+    hash = "sha256-qvUo2OD+vh5oXF/ckz9vJyiQ9wpEbTrC+C4oYXOGFAU=";
   };
 
   nativeBuildInputs = [
@@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     reproc
     libsolv
     curl
+    msgpack-c
     libarchive
     zstd
     bzip2
@@ -52,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_LIBMAMBA" true)
+    (lib.cmakeBool "BUILD_LIBMAMBA_SPDLOG" true)
     (lib.cmakeBool "BUILD_SHARED" true)
   ];
 
diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix
index 344a9e9d3eef..56a781e6bdae 100644
--- a/pkgs/by-name/ma/mamba-cpp/package.nix
+++ b/pkgs/by-name/ma/mamba-cpp/package.nix
@@ -4,6 +4,7 @@
   bzip2,
   cmake,
   cli11,
+  msgpack-c,
   yaml-cpp,
   nlohmann_json,
   zstd,
@@ -29,6 +30,7 @@ stdenv.mkDerivation {
     zstd
     bzip2
     cli11
+    msgpack-c
     yaml-cpp
     libmamba
   ];
diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix
index 84eada8537bb..80602a461941 100644
--- a/pkgs/development/python-modules/libmambapy/default.nix
+++ b/pkgs/development/python-modules/libmambapy/default.nix
@@ -3,6 +3,7 @@
   python,
   buildPythonPackage,
   cmake,
+  msgpack-c,
   ninja,
   libmamba,
   pybind11,
@@ -43,6 +44,7 @@ buildPythonPackage rec {
     bzip2
     spdlog
     fmt
+    msgpack-c
     tl-expected
     nlohmann_json
     yaml-cpp

From 7063c12f4f2565049d065c2348a188510a27467a Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 21 May 2026 21:44:18 +0200
Subject: [PATCH 136/332] python3Packages.conda: 26.1.0 -> 26.5.0

changelog: https://github.com/conda/conda/blob/main/CHANGELOG.md

diff: https://github.com/conda/conda/compare/26.1.1...26.5.0
---
 pkgs/development/python-modules/conda/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
index dce5a4cf2458..0173ce5552e5 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -28,7 +28,7 @@
 buildPythonPackage rec {
   __structuredAttrs = true;
   pname = "conda";
-  version = "26.1.0";
+  version = "26.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "conda";
     repo = "conda";
     tag = version;
-    hash = "sha256-u3xxaSNfPocAjzvzEhKNijsa2lR4xiMSpWHP4MTnBzQ=";
+    hash = "sha256-x6p9CaityAO8NYiKLGUbu3Lk5C/mVmMmdqP4OpfSkNs=";
   };
 
   build-system = [
@@ -44,6 +44,8 @@ buildPythonPackage rec {
     hatch-vcs
   ];
 
+  pythonRelaxDeps = [ "ruamel-yaml" ];
+
   dependencies = [
     archspec
     conda-libmamba-solver

From 7c21402d9ac902ab4eb9738cf41396de333d0ae6 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 21 May 2026 21:16:47 +0200
Subject: [PATCH 137/332] python3Packages.conda-libmamba-solver: 25.11.0 ->
 26.4.2

changelog: https://github.com/conda/conda-libmamba-solver/blob/26.4.2/CHANGELOG.md

diff: https://github.com/conda/conda-libmamba-solver/compare/25.11.0...26.4.2
---
 .../python-modules/conda-libmamba-solver/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index 7220bb94f1aa..7c58c473dded 100644
--- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
@@ -12,7 +12,7 @@
 }:
 buildPythonPackage rec {
   pname = "conda-libmamba-solver";
-  version = "25.11.0";
+  version = "26.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "conda";
     repo = "conda-libmamba-solver";
     tag = version;
-    hash = "sha256-t4mwQ9nsduicT1sL1TQLbuCoS4r7K/GaXyBFOO+3/m8=";
+    hash = "sha256-8+BIUQp2tg50P0UDjzBvywg8/mDelDYMtp/ejEcMH20=";
   };
 
   build-system = [

From 6849aad8c63b4a2e7184cbd029fbdd091122b95b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 20:02:24 +0000
Subject: [PATCH 138/332] python3Packages.language-tool-python: 3.3.1 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/language-tool-python/default.nix b/pkgs/development/python-modules/language-tool-python/default.nix
index d71412aaf6ac..ebb339c71fe3 100644
--- a/pkgs/development/python-modules/language-tool-python/default.nix
+++ b/pkgs/development/python-modules/language-tool-python/default.nix
@@ -11,7 +11,7 @@
 }:
 buildPythonPackage rec {
   pname = "language-tool-python";
-  version = "3.3.1";
+  version = "3.4.0";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "jxmorris12";
     repo = "language_tool_python";
     tag = version;
-    hash = "sha256-Cgzk9Tab9yf/J94SRxLIiTNTyUqZfNXxQYUOnt4w2eI=";
+    hash = "sha256-EX6O9bYJgrgvKkFDjq3A144iFkcwNPIvTTEIC9D9J6M=";
   };
 
   build-system = [ setuptools ];

From 166a28066eb8d08cd270409d73b6e8f594d86a49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 20:49:16 +0000
Subject: [PATCH 139/332] jetbrains.rust-rover: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/rust-rover.nix     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
index 8853e0acf2af..9f73dc336a5d 100644
--- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
@@ -18,20 +18,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1.tar.gz";
-      hash = "sha256-UYljm43s/UOEvk0Peio2Crsdx0K5U5Seo57M34A1A1c=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.tar.gz";
+      hash = "sha256-INIz7nGar/oHh+CHfz4jm5t9/ARPcMfpnOl99Z3kg3I=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-FUDCF4pOtovjBKaNV0dEjc5PwsDLBXTTHnc3+oNDU7A=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-PmCDYM8nqySQm6cpUJQ9PyzSkKOR6V3LuXnYpE0i7fU=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1.dmg";
-      hash = "sha256-DxrFdxSLiyH7/davL4QeAPxlKK3IA5JXzPetTYaMtck=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.dmg";
+      hash = "sha256-HI2qt6wTddANqdRuKQ4X7mXQyBA4dJYz9ewfI2iAYfw=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1-aarch64.dmg";
-      hash = "sha256-K9Gwkudx+WV25fA1IRwfDlqcK8X0I/SzrL7S2iG7IfI=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.dmg";
+      hash = "sha256-JMg/vs3aVeHmr6tiZZTggRGpH9O6lKlyeP8Ot4mm24w=";
     };
   };
   # update-script-end: urls
@@ -45,8 +45,8 @@ in
   product = "RustRover";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.140";
+  version = "2026.1.2";
+  buildNumber = "261.24374.182";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 1a171d6722e430404a9189e363a7c9a48ff64afc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 20:49:28 +0000
Subject: [PATCH 140/332] jetbrains.ruby-mine: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/ruby-mine.nix      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
index c4fe68c48776..6c22776e6acf 100644
--- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
+++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1.tar.gz";
-      hash = "sha256-tdT8LwsHGC5jUxGsRPVw1VfKfKZ05gZsGL6kpsxcPFA=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2.tar.gz";
+      hash = "sha256-6rvtK1TsZsuuVqfya9eh7fHk7LJyyxg4SYrU/yXnK1I=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-ns9oxsMXSPJS5KWSX0oKOyOyg8bguUnd8v1TRwV9EXw=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-EvKpY3zbUHT03GVIT/HJxVkOtJgsCG+jYNcKfiX0mTI=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1.dmg";
-      hash = "sha256-Q/W6Pe3o6qwdHQm2z4bnenyEe7DrWwnov3M+JL8bS0o=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2.dmg";
+      hash = "sha256-KWbysSPVHM0BS09rntD78i8BuP3v26zha8GatFMZtg0=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1-aarch64.dmg";
-      hash = "sha256-UPnESouBCx59e2n8inTfe+zSCkQMF2XeoNw825LTKuU=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2-aarch64.dmg";
+      hash = "sha256-NEmps3wxao9cb2wgbmIndXPs78Tmona4wC9+8DBv7cI=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "RubyMine";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.142";
+  version = "2026.1.2";
+  buildNumber = "261.24374.145";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 84068521eefcb7f75944c909d2b07b259c02ce92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 20:49:29 +0000
Subject: [PATCH 141/332] jetbrains.gateway: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/gateway.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix
index 432953b43c4e..5907a504ce53 100644
--- a/pkgs/applications/editors/jetbrains/ides/gateway.nix
+++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1.tar.gz";
-      hash = "sha256-hXQIvnyjosH3uEUpi43NJYnk8cMXVVlKblpiGeVlekk=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2.tar.gz";
+      hash = "sha256-9NEHD9FXekwjRHTrPMeK4xU4sHnXPge+wRXyCFMmPBk=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-nsF/Oo0p+hXqSehIhrPc7i0zURDXgtf/rBpMFKgq+7c=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-M7XiLlIl7JFKbARb9Zli0c3cHUo2X0nPVrGhs3pK2bQ=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1.dmg";
-      hash = "sha256-1pqtAR8r2ZwU/RhFMDsyFBhhRYvsPrT5F/n3kSP2viA=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2.dmg";
+      hash = "sha256-Wuuj6/K/5xoM9+d59IGzBo19iOJusbIMigoflPLQ+ts=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1-aarch64.dmg";
-      hash = "sha256-orFAOXR9A/0S7lhwkD9bAXyp24HaDSlXe/rL4iT6+80=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2-aarch64.dmg";
+      hash = "sha256-ADWFPMC4ptj2mZk4RJgtIQjOT2xwOkL67UahoKte6mQ=";
     };
   };
   # update-script-end: urls
@@ -40,8 +40,8 @@ mkJetBrainsProduct {
   productShort = "Gateway";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.152";
+  version = "2026.1.2";
+  buildNumber = "261.24374.120";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 228d96c5c6a67da24e3e9f550da786dec79c373e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 21:02:56 +0000
Subject: [PATCH 142/332] jetbrains.phpstorm: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/phpstorm.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index 1c19d743fd91..c4ae7a80d6bd 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1.tar.gz";
-      hash = "sha256-TOSiFAphV/JYrUg9tB/BAtAGjn6P0DpaYHO2W3FcCGQ=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2.tar.gz";
+      hash = "sha256-VbXsfKahp1X4AwAC10VghE+ZkxThovnYHHYyvkOTtFc=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-fWguwgUQstCytAMKam4scziEeyOxVEhIxS1O81HO/yI=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-f0Owuq0OjVwnp4Gj/diiPFn9F1Hf4gm/MwHzkabIH2w=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1.dmg";
-      hash = "sha256-W28NwTNZe3Vj19J32nY8Jrn2rFVVd+0H2NWzDCTG8nw=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2.dmg";
+      hash = "sha256-XzYv58bR8ts6MTREUjqQinCzHvTdrLVEDH5vg1vQ3so=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1-aarch64.dmg";
-      hash = "sha256-tm/UFH/5FX0HQ/FnjQ/Jwwaf/cpIYb4j0NvKlazBp08=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2-aarch64.dmg";
+      hash = "sha256-dJOqdY+D5FssDAvocMOXk9O22qk+QLxwDm2MHK2Wggg=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "PhpStorm";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.149";
+  version = "2026.1.2";
+  buildNumber = "261.24374.185";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 22362851335c9793ec87035074d04799b29a63a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 21:03:04 +0000
Subject: [PATCH 143/332] jetbrains.clion: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/clion.nix          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix
index 60f00e2ec1f3..5b6885bb4614 100644
--- a/pkgs/applications/editors/jetbrains/ides/clion.nix
+++ b/pkgs/applications/editors/jetbrains/ides/clion.nix
@@ -21,20 +21,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1.tar.gz";
-      hash = "sha256-6S0+ASWF7du0tHyfLu/6ZmxymP79m3bwxOxQTFfsoJs=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.tar.gz";
+      hash = "sha256-Q3LOhpwpU6vrPWEzA+s2ZnbRxo+EeodBUHUYs3Xikrs=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-niaHFXxXPh1iH26aAmHES2F/xbfkPJ18erDXFZign+g=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-YM105ozP78oLDmwKL0t4Z4wGjCDh6xvhf/C1oCD6Qi8=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1.dmg";
-      hash = "sha256-LWbFIC2xhh2Co2/BOTvScGWL9Qs77WAM4A+gxtuA4B4=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.dmg";
+      hash = "sha256-UEkYDJBjRvvUUB2UFsc37kdp/i+1ctqULSKs62/t9/I=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1-aarch64.dmg";
-      hash = "sha256-8m6SbpkVdQ9QZykVlse9cK8KysXlPn/NA9WysLHh8jk=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.dmg";
+      hash = "sha256-scMwDF+mIfx/66cBrvdxp+gU3+qA2sUWqoGCEhPItjE=";
     };
   };
   # update-script-end: urls
@@ -48,8 +48,8 @@ in
   product = "CLion";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.135";
+  version = "2026.1.2";
+  buildNumber = "261.24374.148";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From c9feb44bef95feb7b6d91308e4ed03760bd81e95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 21:05:28 +0000
Subject: [PATCH 144/332] jetbrains.goland: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/goland.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix
index 602774a3d921..fe92428cd2a8 100644
--- a/pkgs/applications/editors/jetbrains/ides/goland.nix
+++ b/pkgs/applications/editors/jetbrains/ides/goland.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.1.tar.gz";
-      hash = "sha256-ASzqw8xuRaSAwzoiBsL+6PRyuSvBh43tnF4mEmkur9s=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.2.tar.gz";
+      hash = "sha256-1FkDEaapyDbTPe4soOdyCHLkp/UT3rZ6siGyGyjmGJo=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-25PADBycdas3n6BWSGOJhuMaLcik5P5AfcEO6mY75js=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-E8WpA4s/ePEDAs47IPC0v10C1VKl9UYU7VNX/5igpm4=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.1.dmg";
-      hash = "sha256-kKr5/7z5gbL0YORDET0y7LgczWLEQ31lqsrHgkxrzQ8=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.2.dmg";
+      hash = "sha256-iWYTMImwzMh9KSJgek8a84o/KlLWBaOj80vKlB8Ftes=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.1-aarch64.dmg";
-      hash = "sha256-zfdJrXBatvAl3wNMQ3LhF9oOxo1dEyo8wr4lCoFdm9I=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.dmg";
+      hash = "sha256-TFnEMq7u51UvtaOjnxS+abJhsR3aSnaQjNFfF8EQrcQ=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ in
   product = "Goland";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.143";
+  version = "2026.1.2";
+  buildNumber = "261.24374.154";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 39c7f28bb277aab07b30acc95a9e152ee2431b7a Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 21 May 2026 20:50:09 +0200
Subject: [PATCH 145/332] libmamba: minor cleanup

---
 pkgs/by-name/li/libmamba/package.nix          | 53 ++++++++++---------
 pkgs/by-name/ma/mamba-cpp/package.nix         | 29 +++++-----
 .../conda-libmamba-solver/default.nix         | 11 ++--
 .../python-modules/libmambapy/default.nix     | 36 ++++++-------
 4 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index ad6052e1061a..3b7e461d60b4 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -1,23 +1,23 @@
 {
-  fetchFromGitHub,
-  lib,
-  stdenv,
-  cmake,
-  fmt,
-  spdlog,
-  tl-expected,
-  nlohmann_json,
-  yaml-cpp,
-  simdjson,
-  reproc,
-  libsolv,
-  curl,
-  msgpack-c,
-  libarchive,
-  zstd,
-  nix-update-script,
   bzip2,
+  cmake,
+  curl,
+  fetchFromGitHub,
+  fmt,
+  lib,
+  libarchive,
+  libsolv,
+  msgpack-c,
+  nix-update-script,
+  nlohmann_json,
   python3,
+  reproc,
+  simdjson,
+  spdlog,
+  stdenv,
+  tl-expected,
+  yaml-cpp,
+  zstd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,19 +37,19 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    bzip2
+    curl
     fmt
+    libarchive
+    libsolv
+    msgpack-c
+    nlohmann_json
+    reproc
+    simdjson
     spdlog
     tl-expected
-    nlohmann_json
     yaml-cpp
-    simdjson
-    reproc
-    libsolv
-    curl
-    msgpack-c
-    libarchive
     zstd
-    bzip2
   ];
 
   cmakeFlags = [
@@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_SHARED" true)
   ];
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix
index 56a781e6bdae..539580657d4d 100644
--- a/pkgs/by-name/ma/mamba-cpp/package.nix
+++ b/pkgs/by-name/ma/mamba-cpp/package.nix
@@ -1,19 +1,19 @@
 {
-  lib,
-  stdenv,
   bzip2,
-  cmake,
   cli11,
+  cmake,
+  lib,
+  libmamba,
   msgpack-c,
-  yaml-cpp,
   nlohmann_json,
-  zstd,
+  python3,
   reproc,
   spdlog,
+  stdenv,
   tl-expected,
-  libmamba,
-  python3,
   versionCheckHook,
+  yaml-cpp,
+  zstd,
 }:
 stdenv.mkDerivation {
   pname = "mamba-cpp";
@@ -22,17 +22,17 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
+    bzip2
+    cli11
+    libmamba
+    msgpack-c
+    nlohmann_json
     python3
     reproc
     spdlog
-    nlohmann_json
     tl-expected
-    zstd
-    bzip2
-    cli11
-    msgpack-c
     yaml-cpp
-    libmamba
+    zstd
   ];
 
   cmakeFlags = [
@@ -43,6 +43,9 @@ stdenv.mkDerivation {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   meta = {
     description = "Reimplementation of the conda package manager";
     homepage = "https://github.com/mamba-org/mamba";
diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index 7c58c473dded..8e73b16b3c35 100644
--- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
@@ -1,25 +1,24 @@
 {
-  lib,
+  boltons,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
   hatch-vcs,
-  boltons,
+  lib,
   libmambapy,
   msgpack,
   requests,
   zstandard,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "conda-libmamba-solver";
   version = "26.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
-    inherit pname version;
     owner = "conda";
     repo = "conda-libmamba-solver";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-8+BIUQp2tg50P0UDjzBvywg8/mDelDYMtp/ejEcMH20=";
   };
 
@@ -47,4 +46,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.ericthemagician ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix
index 80602a461941..907fb0ae5116 100644
--- a/pkgs/development/python-modules/libmambapy/default.nix
+++ b/pkgs/development/python-modules/libmambapy/default.nix
@@ -1,23 +1,23 @@
 {
-  lib,
-  python,
-  buildPythonPackage,
+  bzip2,
   cmake,
+  curl,
+  buildPythonPackage,
+  fmt,
+  lib,
+  libmamba,
+  libsolv,
   msgpack-c,
   ninja,
-  libmamba,
+  nlohmann_json,
   pybind11,
+  python,
+  reproc,
   scikit-build-core,
-  fmt,
   spdlog,
   tl-expected,
-  nlohmann_json,
   yaml-cpp,
-  reproc,
-  libsolv,
-  curl,
   zstd,
-  bzip2,
 }:
 
 buildPythonPackage rec {
@@ -39,17 +39,17 @@ buildPythonPackage rec {
 
   buildInputs = [
     (libmamba.override { python3 = python; })
-    curl
-    zstd
     bzip2
-    spdlog
+    curl
     fmt
-    msgpack-c
-    tl-expected
-    nlohmann_json
-    yaml-cpp
-    reproc
     libsolv
+    msgpack-c
+    nlohmann_json
+    reproc
+    spdlog
+    tl-expected
+    yaml-cpp
+    zstd
   ];
 
   pythonImportsCheck = [

From f10e48647c426e5c972bb5b2699198c2f89d0494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= <hello@capypara.de>
Date: Fri, 22 May 2026 00:15:00 +0200
Subject: [PATCH 146/332] jetbrains.*: updater: use channel IDs instead of
 names

---
 .../updater/jetbrains_nix_updater/fetcher.py  |  4 +--
 .../editors/jetbrains/updater/updateInfo.json | 30 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py
index d5672edf34b3..9a1e775e29e8 100644
--- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py
+++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py
@@ -65,7 +65,7 @@ class VersionFetcher:
                 new_build_number = build["@number"]
             else:
                 new_build_number = build["@fullNumber"]
-            if "EAP" not in channel["@name"]:
+            if "EAP" not in channel["@id"]:
                 version_or_build_number = new_version
             else:
                 version_or_build_number = new_build_number
@@ -111,7 +111,7 @@ class VersionFetcher:
         root = xmltodict.parse(updates_response.text)
         products = root["products"]["product"]
         return {
-            channel["@name"]: channel
+            channel["@id"]: channel
             for product in products
             if "channel" in product
             for channel in one_or_more(product["channel"])
diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
index 6c95f480814f..a64e1af94fcd 100644
--- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json
+++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
@@ -1,6 +1,6 @@
 {
   "clion": {
-    "channel": "CLion RELEASE",
+    "channel": "CL-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
@@ -9,7 +9,7 @@
     }
   },
   "datagrip": {
-    "channel": "DataGrip RELEASE",
+    "channel": "DB-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
@@ -18,7 +18,7 @@
     }
   },
   "dataspell": {
-    "channel": "DataSpell RELEASE",
+    "channel": "DS-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
@@ -27,7 +27,7 @@
     }
   },
   "gateway": {
-    "channel": "Gateway RELEASE",
+    "channel": "GW-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
@@ -36,7 +36,7 @@
     }
   },
   "goland": {
-    "channel": "GoLand RELEASE",
+    "channel": "GO-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
@@ -45,7 +45,7 @@
     }
   },
   "idea": {
-    "channel": "IntelliJ IDEA RELEASE",
+    "channel": "IU-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
@@ -54,11 +54,11 @@
     }
   },
   "idea-oss": {
-    "channel": "IntelliJ IDEA RELEASE",
+    "channel": "IU-RELEASE-licensing-RELEASE",
     "urls": {}
   },
   "mps": {
-    "channel": "MPS RELEASE",
+    "channel": "MPS-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
@@ -67,7 +67,7 @@
     }
   },
   "phpstorm": {
-    "channel": "PhpStorm RELEASE",
+    "channel": "PS-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
@@ -76,7 +76,7 @@
     }
   },
   "pycharm": {
-    "channel": "PyCharm RELEASE",
+    "channel": "PY-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz",
@@ -85,11 +85,11 @@
     }
   },
   "pycharm-oss": {
-    "channel": "PyCharm RELEASE",
+    "channel": "PY-RELEASE-licensing-RELEASE",
     "urls": {}
   },
   "rider": {
-    "channel": "Rider RELEASE",
+    "channel": "RD-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
@@ -98,7 +98,7 @@
     }
   },
   "ruby-mine": {
-    "channel": "RubyMine RELEASE",
+    "channel": "RM-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
@@ -107,7 +107,7 @@
     }
   },
   "rust-rover": {
-    "channel": "RustRover RELEASE",
+    "channel": "RR-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
@@ -116,7 +116,7 @@
     }
   },
   "webstorm": {
-    "channel": "WebStorm RELEASE",
+    "channel": "WS-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
       "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",

From 33d118cdba75d3b24482c2b5bc8dd279c1f98b31 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 22 May 2026 00:17:26 +0100
Subject: [PATCH 147/332] owl: fix build with gcc 15

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

diff --git a/pkgs/by-name/ow/owl/package.nix b/pkgs/by-name/ow/owl/package.nix
index 25d0e251ae5a..a71b8bc050b3 100644
--- a/pkgs/by-name/ow/owl/package.nix
+++ b/pkgs/by-name/ow/owl/package.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation {
       --replace-fail "cmake_minimum_required(VERSION 2.8.8)" "cmake_minimum_required(VERSION 3.10)"
     substituteInPlace googletest/{googlemock,googletest}/CMakeLists.txt \
       --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+
+    # https://gcc.gnu.org/gcc-15/porting_to.html#header-dep-changes
+    sed -e '1i #include <cstdint>' -i googletest/googletest/src/gtest-death-test.cc
   '';
 
   meta = {

From 296da583a56a8a030c57e82751847bfdc2e0e1c5 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 21 May 2026 17:19:14 -0600
Subject: [PATCH 148/332] git-aggregator: switch to pyproject

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

diff --git a/pkgs/by-name/gi/git-aggregator/package.nix b/pkgs/by-name/gi/git-aggregator/package.nix
index ceaab59d3ce4..f61bde4a0aea 100644
--- a/pkgs/by-name/gi/git-aggregator/package.nix
+++ b/pkgs/by-name/gi/git-aggregator/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "git-aggregator";
   version = "4.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "acsone";
@@ -17,11 +17,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-sZYh3CN15WTCQ59W24ERJdP48EJt571cbkswLQ3JL2g=";
   };
 
-  nativeBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
     setuptools-scm
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     argcomplete
     colorama
     gitMinimal

From e6673f2e7345026e4bc3c4d0d264d13602558b54 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 22 May 2026 01:03:15 +0000
Subject: [PATCH 149/332] vkquake: 1.32.3.1 -> 1.34.1

---
 pkgs/by-name/vk/vkquake/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/vk/vkquake/package.nix b/pkgs/by-name/vk/vkquake/package.nix
index dc9bc3ed1d37..176dc4d2ac6c 100644
--- a/pkgs/by-name/vk/vkquake/package.nix
+++ b/pkgs/by-name/vk/vkquake/package.nix
@@ -1,7 +1,6 @@
 {
   SDL2,
   fetchFromGitHub,
-  fetchpatch2,
   flac,
   glslang,
   gzip,
@@ -25,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkquake";
-  version = "1.32.3.1";
+  version = "1.34.1";
 
   src = fetchFromGitHub {
     owner = "Novum";
     repo = "vkQuake";
     tag = finalAttrs.version;
-    hash = "sha256-Hsj6LgxlEICI3MMDMCE1KvslYrsYfQPhShpP5kzLCTI=";
+    hash = "sha256-vCjL8zDf+VJjYHQoXPY9kqrAiU7HA7avJcOx6v2Jujg=";
   };
 
   nativeBuildInputs = [
@@ -60,14 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
-  patches = [
-    (fetchpatch2 {
-      # https://github.com/Novum/vkQuake/pull/809
-      url = "https://github.com/Novum/vkQuake/commit/85ddf2386f15944c26317a763d4044077fc8731f.patch?full_index=1";
-      hash = "sha256-t+atA+ilCwGwLpql5BZO2OF4Xh1KdzRFjOpglTIA/KY=";
-    })
-  ];
-
   mesonFlags = [ "-Ddo_userdirs=enabled" ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

From 9882a4e3c715ef2e2ee52f570514e3cfaaf2e456 Mon Sep 17 00:00:00 2001
From: Thomas Murphy <tjmurphy1201@gmail.com>
Date: Thu, 21 May 2026 19:21:34 -0600
Subject: [PATCH 150/332] googleearth-pro: 7.3.6.10201 -> 7.3.7.1155

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

diff --git a/pkgs/by-name/go/googleearth-pro/package.nix b/pkgs/by-name/go/googleearth-pro/package.nix
index d5907528d408..f2cc60a9e9d7 100644
--- a/pkgs/by-name/go/googleearth-pro/package.nix
+++ b/pkgs/by-name/go/googleearth-pro/package.nix
@@ -40,11 +40,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "googleearth-pro";
-  version = "7.3.6.10201";
+  version = "7.3.7.1155";
 
   src = fetchurl {
     url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb";
-    sha256 = "sha256-LqkXOSfE52+7x+Y0DBjYzvVKO0meytLNHuS/ia88FbI=";
+    sha256 = "sha256-lWFGpO4fCywxK/najHzFQoftfCEFiYX/31nloJSzCyM=";
   };
 
   nativeBuildInputs = [

From 8443be281301c17a66069902f03aceeb1c9c501d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 01:29:09 +0000
Subject: [PATCH 151/332] vkd3d: 1.19 -> 2.0

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

diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index 5d2cfb27b46e..fdb6bfadb549 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkd3d";
-  version = "1.19";
+  version = "2.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "vkd3d";
     tag = "vkd3d-${finalAttrs.version}";
-    hash = "sha256-dAm24EVTOQHze5OCveebPJpM6X6SCkNaff1Q0HO7KPs=";
+    hash = "sha256-S0sQaDt0aYYi2Rs/MNRIQ9oOuHm9/LsxaSL93M5jBRw=";
   };
 
   outputs = [

From 6cdc0665a9a481cafcda3fbaf4230a2d669018fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 03:01:31 +0000
Subject: [PATCH 152/332] jetbrains.rider: 2026.1.0.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/rider.nix          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index 3305e15b2112..df8d35ea2f20 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -24,20 +24,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1.tar.gz";
-      hash = "sha256-moIysTTsq7abpQfNh1Bc5Pk6VQgJIT6erbyHsUXf15Y=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.tar.gz";
+      hash = "sha256-OmysaGXGMxxAAa2qrHvX8yXIwJLU7tKG8/EBGhr55EA=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1-aarch64.tar.gz";
-      hash = "sha256-0gEmWObwCio3aBqmUh2u5adWO3fFJV8uFwUTT31KsMI=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-xcwd4OgobMXFQ2W+SN6O5I3mud4kedVQ/0rZBWbXIGY=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1.dmg";
-      hash = "sha256-s/lppcf2gfwmFYeHjWtk2NGPAjo/PAEnaGNWhDOkKOM=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.dmg";
+      hash = "sha256-uoOP+EYB11M99MlAFF7efZSKmCk0fwjCImFiasUQPUw=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1-aarch64.dmg";
-      hash = "sha256-BHHrO4DLfw4cdbrJCH1uqX2qdm/ijyFnj32WQ8rpVhI=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.dmg";
+      hash = "sha256-Mo6gxWatX6wlL3s8Li19F58cnKZtOtFUfNyGPrC6CtA=";
     };
   };
   # update-script-end: urls
@@ -51,8 +51,8 @@ in
   product = "Rider";
 
   # update-script-start: version
-  version = "2026.1.0.1";
-  buildNumber = "261.22158.394";
+  version = "2026.1.2";
+  buildNumber = "261.24374.190";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From b73a85d19e5320522a1f857f57b22b17d6803b5d Mon Sep 17 00:00:00 2001
From: Ryan Fanchiotti <ryan@rur.com>
Date: Thu, 21 May 2026 23:34:25 -0400
Subject: [PATCH 153/332] alive2: add alive-tv binary

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

diff --git a/pkgs/by-name/al/alive2/package.nix b/pkgs/by-name/al/alive2/package.nix
index ce354f694c1c..907b2201746c 100644
--- a/pkgs/by-name/al/alive2/package.nix
+++ b/pkgs/by-name/al/alive2/package.nix
@@ -34,6 +34,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ];
   strictDeps = true;
 
+  cmakeFlags = [
+    (lib.cmakeFeature "BUILD_TV" "1")
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail '-Werror' "" \
@@ -55,6 +59,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/bin
     cp alive $out/bin/
     cp alive-jobserver $out/bin/
+    cp alive-tv $out/bin/
     rm -rf $out/bin/CMakeFiles $out/bin/*.o
     runHook postInstall
   '';

From 75821e696abda2ecfa3f849b416808ac1a4b59fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 05:41:24 +0000
Subject: [PATCH 154/332] clickhouse: 26.4.2.10-stable -> 26.5.1.882-stable

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

diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 6a36b81a54eb..a8d8e8883c11 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "26.4.2.10-stable";
-  rev = "184f682d431389803dd383668f52729cf26e23db";
-  hash = "sha256-UCRwnrIY/j0gdjFnNmR5U7VZeBRqA96mIt6AEKRJQ5Q=";
+  version = "26.5.1.882-stable";
+  rev = "5b96a8d8a5e2f4800b43a780911a39dc5a666e1c";
+  hash = "sha256-Z+xcmHIkCuYSqOFdWSRWk2BFuCeI9yXnJIntSa4zXUk=";
   lts = false;
 }

From 214cfc6c70cf5004a287be82b56bd74064454bd5 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 22 May 2026 08:28:51 +0200
Subject: [PATCH 155/332] claude-code: 2.1.146 -> 2.1.148

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 69a960e98670..4017c80574da 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.146",
-  "commit": "c900a8c71aa966a1a8bf14c49139d87fac9ae881",
-  "buildDate": "2026-05-20T01:57:57Z",
+  "version": "2.1.148",
+  "commit": "650a3d6e4b17f2fd01a8432a7691d9fb147adf8d",
+  "buildDate": "2026-05-21T23:11:38Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "b16f466a2213a04cecf1ad958201655148a49f42952134e6ae182257ccfc08f3",
-      "size": 211056288
+      "checksum": "f4a1860d3d9b01653dde4183e2f1216ca9e0c1a404dd63caa4edf07c904102aa",
+      "size": 211584672
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "6bc14f45e28ea6c8c34220c88327bb72a38c5f978b9aa44d0cb34375cbf78837",
-      "size": 213570448
+      "checksum": "7c52d8419cc22b8355c6309d4542df32b3f245d1a7c3329a30797244ef3c4629",
+      "size": 214082320
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "af25334c7a2632a531b34e3f4c0d69763b997149d31d5f0d748e44813758806f",
-      "size": 236435080
+      "checksum": "b53c29b1fe003372636048c16d57a74f1ca2c57d8413dd5b14e2ca77710823ed",
+      "size": 236959368
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "825d5301380f1f5f466c5268de25a062927be658938fc1d630cfa02c521b8185",
-      "size": 236512976
+      "checksum": "3b38836a1801a6397f8431c6a62b127ce47e3e9d103c1a700fca7f9c8ab5f8ac",
+      "size": 237037264
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "256703637576ef323b8f87695b81e65a7bdc66327f1512dacc9257b7896e7a0f",
-      "size": 229289816
+      "checksum": "06b54aef9989ea379933239c3f2dbee254034523ff67f9a0c8ed31ac6982c077",
+      "size": 229814104
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "e8ab94b1ffb9d9213134d4addfe5d3fe6fd10c524aa2927667e543ac165a7242",
-      "size": 230906928
+      "checksum": "ad0077c9ec67ec2eaeee8be7624cc2e55b9e012e1c19154e5b80ef0a47d0e360",
+      "size": 231431216
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "b585bbaf085554757b627e5ed87aa5c153abb90ef408fb43b0311453b72e8bc2",
-      "size": 232326816
+      "checksum": "1bb46bdb06ef092b0af29cafbfec6ab73251ea34562cfe1d3a5bdf67fe3a5f93",
+      "size": 232827552
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "159488363d937bbac11c55364246513f677e94e681d7431e1622336250091c00",
-      "size": 228292256
+      "checksum": "d86eeb4d84a2bbee253913843a4a507192a37512a2d918a4c91e3f583cb310a5",
+      "size": 228792992
     }
   }
 }

From 483eb8d66a96f448c51f4106c551fc7653377358 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 22 May 2026 08:28:55 +0200
Subject: [PATCH 156/332] vscode-extensions.anthropic.claude-code: 2.1.146 ->
 2.1.148

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

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index e9332a1737a7..f1fb3d074704 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-i8czrgJ2OUaiJudU4F4rSKHUdY+gODWFPzXdmAin9wQ=";
+          hash = "sha256-wFerIcpbXDL0p7DGh19jXuOZyUvbwq2EzlmnLf1fv5M=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-GWtoc7f0X4fbRMsfzAiEi3ZOVxfbrLD+EGFnaHskyRg=";
+          hash = "sha256-ubMVyijSI5WWPSsq6wJCk9BABpli9Kgbgn5T+XP8aMA=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-XYbWWYoDTr7hsEC9L3389/GRKRstYI575qNzmHUirz0=";
+          hash = "sha256-tEQTTcI7pFgJ6S4Lb2XTe5MXxHudyldzTsYpz5OWr5E=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-rC+vgMjsGp27kGk+ZWEtBtxXI1oPEBnyZVUxrOj6lPg=";
+          hash = "sha256-WskmpZBwQt2mSQpvchI5Ca9ZOyN9srVPGHeMULIGRs8=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.146";
+      version = "2.1.148";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From dc2886ac01ba6461342b77162472a3945f2398de Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 22:19:28 +0000
Subject: [PATCH 157/332] python3Packages.snakemake-interface-storage-plugins:
 4.3.2 -> 4.4.1

Diff: https://github.com/snakemake/snakemake-interface-storage-plugins/compare/v4.3.2...v4.4.1
---
 .../default.nix                               | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
index c9d157ba6c70..ef946e17490f 100644
--- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
@@ -2,42 +2,53 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
+
+  # dependencies
   humanfriendly,
   reretry,
   snakemake-interface-common,
+  tenacity,
   throttler,
   wrapt,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-interface-storage-plugins";
-  version = "4.3.2";
+  version = "4.4.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-storage-plugins";
-    tag = "v${version}";
-    hash = "sha256-W2cUwc+9jng4IvBuN+m4WqpehA8qElTRb43w3QOIeN0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tqSIJnU1+DPx/GI5/wzMkoxpLyM/k/SO8FtejRv9Zls=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     humanfriendly
     reretry
     snakemake-interface-common
+    tenacity
     throttler
     wrapt
   ];
 
   pythonImportsCheck = [ "snakemake_interface_storage_plugins" ];
 
+  # No tests
+  doCheck = false;
+
   meta = {
-    description = "This package provides a stable interface for interactions between Snakemake and its storage plugins";
+    description = "Stable interface for interactions between Snakemake and its storage plugins";
+    changelog = "https://github.com/snakemake/snakemake-interface-storage-plugins/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://github.com/snakemake/snakemake-interface-storage-plugins";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 4952b23233860e4b26ab46ed73a2f66b3a5c6804 Mon Sep 17 00:00:00 2001
From: LorenzBischof <1837725+LorenzBischof@users.noreply.github.com>
Date: Fri, 22 May 2026 09:37:13 +0200
Subject: [PATCH 158/332] crossplane-cli: 2.2.1 -> 2.3.0

---
 pkgs/by-name/cr/crossplane-cli/package.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index 042fdcc588e2..7602bb712606 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -9,32 +9,28 @@
 
 buildGoModule (finalAttrs: {
   pname = "crossplane-cli";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "crossplane";
-    repo = "crossplane";
+    repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sQ2sCgFDGogQIIWdNCAKVkorsVuNtUOcaALqE/PGwJ4=";
+    hash = "sha256-FZx31AvGC70iSX3KcLyb5GpwiItO0LliLNeNk8WIX8s=";
   };
 
-  vendorHash = "sha256-DD0I4XLcN3pHhJKc5wBaldQU7gndszqCExSW4jqLMKQ=";
+  vendorHash = "sha256-QZyKX94a9iMvB2NCNr27M7hrQJG9Por0mLW3lCf8f58=";
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/crossplane/crossplane/v2/internal/version.version=v${finalAttrs.version}"
+    "-X github.com/crossplane/crossplane-runtime/v2/pkg/version.version=v${finalAttrs.version}"
   ];
 
-  subPackages = [ "cmd/crank" ];
-
-  postInstall = ''
-    mv $out/bin/crank $out/bin/crossplane
-  '';
+  subPackages = [ "cmd/crossplane" ];
 
   passthru.tests.version = testers.testVersion {
     package = crossplane-cli;
-    command = "crossplane version --client || true";
+    command = "crossplane version --client";
     version = "v${finalAttrs.version}";
   };
 

From dca146f185df056f2e182353a6eca0da309dd2b4 Mon Sep 17 00:00:00 2001
From: LorenzBischof <1837725+LorenzBischof@users.noreply.github.com>
Date: Fri, 22 May 2026 09:38:24 +0200
Subject: [PATCH 159/332] crossplane-cli: add myself as maintainer

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

diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index 7602bb712606..df318ed488fc 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -42,6 +42,9 @@ buildGoModule (finalAttrs: {
     description = "Utility to make using Crossplane easier";
     mainProgram = "crossplane";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ selfuryon ];
+    maintainers = with lib.maintainers; [
+      selfuryon
+      LorenzBischof
+    ];
   };
 })

From e57b8ad67ad400977d787b715eb392871b184f66 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 22:40:54 +0000
Subject: [PATCH 160/332] python3Packages.snakemake-storage-plugin-http: init
 at 0.3.1

---
 .../snakemake-storage-plugin-http/default.nix | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/python-modules/snakemake-storage-plugin-http/default.nix

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-http/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-http/default.nix
new file mode 100644
index 000000000000..8b36587e5dfb
--- /dev/null
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-http/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  requests,
+  requests-oauthlib,
+  snakemake-interface-common,
+  snakemake-interface-storage-plugins,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "snakemake-storage-plugin-http";
+  version = "0.3.1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "snakemake";
+    repo = "snakemake-storage-plugin-http";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ad4IOjU761CaZ+o0//I8/xW+e+4UJG0+VAbQ9KcNjFY=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  pythonRelaxDeps = [
+    "requests-oauthlib"
+  ];
+  dependencies = [
+    requests
+    requests-oauthlib
+    snakemake-interface-common
+    snakemake-interface-storage-plugins
+  ];
+
+  pythonImportsCheck = [ "snakemake_storage_plugin_http" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  disabledTests = [
+    # Requires internet access
+    "test_storage"
+  ];
+
+  meta = {
+    description = "Snakemake storage plugin for donwloading input files from HTTP(s)";
+    homepage = "https://github.com/snakemake/snakemake-storage-plugin-http";
+    changelog = "https://github.com/snakemake/snakemake-storage-plugin-http/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73ea6e0ad256..151c910895d2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18196,6 +18196,10 @@ self: super: with self; {
     callPackage ../development/python-modules/snakemake-storage-plugin-fs
       { };
 
+  snakemake-storage-plugin-http =
+    callPackage ../development/python-modules/snakemake-storage-plugin-http
+      { };
+
   snakemake-storage-plugin-s3 =
     callPackage ../development/python-modules/snakemake-storage-plugin-s3
       { };

From 53998a58291b90e282cadcfc495dbee3574c193a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 07:51:24 +0000
Subject: [PATCH 161/332] 
 python3Packages.snakemake-executor-plugin-cluster-generic: cleanup

---
 .../default.nix                               | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
index 4dab4726cc1b..660b4db7bfac 100644
--- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
+++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
@@ -2,36 +2,69 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
-  snakemake-interface-executor-plugins,
+
+  # dependencies
   snakemake-interface-common,
+  snakemake-interface-executor-plugins,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-executor-plugin-cluster-generic";
   version = "1.0.9";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-executor-plugin-cluster-generic";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [
+    poetry-core
+  ];
 
-  propagatedBuildInputs = [
-    snakemake-interface-executor-plugins
+  dependencies = [
     snakemake-interface-common
+    snakemake-interface-executor-plugins
   ];
 
   pythonImportsCheck = [ "snakemake_executor_plugin_cluster_generic" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+    writableTmpDirAsHomeHook
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  disabledTestPaths = [
+    # Failed to setup log file: [Errno 13] Permission denied: '/build/pytest-of-nixbld/pytest-0/test_group_workflow5/groups/.snakemake'
+    "tests/tests.py::TestWorkflowsCancelCmd::test_group_workflow"
+    "tests/tests.py::TestWorkflowsCancelCmd::test_simple_workflow"
+    "tests/tests.py::TestWorkflowsSidecar::test_group_workflow"
+    "tests/tests.py::TestWorkflowsSidecar::test_simple_workflow"
+    "tests/tests.py::TestWorkflowsStatusCmd::test_group_workflow"
+    "tests/tests.py::TestWorkflowsStatusCmd::test_simple_workflow"
+    "tests/tests.py::TestWorkflowsSubmitCmdOnly::test_group_workflow"
+    "tests/tests.py::TestWorkflowsSubmitCmdOnly::test_simple_workflow"
+  ];
+
   meta = {
     description = "Generic cluster executor for Snakemake";
     homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic";
+    changelog = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 2a78a9a10c6e4b51711eec274484eaff9bd59883 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 07:51:40 +0000
Subject: [PATCH 162/332] 
 python3Packages.snakemake-interface-scheduler-plugins: cleanup

---
 .../default.nix                               | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
index bbceb3a22c30..6ccfe7862249 100644
--- a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
@@ -2,41 +2,62 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   hatchling,
+
+  # dependencies
   snakemake-interface-common,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+
+  # passthru
+  snakemake-interface-scheduler-plugins,
 }:
 
-let
+buildPythonPackage (finalAttrs: {
+  pname = "snakemake-interface-scheduler-plugins";
   version = "2.0.2";
+  pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-scheduler-plugins";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BowMwZllFR9IKYUMhISAbf606awTxfmS/nQxkGgb4y8=";
   };
-in
-buildPythonPackage {
-  pname = "snakemake-interface-scheduler-plugins";
-  inherit version src;
-  pyproject = true;
 
-  build-system = [ hatchling ];
+  build-system = [
+    hatchling
+  ];
 
-  dependencies = [ snakemake-interface-common ];
+  dependencies = [
+    snakemake-interface-common
+  ];
 
   pythonImportsCheck = [ "snakemake_interface_scheduler_plugins" ];
 
-  # test_scheduler: No module named 'snakemake'
-  # nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+  ];
 
-  # enabledTestPaths = [ "tests/tests.py" ];
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  # Circular dependency with snakemake
+  doCheck = false;
+  passthru.tests.pytest = snakemake-interface-scheduler-plugins.overridePythonAttrs {
+    doCheck = true;
+  };
 
   meta = {
     description = "Provides a stable interface for interactions between Snakemake and its scheduler plugins";
     homepage = "https://github.com/snakemake/snakemake-interface-scheduler-plugins";
-    changelog = "https://github.com/snakemake/snakemake-interface-scheduler-plugins/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/snakemake/snakemake-interface-scheduler-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kyehn ];
   };
-}
+})

From 5e8d069fe355164e3e4e3c205845f724d012e21b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:04:24 +0000
Subject: [PATCH 163/332] python3Packages.snakemake-interface-storage-plugins:
 cleanup

---
 .../default.nix                               | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
index ef946e17490f..8b3f8c5f94ea 100644
--- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
@@ -13,6 +13,14 @@
   tenacity,
   throttler,
   wrapt,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+  snakemake-storage-plugin-http,
+
+  # passthru
+  snakemake-interface-storage-plugins,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -41,8 +49,24 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "snakemake_interface_storage_plugins" ];
 
-  # No tests
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+    snakemake-storage-plugin-http
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  disabledTests = [
+    # Requires internet access
+    "test_storage"
+  ];
+
+  # Circular dependency with snakemake
   doCheck = false;
+  passthru.tests.pytest = snakemake-interface-storage-plugins.overridePythonAttrs {
+    doCheck = true;
+  };
 
   meta = {
     description = "Stable interface for interactions between Snakemake and its storage plugins";

From 3bf8cf64d5b80ab4c229e4ee3abab362b0579db1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:13:47 +0000
Subject: [PATCH 164/332] python3Packages.snakemake-storage-plugin-s3: cleanup

---
 .../snakemake-storage-plugin-s3/default.nix   | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
index 3b8529714ed8..d757a619609a 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
@@ -2,24 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
   boto3,
   botocore,
-  poetry-core,
-  snakemake,
-  snakemake-interface-storage-plugins,
   snakemake-interface-common,
+  snakemake-interface-storage-plugins,
   urllib3,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-storage-plugin-s3";
   version = "0.3.6";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-storage-plugin-s3";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hvyQ6V6POUBWTCWt9moQlH0RgSM4J36kjbXK4TtO8Bo=";
   };
 
@@ -33,15 +42,31 @@ buildPythonPackage rec {
     urllib3
   ];
 
-  nativeCheckInputs = [ snakemake ];
-
   pythonImportsCheck = [ "snakemake_storage_plugin_s3" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+    writableTmpDirAsHomeHook
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  disabledTests = [
+    # Requires internet access
+    "test_storage"
+
+    # snakemake_interface_common.exceptions.WorkflowError: Failed to create local storage prefix .snakemake/storage/s3
+    # PermissionError: [Errno 13] Permission denied: '.snakemake'
+    "test_group_workflow"
+    "test_simple_workflow"
+  ];
+
   meta = {
     description = "Snakemake storage plugin for S3 API storage (AWS S3, MinIO, etc.)";
     homepage = "https://github.com/snakemake/snakemake-storage-plugin-s3";
-    changelog = "https://github.com/snakemake/snakemake-storage-plugin-s3/releases/tag/${src.tag}";
+    changelog = "https://github.com/snakemake/snakemake-storage-plugin-s3/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 4a217fdce1b45588c79304f0f93d73f449e8a84a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:21:39 +0000
Subject: [PATCH 165/332] xrootd: add meta.mainProgram

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

diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix
index 4ad8f2d7951e..626f6f5edc77 100644
--- a/pkgs/by-name/xr/xrootd/package.nix
+++ b/pkgs/by-name/xr/xrootd/package.nix
@@ -158,5 +158,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl3Plus;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ ShamrockLee ];
+    mainProgram = "xrootd";
   };
 })

From 11855b765ccd4a6586449084ce8823bcf06c487e Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <me@jfly.fyi>
Date: Fri, 22 May 2026 01:31:14 -0700
Subject: [PATCH 166/332] nixos/test-driver: null out self.pid when shutting
 down the container

Without this, we end up with `self.pid` set to the pid of a dead
process, and `self.process == None`. This causes us to blow [this
assert](https://github.com/jfly/nixpkgs/blob/dd51e81af9226ee80e6f0891f4649e12ea15dfd0/nixos/lib/test-driver/src/test_driver/machine/__init__.py#L1496)
in `NspawnMachine.release`.

It would probably be cleaner to just get rid of `self.pid`. It's
redundant given that we have `self.process`. I'll do that in a followup
commit.

This was discovered here:
https://github.com/NixOS/nixpkgs/pull/522886#discussion_r3285395646, and
will be protected against future regression by a test introduced in that
PR.
---
 nixos/lib/test-driver/src/test_driver/machine/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
index 3dc4f1f8d171..17f19f5d3068 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
@@ -1721,6 +1721,7 @@ class NspawnMachine(BaseMachine):
         with self.nested("waiting for the container to power off"):
             self.process.wait()
             self.process = None
+            self.pid = None
 
 
 class MachineDeprecationWrapper:

From b0ac1aa86405364fb2baa6bbec8952328424c34c Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <me@jfly.fyi>
Date: Fri, 22 May 2026 01:36:11 -0700
Subject: [PATCH 167/332] nixos/test-driver: remove redundant `self.pid` state
 from `NspawnMachine`

We can access it via `self.process`, and this avoids bugs where we
weren't keeping the 2 in sync.
---
 .../test-driver/src/test_driver/machine/__init__.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
index 17f19f5d3068..790da705cf4f 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
@@ -1475,7 +1475,6 @@ class NspawnMachine(BaseMachine):
 
         self.start_command = start_command
         self.process = None
-        self.pid = None
 
         self.machine_sock_path = self.tmp_dir / f"{self.name}-nspawn.sock"
 
@@ -1486,14 +1485,13 @@ class NspawnMachine(BaseMachine):
         return f'ssh -o User=root -o ProxyCommand="{proxy_cmd}" bash'
 
     def release(self) -> None:
-        if self.pid is None:
+        if self.process is None:
             return
 
         if self.machine_sock:
             self.machine_sock.close()
 
-        self.logger.info(f"kill NspawnMachine (pid {self.pid})")
-        assert self.process is not None
+        self.logger.info(f"kill NspawnMachine (pid {self.process.pid})")
         self.process.terminate()
         # Wait for the wrapper to finish its context-manager cleanups
         # (veth/bridge/netns teardown) before returning, so the driver's
@@ -1502,7 +1500,7 @@ class NspawnMachine(BaseMachine):
             self.process.wait(timeout=30)
         except subprocess.TimeoutExpired:
             self.logger.error(
-                f"NspawnMachine {self.name} (pid {self.pid}) did not exit after SIGTERM; sending SIGKILL"
+                f"NspawnMachine {self.name} (pid {self.process.pid}) did not exit after SIGTERM; sending SIGKILL"
             )
             self.process.kill()
             self.process.wait()
@@ -1694,9 +1692,7 @@ class NspawnMachine(BaseMachine):
             stdout=subprocess.PIPE,
         )
 
-        self.pid = self.process.pid
-
-        self.log(f"systemd-nspawn running (pid {self.pid})")
+        self.log(f"systemd-nspawn running (pid {self.process.pid})")
 
         journal_thread = threading.Thread(target=self._stream_journal, daemon=True)
         journal_thread.start()
@@ -1721,7 +1717,6 @@ class NspawnMachine(BaseMachine):
         with self.nested("waiting for the container to power off"):
             self.process.wait()
             self.process = None
-            self.pid = None
 
 
 class MachineDeprecationWrapper:

From 87041211199e19c0497d2e81df09059daf637aa7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 22 May 2026 11:05:18 +0200
Subject: [PATCH 168/332] python3Packages.clickhouse-cityhash: correct license

source: https://github.com/escherba/python-cityhash/blob/master/LICENSE
---
 pkgs/development/python-modules/clickhouse-cityhash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix
index e3662b5c325a..8af68b4ae28c 100644
--- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix
+++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm";
     homepage = "https://github.com/xzkostyan/python-cityhash";
-    license = lib.licenses.upl;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ breakds ];
   };
 }

From 500706995d4928646c34937f55408ae1e1437c2c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 20 May 2026 18:54:43 +0700
Subject: [PATCH 169/332] kallisto: fix build with gcc 15

---
 ...bifrost-fix-datastorage-sz_link-typo.patch | 26 +++++++++++++++++++
 pkgs/by-name/ka/kallisto/package.nix          |  7 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ka/kallisto/bifrost-fix-datastorage-sz_link-typo.patch

diff --git a/pkgs/by-name/ka/kallisto/bifrost-fix-datastorage-sz_link-typo.patch b/pkgs/by-name/ka/kallisto/bifrost-fix-datastorage-sz_link-typo.patch
new file mode 100644
index 000000000000..4aebfd351033
--- /dev/null
+++ b/pkgs/by-name/ka/kallisto/bifrost-fix-datastorage-sz_link-typo.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/bifrost/src/DataStorage.hpp b/ext/bifrost/src/DataStorage.hpp
+index 016775f..deb849d 100644
+--- a/ext/bifrost/src/DataStorage.hpp
++++ b/ext/bifrost/src/DataStorage.hpp
+@@ -67,6 +67,8 @@ class DataStorage {
+ 
+         inline size_t getNbColors() const { return color_names.size(); }
+ 
++        inline vector<string> const& getColorNames() const { return color_names; }
++
+         size_t getUnitigColorsSize(const size_t nb_threads = 1) const;
+ 
+         uint64_t getHash(const UnitigColorMap<U>& um) const;
+diff --git a/ext/bifrost/src/DataStorage.tcc b/ext/bifrost/src/DataStorage.tcc
+index 02929d9..10b844e 100644
+--- a/ext/bifrost/src/DataStorage.tcc
++++ b/ext/bifrost/src/DataStorage.tcc
+@@ -78,7 +78,7 @@ DataStorage<U>::DataStorage(const DataStorage& o) : color_sets(nullptr), shared_
+ 
+         unitig_cs_link = new atomic<uint64_t>[sz_link];
+ 
+-        for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.sz_link[i].load();
++        for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.unitig_cs_link[i].load();
+     }
+ 
+     if ((o.data != nullptr) && (o.sz_cs != 0)){
diff --git a/pkgs/by-name/ka/kallisto/package.nix b/pkgs/by-name/ka/kallisto/package.nix
index 63ed552052cb..e772852c4642 100644
--- a/pkgs/by-name/ka/kallisto/package.nix
+++ b/pkgs/by-name/ka/kallisto/package.nix
@@ -18,9 +18,14 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "kallisto";
     owner = "pachterlab";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8=";
+    hash = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8=";
   };
 
+  patches = [
+    # https://github.com/pmelsted/bifrost/pull/18
+    ./bifrost-fix-datastorage-sz_link-typo.patch
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt ext/bifrost/CMakeLists.txt \
       --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"

From d12a8c71aa590db3fbb4f87c0a2c470944c8e058 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Fri, 22 May 2026 11:09:29 +0200
Subject: [PATCH 170/332] mamba-cpp: fix default paths

---
 pkgs/by-name/ma/mamba-cpp/package.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix
index 539580657d4d..d362aa0941da 100644
--- a/pkgs/by-name/ma/mamba-cpp/package.nix
+++ b/pkgs/by-name/ma/mamba-cpp/package.nix
@@ -4,6 +4,7 @@
   cmake,
   lib,
   libmamba,
+  makeWrapper,
   msgpack-c,
   nlohmann_json,
   python3,
@@ -14,12 +15,19 @@
   versionCheckHook,
   yaml-cpp,
   zstd,
+  # runtime options
+  defaultEnvPath ? "~/.mamba/envs",
+  defaultPkgPath ? "~/.mamba/pkgs",
+  defaultRootPath ? "~/.mamba",
 }:
 stdenv.mkDerivation {
   pname = "mamba-cpp";
   inherit (libmamba) version src;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
 
   buildInputs = [
     bzip2
@@ -43,6 +51,13 @@ stdenv.mkDerivation {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  postInstall = ''
+    wrapProgram $out/bin/mamba \
+      --set-default CONDA_ENVS_PATH '${defaultEnvPath}' \
+      --set-default CONDA_PKGS_DIRS '${defaultPkgPath}' \
+      --set-default MAMBA_ROOT_PREFIX '${defaultRootPath}'
+  '';
+
   __structuredAttrs = true;
   strictDeps = true;
 

From 4d8893c7656a8f53a51bd5517d1e177e7459a849 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 10:04:07 +0000
Subject: [PATCH 171/332] python3Packages.lance-namespace-urllib3-client: 0.7.6
 -> 0.7.7

Diff: https://github.com/lancedb/lance-namespace/compare/v0.7.6...v0.7.7
---
 .../python-modules/lance-namespace-urllib3-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
index a2e16bcba2a8..b87970f0730f 100644
--- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
+++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lance-namespace-urllib3-client";
-  version = "0.7.6";
+  version = "0.7.7";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UI6vbmquZlfDVS4R3PFxc14E+3Z6uccGfg5P/Jfs+LY=";
+    hash = "sha256-f+jtRAq4mI6y3q9Jt2ZqAMhXhNRavld88vWKz3VypBs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python/lance_namespace_urllib3_client";

From 82c18045d7338871fb5bba5e48f9c19fe44ade9a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 10:04:22 +0000
Subject: [PATCH 172/332] python3Packages.lance-namespace: 0.7.6 -> 0.7.7

Diff: https://github.com/lancedb/lance-namespace/compare/v0.7.6...v0.7.7
---
 pkgs/development/python-modules/lance-namespace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix
index 255d63c7747f..f16d173c4514 100644
--- a/pkgs/development/python-modules/lance-namespace/default.nix
+++ b/pkgs/development/python-modules/lance-namespace/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lance-namespace";
-  version = "0.7.6";
+  version = "0.7.7";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UI6vbmquZlfDVS4R3PFxc14E+3Z6uccGfg5P/Jfs+LY=";
+    hash = "sha256-f+jtRAq4mI6y3q9Jt2ZqAMhXhNRavld88vWKz3VypBs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python/lance_namespace";

From d27140ce9c05339409a38dd5c6665621c438d8bc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 10:01:31 +0000
Subject: [PATCH 173/332] python3Packages.pylance: 6.0.0 -> 6.0.1

Diff: https://github.com/lancedb/lance/compare/v6.0.0...v6.0.1

Changelog: https://github.com/lancedb/lance/releases/tag/v6.0.1
---
 pkgs/development/python-modules/pylance/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 4262b8efc9dc..e685b6955a34 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -34,14 +34,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylance";
-  version = "6.0.0";
+  version = "6.0.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-clvpPC8W6T1GkLE7DwRQ8HPexyE9rvFhCFc+SxqDPGk=";
+    hash = "sha256-n9x4Q1UlIuVWcDTdJd72JyQk/nuFMsWfzK2OmoO9wbU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python";
@@ -53,7 +54,7 @@ buildPythonPackage (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-Icl4BCBfTi6WkV3sZlyocZ0WYcXa28WJQ2w5VdhiVAU=";
+    hash = "sha256-b2O38ZKks6oiBAtUx0fTtFSy5nbsZCZD/BmeJY5zda8=";
   };
 
   nativeBuildInputs = [

From e7dbc2e41d6ad5903a52042a698a470865cc504c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:15:51 +0000
Subject: [PATCH 174/332] python3Packages.snakemake-storage-plugin-xrootd:
 1.0.0 -> 1.1.0

Diff: https://github.com/snakemake/snakemake-storage-plugin-xrootd/compare/v1.0.0...v1.1.0

Changelog: https://github.com/snakemake/snakemake-storage-plugin-xrootd/releases/tag/v1.1.0
---
 .../default.nix                               | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
index de5a3cbdf62d..fc67fd23a9ad 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
@@ -1,29 +1,43 @@
 {
   lib,
+  pkgs,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   hatch-vcs,
   hatchling,
-  snakemake,
-  snakemake-interface-storage-plugins,
+
+  # dependencies
+  reretry,
   snakemake-interface-common,
+  snakemake-interface-storage-plugins,
   xrootd,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-storage-plugin-xrootd";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-storage-plugin-xrootd";
-    tag = "v${version}";
-    hash = "sha256-QYG/BE7y3h/Mz1PrVVxmfBBLBLoirrEx9unSEaflUds=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vL9JD9h0ywsKpUPoXhgg6b+vwi7kxK8CF3L6HnAEidE=";
   };
 
-  # xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303
-  pythonRelaxDeps = [ "xrootd" ];
+  postPatch = ''
+    substituteInPlace tests/tests.py \
+      --replace-fail \
+        'subprocess.Popen(["xrootd",' \
+        'subprocess.Popen(["${lib.getExe pkgs.xrootd}",'
+  '';
 
   build-system = [
     hatch-vcs
@@ -33,17 +47,24 @@ buildPythonPackage rec {
   dependencies = [
     snakemake-interface-storage-plugins
     snakemake-interface-common
+    reretry
     xrootd
   ];
 
-  nativeCheckInputs = [ snakemake ];
-
   pythonImportsCheck = [ "snakemake_storage_plugin_xrootd" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
   meta = {
     description = "Snakemake storage plugin for handling input and output via XRootD";
     homepage = "https://github.com/snakemake/snakemake-storage-plugin-xrootd";
+    changelog = "https://github.com/snakemake/snakemake-storage-plugin-xrootd/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 90d358c2c5d718a94aca5b90da520e898fd34776 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:33:53 +0000
Subject: [PATCH 175/332] python3Packages.snakemake-interface-common: cleanup

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../snakemake-interface-common/default.nix    | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix
index 4ff7030078fb..11eafb41897a 100644
--- a/pkgs/development/python-modules/snakemake-interface-common/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix
@@ -1,22 +1,34 @@
 {
   lib,
-  argparse-dataclass,
   buildPythonPackage,
-  configargparse,
   fetchFromGitHub,
   fetchpatch,
+
+  # build-system
   setuptools,
+
+  # dependencies
+  argparse-dataclass,
+  configargparse,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+
+  # passthru
+  snakemake-interface-common,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-interface-common";
   version = "1.23.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-common";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-D3vktJmn1CifdiEg5UPGpBuuigEIb+ja4yklHZA6ytQ=";
   };
 
@@ -29,7 +41,9 @@ buildPythonPackage rec {
     })
   ];
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     argparse-dataclass
@@ -38,16 +52,24 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "snakemake_interface_common" ];
 
-  # test_snakemake_version: No module named 'snakemake'
-  # nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+  ];
 
-  # enabledTestPaths = [ "tests/tests.py" ];
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  # Circular dependency with snakemake
+  doCheck = false;
+  passthru.tests.pytest = snakemake-interface-common.overridePythonAttrs {
+    doCheck = true;
+  };
 
   meta = {
     description = "Common functions and classes for Snakemake and its plugins";
     homepage = "https://github.com/snakemake/snakemake-interface-common";
-    changelog = "https://github.com/snakemake/snakemake-interface-common/releases/tag/v${version}";
+    changelog = "https://github.com/snakemake/snakemake-interface-common/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 0b4982f44a58838f6af4f6b3462513c74fa9f983 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:33:53 +0000
Subject: [PATCH 176/332] python3Packages.snakemake-interface-executor-plugins:
 cleanup

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../default.nix                               | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
index 6200948df93a..57d6ab72f582 100644
--- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
@@ -2,39 +2,66 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
+
+  # dependencies
   argparse-dataclass,
-  throttler,
   snakemake-interface-common,
+  throttler,
+
+  # tests
+  pytestCheckHook,
+  snakemake-executor-plugin-cluster-generic,
+
+  # passthru
+  snakemake-interface-executor-plugins,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-interface-executor-plugins";
   version = "9.4.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-executor-plugins";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ePbdHMYB2LfCOglz87ZnsUkJH7B97hhSmNBGzwtl5OM=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [
+    poetry-core
+  ];
 
   dependencies = [
     argparse-dataclass
-    throttler
     snakemake-interface-common
+    throttler
   ];
 
   pythonImportsCheck = [ "snakemake_interface_executor_plugins" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake-executor-plugin-cluster-generic
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  # Circular dependency with snakemake
+  doCheck = false;
+  passthru.tests.pytest = snakemake-interface-executor-plugins.overridePythonAttrs {
+    doCheck = true;
+  };
+
   meta = {
-    description = "This package provides a stable interface for interactions between Snakemake and its executor plugins";
+    description = "Stable interface for interactions between Snakemake and its executor plugins";
     homepage = "https://github.com/snakemake/snakemake-interface-executor-plugins";
-    changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From f92b3f5b26b47cef096ce81d8149eb935461a2dd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:33:54 +0000
Subject: [PATCH 177/332] python3Packages.snakemake-interface-logger-plugins:
 cleanup

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../default.nix                               | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
index 70854d4d851a..a5d7a0f4d7a0 100644
--- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
@@ -2,34 +2,45 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   hatchling,
+
+  # dependencies
   snakemake-interface-common,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-interface-logger-plugins";
   version = "2.0.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-logger-plugins";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yvEjd4xBjjCocGK/HD1j5jcuy+syyXcEJGdsEFA0H40=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [
+    hatchling
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     snakemake-interface-common
   ];
 
   pythonImportsCheck = [ "snakemake_interface_logger_plugins" ];
 
+  # Tests require snakemake-logger-plugin-rich, which is not packaged in nixpkgs
+  doCheck = false;
+
   meta = {
     description = "Stable interface for interactions between Snakemake and its logger plugins";
     homepage = "https://github.com/snakemake/snakemake-interface-logger-plugins";
+    changelog = "https://github.com/snakemake/snakemake-interface-logger-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 1276849637da8a938d6d389f6cd628a85bec11fc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:33:55 +0000
Subject: [PATCH 178/332] python3Packages.snakemake-interface-report-plugins:
 cleanup

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../default.nix                               | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
index 942da8601a29..d4400ce99643 100644
--- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
@@ -2,32 +2,62 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
+
+  # dependencies
   snakemake-interface-common,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+
+  # passthru
+  snakemake-interface-report-plugins,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-interface-report-plugins";
   version = "1.3.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-report-plugins";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3ugEmdO1dcusKXXBZBRszlZXX5fhJyYSSF5Uj5CKJkQ=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [
+    poetry-core
+  ];
 
-  propagatedBuildInputs = [ snakemake-interface-common ];
+  dependencies = [
+    snakemake-interface-common
+  ];
 
   pythonImportsCheck = [ "snakemake_interface_report_plugins" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  # Circular dependency with snakemake
+  doCheck = false;
+  passthru.tests.pytest = snakemake-interface-report-plugins.overridePythonAttrs {
+    doCheck = true;
+  };
+
   meta = {
     description = "Interface for Snakemake report plugins";
     homepage = "https://github.com/snakemake/snakemake-interface-report-plugins";
+    changelog = "https://github.com/snakemake/snakemake-interface-report-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From d4eedeb694b5ba8a11244e07a6594a81f76ee6d8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:33:56 +0000
Subject: [PATCH 179/332] python3Packages.snakemake-storage-plugin-fs: cleanup

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../snakemake-storage-plugin-fs/default.nix   | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
index 41c0f43edf22..96bcb3fc30fc 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
@@ -2,42 +2,59 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
-  snakemake-interface-storage-plugins,
+
+  # dependencies
   snakemake-interface-common,
+  snakemake-interface-storage-plugins,
   sysrsync,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "snakemake-storage-plugin-fs";
   version = "1.1.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-storage-plugin-fs";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UdK0yhl7ljLh57CXAvH/OYiVyw+BjhPwGjSBXX8sbZk=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [
+    poetry-core
+  ];
 
   dependencies = [
-    snakemake-interface-storage-plugins
     snakemake-interface-common
+    snakemake-interface-storage-plugins
     sysrsync
   ];
 
-  # The current tests are not worth dealing with cyclic dependency on snakemake
-  doCheck = false;
+  pythonImportsCheck = [ "snakemake_storage_plugin_fs" ];
 
-  # Use nothing due to a cyclic dependency on snakemake
-  pythonImportsCheck = [ ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+    writableTmpDirAsHomeHook
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
 
   meta = {
     description = "Snakemake storage plugin that reads and writes from a locally mounted filesystem using rsync";
     homepage = "https://github.com/snakemake/snakemake-storage-plugin-fs";
+    changelog = "https://github.com/snakemake/snakemake-storage-plugin-fs/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ veprbl ];
   };
-}
+})

From 2e7ebe3578cc9fdc24e7b6377ebb081c56724653 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:38:59 +0000
Subject: [PATCH 180/332] python3Packages.snakemake-logger-plugin-rich: init at
 0.4.1

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../snakemake-logger-plugin-rich/default.nix  | 60 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix

diff --git a/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix b/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix
new file mode 100644
index 000000000000..ea76afe73264
--- /dev/null
+++ b/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  pydantic,
+  rich,
+  snakemake-interface-executor-plugins,
+  snakemake-interface-logger-plugins,
+
+  # tests
+  pytestCheckHook,
+  snakemake,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "snakemake-logger-plugin-rich";
+  version = "0.4.1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "cademirch";
+    repo = "snakemake-logger-plugin-rich";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kMjzagM95Td529JU+qIxGStgJGctS08glrFo3CF+Ih8=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    pydantic
+    rich
+    snakemake-interface-executor-plugins
+    snakemake-interface-logger-plugins
+  ];
+
+  pythonImportsCheck = [ "snakemake_logger_plugin_rich" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake
+    writableTmpDirAsHomeHook
+  ];
+
+  meta = {
+    description = "Snakemake logger plugin using Rich";
+    homepage = "https://github.com/cademirch/snakemake-logger-plugin-rich";
+    changelog = "https://github.com/cademirch/snakemake-logger-plugin-rich/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 151c910895d2..7cc03e56b4f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18192,6 +18192,10 @@ self: super: with self; {
     callPackage ../development/python-modules/snakemake-interface-storage-plugins
       { };
 
+  snakemake-logger-plugin-rich =
+    callPackage ../development/python-modules/snakemake-logger-plugin-rich
+      { };
+
   snakemake-storage-plugin-fs =
     callPackage ../development/python-modules/snakemake-storage-plugin-fs
       { };

From 669f01f035e675f02530080d98f95606b32a418f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 08:39:00 +0000
Subject: [PATCH 181/332] python3Packages.snakemake-interface-logger-plugins:
 enable tests

Tests are now possible since snakemake-logger-plugin-rich is packaged.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../default.nix                               | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
index a5d7a0f4d7a0..9ca3fda0ca1d 100644
--- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
@@ -8,6 +8,13 @@
 
   # dependencies
   snakemake-interface-common,
+
+  # tests
+  pytestCheckHook,
+  snakemake-logger-plugin-rich,
+
+  # passthru
+  snakemake-interface-logger-plugins,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -33,8 +40,18 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "snakemake_interface_logger_plugins" ];
 
-  # Tests require snakemake-logger-plugin-rich, which is not packaged in nixpkgs
+  nativeCheckInputs = [
+    pytestCheckHook
+    snakemake-logger-plugin-rich
+  ];
+
+  enabledTestPaths = [ "tests/tests.py" ];
+
+  # Circular dependency with snakemake
   doCheck = false;
+  passthru.tests.pytest = snakemake-interface-logger-plugins.overridePythonAttrs {
+    doCheck = true;
+  };
 
   meta = {
     description = "Stable interface for interactions between Snakemake and its logger plugins";

From 8fdd30ac73e195ac1013d83a0c823ef209c86217 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 22:16:36 +0000
Subject: [PATCH 182/332] snakemake: 9.16.3 -> 9.21.0

Diff: https://github.com/snakemake/snakemake/compare/v9.16.3...v9.21.0

Changelog:
https://github.com/snakemake/snakemake/blob/v9.21.0/CHANGELOG.md
---
 pkgs/by-name/sn/snakemake/package.nix | 46 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 3182e82095b8..dedcaab6cfbd 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -6,18 +6,20 @@
   stress,
   versionCheckHook,
   writableTmpDirAsHomeHook,
+  snakemake,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "snakemake";
-  version = "9.16.3";
+  version = "9.21.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+eEzpRY6ZEKB3v1/AkHDg4bOcM2Y6pt4UMrdKF6soac=";
+    hash = "sha256-+EO+BTMkui0mJvEf0TOaCRBH8MzLsit8xK+71gujHt0=";
   };
 
   postPatch = ''
@@ -33,6 +35,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   build-system = with python3Packages; [ setuptools-scm ];
 
+  pythonRelaxDeps = [
+    "packaging"
+    "sqlmodel"
+  ];
   dependencies = with python3Packages; [
     appdirs
     conda-inject
@@ -53,20 +59,24 @@ python3Packages.buildPythonApplication (finalAttrs: {
     requests
     reretry
     smart-open
-    snakemake-interface-executor-plugins
     snakemake-interface-common
+    snakemake-interface-executor-plugins
     snakemake-interface-logger-plugins
-    snakemake-interface-storage-plugins
     snakemake-interface-report-plugins
     snakemake-interface-scheduler-plugins
+    snakemake-interface-storage-plugins
+    sqlmodel
     stopit
     tabulate
+    tenacity
     throttler
     toposort
     wrapt
     yte
   ];
 
+  pythonImportsCheck = [ "snakemake" ];
+
   # See
   # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99
   # for the current basic test suite. Slurm, Tibanna and Tes require extra
@@ -81,11 +91,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
       requests-mock
       snakemake-executor-plugin-cluster-generic
       snakemake-storage-plugin-fs
+      snakemake-storage-plugin-http
+      snakemake-storage-plugin-s3
       stress
-      versionCheckHook
       polars
     ])
-    ++ [ writableTmpDirAsHomeHook ];
+    ++ [
+      versionCheckHook
+      writableTmpDirAsHomeHook
+    ];
 
   enabledTestPaths = [
     "tests/tests.py"
@@ -97,6 +111,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ];
 
   disabledTests = [
+    # AssertionError: expected file "onerror_module2.log" not produced
+    "test_module_onerror"
+
     # FAILED tests/tests.py::test_env_modules - AssertionError: expected successful execution
     "test_ancient"
     "test_conda_create_envs_only"
@@ -119,13 +136,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "test_issue1256"
     "test_issue2574"
 
-    # Require `snakemake-storage-plugin-fs` (circular dependency)
-    "test_default_storage"
-    "test_default_storage_local_job"
-    "test_deploy_sources"
-    "test_output_file_cache_storage"
-    "test_storage"
-
     # Tries to access internet
     "test_report_after_run"
 
@@ -136,10 +146,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     # Needs unshare
     "test_nodelocal"
 
-    # Requires snakemake-storage-plugin-http
-    "test_keep_local"
-    "test_retrieve"
-
     # Requires conda
     "test_jupyter_notebook"
     "test_jupyter_notebook_nbconvert"
@@ -179,7 +185,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "test_issue1331"
   ];
 
-  pythonImportsCheck = [ "snakemake" ];
+  # Circular dependencies
+  doCheck = false;
+  passthru.tests.pytest = snakemake.overridePythonAttrs {
+    doCheck = true;
+  };
 
   meta = {
     homepage = "https://snakemake.github.io";

From 5d6beea86ec1d9969ddb2408ffa7919a2d3fa7c9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 May 2026 10:11:51 +0000
Subject: [PATCH 183/332] python3Packages.snakemake-interface-logger-plugins:
 2.0.1 -> 2.1.0

Diff: https://github.com/snakemake/snakemake-interface-logger-plugins/compare/v2.0.1...v2.1.0

Changelog: https://github.com/snakemake/snakemake-interface-logger-plugins/blob/v2.1.0/CHANGELOG.md

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../snakemake-interface-logger-plugins/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
index 9ca3fda0ca1d..e4a115ea5c19 100644
--- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "snakemake-interface-logger-plugins";
-  version = "2.0.1";
+  version = "2.1.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
     owner = "snakemake";
     repo = "snakemake-interface-logger-plugins";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yvEjd4xBjjCocGK/HD1j5jcuy+syyXcEJGdsEFA0H40=";
+    hash = "sha256-UBdzJtKukR4Y9KPpu8qJv4HmN9ghncvEqGsTQnHk36k=";
   };
 
   build-system = [

From 0ea2bc77fd43d06da284dd802bb30603a0bf91b6 Mon Sep 17 00:00:00 2001
From: Fede Barcelona <fede_rico_94@hotmail.com>
Date: Fri, 22 May 2026 11:10:24 +0200
Subject: [PATCH 184/332] python3Packages.jsonschema-rs: 0.39.0 -> 0.46.5

---
 .../python-modules/jsonschema-rs/default.nix  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix
index 26103de5e110..77e607deaa47 100644
--- a/pkgs/development/python-modules/jsonschema-rs/default.nix
+++ b/pkgs/development/python-modules/jsonschema-rs/default.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  cacert,
   fetchPypi,
   hypothesis,
   lib,
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-rs";
-  version = "0.39.0";
+  version = "0.46.5";
 
   pyproject = true;
 
@@ -18,12 +19,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "jsonschema_rs";
-    hash = "sha256-K+7QayZF5O6cO6fl23CnYCi6jJl4plSwdl5nji1sbfM=";
+    hash = "sha256-hX434HWi2fbyPepYpVmlW2Y9OHmiUhcABLVpBz2rHvM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-2YNunqzejzDCj7mv9S8g/kY+t39YtQQ2jMeeTwc+NCs=";
+    hash = "sha256-HnrbyfuKIaYKs3ux8Du/PabPNpNu1v37Qm/5gJM6arw=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -36,6 +37,19 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  preCheck = ''
+    # reqwest fails to build its HTTP client on Linux without a CA bundle
+    # ("No CA certificates were loaded from the system").
+    export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
+  '';
+
+  # Need the official JSON Schema Test Suite, which is fetched as a git
+  # submodule and not bundled in the sdist.
+  disabledTestPaths = [
+    "crates/jsonschema-py/tests-py/test_annotation_suite.py"
+    "crates/jsonschema-py/tests-py/test_suite.py"
+  ];
+
   pythonImportsCheck = [ "jsonschema_rs" ];
 
   passthru.updateScript = nix-update-script { };

From 244b70040392ab04d0e570d984e1b654a8f58d77 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 May 2026 20:54:57 +1000
Subject: [PATCH 185/332] nixosTests.simple-vm: rename from nixosTests.simple

renamed because we now have different kinds of tests
---
 ci/eval/compare/default.nix                      | 2 +-
 ci/eval/outpaths.nix                             | 2 +-
 ci/github-script/check-target-branch.js          | 2 +-
 nixos/release-combined.nix                       | 2 +-
 nixos/release-small.nix                          | 4 ++--
 nixos/tests/all-tests.nix                        | 2 +-
 nixos/tests/nixos-test-driver/skip-typecheck.nix | 2 +-
 nixos/tests/{simple.nix => simple-vm.nix}        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename nixos/tests/{simple.nix => simple-vm.nix} (86%)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 4d651afe092e..1e1036e8da9f 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -188,7 +188,7 @@ let
             kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
           ) rebuildsByKernel
           // {
-            "10.rebuild-nixos-tests" = lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds);
+            "10.rebuild-nixos-tests" = lib.elem "nixosTests.simple-vm" (extractPackageNames diffAttrs.rebuilds);
           };
       }
     );
diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix
index 6c29ff403b47..577ecfc4d18a 100755
--- a/ci/eval/outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -108,6 +108,6 @@ in
 tweak (
   (removeAttrs nixpkgsJobs blacklist)
   // {
-    nixosTests = lib.filterAttrs (name: _: name == "simple") nixosJobs.tests;
+    nixosTests = lib.filterAttrs (name: _: name == "simple-vm") nixosJobs.tests;
   }
 )
diff --git a/ci/github-script/check-target-branch.js b/ci/github-script/check-target-branch.js
index cdb2670aeac0..8a3dd0456944 100644
--- a/ci/github-script/check-target-branch.js
+++ b/ci/github-script/check-target-branch.js
@@ -99,7 +99,7 @@ async function checkTargetBranch({ github, context, core, dry }) {
     ...Object.values(changed.rebuildCountByKernel),
   )
   const rebuildsAllTests =
-    changed.attrdiff.changed.includes('nixosTests.simple')
+    changed.attrdiff.changed.includes('nixosTests.simple-vm')
 
   // https://github.com/NixOS/nixpkgs/pull/481205#issuecomment-3790123921
   // These should go to staging-nixos instead of master,
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 40eb4a0d34ae..faa47068e706 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -202,7 +202,7 @@ rec {
         (onFullSupported "nixos.tests.proxy")
         (onFullSupported "nixos.tests.sddm.default")
         (onFullSupported "nixos.tests.shadow")
-        (onFullSupported "nixos.tests.simple")
+        (onFullSupported "nixos.tests.simple-vm")
         (onFullSupported "nixos.tests.sway")
         (onFullSupported "nixos.tests.switchTest")
         (onFullSupported "nixos.tests.udisks2")
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 461afb49d4db..a6a3addd3bfc 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -67,7 +67,7 @@ rec {
         php
         predictable-interface-names
         proxy
-        simple
+        simple-vm
         ;
       latestKernel = {
         inherit (nixos'.tests.latestKernel)
@@ -165,7 +165,7 @@ rec {
           "nixos.tests.predictable-interface-names.unpredictable"
           "nixos.tests.predictable-interface-names.unpredictableNetworkd"
           "nixos.tests.proxy"
-          "nixos.tests.simple"
+          "nixos.tests.simple-vm"
           "nixpkgs.jdk"
           "nixpkgs.tests.stdenv.tests-stdenv-gcc-stageCompare"
           "nixpkgs.opensshTest"
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3475d14e7f26..644dfc90e7e7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1508,7 +1508,7 @@ in
   shoko = import ./shoko.nix { inherit runTest; };
   signal-desktop = runTest ./signal-desktop.nix;
   silverbullet = runTest ./silverbullet.nix;
-  simple = runTest ./simple.nix;
+  simple-vm = runTest ./simple-vm.nix;
   sing-box = runTest ./sing-box.nix;
   sks = runTest ./sks.nix;
   slimserver = runTest ./slimserver.nix;
diff --git a/nixos/tests/nixos-test-driver/skip-typecheck.nix b/nixos/tests/nixos-test-driver/skip-typecheck.nix
index b36e4a819693..887cab290389 100644
--- a/nixos/tests/nixos-test-driver/skip-typecheck.nix
+++ b/nixos/tests/nixos-test-driver/skip-typecheck.nix
@@ -1,5 +1,5 @@
 /**
-  nixosTests.simple, but with skipTypeCheck.
+  nixosTests.simple-vm, but with skipTypeCheck.
   This catches regressions in the wiring, e.g.
   https://github.com/NixOS/nixpkgs/pull/511225
 */
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple-vm.nix
similarity index 86%
rename from nixos/tests/simple.nix
rename to nixos/tests/simple-vm.nix
index f9b9db05302b..51fe6b596d29 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple-vm.nix
@@ -1,5 +1,5 @@
 {
-  name = "simple";
+  name = "simple-vm";
 
   nodes.machine = { };
 

From cdc68a268ce96acf39abf37c360ab1a58d6cdb17 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 May 2026 11:54:05 +1000
Subject: [PATCH 186/332] nixos/tests: add simple-container

nixosTests.simple-vm but using an nspawn container
---
 nixos/tests/all-tests.nix        |  1 +
 nixos/tests/simple-container.nix | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 nixos/tests/simple-container.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 644dfc90e7e7..f4308311858c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1508,6 +1508,7 @@ in
   shoko = import ./shoko.nix { inherit runTest; };
   signal-desktop = runTest ./signal-desktop.nix;
   silverbullet = runTest ./silverbullet.nix;
+  simple-container = runTest ./simple-container.nix;
   simple-vm = runTest ./simple-vm.nix;
   sing-box = runTest ./sing-box.nix;
   sks = runTest ./sks.nix;
diff --git a/nixos/tests/simple-container.nix b/nixos/tests/simple-container.nix
new file mode 100644
index 000000000000..269853423651
--- /dev/null
+++ b/nixos/tests/simple-container.nix
@@ -0,0 +1,11 @@
+{
+  name = "simple-container";
+
+  containers.machine = { };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("multi-user.target")
+    machine.shutdown()
+  '';
+}

From 70558450409e91a92d4a50b6fb2676cf0305cd5c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 May 2026 11:54:05 +1000
Subject: [PATCH 187/332] nixos/release{,-small}: add
 nixosTests.simple-container

nixosTests.simple-vm but using an nspawn container
---
 nixos/release-combined.nix | 1 +
 nixos/release-small.nix    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index faa47068e706..d6ec21f82226 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -202,6 +202,7 @@ rec {
         (onFullSupported "nixos.tests.proxy")
         (onFullSupported "nixos.tests.sddm.default")
         (onFullSupported "nixos.tests.shadow")
+        (onFullSupported "nixos.tests.simple-container")
         (onFullSupported "nixos.tests.simple-vm")
         (onFullSupported "nixos.tests.sway")
         (onFullSupported "nixos.tests.switchTest")
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index a6a3addd3bfc..8db36109abf7 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -67,6 +67,7 @@ rec {
         php
         predictable-interface-names
         proxy
+        simple-container
         simple-vm
         ;
       latestKernel = {
@@ -165,6 +166,7 @@ rec {
           "nixos.tests.predictable-interface-names.unpredictable"
           "nixos.tests.predictable-interface-names.unpredictableNetworkd"
           "nixos.tests.proxy"
+          "nixos.tests.simple-container"
           "nixos.tests.simple-vm"
           "nixpkgs.jdk"
           "nixpkgs.tests.stdenv.tests-stdenv-gcc-stageCompare"

From c103da6a19c623e6e5c8c791d8012c29855bb802 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 May 2026 18:34:16 +1000
Subject: [PATCH 188/332] ci: add nixosTests.simple-container

nixosTests.simple-vm but using an nspawn container
---
 ci/eval/compare/default.nix             | 4 +++-
 ci/eval/outpaths.nix                    | 4 +++-
 ci/github-script/check-target-branch.js | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 1e1036e8da9f..e596b6d1994f 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -172,6 +172,7 @@ let
       rebuildCountByKernel = lib.mapAttrs (
         kernel: kernelRebuilds: lib.length kernelRebuilds
       ) rebuildsByKernel;
+      rebuildNames = extractPackageNames diffAttrs.rebuilds;
     in
     writeText "changed-paths.json" (
       builtins.toJSON {
@@ -188,7 +189,8 @@ let
             kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
           ) rebuildsByKernel
           // {
-            "10.rebuild-nixos-tests" = lib.elem "nixosTests.simple-vm" (extractPackageNames diffAttrs.rebuilds);
+            "10.rebuild-nixos-tests" =
+              lib.elem "nixosTests.simple-container" rebuildNames || lib.elem "nixosTests.simple-vm" rebuildNames;
           };
       }
     );
diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix
index 577ecfc4d18a..afbce48f3321 100755
--- a/ci/eval/outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -108,6 +108,8 @@ in
 tweak (
   (removeAttrs nixpkgsJobs blacklist)
   // {
-    nixosTests = lib.filterAttrs (name: _: name == "simple-vm") nixosJobs.tests;
+    nixosTests = lib.filterAttrs (
+      name: _: name == "simple-container" || name == "simple-vm"
+    ) nixosJobs.tests;
   }
 )
diff --git a/ci/github-script/check-target-branch.js b/ci/github-script/check-target-branch.js
index 8a3dd0456944..01c062d410ab 100644
--- a/ci/github-script/check-target-branch.js
+++ b/ci/github-script/check-target-branch.js
@@ -99,6 +99,7 @@ async function checkTargetBranch({ github, context, core, dry }) {
     ...Object.values(changed.rebuildCountByKernel),
   )
   const rebuildsAllTests =
+    changed.attrdiff.changed.includes('nixosTests.simple-container') ||
     changed.attrdiff.changed.includes('nixosTests.simple-vm')
 
   // https://github.com/NixOS/nixpkgs/pull/481205#issuecomment-3790123921

From 654a07279aeafef9e6d44c5bea3534cdba290104 Mon Sep 17 00:00:00 2001
From: Emil Thorsoe <jekarlson@gmail.com>
Date: Thu, 21 May 2026 23:13:59 +0300
Subject: [PATCH 189/332] termite: remove broken package with no live upstream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also remove from enableAllTerminfo list.

Since vte: 0.82.3 → 0.84.0 custom patches applied to vte in termite are
broken. The package has been without upstream for 5 years for now.

https://github.com/thestinger/termite/commit/18de7682e983e6562a87c63a2814c5e39461b081
https://github.com/NixOS/nixpkgs/issues/122929
---
 nixos/modules/config/terminfo.nix             |   1 -
 nixos/modules/programs/wayland/river.nix      |   2 +-
 nixos/modules/programs/wayland/sway.nix       |   2 +-
 nixos/tests/terminal-emulators.nix            |   2 -
 pkgs/README.md                                |   2 +-
 .../termite/add_errno_header.patch            |  24 ----
 .../terminal-emulators/termite/default.nix    | 112 ------------------
 .../termite/remove_ldflags_macos.patch        |  25 ----
 .../termite/url_regexp_trailing.patch         |  27 -----
 ...function-for-setting-cursor-position.patch |  61 ----------
 ...tion-for-setting-the-text-selections.patch |  56 ---------
 ...nction-for-getting-the-selected-text.patch |  29 -----
 .../terminal-emulators/termite/wrapper.nix    |  23 ----
 pkgs/by-name/vt/vte/package.nix               |   1 -
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   5 -
 16 files changed, 4 insertions(+), 369 deletions(-)
 delete mode 100644 pkgs/applications/terminal-emulators/termite/add_errno_header.patch
 delete mode 100644 pkgs/applications/terminal-emulators/termite/default.nix
 delete mode 100644 pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
 delete mode 100644 pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
 delete mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
 delete mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
 delete mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
 delete mode 100644 pkgs/applications/terminal-emulators/termite/wrapper.nix

diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index 43bb633a1064..15f6ffb423b0 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -50,7 +50,6 @@
           rxvt-unicode-unwrapped
           rxvt-unicode-unwrapped-emoji
           st
-          termite
           tmux
           wezterm
           yaft
diff --git a/nixos/modules/programs/wayland/river.nix b/nixos/modules/programs/wayland/river.nix
index 447d6d63368d..6e8a811e549c 100644
--- a/nixos/modules/programs/wayland/river.nix
+++ b/nixos/modules/programs/wayland/river.nix
@@ -51,7 +51,7 @@ in
         with pkgs; [ swaylock foot dmenu ];
       '';
       example = lib.literalExpression ''
-        with pkgs; [ termite rofi light ]
+        with pkgs; [ alacritty rofi light ]
       '';
       description = ''
         Extra packages to be installed system wide. See
diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix
index c764ade90c8a..14f695e1deab 100644
--- a/nixos/modules/programs/wayland/sway.nix
+++ b/nixos/modules/programs/wayland/sway.nix
@@ -116,7 +116,7 @@ in
         with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ];
       '';
       example = lib.literalExpression ''
-        with pkgs; [ i3status i3status-rust termite rofi light ]
+        with pkgs; [ i3status i3status-rust alacritty rofi light ]
       '';
       description = ''
         Extra packages to be installed system wide. See
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 68f265fa0286..e0913974b86d 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -92,8 +92,6 @@ let
     terminology.cmd = "SHELL=$command terminology --no-wizard=true";
     terminology.colourTest = false; # broken by gloss effect
 
-    termite.pkg = p: p.termite;
-
     termonad.pkg = p: p.termonad;
 
     tilda.pkg = p: p.tilda;
diff --git a/pkgs/README.md b/pkgs/README.md
index 4dc6008354c2..5578e8df3a96 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -327,7 +327,7 @@ A (typically large) program with a distinct user interface, primarily used inter
 
 - **If it’s a _terminal emulator_:**
 
-  - `applications/terminal-emulators` (e.g. `alacritty` or `rxvt` or `termite`)
+  - `applications/terminal-emulators` (e.g. `alacritty` or `rxvt`)
 
 - **If it’s a _file manager_:**
 
diff --git a/pkgs/applications/terminal-emulators/termite/add_errno_header.patch b/pkgs/applications/terminal-emulators/termite/add_errno_header.patch
deleted file mode 100644
index 81283f86a21d..000000000000
--- a/pkgs/applications/terminal-emulators/termite/add_errno_header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Fri, 13 Jul 2018 19:03:09 +1000
-Subject: [PATCH] Add errno.h header which isn't always included automatically.
-
----
- termite.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/termite.cc b/termite.cc
-index 160fe82..13e2572 100644
---- a/termite.cc
-+++ b/termite.cc
-@@ -21,6 +21,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <cmath>
-+#include <errno.h>
- #include <functional>
- #include <limits>
- #include <map>
--- 
-2.17.1
-
diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
deleted file mode 100644
index f5e814132df6..000000000000
--- a/pkgs/applications/terminal-emulators/termite/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  pkg-config,
-  vte,
-  gtk3,
-  ncurses,
-  pcre2,
-  wrapGAppsHook3,
-  nixosTests,
-}:
-
-let
-
-  # termite requires VTE with some internals exposed
-  # https://github.com/thestinger/vte-ng
-  #
-  # three of the patches have been locally modified to cleanly apply on 0.62
-  vte-ng = vte.overrideAttrs (attrs: {
-    patches = attrs.patches or [ ] ++ [
-      (fetchpatch {
-        name = "0001-expose-functions-for-pausing-unpausing-output.patch";
-        url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
-        sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
-      })
-      # Derived from https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch
-      ./vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
-      # Derived from https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch
-      ./vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
-      (fetchpatch {
-        name = "0004-add-functions-to-get-set-block-selection-mode.patch";
-        url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
-        sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
-      })
-      # Derived from "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
-      ./vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
-    ];
-  });
-
-in
-stdenv.mkDerivation rec {
-  pname = "termite";
-  version = "15";
-
-  src = fetchFromGitHub {
-    owner = "thestinger";
-    repo = "termite";
-    rev = "v${version}";
-    sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k";
-    fetchSubmodules = true;
-  };
-
-  # https://github.com/thestinger/termite/pull/516
-  patches = [
-    ./url_regexp_trailing.patch
-    ./add_errno_header.patch
-    # Fix off-by-one in select_text() on libvte >= 0.55.0
-    # Expected to be included in next release (16).
-    (fetchpatch {
-      url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch";
-      sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j";
-    })
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin ./remove_ldflags_macos.patch;
-
-  makeFlags = [
-    "VERSION=v${version}"
-    "PREFIX="
-    "DESTDIR=$(out)"
-  ];
-
-  buildInputs = [
-    vte-ng
-    gtk3
-    ncurses
-    pcre2
-  ];
-
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    pkg-config
-  ];
-
-  outputs = [
-    "out"
-    "terminfo"
-  ];
-
-  passthru = {
-    inherit vte-ng;
-    tests = nixosTests.terminal-emulators.termite;
-  };
-
-  postInstall = ''
-    mkdir -p $terminfo/share
-    mv $out/share/terminfo $terminfo/share/terminfo
-
-    mkdir -p $out/nix-support
-    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
-  '';
-
-  meta = {
-    description = "Simple VTE-based terminal";
-    license = lib.licenses.lgpl2Plus;
-    homepage = "https://github.com/thestinger/termite/";
-    maintainers = with lib.maintainers; [ koral ];
-    platforms = lib.platforms.all;
-    mainProgram = "termite";
-  };
-}
diff --git a/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch b/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
deleted file mode 100644
index f8c68518bb4d..000000000000
--- a/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Fri, 13 Jul 2018 19:01:51 +1000
-Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS.
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index b115f42..ab301ba 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++)
- 	CXXFLAGS += -Wimplicit-fallthrough
- endif
- 
--LDFLAGS := -s -Wl,--as-needed ${LDFLAGS}
-+LDFLAGS := -s -Wl ${LDFLAGS}
- LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}}
- 
- termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh
--- 
-2.17.1
-
diff --git a/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch b/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
deleted file mode 100644
index 96deaa073d71..000000000000
--- a/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Based on https://github.com/thestinger/termite/pull/516
-Modified to apply to v13
-
-From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001
-From: Paul Baecher <pbaecher@gmail.com>
-Date: Thu, 7 Sep 2017 22:58:51 +0200
-Subject: [PATCH] Do not match punctuation at the end of URLs
-
-Punctuation at the end of URLs is most likely part of natural language
-or markup (for example in Markdown). Do not match it as part of the URL.
----
- url_regex.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/url_regex.hh b/url_regex.hh
-index 2ec6be8..3039b53 100644
---- a/url_regex.hh
-+++ b/url_regex.hh
-@@ -9,7 +9,7 @@
- #define PORT            "(?:\\:[[:digit:]]{1,5})?"
- #define SCHEME          "(?:[[:alpha:]][+-.[:alnum:]]*:)"
- #define USERPASS        USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?"
--#define URLPATH         "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?"
-+#define URLPATH         "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(?<![\\Q.,:;()!?\\E]))?"
- 
- const char * const url_regex = SCHEME "//(?:" USERPASS "\\@)?" HOST PORT URLPATH;
- 
diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
deleted file mode 100644
index 8f5c0dab39ad..000000000000
--- a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5ae3acb69474fe5bc43767a4a3625e9ed23607a1 Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle@vdwaa.nl>
-Date: Sat, 13 Feb 2016 22:18:01 +0100
-Subject: [PATCH] expose function for setting cursor position
-
----
- src/vte/vteterminal.h |  5 +++++
- src/vtegtk.cc         | 24 ++++++++++++++++++++++++
- 2 files changed, 29 insertions(+)
-
-diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index a607e5da..9701320d 100644
---- a/src/vte/vteterminal.h
-+++ b/src/vte/vteterminal.h
-@@ -378,6 +378,11 @@ _VTE_PUBLIC
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- 				      glong *column,
-                                       glong *row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
-+_VTE_PUBLIC
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+                                      glong column,
-+                                      glong row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
-+
- 
- _VTE_PUBLIC
- char *vte_terminal_hyperlink_check_event(VteTerminal *terminal,
-diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index b11b780b..bdf36eac 100644
---- a/src/vtegtk.cc
-+++ b/src/vtegtk.cc
-@@ -2415,6 +2415,30 @@ vte_terminal_get_cursor_position(VteTerminal *terminal,
- 	}
- }
- 
-+/**
-+ * vte_terminal_set_cursor_position
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+		                 long column, long row) noexcept
-+{
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+        auto impl = IMPL(terminal);
-+	impl->invalidate_cursor_once(FALSE);
-+	impl->m_screen->cursor.col = column;
-+	impl->m_screen->cursor.row = row;
-+	impl->invalidate_cursor_once(FALSE);
-+	impl->check_cursor_blink();
-+	impl->queue_cursor_moved();
-+
-+}
-+
- /**
-  * vte_terminal_pty_new_sync:
-  * @terminal: a #VteTerminal
diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
deleted file mode 100644
index 203228dae34d..000000000000
--- a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 742d57ecf15e24f6a5f2133a81b6c70acc8ff03c Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle@vdwaa.nl>
-Date: Sat, 13 Feb 2016 22:25:19 +0100
-Subject: [PATCH] add function for setting the text selections
-
----
- src/vte/vteterminal.h |  4 ++++
- src/vtegtk.cc         | 20 ++++++++++++++++++++
- 2 files changed, 24 insertions(+)
-
-diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 9701320d..a11b4cb7 100644
---- a/src/vte/vteterminal.h
-+++ b/src/vte/vteterminal.h
-@@ -196,6 +196,10 @@ _VTE_PUBLIC
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
- _VTE_PUBLIC
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
-+_VTE_PUBLIC
-+void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
-+			      long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
-+
- 
- /* By-word selection */
- _VTE_PUBLIC
-diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index bdf36eac..d9e9f2ed 100644
---- a/src/vtegtk.cc
-+++ b/src/vtegtk.cc
-@@ -2390,6 +2390,26 @@ vte_terminal_unselect_all(VteTerminal *terminal)
-         IMPL(terminal)->deselect_all();
- }
- 
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+		         long start_col, long start_row,
-+			 long end_col, long end_row) noexcept
-+{
-+	g_return_if_fail (VTE_IS_TERMINAL (terminal));
-+
-+        IMPL(terminal)->select_text(start_col, start_row, end_col, end_row);
-+}
-+
- /**
-  * vte_terminal_get_cursor_position:
-  * @terminal: a #VteTerminal
diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
deleted file mode 100644
index fe04434f4a2c..000000000000
--- a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/vte/vteterminal.h
-+++ b/src/vte/vteterminal.h
-@@ -204,7 +204,9 @@
- _VTE_PUBLIC
- void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
- 			      long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
--
-+_VTE_PUBLIC
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
- 
- /* By-word selection */
- _VTE_PUBLIC
---- a/src/vtegtk.cc
-+++ b/src/vtegtk.cc
-@@ -2435,6 +2435,13 @@
-         IMPL(terminal)->select_text(start_col, start_row, end_col, end_row);
- }
- 
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) noexcept
-+{
-+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
-+	return g_strdup (IMPL(terminal)->m_selection[vte::to_integral(vte::platform::ClipboardType::PRIMARY)]->str);
-+}
-+
- /**
-  * vte_terminal_get_cursor_position:
-  * @terminal: a #VteTerminal
diff --git a/pkgs/applications/terminal-emulators/termite/wrapper.nix b/pkgs/applications/terminal-emulators/termite/wrapper.nix
deleted file mode 100644
index ff4d329e52f3..000000000000
--- a/pkgs/applications/terminal-emulators/termite/wrapper.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  makeWrapper,
-  symlinkJoin,
-  configFile ? null,
-  termite,
-}:
-
-if configFile == null then
-  termite
-else
-  symlinkJoin {
-    name = "termite-with-config-${termite.version}";
-
-    paths = [ termite ];
-    nativeBuildInputs = [ makeWrapper ];
-
-    postBuild = ''
-      wrapProgram $out/bin/termite \
-        --add-flags "--config ${configFile}"
-    '';
-
-    passthru.terminfo = termite.terminfo;
-  }
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index 21e5d6e42162..3cec20862b25 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -151,7 +151,6 @@ stdenv.mkDerivation (finalAttrs: {
         sakura
         stupidterm
         terminator
-        termite
         xfce4-terminal
         ;
       inherit blackbox-terminal;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 79f3d954d168..26528fc0f279 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2080,6 +2080,7 @@ mapAliases {
   tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27
   termbook = throw "'termbook' has been removed because it is not maintained upstream and has insecure dependencies."; # Added 2025-12-01
   terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27
+  termite = throw "'termite' has been removed as it was broken and unmaintained upstream"; # Added 2026-05-22
   testVersion = throw "'testVersion' has been renamed to/replaced by 'testers.testVersion'"; # Converted to throw 2025-10-27
   tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
   tewi-font = throw "'tewi-font' has been removed because it was removed from upstream"; # Added 2025-12-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 830b0307bcb4..78a9fda5b799 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1352,11 +1352,6 @@ with pkgs;
     emojiSupport = true;
   };
 
-  termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
-    termite = termite-unwrapped;
-  };
-  termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
-
   twine = with python3Packages; toPythonApplication twine;
 
   inherit (callPackages ../development/tools/ammonite { })

From 47a6a321a447244d8b70e014134caecfdb26f8d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 12:36:06 +0000
Subject: [PATCH 190/332] python3Packages.cynthion: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index ebaaea6079cf..0ed5832bef9c 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -27,14 +27,14 @@
 }:
 buildPythonPackage rec {
   pname = "cynthion";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "cynthion";
     tag = version;
-    hash = "sha256-ebd2L7o6GO57TpwJ7+MOhVSb+I/E8kD7d7DqPj4B3FM=";
+    hash = "sha256-Ju01eqBVZ7CD0pw4nIFML4LcCPXzC78dLpQru3a+5bU=";
   };
 
   sourceRoot = "${src.name}/cynthion/python";

From 585063e202eac73267bc415d5f74a5b05e7c3cf9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 22 May 2026 19:40:07 +0700
Subject: [PATCH 191/332] libtapi: fix build with gcc 15

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

diff --git a/pkgs/by-name/li/libtapi/package.nix b/pkgs/by-name/li/libtapi/package.nix
index 7cc4d917ad7f..81de7f9854c4 100644
--- a/pkgs/by-name/li/libtapi/package.nix
+++ b/pkgs/by-name/li/libtapi/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   ninja,
   python3,
@@ -57,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-Check-for-no_exported_symbols-linker-support.patch
     # Fix build on Linux. GCC is more picky than clang about the field order.
     ./0003-Match-designator-order-with-declaration-order.patch
+    # Add missing <cstdint> include for gcc 15.
+    (fetchpatch2 {
+      url = "https://github.com/llvm/llvm-project/commit/e2f25af711425fb238317582441f4bda56131891.patch?full_index=1";
+      hash = "sha256-zJwl4aeX71UR7a8XHpKl4atbw+hEGCHOQmiFLIJirTY=";
+    })
   ];
 
   postPatch = ''

From aebdcfe36574bf0a31c915641d02152eee930915 Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Thu, 5 Mar 2026 18:40:42 -0500
Subject: [PATCH 192/332] xqilla: fix src hash

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 pkgs/by-name/xq/xqilla/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xq/xqilla/package.nix b/pkgs/by-name/xq/xqilla/package.nix
index a76ccea14a00..dabfcd32d2ed 100644
--- a/pkgs/by-name/xq/xqilla/package.nix
+++ b/pkgs/by-name/xq/xqilla/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/xqilla/XQilla-${finalAttrs.version}.tar.gz";
-    sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd";
+    hash = "sha256-KSYxeRYx/i5+uXJzdzNQY6SPEmEdZB0Clml+DAdZAus=";
   };
 
   patches = [

From 1c0fd758f81a9b2ad6674ad155e724cebc0f573d Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Fri, 6 Mar 2026 22:17:22 -0500
Subject: [PATCH 193/332] libagar: fix conflicting types compilation error

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 .../li/libagar/fix-conflicting-types.patch    | 26 +++++++++++++++++++
 pkgs/by-name/li/libagar/package.nix           |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/li/libagar/fix-conflicting-types.patch

diff --git a/pkgs/by-name/li/libagar/fix-conflicting-types.patch b/pkgs/by-name/li/libagar/fix-conflicting-types.patch
new file mode 100644
index 000000000000..0de03c279f4e
--- /dev/null
+++ b/pkgs/by-name/li/libagar/fix-conflicting-types.patch
@@ -0,0 +1,26 @@
+--- a/math/m_sparse_factor.c
++++ b/math/m_sparse_factor.c
+@@ -1236,7 +1236,6 @@ int  I, NumberOfTies = 0;
+ ElementPtr  ChosenPivot, TiedElements[MAX_MARKOWITZ_TIES + 1];
+ RealNumber  Magnitude, LargestInCol, Ratio, MaxRatio;
+ RealNumber  LargestOffDiagonal;
+-RealNumber  FindBiggestInColExclude();
+ 
+ /* Begin `QuicklySearchDiagonal'. */
+     NumberOfTies = -1;
+@@ -1434,7 +1433,6 @@ register  ElementPtr  pDiag;
+ int  I;
+ ElementPtr  ChosenPivot, pOtherInRow, pOtherInCol;
+ RealNumber  Magnitude, LargestInCol, LargestOffDiagonal;
+-RealNumber  FindBiggestInColExclude();
+ 
+ /* Begin `QuicklySearchDiagonal'. */
+     ChosenPivot = NULL;
+@@ -1601,7 +1599,6 @@ register  ElementPtr  pDiag;
+ int  NumberOfTies = 0, Size = Matrix->Size;
+ ElementPtr  ChosenPivot;
+ RealNumber  Magnitude, Ratio, RatioOfAccepted = 0.0, LargestInCol;
+-RealNumber  FindBiggestInColExclude();
+ 
+ /* Begin `SearchDiagonal'. */
+     ChosenPivot = NULL;
diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix
index 0335ab5a37a1..b9d5f912180f 100644
--- a/pkgs/by-name/li/libagar/package.nix
+++ b/pkgs/by-name/li/libagar/package.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42";
   };
 
+  patches = [
+    ./fix-conflicting-types.patch
+  ];
+
   preConfigure = ''
     substituteInPlace configure.in \
       --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'

From b70649e94928253e40bcf3f6b553c2e9a7105843 Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Fri, 6 Mar 2026 22:23:41 -0500
Subject: [PATCH 194/332] macopix: fix compilation with -std=gnu99

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 pkgs/by-name/ma/macopix/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/macopix/package.nix b/pkgs/by-name/ma/macopix/package.nix
index 66a06004ae5f..c8dfbd2040e0 100644
--- a/pkgs/by-name/ma/macopix/package.nix
+++ b/pkgs/by-name/ma/macopix/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Workaround build failure on -fno-common toolchains:
     #   ld: dnd.o:src/main.h:136: multiple definition of
     #     `MENU_EXT'; main.o:src/main.h:136: first defined here
-    NIX_CFLAGS_COMPILE = "-fcommon";
+    NIX_CFLAGS_COMPILE = "-fcommon -std=gnu99";
     NIX_LDFLAGS = "-lX11";
   };
 

From e28f5a1c20764c609df6f9ae47d06992e0dd91ce Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Sat, 7 Mar 2026 13:01:31 -0500
Subject: [PATCH 195/332] runit: enable parallel building

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

diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix
index b9523760a021..4b7cd61ea04a 100644
--- a/pkgs/by-name/ru/runit/package.nix
+++ b/pkgs/by-name/ru/runit/package.nix
@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
     sed -i 's,-static,,g' src/Makefile
   '';
 
+  enableParallelBuilding = true;
+
   preBuild = ''
     cd src
 

From f23fa1f2b9ea51949416def81209f9087be611ac Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Sat, 7 Mar 2026 13:00:52 -0500
Subject: [PATCH 196/332] runit: fix patch

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 pkgs/by-name/ru/runit/fix-ar-ranlib.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/runit/fix-ar-ranlib.patch b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
index c65a037d5242..02d070c06673 100644
--- a/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
+++ b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
@@ -1,5 +1,5 @@
---- runit-2.1.2/src/print-ar.sh
-+++ runit-2.1.2/src/print-ar.sh
+--- a/src/print-ar.sh
++++ b/src/print-ar.sh
 @@ -1,7 +1,7 @@
  cat warn-auto.sh
  echo 'main="$1"; shift'

From ed275db6eaa588fa0a10e40b4c095717001947ad Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Sun, 8 Mar 2026 09:47:06 -0400
Subject: [PATCH 197/332] x3270: 4.4ga6 -> 4.5ga5

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

diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index e474ddc2f15c..50d615ded7ab 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -24,8 +24,8 @@
 }:
 let
   majorVersion = "4";
-  minorVersion = "4";
-  versionSuffix = "ga6";
+  minorVersion = "5";
+  versionSuffix = "ga5";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "x3270";
@@ -33,11 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${finalAttrs.version}-src.tgz";
-    hash = "sha256-hDju5ZeVzTv78ZYwUzabmqMK9rheTZJ7clTSTpkkM7E=";
+    hash = "sha256-AVdvpYWYzN09Nm/r+u9h49Hek+tgqT+axrpfr4QUTG8=";
   };
 
   postPatch = ''
     patchShebangs .
+    substituteInPlace Common/mkversion.py --replace-fail "int(os.environ['SOURCE_DATE_EPOCH'])" "1"
   '';
 
   buildFlags = lib.optional stdenv.hostPlatform.isLinux "unix";

From b71bb0420af49b180b061daed103738a9b974e57 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 22 May 2026 22:40:33 +0700
Subject: [PATCH 198/332] katex: pin yarn-berry nodejs to 22 to dodge rollup
 2.x require.extensions break

---
 pkgs/by-name/ka/katex/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix
index 154eb8b0bdce..9b2f5216190e 100644
--- a/pkgs/by-name/ka/katex/package.nix
+++ b/pkgs/by-name/ka/katex/package.nix
@@ -2,12 +2,17 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  yarn-berry,
+  yarn-berry_4,
   nodejs,
+  nodejs_22,
   makeBinaryWrapper,
   nix-update-script,
 }:
 
+let
+  # rollup 2.x breaks on nodejs 24.15+ require.extensions regression. https://github.com/nodejs/node/issues/62786
+  yarn-berry = yarn-berry_4.override { nodejs = nodejs_22; };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "katex";
   version = "0.16.28";
@@ -33,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     yarn-berry.yarnBerryConfigHook
     yarn-berry
-    nodejs
+    nodejs_22
     makeBinaryWrapper
   ];
 

From e91ba0d7d23fcb749af8f9c43788ca2c0b9901e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 15:53:12 +0000
Subject: [PATCH 199/332] mangareader: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/by-name/ma/mangareader/package.nix b/pkgs/by-name/ma/mangareader/package.nix
index f2982b668642..25885f446d37 100644
--- a/pkgs/by-name/ma/mangareader/package.nix
+++ b/pkgs/by-name/ma/mangareader/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangareader";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "g-fb";
     repo = "mangareader";
     rev = finalAttrs.version;
-    hash = "sha256-l1rFyOXgBYPiDfAcGR3uGNJ2iHpFmVkfCacckulkkMM=";
+    hash = "sha256-jBBij57n5XWUA5K5DgTZnzuZABur13OxEbp6FzWcf30=";
   };
 
   nativeBuildInputs = [

From c268f3ff1ebc84a21ce98d0fd12aee2332b0a2f7 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 22 May 2026 22:53:21 +0700
Subject: [PATCH 200/332] fotema: fix build with ffmpeg 8.1

---
 .../fotema/cargo-lock-bump-ffmpeg-next.patch  | 193 ++++++++++++++++++
 pkgs/by-name/fo/fotema/package.nix            |  13 +-
 2 files changed, 204 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/fo/fotema/cargo-lock-bump-ffmpeg-next.patch

diff --git a/pkgs/by-name/fo/fotema/cargo-lock-bump-ffmpeg-next.patch b/pkgs/by-name/fo/fotema/cargo-lock-bump-ffmpeg-next.patch
new file mode 100644
index 000000000000..ba274dd90ca8
--- /dev/null
+++ b/pkgs/by-name/fo/fotema/cargo-lock-bump-ffmpeg-next.patch
@@ -0,0 +1,193 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -428,7 +428,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "cexpr",
+  "clang-sys",
+  "itertools 0.13.0",
+@@ -454,9 +454,9 @@
+ 
+ [[package]]
+ name = "bitflags"
+-version = "2.10.0"
++version = "2.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
++checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+ 
+ [[package]]
+ name = "bitreader"
+@@ -555,7 +555,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b01fe135c0bd16afe262b6dea349bd5ea30e6de50708cec639aae7c5c14cc7e4"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "cairo-sys-rs",
+  "glib",
+  "libc",
+@@ -1132,20 +1132,20 @@
+ 
+ [[package]]
+ name = "ffmpeg-next"
+-version = "8.0.0"
++version = "8.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d658424d233cbd993a972dd73a66ca733acd12a494c68995c9ac32ae1fe65b40"
++checksum = "f7c4bd5ab1ac61f29c634df1175d350ded29cf74c3c6d4f7030431a5ae3c7d5d"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "ffmpeg-sys-next",
+  "libc",
+ ]
+ 
+ [[package]]
+ name = "ffmpeg-sys-next"
+-version = "8.0.1"
++version = "8.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9bca20aa4ee774fe384c2490096c122b0b23cf524a9910add0686691003d797b"
++checksum = "a314bc0e022a33a99567ed4bd2576bd58ffd8fcff7891c29194cfecc26a62547"
+ dependencies = [
+  "bindgen",
+  "cc",
+@@ -1709,7 +1709,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "futures-channel",
+  "futures-core",
+  "futures-executor",
+@@ -1796,7 +1796,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6e9b31c7fa5ccb9d91317c956e767daef59be9fee3ae9df30468470368678482"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "gufo-common",
+  "half",
+  "memmap2",
+@@ -1816,7 +1816,7 @@
+ checksum = "7dfec0cd29d5ecfb1dd723868e22e2c49441020f35d5f14307018ff0a1679e2f"
+ dependencies = [
+  "async-lock",
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "blocking",
+  "env_logger",
+  "futures-util",
+@@ -2819,7 +2819,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "libc",
+ ]
+ 
+@@ -2829,7 +2829,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0e5310a2c5b6ffbc094b5f70a2ca7b79ed36ad90e6f90994b166489a1bce3fcc"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "libc",
+  "libseccomp-sys",
+  "pkg-config",
+@@ -3190,7 +3190,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "cfg-if",
+  "cfg_aliases",
+  "libc",
+@@ -3422,7 +3422,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "cfg-if",
+  "foreign-types 0.3.2",
+  "libc",
+@@ -3631,7 +3631,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "crc32fast",
+  "fdeflate",
+  "flate2",
+@@ -3996,7 +3996,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+ ]
+ 
+ [[package]]
+@@ -4242,7 +4242,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "chrono",
+  "fallible-iterator",
+  "fallible-streaming-iterator",
+@@ -4323,7 +4323,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "errno",
+  "libc",
+  "linux-raw-sys",
+@@ -4465,7 +4465,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "core-foundation 0.9.4",
+  "core-foundation-sys",
+  "libc",
+@@ -4478,7 +4478,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "core-foundation 0.10.1",
+  "core-foundation-sys",
+  "libc",
+@@ -4844,7 +4844,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "core-foundation 0.9.4",
+  "system-configuration-sys 0.6.0",
+ ]
+@@ -5205,7 +5205,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+ dependencies = [
+- "bitflags 2.10.0",
++ "bitflags 2.11.1",
+  "bytes",
+  "futures-util",
+  "http 1.4.0",
diff --git a/pkgs/by-name/fo/fotema/package.nix b/pkgs/by-name/fo/fotema/package.nix
index 10da6b71cd04..723d9ab9d6aa 100644
--- a/pkgs/by-name/fo/fotema/package.nix
+++ b/pkgs/by-name/fo/fotema/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  applyPatches,
   clangStdenv,
   fetchFromGitHub,
   rustPlatform,
@@ -40,9 +41,17 @@ clangStdenv.mkDerivation (finalAttrs: {
     hash = "sha256-g1CxgK8gaX24TFnlGUons3ve8Ow9YaiMh1kMwlcP/F8=";
   };
 
+  patches = [
+    # Bump ffmpeg-next 8.0.0 -> 8.1.0 in Cargo.lock for ffmpeg 8.1 compatibility.
+    ./cargo-lock-bump-ffmpeg-next.patch
+  ];
+
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
-    hash = "sha256-vA1vB2Lgyo5SfexDC4Ag85nM+/NzsYZNeIH4HmiESHc=";
+    inherit (finalAttrs) pname version;
+    src = applyPatches {
+      inherit (finalAttrs) src patches;
+    };
+    hash = "sha256-AEZY1QODq4F+CTrJce14qA6XSZjv29wSwIqUjZPWJo4=";
   };
 
   nativeBuildInputs = [

From 598efa9f666472319d3569cc71768163681cd683 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 20 May 2026 22:26:14 +0000
Subject: [PATCH 201/332] rerun: 0.32.1 -> 0.32.2

Diff: https://github.com/rerun-io/rerun/compare/0.32.1...0.32.2

Changelog: https://github.com/rerun-io/rerun/blob/0.32.2/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix                          | 6 +++---
 pkgs/development/python-modules/rerun-notebook/default.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 92b7cfea5331..fb238781ef02 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -35,7 +35,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.32.1";
+  version = "0.32.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-WedZ5RZiin6jGx2aCe5obkkWJSnwzMoP4s+qQIyeq8Y=";
+    hash = "sha256-VVMogg0mWBoev9oE4CSbv2caTTpcfkReTWA1tJ2n7RI=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-LkZA3wcDGIGSjRkjPY7YhjlfVqlGWAMc+qIfDLFZUTE=";
+  cargoHash = "sha256-6cL7pocqcMiw+D7R6LIcegP4tO9fUTgXQFG51n6rsU4=";
 
   cargoBuildFlags = [
     "--package"
diff --git a/pkgs/development/python-modules/rerun-notebook/default.nix b/pkgs/development/python-modules/rerun-notebook/default.nix
index 99c79a166158..f469d8ef1856 100644
--- a/pkgs/development/python-modules/rerun-notebook/default.nix
+++ b/pkgs/development/python-modules/rerun-notebook/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     inherit (finalAttrs) version;
     format = "wheel";
     python = "py2.py3";
-    hash = "sha256-meHaELZC6ujtn3AQB/vxXZxno54XrS99y4rFKMWa6BU=";
+    hash = "sha256-4kSDPW8ATfNcajb4Ebz6llwqfsX8lNYlYDZbekdcmMk=";
   };
 
   pythonRelaxDeps = [

From 518bf6c8c67858912345caa20e50169ef3e004e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 16:31:35 +0000
Subject: [PATCH 202/332] telemt: 3.4.11 -> 3.4.12

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

diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix
index 8930a708170e..6ebe37de4834 100644
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "telemt";
-  version = "3.4.11";
+  version = "3.4.12";
 
   src = fetchFromGitHub {
     owner = "telemt";
     repo = "telemt";
     tag = version;
-    hash = "sha256-jBspeSj8aRbHngK8bviVt/i1UiYUPRHSd8+7dnmJOQY=";
+    hash = "sha256-o/C9qKMv5szZCfcncHScEjkyUTwXcCT9bx84cWnzLWA=";
   };
 
-  cargoHash = "sha256-x5/SLSlYeGx40oXj/I/5zvyTNgSBwKsA33OwVIq9LGw=";
+  cargoHash = "sha256-lJ+4gYvESKRAtxoTeHuXWi1tOblc6GeGIDYicDxEHuU=";
 
   checkFlags = [
     # flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths

From b442a8d76b33901feba3d6e1ed24e50724d1a143 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 24 Feb 2026 11:17:31 -0500
Subject: [PATCH 203/332] stdenv/freebsd: upgrade to modern llvm to fix FreeBSD
 15 build

Also do some other misc modernization
---
 pkgs/stdenv/freebsd/default.nix               | 20 ++++++++-----------
 pkgs/stdenv/freebsd/make-bootstrap-tools.nix  | 18 ++++++++++-------
 pkgs/stdenv/freebsd/unpack-bootstrap-files.sh |  7 ++++++-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index db991403ece0..046039d1ffbe 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -99,12 +99,11 @@ let
           "lib/clang"
         ];
         # SYNCME: this version number must be synced with the one in make-bootstrap-tools.nix
-        version = "18";
+        version = "21";
       };
       libunwind = linkBootstrap {
         name = "libunwind";
         paths = [
-          "lib/libunwind.a"
           "lib/libunwind.so"
           "lib/libunwind.so.1"
           "lib/libunwind.so.1.0"
@@ -291,6 +290,7 @@ let
     };
     freebsd = {
       locales = linkBootstrap { paths = [ "share/locale" ]; };
+      libiconvModules = linkBootstrap { paths = [ "lib/i18n" ]; };
       libc = linkBootstrap {
         name = "bootstrapLibs";
         paths = [
@@ -303,16 +303,12 @@ let
           "lib/crtendS.o"
           "lib/crti.o"
           "lib/crtn.o"
-          "lib/libc++.a"
           "lib/libc++.so"
           "lib/libc++.so.1"
-          "lib/libc.a"
           "lib/libc.so"
           "lib/libc.so.7"
-          "lib/libc_nonshared.a"
           "lib/libcrypt.so"
           "lib/libcrypt.so.5"
-          "lib/libcxxrt.a"
           "lib/libcxxrt.so"
           "lib/libcxxrt.so.1"
           "lib/libdevstat.so"
@@ -329,11 +325,10 @@ let
           "lib/libgcc_s.so.1"
           "lib/libkvm.so"
           "lib/libkvm.so.7"
-          "lib/libm.a"
           "lib/libm.so"
           "lib/libm.so.5"
           "lib/libmd.so"
-          "lib/libmd.so.6"
+          "lib/libmd.so.7"
           "lib/libncurses.so"
           "lib/libncurses.so.6"
           "lib/libncursesw.so"
@@ -344,7 +339,7 @@ let
           "lib/libthr.so"
           "lib/libthr.so.3"
           "lib/libutil.so"
-          "lib/libutil.so.9"
+          "lib/libutil.so.10"
           "lib/libxnet.so"
           "include"
           "share"
@@ -459,8 +454,6 @@ let
           export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
           export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
           export PATH_LOCALE=${prevStage.freebsd.localesReal or prevStage.freebsd.locales}/share/locale
-        ''
-        + lib.optionalString (prevStage.freebsd ? libiconvModules) ''
           export PATH_I18NMODULE=${prevStage.freebsd.libiconvModules}/lib/i18n
         '';
       };
@@ -589,7 +582,10 @@ in
       __bootstrapArchive = bootstrapArchive;
       fetchurl = prevStage.fetchurlReal;
       freebsd = super.freebsd.overrideScope (
-        self': super': { localesPrev = prevStage.freebsd.localesReal; }
+        self': super': {
+          inherit (prevStage.freebsd) libc;
+          localesPrev = prevStage.freebsd.localesReal;
+        }
       );
     };
   })
diff --git a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
index e6026e2b3361..4a75d2d26084 100644
--- a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
@@ -46,6 +46,8 @@ let
   mkdir = runCommand "mkdir" { coreutils = coreutils-big; } ''
     mkdir -p $out/bin
     cp $coreutils/bin/mkdir $out/bin
+    cp $coreutils/bin/cp $out/bin
+    cp $coreutils/bin/mv $out/bin
   '';
 in
 rec {
@@ -58,13 +60,13 @@ rec {
         gnutar
       ])
       ''
-        rm -rf include lib/*.a lib/i18n lib/bash share
+        rm -rf include lib/*.a lib/bash share
       '';
   bootstrap-tools = tar-all "bootstrap-tools.tar.xz" (
     with pkgs;
     # SYNCME: this version number must be synced with the one in default.nix
     let
-      llvmPackages = llvmPackages_18;
+      llvmPackages = llvmPackages_21;
     in
     [
       (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp")
@@ -84,14 +86,16 @@ rec {
       gzip
       bzip2
       bzip2.dev
-      curl
+      # We don't use wcurl, and it uses shebangs for the build system when cross-compiling.
+      # That pollutes the bootstrap tarballs and prevents it from working.
+      (curl.overrideAttrs (old: {
+        postFixup = "rm $bin/bin/wcurl";
+      }))
       expand-response-params
       binutils-unwrapped
       freebsd.libc
-      llvmPackages.libcxx
-      llvmPackages.libcxx.dev
-      llvmPackages.compiler-rt
-      llvmPackages.compiler-rt.dev
+      stdenv.cc.libcxx
+      stdenv.cc.libcxx.dev
       llvmPackages.clang-unwrapped
       (freebsd.locales.override { locales = [ "C.UTF-8" ]; })
     ]
diff --git a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
index dfbf860ac8c9..023ef73145b6 100644
--- a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
+++ b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
@@ -6,7 +6,9 @@ BADLIST=ld-elf.so.1
 
 oobpatch() {
     $out/libexec/ld-elf.so.1 $src/bin/cp $1 ./tmp
-    $out/libexec/ld-elf.so.1 $out/bin/patchelf --set-rpath $out/lib --set-interpreter $out/libexec/ld-elf.so.1 ./tmp
+    $out/libexec/ld-elf.so.1 $out/bin/patchelf --set-rpath $out/lib ./tmp
+    # This will fail for libraries, but we don't have set -e so it's fine
+    $out/libexec/ld-elf.so.1 $out/bin/patchelf --set-interpreter $out/libexec/ld-elf.so.1 ./tmp
     $out/libexec/ld-elf.so.1 $src/bin/mv ./tmp $1
     BADLIST="$BADLIST|${1##*/}"
 }
@@ -14,6 +16,9 @@ oobpatch() {
 oobpatch $out/bin/patchelf
 oobpatch $out/lib/libthr.so.3
 oobpatch $out/lib/libc.so.7
+oobpatch $out/lib/libgmp.so.10
+oobpatch $out/lib/librt.so.1
+oobpatch $out/lib/libsys.so.7
 
 for f in $($out/libexec/ld-elf.so.1 $out/bin/find $out/lib -type f); do
     $out/libexec/ld-elf.so.1 $out/bin/grep -E "$BADLIST" <<<"$f" && continue

From 7e53ba9cdbb9ebc3f5fe9d077ebaad6503ded695 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Thu, 26 Feb 2026 22:34:41 -0700
Subject: [PATCH 204/332] libuv: disable some failing tests on freebsd

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

diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix
index 804cb5b89134..187b1ed148c7 100644
--- a/pkgs/by-name/li/libuv/package.nix
+++ b/pkgs/by-name/li/libuv/package.nix
@@ -130,6 +130,10 @@ stdenv.mkDerivation (finalAttrs: {
         "shutdown_close_pipe"
       ]
       ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+        # ENETUNREACH when performed in jailed build env
+        "tcp_connect"
+        "udp_connect"
+        "connect_unspecified"
         # EOPNOTSUPP when performed in jailed build env
         "tcp_reuseport"
         "udp_reuseport"

From 82c51c6fc8adbcd6aa418f8e8eb2ce438081f83a Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 27 Feb 2026 10:31:13 -0700
Subject: [PATCH 205/332] openssl: fix tests on freebsd native

---
 pkgs/development/libraries/openssl/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2401b143436e..352500e7a78b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -103,6 +103,13 @@ let
           ''
       + lib.optionalString stdenv.hostPlatform.isCygwin ''
         rm test/recipes/01-test_symbol_presence.t
+      ''
+      # this test has inconsistent behavior in the freebsd sandbox
+      # (binds to only ipv6 and connects on only ipv4)
+      + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
+        substituteInPlace test/recipes/82-test_ocsp_cert_chain.t \
+          --replace-fail '"-accept",' '"-4", "-accept",' \
+          --replace-fail '"-connect",' '"-4", "-connect",'
       '';
 
       outputs = [

From 3293eb7d5521e3baae5af80eba7aa10f07c1999c Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 27 Feb 2026 17:13:04 -0700
Subject: [PATCH 206/332] git: disable some tests failing on FreeBSD for no
 good reason

---
 pkgs/by-name/gi/git/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix
index b5ccd79b8777..fa7bcc7cd054 100644
--- a/pkgs/by-name/gi/git/package.nix
+++ b/pkgs/by-name/gi/git/package.nix
@@ -577,6 +577,15 @@ stdenv.mkDerivation (finalAttrs: {
     # Fails largely due to assumptions about BOM
     # Tested to fail: 2.18.0
     disable_test t0028-working-tree-encoding
+  ''
+  + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
+    # Time zones are not available in the build sandbox.
+    # This can be fixed if/when we decide on how the hardcoded libc paths should look
+    disable_test t0006-date
+    # Kernel bug (?) related to confusion over whether ulimit -n should set max fd or num files
+    disable_test t5324-split-commit-graph
+    # known breakage vanished?
+    disable_test t7815-grep-binary
   '';
 
   stripDebugList = [

From 2a718c645774c0b46e94bdd18702df95a46d4f7b Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Mon, 2 Mar 2026 06:05:21 +0000
Subject: [PATCH 207/332] gitMinimal: build with curlMinimal on FreeBSD

FreeBSD bootstrap needs git, use curlMinimal for gitMinimal
to remove a dependency loop
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd02ed8d386e..a9277bea9fc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1141,6 +1141,7 @@ with pkgs;
     perlSupport = false;
     rustSupport = false; # Needed for bootstrap
     withpcre2 = false;
+    curl = if stdenv.hostPlatform.isFreeBSD then curlMinimal else curl; # Needed for FreeBSD bootstrap
   };
 
   bump2version = with python3Packages; toPythonApplication bump2version;

From 805c37dde65a6fc9a7acebfc6c81942453196a67 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Fri, 22 May 2026 11:01:13 -0400
Subject: [PATCH 208/332] libarchive: Disable string conversion test on FreeBSD

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

diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 9469def9b188..8f9f756a2ee9 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -65,6 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
         #   bsdcpio: linkfile: large inode number truncated: Numerical result out of range
         "cpio/test/test_basic.c"
         "cpio/test/test_format_newc.c"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+        # Locales are broken while building FreeBSD stdenv
+        # Optimally they would be fixed, but it is challenging to debug.
+        "libarchive/test/test_archive_string_conversion.c"
       ];
       removeTest = testPath: ''
         substituteInPlace Makefile.am --replace-fail "${testPath}" ""

From 1e4eae9424e611d5eb045b48c4cc465db0b16056 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 22 May 2026 18:24:23 +0200
Subject: [PATCH 209/332] debian-devscripts: vendor patches

Both patches are from unmerged PRs and the commit corresponding to the
second patch has already been garbage-collected, causing the build of
debian-devscripts to fail.

The first vendored patch corresponds to
https://github.com/Debian/devscripts/commit/c6a018e0ef50a1b0cb4962a2f96dae7c6f21f1d4.patch
from https://github.com/Debian/devscripts/pull/2.

The second vendored patch corresponds to
https://salsa.debian.org/debian/devscripts/-/merge_requests/637.patch
from https://salsa.debian.org/debian/devscripts/-/merge_requests/637.

Hydra: https://hydra.nixos.org/build/329270098
---
 ...rdening-check-obey-binutils-env-vars.patch |  72 ++++++
 pkgs/by-name/de/debian-devscripts/package.nix |  15 +-
 .../write-to-stdout-and-exit-0.patch          | 212 ++++++++++++++++++
 3 files changed, 289 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/de/debian-devscripts/hardening-check-obey-binutils-env-vars.patch
 create mode 100644 pkgs/by-name/de/debian-devscripts/write-to-stdout-and-exit-0.patch

diff --git a/pkgs/by-name/de/debian-devscripts/hardening-check-obey-binutils-env-vars.patch b/pkgs/by-name/de/debian-devscripts/hardening-check-obey-binutils-env-vars.patch
new file mode 100644
index 000000000000..65a06da93f73
--- /dev/null
+++ b/pkgs/by-name/de/debian-devscripts/hardening-check-obey-binutils-env-vars.patch
@@ -0,0 +1,72 @@
+From c6a018e0ef50a1b0cb4962a2f96dae7c6f21f1d4 Mon Sep 17 00:00:00 2001
+From: Robert Scott <code@humanleg.org.uk>
+Date: Sun, 12 Feb 2023 23:04:15 +0000
+Subject: [PATCH] hardening-check: obey READELF, LDD & OBJDUMP env vars for
+ tool names
+
+this is useful on e.g. cross-build systems where the desired
+tools may have platform-denoting prefixes
+---
+ scripts/hardening-check.pl | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/scripts/hardening-check.pl b/scripts/hardening-check.pl
+index ad7f4e43..d4b1f79e 100755
+--- a/scripts/hardening-check.pl
++++ b/scripts/hardening-check.pl
+@@ -47,6 +47,9 @@
+ pod2usage(1)                                                if $help;
+ pod2usage(-exitstatus => 0, -verbose => 2, -noperldoc => 1) if $man;
+ 
++my $ldd     = $ENV{'LDD'} || "ldd";
++my $objdump = $ENV{'OBJDUMP'} || "objdump";
++my $readelf = $ENV{'READELF'} || "readelf";
+ my $overall = 0;
+ my $rc      = 0;
+ my $report  = "";
+@@ -220,8 +223,8 @@ (@)
+ # Find the libc used in this executable, if any.
+ sub find_libc($) {
+     my ($file) = @_;
+-    my $ldd = output("ldd", $file);
+-    $ldd =~ /^\s*libc\.so\.\S+\s+\S+\s+(\S+)/m;
++    my $ldd_out = output($ldd, $file);
++    $ldd_out =~ /^\s*libc\.so\.\S+\s+\S+\s+(\S+)/m;
+     return $1 || "";
+ }
+ 
+@@ -232,7 +235,7 @@ ($$)
+     # Catch "NOTYPE" for object archives.
+     my $func_regex = " (I?FUNC|NOTYPE) ";
+ 
+-    my $relocs = output("readelf", "-sW", $file);
++    my $relocs = output($readelf, "-sW", $file);
+     for my $line (split("\n", $relocs)) {
+         next if ($line               !~ /$func_regex/);
+         next if ($undefined && $line !~ /$func_regex.* UND /);
+@@ -271,21 +274,21 @@ ($$)
+     @tags   = ();
+ 
+     # Get program headers.
+-    my $PROG_REPORT = output("readelf", "-lW", $file);
++    my $PROG_REPORT = output($readelf, "-lW", $file);
+     if (length($PROG_REPORT) == 0) {
+         $overall = 1;
+         next;
+     }
+ 
+     # Get ELF headers.
+-    my $DYN_REPORT = output("readelf", "-dW", $file);
++    my $DYN_REPORT = output($readelf, "-dW", $file);
+ 
+     # Get disassembly
+     my $DISASM
+-      = output("objdump", "-d", "--no-show-raw-insn", "-M", "intel", $file);
++      = output($objdump, "-d", "--no-show-raw-insn", "-M", "intel", $file);
+ 
+     # Get notes
+-    my $NOTES = output("readelf", "-n", $file);
++    my $NOTES = output($readelf, "-n", $file);
+ 
+     # Get list of all symbols needing external resolution.
+     my $functions = find_functions($file, 1);
diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index 6a686bcc29db..0637f01e2d7c 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch,
   xz,
   dpkg,
   libxslt,
@@ -44,17 +43,13 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    (fetchpatch {
-      name = "hardening-check-obey-binutils-env-vars.patch";
-      url = "https://github.com/Debian/devscripts/pull/2/commits/c6a018e0ef50a1b0cb4962a2f96dae7c6f21f1d4.patch";
-      hash = "sha256-UpS239JiAM1IYxNuJLdILq2h0xlR5t0Tzhj47xiMHww=";
-    })
+    # hardening-check: obey READELF, LDD & OBJDUMP env vars for tool names
+    # https://github.com/Debian/devscripts/pull/2
+    ./hardening-check-obey-binutils-env-vars.patch
+
     # Write to stdout and exit 0 for --help, --version
     # https://salsa.debian.org/debian/devscripts/-/merge_requests/637
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/devscripts/-/commit/dbb258ea17749e2d102d4d181fe2709bda5584e7.patch";
-      hash = "sha256-+/E1UhxKk4PYD1bO1kI0qjfBpcMoFbo3xiY45IQ/FWU=";
-    })
+    ./write-to-stdout-and-exit-0.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/de/debian-devscripts/write-to-stdout-and-exit-0.patch b/pkgs/by-name/de/debian-devscripts/write-to-stdout-and-exit-0.patch
new file mode 100644
index 000000000000..47acda7c5f9a
--- /dev/null
+++ b/pkgs/by-name/de/debian-devscripts/write-to-stdout-and-exit-0.patch
@@ -0,0 +1,212 @@
+From d76aaa05cb44a6ba741c74a83a319fcabf493865 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Mon, 20 Apr 2026 13:59:02 -0700
+Subject: [PATCH 1/5] dpkg-genbuilddeps: exit 0 for --help, --version
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+---
+ scripts/dpkg-genbuilddeps.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/dpkg-genbuilddeps.sh b/scripts/dpkg-genbuilddeps.sh
+index 04cb048d..dd140ea7 100755
+--- a/scripts/dpkg-genbuilddeps.sh
++++ b/scripts/dpkg-genbuilddeps.sh
+@@ -14,12 +14,12 @@ Options:
+    -h, --help     This help
+    -v, --version  Report version and exit
+ EOF
+-	    exit 1
++	    exit 0
+ 	    ;;
+ 	-v|--version)
+ 	    echo "$PROGNAME wrapper for dpkg-depcheck:"
+ 	    dpkg-depcheck --version
+-	    exit 1
++	    exit 0
+ 	    ;;
+     esac
+ fi
+-- 
+GitLab
+
+
+From 183ed0a70f6f72dc6bf4d9765285c62b8c7e8629 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Mon, 20 Apr 2026 14:04:43 -0700
+Subject: [PATCH 2/5] debchange: Use ###VERSION###
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+---
+ scripts/debchange.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/debchange.pl b/scripts/debchange.pl
+index adae33d9..0b60b0b2 100755
+--- a/scripts/debchange.pl
++++ b/scripts/debchange.pl
+@@ -250,7 +250,7 @@ EOF
+ 
+ sub version () {
+     print <<"EOF";
+-This is $progname, from the Debian devscripts package, version 2.17.10
++This is $progname, from the Debian devscripts package, version ###VERSION###
+ This code is copyright 1999-2003 by Julian Gilbey, all rights reserved.
+ Based on code by Christoph Lameter.
+ This program comes with ABSOLUTELY NO WARRANTY.
+-- 
+GitLab
+
+
+From 73625a57909ea3fd7c5cdea3115c9d16f87668a9 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Mon, 20 Apr 2026 14:12:18 -0700
+Subject: [PATCH 3/5] hardening-check: exit 0 for --help
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+---
+ scripts/hardening-check.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/hardening-check.pl b/scripts/hardening-check.pl
+index 1a2b2dfa..433c1ca6 100755
+--- a/scripts/hardening-check.pl
++++ b/scripts/hardening-check.pl
+@@ -46,7 +46,7 @@ GetOptions(
+     "help|h|?"               => \$help,
+     "man|H"                  => \$man,
+ ) or pod2usage(2);
+-pod2usage(1)                                                if $help;
++pod2usage(0)                                                if $help;
+ pod2usage(-exitstatus => 0, -verbose => 2, -noperldoc => 1) if $man;
+ 
+ my $overall = 0;
+-- 
+GitLab
+
+
+From e8fb22f6d8d7a916f66ca87fa252d03af6270105 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Mon, 20 Apr 2026 14:46:50 -0700
+Subject: [PATCH 4/5] who-permits-upload: Write to stdout, exit 0 for --help
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+---
+ scripts/who-permits-upload.pl | 44 ++++++++++++++++++-----------------
+ 1 file changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/scripts/who-permits-upload.pl b/scripts/who-permits-upload.pl
+index 99e3e1df..60b4a1f9 100755
+--- a/scripts/who-permits-upload.pl
++++ b/scripts/who-permits-upload.pl
+@@ -189,39 +189,41 @@ if ($TYPE eq 'package') {
+ } elsif ($TYPE eq 'sponsor') {
+     $TYPE = TYPE_SPONSOR;
+ } else {
+-    usage();
++    usage(*STDERR);
++    exit 2;
+ }
+ 
+ if ($HELP) {
+-    usage();
++    usage(*STDOUT);
++    exit 0;
+ }
+ 
+ if (not @ARGUMENTS) {
+-    usage();
++    usage(*STDERR);
++    exit 2;
+ }
+ 
+ sub usage {
+-    print STDERR (
++    my ($fh) = @_;
++    print $fh (
+ "Usage: $0 [-h][-s KEYRING][-d DM_URL][-s SEARCH_TYPE] QUERY [QUERY ...]\n"
+     );
+-    print STDERR "Retrieve permissions granted to Debian Maintainers (DM)\n";
+-    print STDERR "\n";
+-    print STDERR "-h, --help\n";
+-    print STDERR "\t\t\tDisplay this usage summary and exit\n";
+-    print STDERR "-k, --keyring=KEYRING\n";
+-    print STDERR
++    print $fh "Retrieve permissions granted to Debian Maintainers (DM)\n";
++    print $fh "\n";
++    print $fh "-h, --help\n";
++    print $fh "\t\t\tDisplay this usage summary and exit\n";
++    print $fh "-k, --keyring=KEYRING\n";
++    print $fh
+       "\t\t\tUse the supplied keyring file(s) instead of the default\n";
+-    print STDERR "\t\t\tkeyring. Separate arguments by a colon (\":\")\n";
+-    print STDERR "-d, --dmfile=DM_URL\n";
+-    print STDERR "\t\t\tRetrieve DM permissions from the supplied URL.\n";
+-    print STDERR "\t\t\tDefault is https://ftp-master.debian.org/dm.txt\n";
+-    print STDERR "-s, --search=SEARCH_TYPE\n";
+-    print STDERR "\t\t\tSupplied QUERY arguments are interpreted as:\n";
+-    print STDERR
+-      "\t\t\tpackage name when SEARCH_TYPE is \"package\" (default)\n";
+-    print STDERR "\t\t\tDM user name id when SEARCH_TYPE is \"uid\"\n";
+-    print STDERR "\t\t\tsponsor user id when SEARCH_TYPE is \"sponsor\"\n";
+-    exit 2;
++    print $fh "\t\t\tkeyring. Separate arguments by a colon (\":\")\n";
++    print $fh "-d, --dmfile=DM_URL\n";
++    print $fh "\t\t\tRetrieve DM permissions from the supplied URL.\n";
++    print $fh "\t\t\tDefault is https://ftp-master.debian.org/dm.txt\n";
++    print $fh "-s, --search=SEARCH_TYPE\n";
++    print $fh "\t\t\tSupplied QUERY arguments are interpreted as:\n";
++    print $fh "\t\t\tpackage name when SEARCH_TYPE is \"package\" (default)\n";
++    print $fh "\t\t\tDM user name id when SEARCH_TYPE is \"uid\"\n";
++    print $fh "\t\t\tsponsor user id when SEARCH_TYPE is \"sponsor\"\n";
+ }
+ 
+ sub leave {
+-- 
+GitLab
+
+
+From d91e190604da139b2b492efcdeb55a099467dd03 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Mon, 20 Apr 2026 15:36:22 -0700
+Subject: [PATCH 5/5] cowpoke: Write to stdout for --help
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+---
+ scripts/cowpoke.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/cowpoke.sh b/scripts/cowpoke.sh
+index 54dd9fc2..f7756322 100755
+--- a/scripts/cowpoke.sh
++++ b/scripts/cowpoke.sh
+@@ -111,7 +111,7 @@ GNU General Public License."
+ }
+ 
+ usage() {
+-    cat 1>&2 <<EOF
++    cat <<EOF
+ 
+ cowpoke [options] package.dsc
+ 
+@@ -258,7 +258,7 @@ for arg; do
+ 
+ 	*)
+ 	    echo "ERROR: unrecognised option '$arg'"
+-	    usage 1
++	    usage 1 >&2
+ 	    ;;
+     esac
+ done
+@@ -269,7 +269,7 @@ if [ -z "$REMOTE_SCRIPT" ]; then
+ fi
+ if [ -z "$DSC" ]; then
+     echo "ERROR: No package .dsc specified"
+-    usage 1
++    usage 1 >&2
+ fi
+ if ! [ -r "$DSC" ]; then
+     echo "ERROR: '$DSC' not found."
+-- 
+GitLab
+

From d2ea1ace635737c4d4efe66ffe7a1d90507ae5c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 16:46:52 +0000
Subject: [PATCH 210/332] starlark: 0-unstable-2026-03-26 ->
 0-unstable-2026-05-22

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

diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 7f4f4d885785..57ca8a24f0a1 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2026-03-26";
+  version = "0-unstable-2026-05-22";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "fadfc96def35ea95e7f2bd9952256d4db1d80d91";
-    hash = "sha256-t+7QUORMlRCA1lLhekPrR3ag7hmX++DrSOBQunTMLFM=";
+    rev = "ec58d4b459e2866ed51124596d888ed7aa4f90b8";
+    hash = "sha256-9H0TIp2CIGo5Rqld9Xvsg/uQmfswiUzSsu7vwazjcho=";
   };
 
   vendorHash = "sha256-Ejw5f5ulEcLHm4WYKatwA7FZ9lfdqZTOE3SdkaK6jYE=";

From 98086d4dcfbcb53afb31b474c5c2c510451456b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 17:05:42 +0000
Subject: [PATCH 211/332] nwg-panel: 0.10.13 -> 0.10.15

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

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index a0b79ff060b5..a33a524a55e2 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nwg-panel";
-  version = "0.10.13";
+  version = "0.10.15";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TfE2RjbCBoHcdp9st+HeVhSfTMahZdQaItOIuT8Sxcc=";
+    hash = "sha256-zRoOsVnwn2DQctB9ZP0pAAnf9Ragd2RZGHZGN1KnMsQ=";
   };
 
   # No tests

From b3b4645f0cf7c11755bacb7698ad283db7dd3210 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 17 May 2026 11:31:57 +0000
Subject: [PATCH 212/332] xonsh: 0.23.5 -> 0.23.7

---
 pkgs/by-name/xo/xonsh/unwrapped.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 2fc27e57c7d1..f26ac839197c 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "xonsh";
-  version = "0.23.5";
+  version = "0.23.7";
   pyproject = true;
 
   # PyPI package ships incomplete tests
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "xonsh";
     repo = "xonsh";
     tag = version;
-    hash = "sha256-jiHcOSkqvQj6/BFyDFUcTvknATAYqeVco0KecCXBWD0=";
+    hash = "sha256-KKkHqaAHnj1WMeJPrvpNXwXZ6c/V6SIIfoLYytY4kPY";
   };
 
   build-system = [
@@ -119,6 +119,13 @@ buildPythonPackage rec {
     "test_skipper_command"
     "test_xonsh_lexer_no_win"
     "test_on_command_not_found_dict_without_env"
+    "test_alias_shadowing_real_binary_is_not_only_functional"
+    "test_complete_inner_command_plain"
+    "test_complete_inner_command_after_double_dash"
+    "test_complete_inner_command_after_double_dash_empty"
+    "test_complete_inner_command_after_flag_with_value"
+    "test_complete_inner_command_after_long_flag_with_value"
+    "test_complete_inner_command_after_env_assign"
   ];
 
   disabledTestPaths = [

From 79d21004a23e2927ea8b479da3128b5bf9e8ba91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 18:29:00 +0000
Subject: [PATCH 213/332] mirrord: 3.210.0 -> 3.211.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index e709411eb6a9..d0919eeffcf3 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.210.0",
+  "version": "3.211.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_linux_x86_64",
-      "hash": "sha256-eg7eO97SHZQoju/wH/6IvyEmLi//HXLsDJ3AjeJyPA8="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_linux_x86_64",
+      "hash": "sha256-5ke7ZXbqGAWcwUNW5ofrc0Ez7XS9oekHFuVagFeMwKA="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_linux_aarch64",
-      "hash": "sha256-J+2jHv3/QhpxOHoCMTJMr1k8TTQfQVYjPGuZeZ0GufQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_linux_aarch64",
+      "hash": "sha256-o9Hu5TqPzcOmbwAG40f6CDw5VE/3v3ggXJ6/2RPuReU="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_mac_universal",
-      "hash": "sha256-GctpfiYZOfkYqbAmTWV+VHxbg4IGc/xhZvacgBltJnU="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_mac_universal",
+      "hash": "sha256-aOPjhsMAVP5Jn8pjxRyr/92HXlMB5nix9BwHoc2uf8A="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_mac_universal",
-      "hash": "sha256-GctpfiYZOfkYqbAmTWV+VHxbg4IGc/xhZvacgBltJnU="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_mac_universal",
+      "hash": "sha256-aOPjhsMAVP5Jn8pjxRyr/92HXlMB5nix9BwHoc2uf8A="
     }
   }
 }

From 72589a5689b9177f2570e908c59fbe2f5d9a8c27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 18:44:15 +0000
Subject: [PATCH 214/332] rgl: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/by-name/rg/rgl/package.nix b/pkgs/by-name/rg/rgl/package.nix
index ead2adb11887..c584d0b2d64c 100644
--- a/pkgs/by-name/rg/rgl/package.nix
+++ b/pkgs/by-name/rg/rgl/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgl";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "ink0rr";
     repo = "rgl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kucD1FosCV2dxhLzxpOv/HvsqddH3NiAEVkqGTWTmGE=";
+    hash = "sha256-UBr6yv6fDa3DhPYY/RGkCcjT15UnGa5cDJBUsCkeRjw=";
   };
 
-  cargoHash = "sha256-/BeT18tIucgq1b5js+7QX0d1OyF5drNWMAFtv+g/XtM=";
+  cargoHash = "sha256-6qjk6f7mclRI1X91JNlKCWonSANb2R757r5/MBPRmRA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 261cdb2da56b1d971e6f05c4c6ddf92e43bbe925 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 18:56:53 +0000
Subject: [PATCH 215/332] dwproton-bin: dwproton-11.0-1 -> dwproton-11.0-2

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

diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
index 400d2e707612..88c3abc435c1 100644
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
     inherit steamDisplayName;
 
     pname = "dwproton-bin";
-    version = "dwproton-11.0-1";
+    version = "dwproton-11.0-2";
 
     src = fetchzip {
       url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-G8VeHp0POZBHfxN78PCwwm6z7zVNMveAdwf/IMJQ/9Q=";
+      hash = "sha256-3AxBr8fQh4bbAsdSSZuyQR2GOz78vdhC6jJbLmiYEXY=";
     };
 
     preFixup = ''

From 974a676436a2dc0c9d983891cd519c7b9ec6dd93 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 22 May 2026 21:12:08 +0200
Subject: [PATCH 216/332] python3Packages.wasmtime: don't run mypy via
 pytest-mypy

Type checking breaks easily and we're not interested in type checking
results [1].

Hydra: https://hydra.nixos.org/build/329220521

[1] https://nixos.org/manual/nixpkgs/unstable/#testing-python-packages
---
 pkgs/development/python-modules/wasmtime/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wasmtime/default.nix b/pkgs/development/python-modules/wasmtime/default.nix
index 0d6385e2d5ee..fd3908ff7301 100644
--- a/pkgs/development/python-modules/wasmtime/default.nix
+++ b/pkgs/development/python-modules/wasmtime/default.nix
@@ -5,7 +5,6 @@
   python,
   pkgs,
   pycparser,
-  pytest-mypy,
   pytestCheckHook,
   setuptools-git-versioning,
   setuptools,
@@ -32,6 +31,10 @@ buildPythonPackage (finalAttrs: {
     substituteInPlace ci/cbindgen.py \
       --replace-fail "'-D__builtin_va_list=int'," "'-D__builtin_va_list=int', '-Dnullptr_t=void*',"
 
+    # Don't run mypy via pytest-mypy (type checking breaks easily)
+    substituteInPlace pytest.ini \
+      --replace-fail 'addopts = --doctest-modules --mypy' 'addopts = --doctest-modules'
+
     sed -i '/^backend-path = \[/,/^\]/d' pyproject.toml
 
     # Use nixpkgs' wasmtime instead of downloading prebuilt C API artifacts.
@@ -57,7 +60,6 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pycparser
-    pytest-mypy
     pytestCheckHook
     writableTmpDirAsHomeHook
   ];

From 48f9d0652e55892b6e10094ecafebde01baf481b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 20:27:39 +0000
Subject: [PATCH 217/332] owi: 0.2-unstable-2026-05-05 ->
 0.2-unstable-2026-05-22

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

diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index d357aaa60729..486145d4f6d0 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -15,14 +15,14 @@ let
 in
 ocamlPackages.buildDunePackage {
   pname = "owi";
-  version = "0.2-unstable-2026-05-05";
+  version = "0.2-unstable-2026-05-22";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "e79d8d82918689a83e6bc74f71ce5cef85197c1c";
+    rev = "2d6ec0d897a209f34849d25f8bcfc73298820be3";
     fetchSubmodules = true;
-    hash = "sha256-zwnx5HlEJ6eUMu+9JAbxjpS4aKJbuNLfxekFqTtjq60=";
+    hash = "sha256-A+mTFvojEpIfRPJkPRf5vfHf+nk+3/hdIbJqIDv/AzM=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From 5bc550b3c13831f9d78420d6437fef3c3859e36e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 May 2026 21:49:50 +0100
Subject: [PATCH 218/332] nginxMainline: 1.31.0 -> 1.31.1

Changes: https://nginx.org/en/CHANGES
---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 5577ca7a583f..7e6e8943428c 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.31.0";
-  hash = "sha256-bVsA1FOTry5OfFKkQtKhmPDMvHZ47QYqRvQD7dgz66o=";
+  version = "1.31.1";
+  hash = "sha256-n8quuPIlRLCaGadh80EsQRIhVCJAFjS+vdEpakA8xLw=";
 }

From 79ca1dd2b541795da8cdabac5d7df6fa87ab42a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 20:55:49 +0000
Subject: [PATCH 219/332] wgsl-analyzer: 2026-03-13 -> 2026-04-26

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

diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix
index 14872174f4b7..9c670bbd998f 100644
--- a/pkgs/by-name/wg/wgsl-analyzer/package.nix
+++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wgsl-analyzer";
-  version = "2026-03-13";
+  version = "2026-04-26";
 
   src = fetchFromGitHub {
     owner = "wgsl-analyzer";
     repo = "wgsl-analyzer";
     tag = finalAttrs.version;
-    hash = "sha256-a1H/QJhLdBiwjqiG3icsKrSMz079yBjdBKffGANgdTQ=";
+    hash = "sha256-OmXuUqkoLYs4R6Bb0oguiC3oG0C+F0Vy3X8DTNnlFYU=";
   };
 
-  cargoHash = "sha256-UM8oEg8gpsq9lnoDpeArGTl36EE7Tn6YMHXEIagVGvI=";
+  cargoHash = "sha256-fWgpzuo9+VfG3/mf2Bpfc9ZuzpL9Cap0BkXLyuBaq+s=";
 
   checkFlags = [
     # Imports failures

From 36114916a325a3b93b4dde17861ac486ec0d0d39 Mon Sep 17 00:00:00 2001
From: soyouzpanda <soyouzpanda@soyouzpanda.fr>
Date: Thu, 22 May 2025 22:05:36 +0200
Subject: [PATCH 220/332] nixos/lasuite-drive: init

---
 .../manual/release-notes/rl-2605.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/web-apps/lasuite-drive.nix       | 542 ++++++++++++++++++
 3 files changed, 545 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/lasuite-drive.nix

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index e8d53ac85c4b..cffbb0702f8d 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -130,6 +130,8 @@
 
 - [Howdy](https://github.com/boltgolt/howdy), a Windows Hello™ style facial authentication program for Linux.
 
+- [SuiteNumérique Drive](https://github.com/suitenumerique/drive), a collaborative file sharing and document management platform that scales. Built with Django and React. Open source alternative to Sharepoint or Google Drive.
+
 - [linux-enable-ir-emitter](https://github.com/EmixamPP/linux-enable-ir-emitter), a tool used to set up IR cameras, used with Howdy.
 
 - [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 718fb29d4d8d..ddcba6515fed 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1696,6 +1696,7 @@
   ./services/web-apps/komga.nix
   ./services/web-apps/lanraragi.nix
   ./services/web-apps/lasuite-docs.nix
+  ./services/web-apps/lasuite-drive.nix
   ./services/web-apps/lasuite-meet.nix
   ./services/web-apps/lauti.nix
   ./services/web-apps/lemmy.nix
diff --git a/nixos/modules/services/web-apps/lasuite-drive.nix b/nixos/modules/services/web-apps/lasuite-drive.nix
new file mode 100644
index 000000000000..bd7d17f105ca
--- /dev/null
+++ b/nixos/modules/services/web-apps/lasuite-drive.nix
@@ -0,0 +1,542 @@
+{
+  config,
+  lib,
+  pkgs,
+  utils,
+  ...
+}:
+let
+  inherit (lib)
+    concatMapStringsSep
+    concatStringsSep
+    escapeShellArg
+    getExe
+    hasSuffix
+    mapAttrs
+    match
+    mkEnableOption
+    mkIf
+    mkPackageOption
+    mkOption
+    types
+    optional
+    optionalString
+    ;
+
+  cfg = config.services.lasuite-drive;
+
+  pythonEnvironment = mapAttrs (
+    _: value:
+    if value == null then
+      "None"
+    else if value == true then
+      "True"
+    else if value == false then
+      "False"
+    else
+      toString value
+  ) cfg.settings;
+
+  commonServiceConfig = {
+    RuntimeDirectory = "lasuite-drive";
+    StateDirectory = "lasuite-drive";
+    WorkingDirectory = "/var/lib/lasuite-drive";
+
+    User = "lasuite-drive";
+    DynamicUser = true;
+    SupplementaryGroups = mkIf cfg.redis.createLocally [
+      config.services.redis.servers.lasuite-drive.group
+    ];
+    # hardening
+    AmbientCapabilities = "";
+    CapabilityBoundingSet = [ "" ];
+    DevicePolicy = "closed";
+    LockPersonality = true;
+    NoNewPrivileges = true;
+    PrivateDevices = true;
+    PrivateTmp = true;
+    PrivateUsers = true;
+    ProcSubset = "pid";
+    ProtectClock = true;
+    ProtectControlGroups = true;
+    ProtectHome = true;
+    ProtectHostname = true;
+    ProtectKernelLogs = true;
+    ProtectKernelModules = true;
+    ProtectKernelTunables = true;
+    ProtectProc = "invisible";
+    ProtectSystem = "strict";
+    RemoveIPC = true;
+    MemoryDenyWriteExecute = true;
+    RestrictAddressFamilies = [
+      "AF_INET"
+      "AF_INET6"
+      "AF_UNIX"
+    ];
+    RestrictNamespaces = true;
+    RestrictRealtime = true;
+    RestrictSUIDSGID = true;
+    SystemCallArchitectures = "native";
+    UMask = "0077";
+    EnvironmentFile = cfg.environmentFiles;
+  };
+
+  proxySuffix = if match "unix:.*" cfg.bind != null then ":" else "";
+
+  # Convert environment variables to be used as systemd-run arguments
+  envArgs = lib.concatStringsSep " " (
+    lib.mapAttrsToList (name: value: "-E ${escapeShellArg "${name}=${value}"}") pythonEnvironment
+  );
+
+  # Easier usage of django manage.py stuff
+  manage = pkgs.writeShellScriptBin "lasuite-drive-manage" ''
+    exec ${lib.getExe' config.systemd.package "systemd-run"} \
+      -p User=${commonServiceConfig.User} \
+      -p DynamicUser=yes \
+      -p StateDirectory=${commonServiceConfig.StateDirectory} \
+      ${optionalString cfg.redis.createLocally "-p SupplementaryGroups=${config.services.redis.servers.lasuite-drive.group} \\"}
+      ${concatMapStringsSep "\n" (envFile: "-p EnvironmentFile=${envFile} \\") cfg.environmentFiles}
+      --working-directory=${commonServiceConfig.WorkingDirectory} \
+      --quiet --collect --pipe --pty \
+      ${envArgs} ${lib.getExe cfg.package} "$@"
+  '';
+in
+{
+  options.services.lasuite-drive = {
+    enable = mkEnableOption "SuiteNumérique Drive";
+
+    package = mkPackageOption pkgs "lasuite-drive" { };
+
+    bind = mkOption {
+      type = types.str;
+      default = "unix:/run/lasuite-drive/gunicorn.sock";
+      example = "127.0.0.1:8000";
+      description = ''
+        The path, host/port or file descriptior to bind the gunicorn socket to.
+
+        See  <https://docs.gunicorn.org/en/stable/settings.html#bind> for possible options.
+      '';
+    };
+
+    enableNginx = mkEnableOption "enable and configure Nginx for reverse proxying" // {
+      default = true;
+    };
+
+    secretKeyPath = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Path to the Django secret key.
+
+        The key can be generated using:
+        ```
+        python3 -c 'import secrets; print(secrets.token_hex())'
+        ```
+
+        :::{.note}
+        If not specified, a secret key is automatically generated and stored in the state directory.
+        :::
+      '';
+    };
+
+    s3Url = mkOption {
+      type = types.str;
+      description = ''
+        URL of the S3 bucket.
+      '';
+    };
+
+    postgresql = {
+      createLocally = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Configure local PostgreSQL database server for drive.
+        '';
+      };
+    };
+
+    redis = {
+      createLocally = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Configure local Redis cache server for drive.
+        '';
+      };
+    };
+
+    gunicorn = {
+      extraArgs = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "--name=drive"
+          "--workers=3"
+        ];
+        description = ''
+          Extra arguments to pass to the gunicorn process.
+        '';
+      };
+    };
+
+    celery = {
+      extraArgs = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        description = ''
+          Extra arguments to pass to the celery process.
+        '';
+      };
+    };
+
+    domain = mkOption {
+      type = types.str;
+      description = ''
+        Domain name of the drive instance.
+      '';
+    };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType = types.attrsOf (
+          types.nullOr (
+            types.oneOf [
+              types.str
+              types.bool
+              types.path
+              types.int
+            ]
+          )
+        );
+
+        options = {
+          DJANGO_CONFIGURATION = mkOption {
+            type = types.str;
+            internal = true;
+            default = "Production";
+            description = "The configuration that Django will use";
+          };
+
+          DJANGO_SETTINGS_MODULE = mkOption {
+            type = types.str;
+            internal = true;
+            default = "drive.settings";
+            description = "The configuration module that Django will use";
+          };
+
+          DJANGO_SECRET_KEY_FILE = mkOption {
+            type = types.path;
+            default =
+              if cfg.secretKeyPath == null then "/var/lib/lasuite-drive/django_secret_key" else cfg.secretKeyPath;
+            description = "The path to the file containing Django's secret key";
+          };
+
+          DATA_DIR = mkOption {
+            type = types.path;
+            default = "/var/lib/lasuite-drive";
+            description = "Path to the data directory";
+            readOnly = true;
+          };
+
+          DJANGO_ALLOWED_HOSTS = mkOption {
+            type = types.listOf types.str;
+            default =
+              if cfg.enableNginx then
+                [
+                  "localhost"
+                  "127.0.0.1"
+                  cfg.domain
+                ]
+              else
+                [ ];
+            defaultText = lib.literalExpression ''
+              if cfg.enableNginx then [ "localhost" "127.0.0.1" cfg.domain ] else [ ]
+            '';
+            apply = list: concatStringsSep "," list;
+            description = "Comma-separated list of hosts that are able to connect to the server";
+          };
+
+          DB_NAME = mkOption {
+            type = types.str;
+            default = "lasuite-drive";
+            description = "Name of the database";
+          };
+
+          DB_USER = mkOption {
+            type = types.str;
+            default = "lasuite-drive";
+            description = "User of the database";
+          };
+
+          DB_HOST = mkOption {
+            type = types.nullOr types.str;
+            default = if cfg.postgresql.createLocally then "/run/postgresql" else null;
+            description = "Host of the database";
+          };
+
+          REDIS_URL = mkOption {
+            type = types.nullOr types.str;
+            default =
+              if cfg.redis.createLocally then
+                "unix://${config.services.redis.servers.lasuite-drive.unixSocket}?db=1"
+              else
+                null;
+            description = "URL of the redis backend";
+          };
+
+          CELERY_BROKER_URL = mkOption {
+            type = types.nullOr types.str;
+            default =
+              if cfg.redis.createLocally then
+                "redis+socket://${config.services.redis.servers.lasuite-drive.unixSocket}?db=2"
+              else
+                null;
+            description = "URL of the redis backend for celery";
+          };
+        };
+      };
+      default = { };
+      example = ''
+        {
+          AWS_S3_ENDPOINT_URL = "https://s3.us-west.amazonaws.com";
+        }
+      '';
+      description = ''
+        Configuration options of drive.
+
+        See <https://github.com/suitenumerique/drive/blob/v${cfg.package.version}/docs/env.md>
+
+        `REDIS_URL` and `CELERY_BROKER_URL` are set if `services.lasuite-drive.redis.createLocally` is true.
+        `DB_HOST` is set if `services.lasuite-drive.postgresql.createLocally` is true.
+      '';
+    };
+
+    environmentFiles = mkOption {
+      type = types.listOf types.path;
+      default = [ ];
+      description = ''
+        Path to environment files.
+
+        This can be useful to pass secrets to drive via tools like `agenix` or `sops`.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    warnings = mkIf (cfg.enableNginx && !(hasSuffix "/" cfg.s3Url)) [
+      ''
+        services.lasuite-drive.s3Url should end with a trailing slash (/).
+        This could break the HTTP requests by nginx to the S3 backend.
+      ''
+    ];
+
+    environment.systemPackages = [ manage ];
+
+    systemd.services.lasuite-drive = {
+      description = "Drive from SuiteNumérique";
+      after = [
+        "network-online.target"
+      ]
+      ++ (optional cfg.postgresql.createLocally "postgresql.service")
+      ++ (optional cfg.redis.createLocally "redis-lasuite-drive.service");
+      wants =
+        (optional cfg.postgresql.createLocally "postgresql.service")
+        ++ (optional cfg.redis.createLocally "redis-lasuite-drive.service");
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        if [ ! -f .version ]; then
+          touch .version
+        fi
+
+        ${optionalString (cfg.secretKeyPath == null) ''
+          if [[ ! -f /var/lib/lasuite-drive/django_secret_key ]]; then
+            (
+              umask 0377
+              tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge /var/lib/lasuite-drive/django_secret_key
+            )
+          fi
+        ''}
+        if [ "${cfg.package.version}" != "$(cat .version)" ]; then
+          ${getExe cfg.package} migrate
+          echo -n "${cfg.package.version}" > .version
+        fi
+      '';
+
+      environment = pythonEnvironment;
+
+      serviceConfig = {
+        BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-drive/static";
+
+        ExecStart = utils.escapeSystemdExecArgs (
+          [
+            (lib.getExe' cfg.package "gunicorn")
+            "--bind=${cfg.bind}"
+          ]
+          ++ cfg.gunicorn.extraArgs
+          ++ [ "drive.wsgi:application" ]
+        );
+      }
+      // commonServiceConfig;
+    };
+
+    systemd.services.lasuite-drive-celery = {
+      description = "Docs Celery broker from SuiteNumérique";
+      after = [
+        "network-online.target"
+      ]
+      ++ (optional cfg.postgresql.createLocally "postgresql.service")
+      ++ (optional cfg.redis.createLocally "redis-lasuite-drive.service");
+      wants =
+        (optional cfg.postgresql.createLocally "postgresql.service")
+        ++ (optional cfg.redis.createLocally "redis-lasuite-drive.service");
+      wantedBy = [ "multi-user.target" ];
+
+      environment = pythonEnvironment;
+
+      serviceConfig = {
+        ExecStart = utils.escapeSystemdExecArgs (
+          [ (lib.getExe' cfg.package "celery") ]
+          ++ cfg.celery.extraArgs
+          ++ [
+            "--app=drive.celery_app"
+            "worker"
+          ]
+        );
+      }
+      // commonServiceConfig;
+    };
+
+    systemd.services.lasuite-drive-beat = {
+      description = "Docs Celery beat from SuiteNumérique";
+      after = [
+        "network-online.target"
+      ]
+      ++ (optional cfg.postgresql.createLocally "postgresql.service")
+      ++ (optional cfg.redis.createLocally "redis-lasuite-drive.service");
+      wants =
+        (optional cfg.postgresql.createLocally "postgresql.service")
+        ++ (optional cfg.redis.createLocally "redis-lasuite-drive.service");
+      wantedBy = [ "multi-user.target" ];
+
+      environment = pythonEnvironment;
+
+      serviceConfig = {
+        ExecStart = utils.escapeSystemdExecArgs (
+          [ (lib.getExe' cfg.package "celery") ]
+          ++ cfg.celery.extraArgs
+          ++ [
+            "--app=drive.celery_app"
+            "beat"
+          ]
+        );
+      }
+      // commonServiceConfig;
+    };
+
+    services.postgresql = mkIf cfg.postgresql.createLocally {
+      enable = true;
+      ensureDatabases = [ "lasuite-drive" ];
+      ensureUsers = [
+        {
+          name = "lasuite-drive";
+          ensureDBOwnership = true;
+        }
+      ];
+    };
+
+    services.redis.servers.lasuite-drive = mkIf cfg.redis.createLocally { enable = true; };
+
+    services.nginx = mkIf cfg.enableNginx {
+      enable = true;
+
+      virtualHosts.${cfg.domain} = {
+        extraConfig = ''
+          error_page 401 /401.html;
+          error_page 403 /403.html;
+          error_page 404 /404.html;
+        '';
+
+        root = cfg.package.frontend;
+
+        locations."/" = {
+          tryFiles = "$uri $uri.html index.html $uri/ =404";
+        };
+
+        locations."~ '^/explorer/items/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$'" =
+          {
+            tryFiles = "$uri /explorer/items/[id].html";
+          };
+
+        locations."~ '^/explorer/items/files/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$'" =
+          {
+            tryFiles = "$uri /explorer/items/files/[id].html";
+          };
+
+        locations."~ '^/wopi/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$'" = {
+          tryFiles = "$uri /wopi/[id].html";
+        };
+
+        locations."/static/" = {
+          alias = "${cfg.package}/share/static/";
+        };
+
+        locations."/api" = {
+          proxyPass = "http://${cfg.bind}";
+          recommendedProxySettings = true;
+        };
+
+        locations."/admin" = {
+          proxyPass = "http://${cfg.bind}";
+          recommendedProxySettings = true;
+        };
+
+        locations."/media-auth" = {
+          proxyPass = "http://${cfg.bind}${proxySuffix}/api/v1.0/items/media-auth/";
+          recommendedProxySettings = true;
+          extraConfig = ''
+            proxy_set_header X-Original-URL $request_uri;
+            proxy_pass_request_body off;
+            proxy_set_header Content-Length "";
+            proxy_set_header X-Original-Method $request_method;
+          '';
+        };
+
+        locations."/media/" = {
+          proxyPass = cfg.s3Url;
+          extraConfig = ''
+            auth_request /media-auth;
+            auth_request_set $authHeader $upstream_http_authorization;
+            auth_request_set $authDate $upstream_http_x_amz_date;
+            auth_request_set $authContentSha256 $upstream_http_x_amz_content_sha256;
+
+            proxy_set_header Authorization $authHeader;
+            proxy_set_header X-Amz-Date $authDate;
+            proxy_set_header X-Amz-Content-SHA256 $authContentSha256;
+
+            add_header Content-Disposition "attachment";
+          '';
+        };
+
+        locations."/media/preview/" = {
+          proxyPass = cfg.s3Url;
+          extraConfig = ''
+            auth_request /media-auth;
+            auth_request_set $authHeader $upstream_http_authorization;
+            auth_request_set $authDate $upstream_http_x_amz_date;
+            auth_request_set $authContentSha256 $upstream_http_x_amz_content_sha256;
+
+            proxy_set_header Authorization $authHeader;
+            proxy_set_header X-Amz-Date $authDate;
+            proxy_set_header X-Amz-Content-SHA256 $authContentSha256;
+          '';
+        };
+      };
+    };
+  };
+
+  meta = {
+    buildDocsInSandbox = false;
+    maintainers = [ lib.maintainers.soyouzpanda ];
+  };
+}

From 0b00dcb6dfb36210684f519c3d336c2f33fe0d5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 21:21:59 +0000
Subject: [PATCH 221/332] uv: 0.11.15 -> 0.11.16

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index dca877c6060e..a754b34d8058 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.11.15";
+  version = "0.11.16";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-Nwf7DSxXG5F515LW19q+2VpXtdVLUWx2sMQr35lvsgk=";
+    hash = "sha256-5LJspcHj/RjOMv7eRB7n+tofX4s51M3kqHCPymCg90A=";
   };
 
-  cargoHash = "sha256-PWkDAl6jkpZBz19mz4ZQmiA/RvgFC0KOftXQtZ0SFdk=";
+  cargoHash = "sha256-2lg86WxPGVbJ91zi61lKrSqnzFgmmSrBrl+SfV5SJWU=";
 
   buildInputs = [
     rust-jemalloc-sys

From 63fd999ec40acb9f64e8668561f41245ae53fffe Mon Sep 17 00:00:00 2001
From: soyouzpanda <soyouzpanda@soyouzpanda.fr>
Date: Fri, 22 May 2026 23:19:09 +0200
Subject: [PATCH 222/332] nixos/tests/lasuite-drive: init

---
 nixos/tests/all-tests.nix                 |   1 +
 nixos/tests/web-apps/lasuite-drive.nix    | 243 ++++++++++++++++++++++
 pkgs/by-name/la/lasuite-drive/package.nix |   4 +
 3 files changed, 248 insertions(+)
 create mode 100644 nixos/tests/web-apps/lasuite-drive.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e49f415dc2a1..4917afcde739 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -868,6 +868,7 @@ in
   languagetool = runTest ./languagetool.nix;
   lanraragi = runTest ./lanraragi.nix;
   lasuite-docs = runTest ./web-apps/lasuite-docs.nix;
+  lasuite-drive = runTest ./web-apps/lasuite-drive.nix;
   lasuite-meet = runTest ./web-apps/lasuite-meet.nix;
   latestKernel.login = runTest {
     imports = [ ./login.nix ];
diff --git a/nixos/tests/web-apps/lasuite-drive.nix b/nixos/tests/web-apps/lasuite-drive.nix
new file mode 100644
index 000000000000..416c49c832d9
--- /dev/null
+++ b/nixos/tests/web-apps/lasuite-drive.nix
@@ -0,0 +1,243 @@
+{ lib, ... }:
+let
+  domain = "drive.local";
+  oidcAddr = "127.0.0.1:8080";
+  s3Addr = "127.0.0.1:9000";
+
+  garageAccessKey = "GKaaaaaaaaaaaaaaaaaaaaaaaa";
+  garageSecretKey = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+in
+
+{
+  name = "lasuite-drive";
+  meta.maintainers = with lib.maintainers; [
+    soyouzpanda
+  ];
+
+  containers.machine =
+    { pkgs, ... }:
+    {
+      networking.hosts."127.0.0.1" = [ domain ];
+
+      environment.systemPackages = with pkgs; [
+        awscli2
+        jq
+      ];
+
+      services.lasuite-drive = {
+        enable = true;
+        enableNginx = true;
+        redis.createLocally = true;
+        postgresql.createLocally = true;
+
+        inherit domain;
+        s3Url = "http://${s3Addr}/lasuite-drive/";
+
+        settings = {
+          DJANGO_SECRET_KEY_FILE = pkgs.writeText "django-secret-file" ''
+            8540db59c03943d48c3ed1a0f96ce3b560e0f45274f120f7ee4dace3cc366a6b
+          '';
+
+          OIDC_OP_JWKS_ENDPOINT = "http://${oidcAddr}/dex/keys";
+          OIDC_OP_AUTHORIZATION_ENDPOINT = "http://${oidcAddr}/dex/auth/mock";
+          OIDC_OP_TOKEN_ENDPOINT = "http://${oidcAddr}/dex/token";
+          OIDC_OP_USER_ENDPOINT = "http://${oidcAddr}/dex/userinfo";
+          OIDC_RP_CLIENT_ID = "lasuite-drive";
+          OIDC_RP_SIGN_ALGO = "RS256";
+          OIDC_RP_SCOPES = "openid email";
+          OIDC_RP_CLIENT_SECRET = "lasuitedriveclientsecret";
+
+          LOGIN_REDIRECT_URL = "http://${domain}";
+          LOGIN_REDIRECT_URL_FAILURE = "http://${domain}";
+          LOGOUT_REDIRECT_URL = "http://${domain}";
+
+          AWS_S3_ENDPOINT_URL = "http://${s3Addr}";
+          AWS_S3_ACCESS_KEY_ID = garageAccessKey;
+          AWS_S3_SECRET_ACCESS_KEY = garageSecretKey;
+          AWS_STORAGE_BUCKET_NAME = "lasuite-drive";
+          AWS_S3_REGION_NAME = "garage";
+          MEDIA_BASE_URL = "http://${domain}";
+
+          # Disable HTTPS feature in tests because we're running on a HTTP connection
+          DJANGO_SECURE_PROXY_SSL_HEADER = "";
+          DJANGO_SECURE_SSL_REDIRECT = false;
+          DJANGO_CSRF_COOKIE_SECURE = false;
+          DJANGO_SESSION_COOKIE_SECURE = false;
+          DJANGO_CSRF_TRUSTED_ORIGINS = "http://*";
+        };
+      };
+
+      services.dex = {
+        enable = true;
+        settings = {
+          issuer = "http://${oidcAddr}/dex";
+          storage = {
+            type = "postgres";
+            config.host = "/var/run/postgresql";
+          };
+          web.http = "127.0.0.1:8080";
+          oauth2.skipApprovalScreen = true;
+          staticClients = [
+            {
+              id = "lasuite-drive";
+              name = "Drive";
+              redirectURIs = [ "http://${domain}/api/v1.0/callback/" ];
+              secretFile = "/etc/dex/lasuite-drive";
+            }
+          ];
+          connectors = [
+            {
+              type = "mockPassword";
+              id = "mock";
+              name = "Example";
+              config = {
+                username = "admin";
+                password = "password";
+              };
+            }
+          ];
+        };
+      };
+
+      services.garage = {
+        enable = true;
+        package = pkgs.garage_2;
+        settings = {
+          rpc_bind_addr = "127.0.0.1:3901";
+          rpc_public_addr = "127.0.0.1:3901";
+          rpc_secret = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+          replication_factor = 1;
+
+          s3_api = {
+            s3_region = "garage";
+            api_bind_addr = s3Addr;
+          };
+        };
+      };
+      environment.etc."dex/lasuite-drive" = {
+        mode = "0400";
+        user = "dex";
+        text = "lasuitedriveclientsecret";
+      };
+
+      services.postgresql = {
+        enable = true;
+        ensureDatabases = [ "dex" ];
+        ensureUsers = [
+          {
+            name = "dex";
+            ensureDBOwnership = true;
+          }
+        ];
+      };
+    };
+
+  testScript = ''
+    import json
+
+    with subtest("Wait for units to start"):
+      machine.wait_for_unit("dex.service")
+      machine.wait_for_unit("garage.service")
+      machine.wait_for_unit("lasuite-drive.service")
+      machine.wait_for_unit("lasuite-drive-celery.service")
+      machine.wait_for_unit("lasuite-drive-beat.service")
+
+    with subtest("Create S3 bucket"):
+      machine.wait_for_open_port(3901)
+      garage_node_id = machine.succeed("garage status | tail -n1 | awk '{ print $1 }'")
+      machine.succeed(f"garage layout assign -c 100MB -z garage {garage_node_id}")
+      machine.succeed("garage layout apply --version 1")
+      machine.succeed("garage key import ${garageAccessKey} ${garageSecretKey} --yes")
+      machine.succeed("garage bucket create lasuite-drive")
+      machine.succeed("garage bucket allow --read --write --owner lasuite-drive --key ${garageAccessKey}")
+      machine.succeed("AWS_SECRET_ACCESS_KEY=${garageSecretKey} "
+        "AWS_ACCESS_KEY_ID=${garageAccessKey} "
+        "aws --endpoint http://${s3Addr} "
+        "s3api put-bucket-cors "
+        "--bucket lasuite-drive --cors-configuration "
+        """'{"CORSRules":[{"AllowedHeaders":["*"],"AllowedMethods":["PUT"],"AllowedOrigins":["http://${domain}"]}]}'""")
+
+    with subtest("Wait for web servers to start"):
+      machine.wait_until_succeeds("curl -fs "
+        "'http://${domain}/api/v1.0/authenticate/'",
+        timeout=120)
+      machine.wait_until_succeeds("curl -fs "
+        "'${oidcAddr}/dex/auth/mock?client_id=lasuite-drive&response_type=code&redirect_uri=http://${domain}/api/v1.0/callback/&scope=openid'",
+        timeout=120)
+
+    with subtest("Login"):
+      state, nonce = machine.succeed("curl -fs -c cjar "
+        "'http://${domain}/api/v1.0/authenticate/' "
+        "-w '%{redirect_url}' "
+        "| sed -n 's/.*state=\\(.*\\)&nonce=\\(.*\\)/\\1 \\2/p'").strip().split(' ')
+
+      oidc_state = machine.succeed("curl -fs "
+        f"'${oidcAddr}/dex/auth/mock?client_id=lasuite-drive&response_type=code&redirect_uri=http://${domain}/api/v1.0/callback/&scope=openid+email&state={state}&nonce={nonce}' "
+        "| sed -n 's/.*state=\\(.*\\)\">.*/\\1/p'").strip()
+
+      code = machine.succeed("curl -fs "
+        f"'${oidcAddr}/dex/auth/mock/login?back=&state={oidc_state}' "
+        "-d 'login=admin&password=password' "
+        "-w '%{redirect_url}' "
+        "| sed -n 's/.*code=\\(.*\\)&.*/\\1/p'").strip()
+
+      print(f"Got approval code {code}")
+
+      machine.succeed(f"curl -fs -c cjar -b cjar 'http://${domain}/api/v1.0/callback/?code={code}&state={state}'")
+
+    with subtest("Upload a document"):
+      csrf_token = machine.succeed("grep csrftoken cjar | cut -f 7 | tr -d '\n'")
+      upload = json.loads(
+        machine.succeed("curl -fs -c cjar -b cjar "
+          "'http://${domain}/api/v1.0/items/' "
+          "-X POST "
+          f"-H 'X-CSRFToken: {csrf_token}' "
+          "-H 'Content-Type: application/json' "
+          "-H 'Referer: http://${domain}/explorer/items/my-files' "
+          "--data-raw '{\"type\":\"file\",\"filename\":\"text.txt\"}'"
+        )
+      )
+
+      print(f"Created file with id {upload['id']}")
+
+      machine.succeed("curl -fs "
+        f"'{upload['policy']}' "
+        "-X PUT "
+        "-H 'Origin: http://${domain}' "
+        "-H 'X-amz-acl: private' "
+        "-H 'Content-Type: text/plain' "
+        "-H 'Content-Length: 8' "
+        "--data-raw 'sometext'")
+
+      print("Uploaded file")
+
+      csrf_token = machine.succeed("grep csrftoken cjar | cut -f 7 | tr -d '\n'")
+      machine.succeed("curl -fs -c cjar -b cjar "
+        f"'http://${domain}/api/v1.0/items/{upload['id']}/upload-ended/' "
+        "-X POST "
+        f"-H 'X-CSRFToken: {csrf_token}' "
+        "-H 'Referer: http://${domain}/explorer/items/my-files'")
+
+    with subtest("Download a document"):
+      csrf_token = machine.succeed("grep csrftoken cjar | cut -f 7 | tr -d '\n'")
+      items = json.loads(
+        machine.succeed("curl -fs -c cjar -b cjar "
+          f"'http://${domain}/api/v1.0/items/' "
+          "-X GET "
+          f"-H 'X-CSRFToken: {csrf_token}' "
+          "-H 'Referer: http://${domain}/explorer/items/my-files'"
+        )
+      )
+
+      assert items["count"] == 1
+
+      url = items["results"][0]["url_permalink"]
+
+      data = machine.succeed("curl -fs -c cjar -b cjar -L "
+        f"'{url}' "
+        "-X GET "
+        "-H 'Referer: http://${domain}/explorer/items/my-files'")
+
+      assert data == "sometext"
+  '';
+}
diff --git a/pkgs/by-name/la/lasuite-drive/package.nix b/pkgs/by-name/la/lasuite-drive/package.nix
index 7f608fb95846..61d77e62b6a8 100644
--- a/pkgs/by-name/la/lasuite-drive/package.nix
+++ b/pkgs/by-name/la/lasuite-drive/package.nix
@@ -4,6 +4,7 @@
   python3,
   stdenv,
   fetchFromGitHub,
+  nixosTests,
 }:
 let
   version = "0.18.0";
@@ -141,6 +142,9 @@ python.pkgs.buildPythonApplication (finalAttrs: {
 
   passthru = {
     inherit mail frontend;
+    tests = {
+      login-upload-and-download-file = nixosTests.lasuite-drive;
+    };
   };
 
   __structuredAttrs = true;

From 9a763ad07bb1ec49cb4eff828bc31cdd59cb3dd6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 May 2026 23:57:07 +0200
Subject: [PATCH 223/332] postgrest: 14.11 -> 14.12

Release Notes:
https://github.com/PostgREST/postgrest/releases/tag/v14.12
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7ae7c242846e..537bce427b8e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2521,12 +2521,12 @@ with haskellLib;
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "14.11";
+          version = "14.12";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-ml6yWKNA+5j0vX4gZPz08q6JdLaIh5mLW4N7uuzkl0M=";
+            hash = "sha256-9Y14sDjHf51qv78DGIrcoU1S/nSHOhc6lGM9wRlegMs=";
           };
         })
       ];

From 98817ee929bddb5203c51e847a67937b272c55f1 Mon Sep 17 00:00:00 2001
From: Clara Engler <cve@cve.cx>
Date: Mon, 18 May 2026 19:52:04 +0200
Subject: [PATCH 224/332] kiesel: init at 0.2.0

---
 pkgs/by-name/ki/kiesel/deps.nix    | 121 +++++++++++++++++++++++++++++
 pkgs/by-name/ki/kiesel/package.nix |  58 ++++++++++++++
 pkgs/by-name/ki/kiesel/test.nix    |  12 +++
 3 files changed, 191 insertions(+)
 create mode 100644 pkgs/by-name/ki/kiesel/deps.nix
 create mode 100644 pkgs/by-name/ki/kiesel/package.nix
 create mode 100644 pkgs/by-name/ki/kiesel/test.nix

diff --git a/pkgs/by-name/ki/kiesel/deps.nix b/pkgs/by-name/ki/kiesel/deps.nix
new file mode 100644
index 000000000000..bfae34f35bff
--- /dev/null
+++ b/pkgs/by-name/ki/kiesel/deps.nix
@@ -0,0 +1,121 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{
+  linkFarm,
+  fetchzip,
+  fetchgit,
+}:
+
+linkFarm "zig-packages" [
+  {
+    name = "N-V-__8AAFP3MACLqx3IPYUe7MVJki-nUn2Jtimo4Tx6u2s_";
+    path = fetchgit {
+      url = "https://github.com/bellard/quickjs";
+      rev = "f1139494d18a2053630c5ed3384a42bb70db3c53";
+      hash = "sha256-XeDNFR3jbP/rY9zBqaiOaDTwKn7tuxHMiBK3qwAky4w=";
+    };
+  }
+  {
+    name = "N-V-__8AAMFkNQCMS3QG2Q2vrQ1urnQq0PqKINS-iRDs1Xqc";
+    path = fetchzip {
+      url = "https://musl.libc.org/releases/musl-1.2.6.tar.gz";
+      hash = "sha256-vcI36q0+leXQBuGms1Uf0IF6U4KLGmW3Yz2t7cpNw5k=";
+    };
+  }
+  {
+    name = "N-V-__8AAOysEw1hmwdD5wXRZ2cFnJPd2TRXwVpC--qXk-ot";
+    path = fetchgit {
+      url = "https://github.com/unicode-org/icu4x";
+      rev = "6f32890b737485e86b712777edb7001d2f31c9c8";
+      hash = "sha256-O9p1++FZmiCNGk55hvYe3iS/kdSXzR+1htWCq2tBgdw=";
+    };
+  }
+  {
+    name = "N-V-__8AAPLKOQDfJ5TYhiiy_6a_dZqUmo9K4e8Xhjfup3fd";
+    path = fetchgit {
+      url = "https://github.com/boa-dev/temporal";
+      tag = "v0.2.3";
+      hash = "sha256-wD4pTVgQZrGONgSTDm9Eq3fo3Ez7aIC0/n4Rqgksad4=";
+    };
+  }
+  {
+    name = "args-0.0.0-CiLiqmvgAADyJmrzcQTP9IOYNvTzR_KGrg3ZNNsH2Qv0";
+    path = fetchgit {
+      url = "https://github.com/ikskuh/zig-args";
+      rev = "d47ae21768f9ec47c2a4154ab48b87166965b820";
+      hash = "sha256-Gpl6GU74hNf3ZTg5v2ua3gajjPJRIrb2EIraDVQZBdw=";
+    };
+  }
+  {
+    name = "bdwgc-8.3.0-8obE-IejLwCX53s54D3b3nIqlsMLiZ0ZtAF8nMvffTtR";
+    path = fetchgit {
+      url = "https://github.com/bdwgc/bdwgc";
+      rev = "ea69934ed214cfb4e38d2a0176cc392af8055a83";
+      hash = "sha256-wippr/ilU5cf+2D6T+kXUDZC0r353wCYyad7Y0hQvdM=";
+    };
+  }
+  {
+    name = "bdwgc_zig-0.1.0-ffcEgVh8AAAhDLt3oykzvhRx_WDGdHCoqmswDTnmei6b";
+    path = fetchgit {
+      url = "https://github.com/bdwgc/bdwgc-zig";
+      rev = "1cfcd9ea8947e172f20b028fbc52e778632fa407";
+      hash = "sha256-bTjPgn44QAgWAjiLqP3S5CK9os7L1cex+TXgzKU2dHY=";
+    };
+  }
+  {
+    name = "build_crab-0.3.0-U0id_xWbAAD_ILwDslPuOn6XptkUzaGgJqRtO8aV_naN";
+    path = fetchgit {
+      url = "https://github.com/linusg/build.crab";
+      rev = "8592bb943546f1b08cdcb3a23701750737f40af5";
+      hash = "sha256-IMh1qxl6Fb+08oEgIR/93F5bKub8bkGXiNbjLNsbgYs=";
+    };
+  }
+  {
+    name = "icu4zig-0.1.0-IT7GrJalAgC00wqxu8c6JBs8A580wS-QrXBE7FJ1ZVaz";
+    path = fetchgit {
+      url = "https://codeberg.org/linus/icu4zig";
+      rev = "13caca132022c0acd9a0c04356ebf7d758340b8a";
+      hash = "sha256-fz1YnPDDEIJVxlmxUfYq3ydksu739cT6aNK5W9N1RbA=";
+    };
+  }
+  {
+    name = "known_folders-0.0.0-Fy-PJsbKAACbDh9bBxR0MMThxZSS6A9RH4apWphNHY70";
+    path = fetchgit {
+      url = "https://github.com/ziglibs/known-folders";
+      rev = "207c34a16e4365edc20d92c7892f962b3bed46e8";
+      hash = "sha256-9hMnEc3ktnFTZT28hjaOkafjSUXEI+SNIO9GMcJrBfA=";
+    };
+  }
+  {
+    name = "parser_toolkit-0.1.0-baYGPdpDEwBQQ2__YEalqGB09TAjP7vpoe2DFkwg6mRa";
+    path = fetchgit {
+      url = "https://github.com/ikskuh/parser-toolkit";
+      rev = "cc3977376a7bf0eb6f203ae5c00e8cea6f9d6600";
+      hash = "sha256-6mYFtGenWWQoLFg/VJZRMmCY2xyt/ntGqd+DvhDjqXE=";
+    };
+  }
+  {
+    name = "stackinfo-0.1.0-NZ2qTk8iAAC6y9NJVJ55kzDGmuGMoqGhlmHiG1baZKi3";
+    path = fetchgit {
+      url = "https://codeberg.org/linus/zig-stackinfo";
+      rev = "08bc113a9f8e85689ef536b6e5516c658bf4703e";
+      hash = "sha256-2BwpJUtI9OHjuiO0h/pOORieV4QgaT7iJ2kCniin6Kg=";
+    };
+  }
+  {
+    name = "unicode_id-0.0.1-u-LDL5CDAQArdOvYpoHk9jOi8A9QbZwUD0JB3CjZ7i6O";
+    path = fetchgit {
+      url = "https://codeberg.org/linus/unicode-id";
+      rev = "107488ed2dea04ef30a79538ded406d84a164901";
+      hash = "sha256-JHt7PUP/onrb797ufYC36AH4255/EjNUvUY6Hjk4pT4=";
+    };
+  }
+  {
+    name = "zigline-0.1.0-6llsB4uJAgAP1Yhp3ewmtwUXbg9RjHoc9Arl-i27NGWT";
+    path = fetchgit {
+      url = "https://github.com/alimpfard/zigline";
+      rev = "c0e5fc200b35ec177167f6dac1bb923b8a1478c5";
+      hash = "sha256-+C/z2h5FwnOGkr0WsAzSLQeqowUAQmIrKZGt/G/YrKw=";
+    };
+  }
+]
diff --git a/pkgs/by-name/ki/kiesel/package.nix b/pkgs/by-name/ki/kiesel/package.nix
new file mode 100644
index 000000000000..abc45b1930f9
--- /dev/null
+++ b/pkgs/by-name/ki/kiesel/package.nix
@@ -0,0 +1,58 @@
+{
+  callPackage,
+  cargo,
+  fetchFromCodeberg,
+  lib,
+  nix-update-script,
+  rustc,
+  rustPlatform,
+  stdenv,
+  zig_0_16,
+}:
+let
+  zig = zig_0_16;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kiesel";
+  version = "0.2.0";
+
+  src = fetchFromCodeberg {
+    owner = "kiesel-js";
+    repo = "kiesel";
+    tag = finalAttrs.version;
+    hash = "sha256-bddGd3LPmVV8wwoVHYJJKoHS6ssYyU1hQBTGJBQJPgc=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    src = "${finalAttrs.src}/pkg/zement";
+    hash = "sha256-SOp8UW0iKniXwzEGGtzX5rFAdVQKDHoEvCupquusvmo=";
+  };
+  cargoRoot = "pkg/zement";
+  deps = callPackage ./deps.nix { };
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
+    zig.hook
+  ];
+
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ];
+
+  __structuredAttrs = true;
+  passthru.tests.run = callPackage ./test.nix { kiesel = finalAttrs.finalPackage; };
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "JavaScript engine written in Zig";
+    license = lib.licenses.mit;
+    homepage = "https://kiesel.dev";
+    maintainers = with lib.maintainers; [ cvengler ];
+    platforms = lib.platforms.all;
+    mainProgram = "kiesel";
+  };
+})
diff --git a/pkgs/by-name/ki/kiesel/test.nix b/pkgs/by-name/ki/kiesel/test.nix
new file mode 100644
index 000000000000..66479a83f0e2
--- /dev/null
+++ b/pkgs/by-name/ki/kiesel/test.nix
@@ -0,0 +1,12 @@
+{ runCommand, kiesel }:
+runCommand "kiesel-test-run"
+  {
+    nativeBuildInputs = [ kiesel ];
+  }
+  ''
+    export NO_COLOR=1
+    GOT=$(kiesel -p -c 'Array(16).join("wat" - 1) + " Batman!"')
+    EXPECT='"NaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaN Batman!"'
+    test "$EXPECT" = "$GOT"
+    touch $out
+  ''

From 9649cad0c89dac4045776f2097cbf0eda05f26e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 22:09:39 +0000
Subject: [PATCH 225/332] gh-gei: 1.29.0 -> 1.29.1

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

diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 01d7935927b4..bf79aa6eb2cf 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.29.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-qHlORWmMBHo8PtuGG4JaWdkCdIdybNfzWDEM/JNlCOc=";
+    hash = "sha256-Ykd2/Y5Duw2yDO0uKhdt8mYLG85SeolByj/UK7ACJCo=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

From 41ef5dc6f2e126a535653e0d9d1111bf7e9bcddd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 22:10:11 +0000
Subject: [PATCH 226/332] gitu: 0.41.0 -> 0.42.0

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

diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 77436798588b..2d588493d898 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitu";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q1U9a9GZJcpAF6VDqBGZW4eBW/5P6uz+C+/2+/vjqTM=";
+    hash = "sha256-rEhAMikMCPtpKz7GAAFxzJYYshtEeeuawgagnD4IJhU=";
   };
 
-  cargoHash = "sha256-RP8n3RZzWA0AYhsRnblmzefRsT6+Qje2ah7eFYk69ow=";
+  cargoHash = "sha256-LZegPuUOSxg3a7Gl6bNMEvpKlD4BcaYgs3mc5EwIkTE=";
 
   nativeBuildInputs = [
     pkg-config

From c10ac61325ed8418c1a1da876c1b66f50aae7691 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 22:10:56 +0000
Subject: [PATCH 227/332] git-pkgs: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix
index f304f36bfb41..c4f45e920904 100644
--- a/pkgs/by-name/gi/git-pkgs/package.nix
+++ b/pkgs/by-name/gi/git-pkgs/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "git-pkgs";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "git-pkgs";
     repo = "git-pkgs";
     tag = "v${version}";
-    hash = "sha256-5fo4Zvh5ho8WefDv3bV5sVi9j3RwHWP4+ShigqDOUl8=";
+    hash = "sha256-biKDEvhV0CLoZxUgby7EH4kv0WZlQKHzPnjz5KarXK0=";
   };
 
-  vendorHash = "sha256-GPtw+iCUH5/V13WNSvmktchXOz0PGW5ckhCqpiRhHLQ=";
+  vendorHash = "sha256-mBSoIsclotqBTBivHdpC33X2lBBIX/LlLJxKe03mHqo=";
 
   subPackages = [ "." ];
 

From 97096daea4d8a24103b30cdc77e0763ba4137899 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 23:11:05 +0000
Subject: [PATCH 228/332] typesetter: 0.12.6 -> 0.13.1

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

diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix
index 6b637623a864..05e449d16f92 100644
--- a/pkgs/by-name/ty/typesetter/package.nix
+++ b/pkgs/by-name/ty/typesetter/package.nix
@@ -30,19 +30,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typesetter";
-  version = "0.12.6";
+  version = "0.13.1";
   __structuredAttrs = true;
 
   src = fetchFromCodeberg {
     owner = "haydn";
     repo = "typesetter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BN/gxJzJ2rjSztVWCid8y9NiHCqMVSQIW4b6VmjJGTo=";
+    hash = "sha256-emYFnPfDdip3ELCf7JC2+mZna8d2K2Xk3HsiF4x/nJg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-6GM3c4Pq/U5dvpR8R/d78nwoWfbUQTwhjlCOhN5UG0s=";
+    hash = "sha256-zBchG/uLvImV2UGD1TNdowrYO0yiSpzblwF4AvUzZl4=";
   };
 
   strictDeps = true;

From 6b9d6878d062b388770b9c43e9ba16c3113d451a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 23:38:26 +0000
Subject: [PATCH 229/332] libretro.mupen64plus: 0-unstable-2026-05-12 ->
 0-unstable-2026-05-20

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

diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
index 006132850245..dfcf2fa8a9d2 100644
--- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
@@ -12,13 +12,13 @@
 }:
 mkLibretroCore {
   core = "mupen64plus-next";
-  version = "0-unstable-2026-05-12";
+  version = "0-unstable-2026-05-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mupen64plus-libretro-nx";
-    rev = "8cdfadf266a784cd1849f7fef8adae2912240b18";
-    hash = "sha256-37A9ScN8jRX1i2aocyNr3VAJsJ7xoMsmzVgPILpoqmQ=";
+    rev = "98c1b0d877542b01314b3b04272282ba223b65b3";
+    hash = "sha256-ardO7zuuG4rqm2d88IduMs3CVYNHiHyaxQ5ZDtbMVHU=";
   };
 
   # Fix for GCC 14

From a00f79b5e701ac5a683f0b519660ff56be3ea82b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 May 2026 01:45:40 +0200
Subject: [PATCH 230/332] exploitdb: 2026-05-16 -> 2026-05-22

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/2026-05-16...2026-05-22
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 3bf1b9b9fb47..f587db0dde0e 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "exploitdb";
-  version = "2026-05-16";
+  version = "2026-05-22";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     tag = finalAttrs.version;
-    hash = "sha256-7cjqHHflxFfWDx9Bfe2+nX549blfZG0rLZDB3li8pkA=";
+    hash = "sha256-DzTgrRjonZgvkLfXpt7oxlmxYD+y3lALTpyAsTv9Y0A=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 9c47d3127c7a49202063e6094191e832aa5db074 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 May 2026 01:46:11 +0200
Subject: [PATCH 231/332] python3Packages.agentic-threat-hunting-framework:
 0.12.0 -> 0.13.0

Diff: https://github.com/Nebulock-Inc/agentic-threat-hunting-framework/compare/v0.12.0...v0.13.0

Changelog: https://github.com/Nebulock-Inc/agentic-threat-hunting-framework/releases/tag/v0.13.0
---
 .../agentic-threat-hunting-framework/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
index b9ea9cd04c84..8ab717e97e7f 100644
--- a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
+++ b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "agentic-threat-hunting-framework";
-  version = "0.12.0";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Nebulock-Inc";
     repo = "agentic-threat-hunting-framework";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mAhue0ruf0PGwix+ab6eaKrGJoKOh/8I+LiBWa+viMU=";
+    hash = "sha256-5E9nUSGwEuGdt04M0rRoHES8Klco6j5X1TLa/E7KdgM=";
   };
 
   build-system = [ setuptools ];

From ae8284b80c49dea96d21b134081506ec6b4139a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 00:30:33 +0000
Subject: [PATCH 232/332] wcslib: 8.7 -> 8.8

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

diff --git a/pkgs/by-name/wc/wcslib/package.nix b/pkgs/by-name/wc/wcslib/package.nix
index a56265119a1f..34cd40987cb3 100644
--- a/pkgs/by-name/wc/wcslib/package.nix
+++ b/pkgs/by-name/wc/wcslib/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wcslib";
-  version = "8.7";
+  version = "8.8";
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-eS/gXAlURDOppOpUgPrNvsLabSgFgnW16QBqHyjFZGU=";
+    hash = "sha256-3NW5UuaAFtDiRZ4fD5hmND54uTljXbZEKfz0eOHqS/w=";
   };
 
   # error: call to undeclared library function 'snprintf'

From 82eaf69469a5fb2e86993eba825d1c8a8410eb45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 01:32:43 +0000
Subject: [PATCH 233/332] deja: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/by-name/de/deja/package.nix b/pkgs/by-name/de/deja/package.nix
index 74cfc1919719..608420c820d0 100644
--- a/pkgs/by-name/de/deja/package.nix
+++ b/pkgs/by-name/de/deja/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "deja";
-  version = "0.2.5";
+  version = "0.2.6";
   __structuredAttrs = true;
   src = fetchFromGitHub {
     owner = "Giammarco-Ferranti";
     repo = "deja";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0eRXPtm+L1C4/fc/WLn9p2LV8uhJ4w+40hhA69+CEdw=";
+    hash = "sha256-xxbClKhhSwo+jUjAZ2gS4yOS5sSI76dfPpDzA3qdV18=";
   };
 
   vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8=";

From be3620d19fe11673f84ceb67e6fefda36a161049 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Fri, 22 May 2026 19:31:03 -0700
Subject: [PATCH 234/332] open-webui: remove --legacy-peer-deps

bits-ui v2.16.3 declares @internationalized/date as a peer dependency.
With --legacy-peer-deps, npm uses v6 behaviour and skips installing
peer deps entirely, so the package was absent from node_modules.
---
 pkgs/by-name/op/open-webui/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 8a7d0cb36e52..3d7906cf5e2e 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -32,11 +32,7 @@ let
 
     npmDepsHash = "sha256-kAUbFAFNo5RHMGqO7sPHSxSEZw9Ky6Pxp/vddDyw90E=";
 
-    # See https://github.com/open-webui/open-webui/issues/15880
-    npmFlags = [
-      "--force"
-      "--legacy-peer-deps"
-    ];
+    npmFlags = [ "--force" ];
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

From f669e5b809cd9a4315c1b80c10a77a8f6500e3cb Mon Sep 17 00:00:00 2001
From: Nathanael Robbins <31457698+robbins@users.noreply.github.com>
Date: Fri, 22 May 2026 22:53:59 -0400
Subject: [PATCH 235/332] android-studio-for-platform: stable 2024.2.2.13 ->
 2025.3.2.6, canary 2024.3.1.9 -> 2026.1.2.1

---
 .../editors/android-studio-for-platform/common.nix  |  5 +++++
 .../editors/android-studio-for-platform/default.nix | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix
index 308e112a8c77..a0aa2d6799f2 100644
--- a/pkgs/applications/editors/android-studio-for-platform/common.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/common.nix
@@ -25,6 +25,8 @@
   fontsConf,
   fontconfig,
   freetype,
+  libGL,
+  libsecret,
   libx11,
   libxext,
   libxi,
@@ -122,6 +124,9 @@ let
 
             # For Soong sync
             e2fsprogs
+
+            libsecret
+            libGL
           ]
         }"
     '';
diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix
index aafc1a9b0201..07bcf8bfd29d 100644
--- a/pkgs/applications/editors/android-studio-for-platform/default.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/default.nix
@@ -16,15 +16,14 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2024.2.2.13";
-    # this seems to be a fuckup on google's side
-    versionPrefix = "Ladybug%20Feature%20Drop";
-    sha256Hash = "sha256-yMUTWOpYHa/Aizrgvs/mbofrDqrbL5bJYjuklIdyU/0=";
+    version = "2025.3.2.6";
+    versionPrefix = "Panda%202";
+    sha256Hash = "sha256-mAJPmDSoE9STOh45u0dIejL4TyR8CIqcGMhiixIFIWc=";
   };
   canaryVersion = {
-    version = "2024.3.1.9";
-    versionPrefix = "canary-meerkat";
-    sha256Hash = "sha256-j5KEwHbc+0eFi3GZlD5PMuM/RWw2MJ1PaXZrPMvhCik=";
+    version = "2026.1.2.1";
+    versionPrefix = "canary-Quail%202";
+    sha256Hash = "sha256-UYj+6CSmtxC11HVjPxc+m9r6b5RrXXFOzpDfSkx4mw4=";
   };
 in
 {

From a56e5e28a549a7d217ae3901a4cecfc2813d0f20 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 22 May 2026 23:04:07 -0400
Subject: [PATCH 236/332] python3Packages.jsonschema-rs: set
 __darwinAllowLocalNetworking

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

diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix
index 77e607deaa47..4be27d746133 100644
--- a/pkgs/development/python-modules/jsonschema-rs/default.nix
+++ b/pkgs/development/python-modules/jsonschema-rs/default.nix
@@ -52,6 +52,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "jsonschema_rs" ];
 
+  __darwinAllowLocalNetworking = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 308c3c352cdbda17ab08b750886d3b5895018a05 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Fri, 22 May 2026 22:58:02 -0400
Subject: [PATCH 237/332] nginx: 1.30.1 -> 1.30.2

Changelog: https://nginx.org/en/CHANGES-1.30
Advisory: https://my.f5.com/manage/s/article/K000161377

Fixes: CVE-2026-9256
---
 pkgs/servers/http/nginx/stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index 7d01bc4c7942..61d47dba246b 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.30.1";
-  hash = "sha256-mXZQANl0iWsxyliC2MJ5zj/n729cb58Kln7X/TQH+cw=";
+  version = "1.30.2";
+  hash = "sha256-ffMJCQf8o8wORW1twAzrIw2nTqiAJs7/Cv/CnbvZrEw=";
 }

From d65495fe777d7e249b973568590615d6a2124bbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 03:39:27 +0000
Subject: [PATCH 238/332] jetbrains.webstorm: 2026.1.1 -> 2026.1.2

---
 .../editors/jetbrains/ides/webstorm.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
index 845d1472ab60..a193754670dd 100644
--- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1.tar.gz";
-      hash = "sha256-r9XetjreFB6qU7VQbHsFLn7boKhZylfyGsfPNumFQZw=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2.tar.gz";
+      hash = "sha256-xoMOLYSuWqWUh5RLI1Q4OnAgGM6tqRDWd1VoULX17yE=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-Damq3svwCOrE+fTBBVY8vi/1vtFJFFqFsSWQhY9L/x4=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-Qe9yclQj971jK8V2SL5GAlNpgUfTwP/PS2ILv2LyhuE=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1.dmg";
-      hash = "sha256-+s6MjE4zD4YZxnYRqsaXVthTWNnCn1HS3K7Ik+lb2cI=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2.dmg";
+      hash = "sha256-DmsOaBjKnhbipSrIfbTqNd9+qcd2i3zkKfVvLK1GXbI=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1-aarch64.dmg";
-      hash = "sha256-/WwGXnvYZz8MzOOQgf4BGMRP7cLIv8FA1lK8NvIgtoo=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2-aarch64.dmg";
+      hash = "sha256-2YyCHi7yPXnq5KWkqC+Uodnc4xj+DkTsL1vUNqLNmPg=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "WebStorm";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.23567.141";
+  version = "2026.1.2";
+  buildNumber = "261.24374.125";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From bb617e6fdf7ec98e9a7671dcec146f183fbd929f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 04:12:43 +0000
Subject: [PATCH 239/332] labwc-tweaks-gtk: 0-unstable-2026-05-09 ->
 0-unstable-2026-05-22

---
 pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
index f61536173388..0802fd78730f 100644
--- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
+++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc-tweaks-gtk";
-  version = "0-unstable-2026-05-09";
+  version = "0-unstable-2026-05-22";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc-tweaks-gtk";
-    rev = "c84d78c601e9f9a6e863766e35f736635cfa52d0";
-    hash = "sha256-qyMgo9QB8wLzZiUlbz/NjTssYy8FB28A5RX7Hd05ays=";
+    rev = "ebe05bef2cf5966a45a42370371ae879c472cf6d";
+    hash = "sha256-5HqxB03yXksRBV/wZa3J5xLEIbv2oZvLp2YQ3FMgd1k=";
   };
 
   nativeBuildInputs = [

From 0a4b21c747c259de727cec2543ef412c18c026ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 04:32:23 +0000
Subject: [PATCH 240/332] bark-server: 2.3.4 -> 2.3.5

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

diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index 7fb34848a4f4..1bd83a305a2f 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "bark-server";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "Finb";
     repo = "bark-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ANOGAzm+25WUoRMGE5b70uKE4EhlGkuC4QWvpa2K7Uo=";
+    hash = "sha256-s02nLAlKO5SGX0Nx5z/5fZBf6R0kkY4IofbGW8ica50=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-yStMk1U6FmF2Ldqnm5HKsu6Pn3xjm5pGLMWAGyYxb2c=";
+  vendorHash = "sha256-+WyTKyWVzJAgCQ6bXbOjrJUZkw5XVrvAdgALL2eXU64=";
 
   ldflags = [
     "-s"

From 9c081c4653f7e40dd30ba88fa898891100223c36 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Sat, 23 May 2026 00:34:03 -0400
Subject: [PATCH 241/332] atlauncher: fix aarch64-linux build

Assisted-by: Codex:gpt-5.5
---
 pkgs/by-name/at/atlauncher/package.nix        |  8 ++-
 .../at/atlauncher/remove-launch4j.patch       | 71 +++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/at/atlauncher/remove-launch4j.patch

diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix
index 89e037f04f70..523c3b8bd504 100644
--- a/pkgs/by-name/at/atlauncher/package.nix
+++ b/pkgs/by-name/at/atlauncher/package.nix
@@ -36,6 +36,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-pRYXzFUbVXYwD7edhBoVcVo/QDo6QSJJQd58Hf3rBGo=";
   };
 
+  patches = [
+    # Launch4j does not publish the Linux workdir artifact selected on aarch64.
+    # Nixpkgs only needs the cross-platform jar, so remove the Windows exe task.
+    ./remove-launch4j.patch
+  ];
+
   nativeBuildInputs = [
     gradle
     makeWrapper
@@ -52,8 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   gradleFlags = [
     "-Dorg.gradle.java.home=${jdk17_headless.home}"
-    "--exclude-task"
-    "createExe"
   ];
 
   installPhase =
diff --git a/pkgs/by-name/at/atlauncher/remove-launch4j.patch b/pkgs/by-name/at/atlauncher/remove-launch4j.patch
new file mode 100644
index 000000000000..c4b4b46a8494
--- /dev/null
+++ b/pkgs/by-name/at/atlauncher/remove-launch4j.patch
@@ -0,0 +1,71 @@
+diff --git a/build.gradle b/build.gradle
+index 474c0c0..59fc2d2 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -24,7 +24,6 @@ plugins {
+     id 'org.cadixdev.licenser' version '0.6.1'
+     id 'com.adarshr.test-logger' version '4.0.0'
+     id 'edu.sc.seis.macAppBundle' version '2.3.0'
+-    id 'edu.sc.seis.launch4j' version '3.0.6'
+     id 'de.undercouch.download' version '5.6.0'
+     id 'com.github.johnrengelman.shadow' version '8.1.1'
+     id 'com.github.ben-manes.versions' version '0.52.0'
+@@ -282,34 +281,15 @@ def currentYear() {
+     return df.format(new Date())
+ }
+ 
+-launch4j {
+-    outfile = "ATLauncher-${project.version}.exe"
+-    jreMinVersion = "${project.targetCompatibility.toString()}"
+-    mainClassName = 'com.atlauncher.App'
+-    icon = "${projectDir}/src/main/resources/assets/image/icon.ico"
+-    version = "${project.version}"
+-    textVersion = "${project.version}"
+-    copyright = "2013-${currentYear()} ${project.name}"
+-    companyName = "${project.name}"
+-    bundledJrePath = "jre/;%JAVA_HOME%;%PATH%"
+-    jvmOptions = [
+-        "-Djna.nosys=true",
+-        "-Djava.net.preferIPv4Stack=true",
+-        "-Dawt.useSystemAAFontSettings=on",
+-        "-Dswing.aatext=true"
+-    ]
+-}
+ 
+ artifacts {
+     archives shadowJar
+-    archives file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.exe').replace('libs', 'launch4j'))
+     archives file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.zip').replace('libs', 'distributions'))
+ }
+ 
+ task copyArtifacts(type: Copy) {
+     dependsOn build
+     from shadowJar
+-    from file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.exe').replace('libs', 'launch4j'))
+     from file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.zip').replace('libs', 'distributions'))
+     into "${projectDir}/dist"
+ }
+@@ -368,14 +348,6 @@ clean.doFirst {
+     delete "${projectDir}/dist"
+ }
+ 
+-project.afterEvaluate {
+-    tasks.check {
+-        dependsOn -= tasks.find {
+-            it.name.equals("checkLicenses")
+-        }
+-    }
+-}
+-
+ def shouldIgnoreUpdate = { String version -> return ['ALPHA', 'BETA', 'RC', '-M'].any { it -> version.toUpperCase(Locale.ENGLISH).contains(it) } }
+ tasks.named("dependencyUpdates").configure {
+     rejectVersionIf {
+@@ -385,8 +357,6 @@ tasks.named("dependencyUpdates").configure {
+ 
+ build.finalizedBy copyArtifacts
+ shadowJar.dependsOn jar
+-build.dependsOn createExe, createMacApp
+ startScripts.dependsOn shadowJar
+-createExe.dependsOn shadowJar
+ createAppZip.dependsOn downloadNewerUniversalJavaApplicationStub
+ createDmg.dependsOn downloadNewerUniversalJavaApplicationStub

From 234afb7b18de2d088c2ad536bd6e94cb189ecc52 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 23 May 2026 11:45:56 +0700
Subject: [PATCH 242/332] hooky: fix build with kdl-hs 1.1

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

diff --git a/pkgs/by-name/ho/hooky/package.nix b/pkgs/by-name/ho/hooky/package.nix
index 04ba4fb69eb5..9a087b351419 100644
--- a/pkgs/by-name/ho/hooky/package.nix
+++ b/pkgs/by-name/ho/hooky/package.nix
@@ -20,6 +20,11 @@ haskellPackages.mkDerivation {
     hash = "sha256-w4sWD5dZTNKwrYhrJw9RcwGoeNxpJnm/6RRqYjiIiBg=";
   };
 
+  postPatch = ''
+    substituteInPlace src/Hooky/Config.hs \
+      --replace-fail 'KDL.text' 'KDL.string'
+  '';
+
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = with haskellPackages; [

From 7db9ff04d54b01da28e3e71f53b1e9ae2e98aff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 05:39:35 +0000
Subject: [PATCH 243/332] pi-coding-agent: 0.75.3 -> 0.75.4

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

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index c24e3e1ad58c..e37c769445f7 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.75.3";
+  version = "0.75.4";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c/+cxkp/EZ2PLERxTENN5edXHEs7M2oqzNepjRA4TIE=";
+    hash = "sha256-zyIgs2N7uVz+7E+NqxH78baRw0OwXvlrjZiDIP/v0M4=";
   };
 
-  npmDepsHash = "sha256-/mWjrZFzRmtkbWYMJOXKnLPxFITFndq5hgdY0DnPfAg=";
+  npmDepsHash = "sha256-5Vl+0BBUS7Rtb6XqpGKbbNMyh+9UX2aAsgtn60QLX7A=";
 
   npmWorkspace = "packages/coding-agent";
 

From 51552f84ca8d2fa2cc74fabd86ba299a309a12c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 06:12:01 +0000
Subject: [PATCH 244/332] python3Packages.nextcord: 3.1.1 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix
index 2f3345ffc4eb..b9a4074db409 100644
--- a/pkgs/development/python-modules/nextcord/default.nix
+++ b/pkgs/development/python-modules/nextcord/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "nextcord";
-  version = "3.1.1";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "nextcord";
     repo = "nextcord";
     tag = "v${version}";
-    hash = "sha256-ex6amnB51Jla5ia2HVaMOZsDOEtgJ8RB1eNTLpXNzSY=";
+    hash = "sha256-4/3RM32kEYt5J4bL7/SsPvKhnT1eGS3o0+9lNMqbSj8=";
   };
 
   patches = [

From 2c48a021b24208c946db0b17ffb9cce004d3fcc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 06:12:36 +0000
Subject: [PATCH 245/332] better-commits: 1.23.0 -> 1.23.1

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

diff --git a/pkgs/by-name/be/better-commits/package.nix b/pkgs/by-name/be/better-commits/package.nix
index d210b303d04b..d59e188dc364 100644
--- a/pkgs/by-name/be/better-commits/package.nix
+++ b/pkgs/by-name/be/better-commits/package.nix
@@ -8,13 +8,13 @@
 
 buildNpmPackage rec {
   pname = "better-commits";
-  version = "1.23.0";
+  version = "1.23.1";
 
   src = fetchFromGitHub {
     owner = "Everduin94";
     repo = "better-commits";
     tag = "v${version}";
-    hash = "sha256-d2e+vA8qPr5H70X6caeW+s4yjI1zGByvmZd50j2nAQI=";
+    hash = "sha256-4ixxgpqyjU1juU200Dc0YTSC+bvVYHpqzylCR3Yy+Yk=";
   };
 
   npmDepsHash = "sha256-18fkqQ3Y0fflSGXDPaMpHW7nC0ARMoCStxBzkEXiujs=";

From c729539af3cf0a821968bed36ea207de017cc038 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 07:02:38 +0000
Subject: [PATCH 246/332] typora: 1.13.4 -> 1.13.6

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

diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index 6a3138e95270..1d41a550e53f 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -20,7 +20,7 @@
 
 let
   pname = "typora";
-  version = "1.13.4";
+  version = "1.13.6";
 
   passthru = {
     sources = {
@@ -29,21 +29,21 @@ let
           "https://download.typora.io/linux/typora_${version}_amd64.deb"
           "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
         ];
-        hash = "sha256-aEgp0j6HGZePKwc21LvMpmXk7S5cgcUttpxl3fQw9ak=";
+        hash = "sha256-EwVqMinvC26R5ULDGiiONwS3sH3GBJ/sPr2pnqfQR5s=";
       };
       aarch64-linux = fetchurl {
         urls = [
           "https://download.typora.io/linux/typora_${version}_arm64.deb"
           "https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
         ];
-        hash = "sha256-hvEsnkjbEhZVOIGKGh9RloUBicKpSMzzBGMFtc+3EAk=";
+        hash = "sha256-3/eS9xAC7+V55grhHPLU/9+JefkXgIyKlEh3vRkqZUo=";
       };
       aarch64-darwin = fetchurl {
         urls = [
           "https://download.typora.io/mac/Typora-${version}.dmg"
           "https://downloads.typoraio.cn/mac/Typora-${version}.dmg"
         ];
-        hash = "sha256-3IyOFTLDkd43Tij1B1Tw0epZ8HwMiNMJHQJAGHCcP84=";
+        hash = "sha256-kXnzhuu3ItF9mV0x+v7+hbYNCOo1DAfIzYMHwAL+LHM=";
       };
     };
     updateScript = ./update.sh;

From 47e19f5f91a9d3eebd7a6e5f117fba494e56a8c1 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 22 May 2026 11:54:13 +0200
Subject: [PATCH 247/332] nixos/containers: fix default gateway with
 privateNetwork

Fixes issue reported here https://github.com/NixOS/nixpkgs/pull/515773#issuecomment-4501563586

Containers with privateNetwork have an eth0 interface configured
imperatively by the container setup script, so the networking-interfaces.nix module
doesn't know about it. Specifying the default gateway then fails
silently, unless this setup is mirrored in networking.interfaces.eth0
inside the container.
---
 .../virtualisation/nixos-containers.nix       | 21 ++++++
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/containers-gateway.nix            | 67 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 nixos/tests/containers-gateway.nix

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index a952e64c5b65..84bb0b6c4856 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -524,6 +524,19 @@ let
     tmpfs = null;
   };
 
+  # Parses an IPv4 address with an optional prefix
+  ipv4FromString =
+    str:
+    let
+      segments = lib.splitString "/" str;
+      prefix = lib.elemAt segments 1;
+      hasPrefix = builtins.length segments == 2;
+    in
+    {
+      address = lib.head segments;
+      prefixLength = if hasPrefix then builtins.fromJSON prefix else 32;
+    };
+
 in
 
 {
@@ -594,6 +607,14 @@ in
                                 boot.isNspawnContainer = true;
                                 networking.hostName = mkDefault name;
                                 networking.useDHCP = false;
+                                networking.interfaces = lib.mkIf config.privateNetwork {
+                                  eth0.ipv4.addresses = lib.optional (config.localAddress != null) (
+                                    ipv4FromString config.localAddress
+                                  );
+                                  eth0.ipv6.addresses = lib.optional (config.localAddress6 != null) (
+                                    lib.network.ipv6.fromString config.localAddress6
+                                  );
+                                };
                                 assertions = [
                                   {
                                     assertion =
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e653dc42b9c2..5a8b72970a68 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -385,6 +385,7 @@ in
   containers-custom-pkgs = runTest ./containers-custom-pkgs.nix;
   containers-ephemeral = runTest ./containers-ephemeral.nix;
   containers-extra_veth = runTest ./containers-extra_veth.nix;
+  containers-gateway = runTest ./containers-gateway.nix;
   containers-hosts = runTest ./containers-hosts.nix;
   containers-imperative = runTest ./containers-imperative.nix;
   containers-ip = runTest ./containers-ip.nix;
diff --git a/nixos/tests/containers-gateway.nix b/nixos/tests/containers-gateway.nix
new file mode 100644
index 000000000000..48a29f6c99dc
--- /dev/null
+++ b/nixos/tests/containers-gateway.nix
@@ -0,0 +1,67 @@
+let
+  hostIp4 = "192.168.0.1";
+  containerIp4 = "192.168.0.100/24";
+  hostIp6 = "fc00::1";
+  containerIp6 = "fc00::2/7";
+in
+
+{ lib, ... }:
+{
+  name = "containers-gateway";
+  meta = {
+    maintainers = with lib.maintainers; [
+      rnhmjoj
+    ];
+  };
+
+  nodes.machine = {
+    networking.bridges = {
+      br0.interfaces = [ ];
+    };
+    networking.interfaces = {
+      br0.ipv4.addresses = [
+        {
+          address = hostIp4;
+          prefixLength = 24;
+        }
+      ];
+      br0.ipv6.addresses = [
+        {
+          address = hostIp6;
+          prefixLength = 7;
+        }
+      ];
+    };
+
+    containers.test = {
+      autoStart = true;
+      privateNetwork = true;
+      hostBridge = "br0";
+      localAddress = containerIp4;
+      localAddress6 = containerIp6;
+      config.networking = {
+        defaultGateway.address = hostIp4;
+        defaultGateway6.address = hostIp6;
+      };
+    };
+  };
+
+  testScript = ''
+    def container_succeed(command: str):
+        machine.succeed(f"nixos-container run test -- {command}")
+
+    machine.wait_for_unit("default.target")
+    assert "test" in machine.succeed("nixos-container list")
+
+    with subtest("Container has started"):
+        assert "up" in machine.succeed("nixos-container status test")
+
+    with subtest("Container can ping the host"):
+        container_succeed("ping -n -c 1 ${hostIp4}")
+        container_succeed("ping -n -c 1 ${hostIp6}")
+
+    with subtest("Container default gateways are set"):
+        container_succeed("ip -4 route show default | grep 'via ${hostIp4}'")
+        container_succeed("ip -6 route show default | grep 'via ${hostIp6}'")
+  '';
+}

From 0d7f9454f709fc8593e042f2d685a51ec17c479c Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Sat, 23 May 2026 04:49:48 -0300
Subject: [PATCH 248/332] opencode: 1.15.7 -> 1.15.10

- https://github.com/anomalyco/opencode/releases/tag/v1.15.10
- https://github.com/anomalyco/opencode/releases/tag/v1.15.9
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 540fb2f2e997..576014d1704a 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.15.7";
+  version = "1.15.10";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fk8GDVE+bQfOkZCQ1YEc3V7YIXDHfNC/srcZs/MrE38=";
+    hash = "sha256-qp67k8Z+VA81uukZYuu3yqqmg/L8pkxYZQrJBoE25tU=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-bwCWjaIYfzkJkCMRQ8veKM81pBt8CzMZhUqHgFM/muk=";
+    outputHash = "sha256-r3S0HHNk4TeTHEd8vbvgF+AXl5lJAyrTq+u2T3W0PdA=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From f4ed0add00aaaed1d706e7681399c264b3c19e61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 08:26:37 +0000
Subject: [PATCH 249/332] hyprlandPlugins.hypr-darkwindow: 0.54.3 -> 0.55.2

---
 .../hyprwm/hyprland-plugins/hypr-darkwindow.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
index 7ecbde27f2fe..8cc7cec60189 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix
@@ -7,13 +7,13 @@
 
 mkHyprlandPlugin (finalAttrs: {
   pluginName = "hypr-darkwindow";
-  version = "0.54.3";
+  version = "0.55.2";
 
   src = fetchFromGitHub {
     owner = "micha4w";
     repo = "Hypr-DarkWindow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nbaNBxREqiqc6bwUkgfyuCah61O89atJyNTPYq4Xij8=";
+    hash = "sha256-8Ht9yhlwOtDWFvL6VYlryNxyRethFqc0iWtBetP0xws=";
   };
 
   installPhase = ''

From 9f5508fd0e0fd12acb008fd0729e75344789c35d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 08:42:48 +0000
Subject: [PATCH 250/332] dart-sass: 1.99.0 -> 1.100.0

---
 pkgs/by-name/da/dart-sass/package.nix       |  4 +--
 pkgs/by-name/da/dart-sass/pubspec.lock.json | 28 ++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index b8b051f3acfb..8a91dfbd8b9e 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -23,13 +23,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.99.0";
+  version = "1.100.0";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-WbXjMnbBKzgX8PjFhthLj4iQCccPcwln59UoiRrf5z4=";
+    hash = "sha256-yjI89EgFHMitdVVkjutTAiV/bND/eGTNCrLyZp/As4w=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index 3d8fc9a42a88..3129a0553f0b 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -174,11 +174,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_mappable",
-        "sha256": "97526bd5e1b1739be5c7379c51d391d074b6bbd109e6e92be49028ecb1a9853c",
+        "sha256": "960746478faaa68ed6b9d3c6fd03c87c7b8614e6c33e75fe1b0c6d7a60adcf29",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.7.0"
+      "version": "4.8.0"
     },
     "dart_style": {
       "dependency": "transitive",
@@ -324,11 +324,11 @@
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "sha256": "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.11.0"
+      "version": "4.12.0"
     },
     "lints": {
       "dependency": "direct dev",
@@ -364,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
+        "sha256": "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.19"
+      "version": "0.12.20"
     },
     "meta": {
       "dependency": "direct main",
@@ -674,31 +674,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
+        "sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.31.0"
+      "version": "1.31.1"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
+        "sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.11"
+      "version": "0.7.12"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
+        "sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.17"
+      "version": "0.6.18"
     },
     "test_descriptor": {
       "dependency": "direct dev",
@@ -744,11 +744,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
     },
     "watcher": {
       "dependency": "direct main",

From bde39b04eda5984de5a6d0df2890a7ac80ba9c6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 09:11:21 +0000
Subject: [PATCH 251/332] python3Packages.aioamazondevices: 13.5.0 -> 13.7.2

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

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 5aebb9f9f0fb..2996f102ad2a 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "13.5.0";
+  version = "13.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-+71t47H4/idWeef8Nf+4TVHB0xEe5mWCQ271ECm3jOg=";
+    hash = "sha256-j2xlCI3i+IszpDfOcUiN6yPsMzEQBUwB8Lq6c6Y/QPo=";
   };
 
   build-system = [ poetry-core ];

From bce8bfc8bbab6bafc6018f1a4b22107fb2a25deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 09:17:50 +0000
Subject: [PATCH 252/332] everest: 6286 -> 6305

---
 pkgs/by-name/ev/everest-bin/package.nix | 6 +++---
 pkgs/by-name/ev/everest/package.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 8b98f80f3667..8735a4aed442 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "6286";
+  version = "6305";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6286.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6305.0/main.zip";
     extension = "zip";
-    hash = "sha256-QhC/VZTy7TxIuJZKjqIKWvX/t8d+5EAFhQiS1R9AnQ4=";
+    hash = "sha256-sx//95XTUD7tg9TmeY2J8ECz/3GpwmJv6i0aGeGjFsg=";
   };
   buildInputs = [
     icu
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index dda1cae846f7..f32d8a186d94 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -11,8 +11,8 @@
 
 let
   pname = "everest";
-  version = "6286";
-  rev = "dcc400b1724b4762ca92b50e8d274f66ddeafa0c";
+  version = "6305";
+  rev = "1b9d110780406d406af8d7e7446247ce858c63e0";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -25,7 +25,7 @@ buildDotnetModule {
     fetchSubmodules = true;
     # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
     # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
-    hash = "sha256-I2Cy3gGAqD9Irxg44qFH48piJQSn1CpmetyUvJs35cE=";
+    hash = "sha256-yZ/hn7+O0vc1AgiDlpWZk6ivFIfvjmCX5pfwnpZy2ag=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 8fb728225955b8f0afbd41da634bdc8bdaaf7997 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 21 May 2026 15:34:57 +0200
Subject: [PATCH 253/332] hot-resize: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix
index 3afc22dd2067..6c82cd57bc4f 100644
--- a/pkgs/by-name/ho/hot-resize/package.nix
+++ b/pkgs/by-name/ho/hot-resize/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hot-resize";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "liberodark";
     repo = "hot-resize";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8UA5Wv96PUerBRTwTwkSAv1iw6lt9nd4MXGdKUmxoz4=";
+    hash = "sha256-TMLtU2c5jkZEc14rII/+I1GtUzBnnZgPyPUgghqs7sM=";
   };
 
-  cargoHash = "sha256-uGMd9xZRYbCJyHkUZXvUnN3M5N1FTaROfoww+oODAHE=";
+  cargoHash = "sha256-z9jWAGhSjYFQ8EhK0V4JsxToLYbEB4TJvhJJfUTGZS0=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -43,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       }
   '';
 
+  __structuredAttrs = true;
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];

From 2b9f291a4d18deea98038f71db622de7b4b94d69 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 23 May 2026 17:54:12 +0800
Subject: [PATCH 254/332] atril: 1.28.4 -> 1.28.5

https://github.com/mate-desktop/atril/compare/v1.28.4...v1.28.5
---
 pkgs/by-name/at/atril/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/atril/package.nix b/pkgs/by-name/at/atril/package.nix
index fbb6fcf4f974..a8d5dbadf6a6 100644
--- a/pkgs/by-name/at/atril/package.nix
+++ b/pkgs/by-name/at/atril/package.nix
@@ -33,14 +33,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "atril";
-  version = "1.28.4";
+  version = "1.28.5";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "atril";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-0BrD897SRf26A4Z1wdizfwoVEEQ7c7EEhAV4vmkBc8E=";
+    hash = "sha256-iG+FFvxxL2/6HqGchoaIDqx8Gfo1wxqM4GW66ScZlao=";
   };
 
   nativeBuildInputs = [

From 9d1626acb2c16c60b700548f689240d6918b06ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 10:05:39 +0000
Subject: [PATCH 255/332] solanum: 0-unstable-2026-05-13 ->
 0-unstable-2026-05-23

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

diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index d001db6151cd..cb0e89a330c8 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solanum";
-  version = "0-unstable-2026-05-13";
+  version = "0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "solanum-ircd";
     repo = "solanum";
-    rev = "8cbf75cc728f99224fe0f2fa86689db07a317ea9";
-    hash = "sha256-6+EkYOgiQo6mD7O7Id74WTRJ4FtBie1/i+SBj+g7su8=";
+    rev = "dfe6757a577109d2180465da6270b5a6bc08f8d7";
+    hash = "sha256-ngg/0HPZeCYodIWt8p9zpCj6hQMiVoc9E2cm/87eE8k=";
   };
 
   postPatch = ''

From 82ed78a9ee81eada31b619ebcdbb248daa123b9a Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Thu, 21 May 2026 03:00:07 +0200
Subject: [PATCH 256/332] nixos/gdm: add warning for Pulseaudio + gdm

We plan to use systemd-userdbd for NixOS 26.11, which will dynamically
allocate greeter users + their homes, which would break the current PA
config. GNOME already depends on PipeWire in other places, so there's
little reason to keep this around.
---
 nixos/modules/services/display-managers/gdm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index 8013fbde9031..dd043cbf272a 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -200,6 +200,8 @@ in
 
   config = lib.mkIf cfg.enable {
 
+    warnings = lib.optional config.services.pulseaudio.enable "Support for Pulseaudio + gdm will be removed in NixOS 26.11";
+
     services.xserver.displayManager.lightdm.enable = false;
 
     users.users = lib.mkMerge [

From 5cb52e21868458115f297228f8edbdc9129373bf Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyu@yiyuzhou.io>
Date: Sat, 28 Mar 2026 19:43:19 -0700
Subject: [PATCH 257/332] mcdreforged: fix build

Co-authored-by: Moraxyc <i@qaq.li>
---
 pkgs/development/python-modules/mcdreforged/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index 30991c13c275..daa168105f7b 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -52,6 +52,8 @@ buildPythonPackage rec {
     versionCheckHook
   ];
 
+  pythonRelaxDeps = [ "ruamel.yaml" ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From e01d65753bf7db6f1cd38736ce5f22a90c180916 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyu@yiyuzhou.io>
Date: Sat, 28 Mar 2026 23:35:05 -0700
Subject: [PATCH 258/332] mcdreforged: cleanup

---
 .../python-modules/mcdreforged/default.nix    | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index daa168105f7b..0187158c128d 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -1,25 +1,25 @@
 {
-  lib,
-  fetchFromGitHub,
   buildPythonPackage,
-  setuptools,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  versionCheckHook,
+
   colorama,
   colorlog,
   packaging,
   parse,
+  pathspec,
   prompt-toolkit,
   psutil,
   requests,
   resolvelib,
   ruamel-yaml,
+  setuptools,
   typing-extensions,
-  pathspec,
-  pytestCheckHook,
-  versionCheckHook,
-  nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mcdreforged";
   version = "2.15.7";
   pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-e1JrDh8Zio+TCVCVvH8tBE/tY5ja3Nr3dCQRJwRqYh4=";
   };
 
@@ -38,13 +38,13 @@ buildPythonPackage rec {
     colorlog
     packaging
     parse
+    pathspec
     prompt-toolkit
     psutil
     requests
     resolvelib
     ruamel-yaml
     typing-extensions
-    pathspec
   ];
 
   nativeCheckInputs = [
@@ -54,14 +54,22 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "ruamel.yaml" ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
-    description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server";
+    changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/${finalAttrs.src.tag}";
+    longDescription = ''
+      MCDReforged (abbreviated as MCDR) is a tool which provides the
+      management ability of the Minecraft server using custom plugin
+      system.  It doesn't need to modify or mod the original Minecraft
+      server at all.
+
+      From in-game calculator, player high-light, to manipulate
+      scoreboard, manage structure file and backup / load backup, you
+      can implement these by using MCDR and related plugins.
+    '';
+    description = "Minecraft server control tool";
     homepage = "https://mcdreforged.com";
-    changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ moraxyc ];
     mainProgram = "mcdreforged";
+    maintainers = with lib.maintainers; [ moraxyc ];
   };
-}
+})

From f3401f22a391c93e9aba5948b21edda87cab70c1 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 23 May 2026 12:27:30 +0200
Subject: [PATCH 259/332] harper: 2.1.0 -> 2.2.1

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

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index a29356e421e8..0173008e1003 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harper";
-  version = "2.1.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9AA2uln9cnMzFvPbxiD05sfdAZKO7xzoJSfQbeRNE9Y=";
+    hash = "sha256-8FTmeavSPH5OAkLbAaP69j98X5U3V4Trn7BMOw0BS8o=";
   };
 
-  cargoHash = "sha256-P90qKrV4YK1ATwclbJ8wX+rcCdE1QetNNL96/IXeIMA=";
+  cargoHash = "sha256-cHtUPev09kRxu1X52fFWo/eBuc6t+uQDkwa21wVUrBc=";
 
   cargoBuildFlags = [
     "--package=harper-cli"

From 1d6a51916f0db54362607477e9d678abac5cf203 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 11:02:56 +0000
Subject: [PATCH 260/332] python3Packages.cadwyn: 6.2.0 -> 6.2.2

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

diff --git a/pkgs/development/python-modules/cadwyn/default.nix b/pkgs/development/python-modules/cadwyn/default.nix
index 48146c35e02f..05b665315500 100644
--- a/pkgs/development/python-modules/cadwyn/default.nix
+++ b/pkgs/development/python-modules/cadwyn/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cadwyn";
-  version = "6.2.0";
+  version = "6.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zmievsa";
     repo = "cadwyn";
     tag = finalAttrs.version;
-    hash = "sha256-vkW3ZSIRuIDVQCHMsZrBEs+VBW55kn0dE2nMXqL5XmU=";
+    hash = "sha256-IM/7IF3zQHaJWlMmG3el9x4/BOFTXYUmJq4gRLP4gVs=";
   };
 
   disabled = pythonAtLeast "3.14";

From dd89aa09092be631951fdfc40ee867431a960608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 11:19:23 +0000
Subject: [PATCH 261/332] remind: 06.02.05 -> 06.02.06

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

diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index 954f3ac95397..486c6f8d24a1 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "06.02.05";
+  version = "06.02.06";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-7zjQMnC4OwfwaqMlH9IABkwUw7RUKIQj2gl3rXKiRLI=";
+    hash = "sha256-Bsrl9WZXb59rznoZEBa/7S6F1QR4S+y1xolfDwJN3kk=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

From aac1bea2f5cec90280d1978aa5f7f726b0f6c40c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 11:46:57 +0000
Subject: [PATCH 262/332] resterm: 0.39.3 -> 0.39.5

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

diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index 3b4623833807..163e13a8899f 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.39.3";
+  version = "0.39.5";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t5A0kFqi2q0z7zBszrGvK54vQpZG948E8byL39UfL68=";
+    hash = "sha256-Qd7ocX2w2dDyoXvv5oaEqpLJYieBahjjkPMom4EVBss=";
   };
 
   vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";

From 60084bc78f912b0d8ad2eb440cdc8d2562756e05 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sat, 23 May 2026 13:51:14 +0200
Subject: [PATCH 263/332] linux_7_0: 7.0.9 -> 7.0.10

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 448a6a216e2e..7c0ee305b0d4 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -35,8 +35,8 @@
         "lts": true
     },
     "7.0": {
-        "version": "7.0.9",
-        "hash": "sha256:1i7ihfnidi3q91g24swa7i9rk9m1f016g8l7a7622ingfvgsq1xc",
+        "version": "7.0.10",
+        "hash": "sha256:1p1j9s0b4qv9m0pm6vj477rqgyd1b0lsk0gy74cks3n2cbmpfj89",
         "lts": false
     }
 }

From 8bd16a6891b63143c89e67fec71d39be32dfcc7e Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sat, 23 May 2026 13:51:20 +0200
Subject: [PATCH 264/332] linux_6_18: 6.18.32 -> 6.18.33

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 7c0ee305b0d4..fbe0fa3e0d35 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.18": {
-        "version": "6.18.32",
-        "hash": "sha256:195xsf4d2rpzkkjdp570sgz4128djzvi5wsqc7m890jp8paasz86",
+        "version": "6.18.33",
+        "hash": "sha256:10mp1ypsdz42jr26g1xxbw806mvpy0n35418fhsgxxlr4lqgy5kg",
         "lts": true
     },
     "7.0": {

From 802bd3500a12257fae31787c268fb37da2c45fed Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sat, 23 May 2026 13:51:23 +0200
Subject: [PATCH 265/332] linux_6_12: 6.12.90 -> 6.12.91

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index fbe0fa3e0d35..ab2f6e6865fb 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.90",
-        "hash": "sha256:1a521y1gins69ir1dskhavmrn9bq28c1vknkhii8m2s6azq1y6hz",
+        "version": "6.12.91",
+        "hash": "sha256:0sbrb612b653w64g5jkpbf68y0fka2sgnwblam41k7wz2sgapwhg",
         "lts": true
     },
     "6.18": {

From 00073245bc1d9160b1f1b2abde4028c723e9ff4f Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sat, 23 May 2026 13:51:25 +0200
Subject: [PATCH 266/332] linux_6_6: 6.6.140 -> 6.6.141

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index ab2f6e6865fb..7cb0b65eaecc 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.140",
-        "hash": "sha256:1nxpckv5kq4i0vhg0nszzkq1sf9lsjjkaf8q8wvpyc6ll9s9cz6n",
+        "version": "6.6.141",
+        "hash": "sha256:1qbzxgqs7q9gyqfrf0j7p0pgjxnjj5mibamhm280mf9anqp6bhiv",
         "lts": true
     },
     "6.12": {

From d12f36bf2189015c0874459ae42f4c1a1f1d51ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Apr 2026 19:09:14 +0000
Subject: [PATCH 267/332] pihole-web: 6.4.1 -> 6.5

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

diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix
index d3a0d978d8cf..27f585725496 100644
--- a/pkgs/by-name/pi/pihole-web/package.nix
+++ b/pkgs/by-name/pi/pihole-web/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pihole-web";
-  version = "6.4.1";
+  version = "6.5";
 
   src = fetchFromGitHub {
     owner = "pi-hole";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0nhMbOEZ4Q4XxOvskcEbDkK4HqdosgAzdRF4sT9+zjQ=";
+    hash = "sha256-ozMqgxyYBDNeYGnZIhql7hnF8D/PwqAe9ypUkkUfKBc=";
   };
 
   propagatedBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Pi-hole web dashboard displaying stats and more";
     homepage = "https://github.com/pi-hole/web";
-    changelog = "https://github.com/pi-hole/FTL/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/pi-hole/web/releases/tag/v${finalAttrs.version}";
     longDescription = ''
       Pi-hole's Web interface (based off of AdminLTE) provides a central
       location to manage your Pi-hole and review the statistics generated by

From b4ce6d1a90ec81bf6c744630c6eb260d54421362 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 11:59:49 +0000
Subject: [PATCH 268/332] skalibs: 2.14.5.1 -> 2.15.0.0

Closes: https://github.com/NixOS/nixpkgs/pull/523300
---
 pkgs/development/skaware-packages/skalibs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 9ce53d52cbf6..9d0c622612dd 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "skalibs";
-  version = "2.14.5.1";
-  sha256 = "sha256-+jWccEObSAQAoKLvaAJqJzazFQJanZXfadNGAfuTjw8=";
+  version = "2.15.0.0";
+  sha256 = "sha256-f96W6K+0GRWToVMoiD6cdybJaJHPBxIiFGgh6Mh/gAc=";
 
   description = "Set of general-purpose C programming libraries";
 

From a357cebeccabf5cd87389cc341898a88596de50a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 05:32:15 +0000
Subject: [PATCH 269/332] nsss: 0.2.1.1 -> 0.2.1.2

Closes: https://github.com/NixOS/nixpkgs/pull/474152
---
 pkgs/development/skaware-packages/nsss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix
index 099bb24d2b3b..9432e8293649 100644
--- a/pkgs/development/skaware-packages/nsss/default.nix
+++ b/pkgs/development/skaware-packages/nsss/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "nsss";
-  version = "0.2.1.1";
-  sha256 = "sha256-pff2y8Gdey3ALVjiupwJ0I+iRZ/j3xh3815jnA8rEpI=";
+  version = "0.2.1.2";
+  sha256 = "sha256-zKpz6QUJ8/pbUq+F2QIDumKMFsna7TTFQmea52gfEGc=";
 
   description = "Implementation of a subset of the pwd.h, group.h and shadow.h family of functions";
 

From 0938eafb082a9f14cd473a6095c5adfc0f3a8ac7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 00:30:59 +0000
Subject: [PATCH 270/332] utmps: 0.1.3.2 -> 0.1.3.3

Closes: https://github.com/NixOS/nixpkgs/pull/518536
---
 pkgs/development/skaware-packages/utmps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix
index 58157ec79aa7..37a375380465 100644
--- a/pkgs/development/skaware-packages/utmps/default.nix
+++ b/pkgs/development/skaware-packages/utmps/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "utmps";
-  version = "0.1.3.2";
-  sha256 = "sha256-sRTVauysicBctMDtM8Y4igIRSwnenM44Srm4qTRphmg=";
+  version = "0.1.3.3";
+  sha256 = "sha256-4iEr0C/hdzBCT39eMKTd5x0IYqUrI9i3Ke7XRCCjSaI=";
 
   description = "Secure utmpx and wtmp implementation";
 

From d7fa5fca04bb55c1bdcbc258d3440dec378b5704 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 17:33:24 +0000
Subject: [PATCH 271/332] execline: 2.9.8.1 -> 2.9.9.1

Closes: https://github.com/NixOS/nixpkgs/pull/520566
---
 pkgs/development/skaware-packages/execline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index ed2f1795d87e..e5fdeb03d716 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -7,14 +7,14 @@
 }:
 
 let
-  version = "2.9.8.1";
+  version = "2.9.9.1";
 in
 skawarePackages.buildPackage {
   inherit version;
 
   pname = "execline";
   # ATTN: also check whether there is a new manpages version
-  sha256 = "sha256-IzUNEHl5CWNgYFImB1kctKIRgyjLWMXmX7GaLA1HJk4=";
+  sha256 = "sha256-vmNTMpepPDb9JnGVEXtOZoaHpSb4NFF6jbR9hbbH7Go=";
 
   # Maintainer of manpages uses following versioning scheme: for every
   # upstream $version he tags manpages release as ${version}.1, and,

From baeb831e165a8a910ee8cde3223d1a500ebd0679 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 18 May 2026 12:38:08 +0200
Subject: [PATCH 272/332] s6: 2.14.0.1 -> 2.15.0.0

---
 pkgs/development/skaware-packages/s6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix
index 19e9f206b473..d88a808762db 100644
--- a/pkgs/development/skaware-packages/s6/default.nix
+++ b/pkgs/development/skaware-packages/s6/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6";
-  version = "2.14.0.1";
-  sha256 = "sha256-wlr+gXy8P1lO/FBQNR+LkQG6eGFtDOkVZY83Dn7i4lg=";
+  version = "2.15.0.0";
+  sha256 = "sha256-J9/3PWJihVQBM+B151iHCH9RF/1R3llQPvfSnpb2nkw=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-man-pages";

From 84dfce20a052c36abf5210ae1a02cda30fafcc8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 07:33:18 +0000
Subject: [PATCH 273/332] s6-rc: 0.6.0.0 -> 0.6.1.1

Closes: https://github.com/NixOS/nixpkgs/pull/520350
---
 pkgs/development/skaware-packages/s6-rc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix
index 0029eb0afd6d..63c5cda8cf3d 100644
--- a/pkgs/development/skaware-packages/s6-rc/default.nix
+++ b/pkgs/development/skaware-packages/s6-rc/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-rc";
-  version = "0.6.0.0";
-  sha256 = "sha256-RtSmKVnvFgl7hNz7DDsxpv9JqkdtSu7Jxbe94c5oSQE=";
+  version = "0.6.1.1";
+  sha256 = "sha256-tU8iajW+HuVqIovxpMOUN/ByvGTmnb81bnM+YGqGQC0=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-rc-man-pages";

From 514f6d2cf2a9992b48d2eab66ed2c1ef55270b22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 16:13:34 +0000
Subject: [PATCH 274/332] s6-linux-init: 1.2.0.0 -> 1.2.0.1

Closes: https://github.com/NixOS/nixpkgs/pull/520541
---
 pkgs/development/skaware-packages/s6-linux-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index 9643b8a0ebb7..ff8137aa19ec 100644
--- a/pkgs/development/skaware-packages/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-linux-init";
-  version = "1.2.0.0";
-  sha256 = "sha256-82cImDHGlI/evomW2khKuP0Uhclek8HlsDe4hxGN6dk=";
+  version = "1.2.0.1";
+  sha256 = "sha256-ctWbE2g9E5D335ooa+Rn5zKTQWAhr5+hAjySk+xcfXw=";
 
   description = "Set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
   platforms = lib.platforms.linux;

From e5c136b862accbb3b0ca243ac5d0d0b45c782ffc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 10:04:41 +0000
Subject: [PATCH 275/332] s6-portable-utils: 2.3.1.1 -> 2.3.1.2

Closes: https://github.com/NixOS/nixpkgs/pull/474190
---
 .../skaware-packages/s6-portable-utils/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix
index adac6eec681e..cb6c1148f05d 100644
--- a/pkgs/development/skaware-packages/s6-portable-utils/default.nix
+++ b/pkgs/development/skaware-packages/s6-portable-utils/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-portable-utils";
-  version = "2.3.1.1";
-  sha256 = "sha256-zwjXGWPA6hcIzdgr1ArTARVLzMWbaO77Qoqnm0InMkI=";
+  version = "2.3.1.2";
+  sha256 = "sha256-z7kBhtDA6yBOHlxvk3nplBPFRrzPOLtudhd/gjcao6o=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-portable-utils-man-pages";

From cc306432861192940d12ea08d97aced089060dfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 May 2026 03:45:24 +0000
Subject: [PATCH 276/332] s6-linux-utils: 2.6.4.0 -> 2.6.4.1

Closes: https://github.com/NixOS/nixpkgs/pull/519996
---
 pkgs/development/skaware-packages/s6-linux-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix
index 1a9d58065237..0b91b576b217 100644
--- a/pkgs/development/skaware-packages/s6-linux-utils/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-utils/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-linux-utils";
-  version = "2.6.4.0";
-  sha256 = "sha256-zHJ/cNXoeAQzpJest8sxAGVrMSZYmrAunSBCAGx5TPI=";
+  version = "2.6.4.1";
+  sha256 = "sha256-FuGltaK0qYZ0tKlxlhKtt5WI48IMQIM2AnjqOPLTISk=";
 
   description = "Set of minimalistic Linux-specific system utilities";
   platforms = lib.platforms.linux;

From 1849d5f660994a020e085b4efea5fbad9edf69d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 May 2026 11:29:38 +0000
Subject: [PATCH 277/332] s6-dns: 2.4.1.1 -> 2.4.1.2

Closes: https://github.com/NixOS/nixpkgs/pull/474774
---
 pkgs/development/skaware-packages/s6-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix
index ba87616942c4..ee0c7878533e 100644
--- a/pkgs/development/skaware-packages/s6-dns/default.nix
+++ b/pkgs/development/skaware-packages/s6-dns/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-dns";
-  version = "2.4.1.1";
-  sha256 = "sha256-JkPP9JmgeOoXDl+mqH2GxNcjtl89FICnE318xJlHQzg=";
+  version = "2.4.1.2";
+  sha256 = "sha256-BhjYgw/OY+4Xt/VeSUKAachcl6FxCCensjSbZgzTOk4=";
 
   description = "Suite of DNS client programs and libraries for Unix systems";
 

From 4ba2579545b1ed4908c0bf9f86a187103478f614 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 21:59:09 +0000
Subject: [PATCH 278/332] s6-networking: 2.7.2.1 -> 2.8.0.0

Closes: https://github.com/NixOS/nixpkgs/pull/519560
---
 pkgs/development/skaware-packages/s6-networking/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix
index b96feb033247..79a133fc8886 100644
--- a/pkgs/development/skaware-packages/s6-networking/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking/default.nix
@@ -25,8 +25,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
 skawarePackages.buildPackage {
   pname = "s6-networking";
-  version = "2.7.2.1";
-  sha256 = "sha256-Z5+GUthb40PawfB2SXzTbKjFZACUh4D4XcZONAVeLBs=";
+  version = "2.8.0.0";
+  sha256 = "sha256-rE9lhA/OwWJPe/nGMvtAVThRvJApV/+VayofIoGkXNQ=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-networking-man-pages";

From 7875de5f5d6234bcd5fca63ce325d9b7b766b8bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 May 2026 10:51:09 +0000
Subject: [PATCH 279/332] mdevd: 0.1.8.1 -> 0.1.8.2

Closes: https://github.com/NixOS/nixpkgs/pull/521220
---
 pkgs/development/skaware-packages/mdevd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix
index 6c4d17b7763a..2804326b3218 100644
--- a/pkgs/development/skaware-packages/mdevd/default.nix
+++ b/pkgs/development/skaware-packages/mdevd/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "mdevd";
-  version = "0.1.8.1";
-  sha256 = "sha256-k9K7pymf87G58kmSjC6E4jpa89gp69lnfqRFNcWFqoI=";
+  version = "0.1.8.2";
+  sha256 = "sha256-zhrgFJtqV6NPYIIY/WGBqmqmgTXKwvTZMbW0F7By4kQ=";
 
   description = "mdev-compatible Linux hotplug manager daemon";
   platforms = lib.platforms.linux;

From 8b48b20abdd87d5b6e2093c61099f5399c3449e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 12:36:52 +0000
Subject: [PATCH 280/332] tipidee: 0.0.7.1 -> 0.0.7.2

Closes: https://github.com/NixOS/nixpkgs/pull/518692
---
 pkgs/development/skaware-packages/tipidee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix
index 9b822903866b..6e8d07841ef8 100644
--- a/pkgs/development/skaware-packages/tipidee/default.nix
+++ b/pkgs/development/skaware-packages/tipidee/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "tipidee";
-  version = "0.0.7.1";
-  sha256 = "sha256-ah5JwvCvWqRNuO3sK5KUxPXPaLg6eDGatJkE+KUv63M=";
+  version = "0.0.7.2";
+  sha256 = "sha256-x34St9s/3FbcI9s3ncpmhhbnQmA/6Gf6K9yNTxrKj5s=";
 
   description = "HTTP 1.1 webserver, serving static files and CGI/NPH";
 

From 754c1c760e7f0212965f0f8f98b841bdb7d18425 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 18 May 2026 12:53:04 +0200
Subject: [PATCH 281/332] execline.manpages: 2.9.8.1.3 -> 2.9.9.1.1

---
 pkgs/development/skaware-packages/execline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index e5fdeb03d716..f47dd73b295f 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -22,8 +22,8 @@ skawarePackages.buildPackage {
   # ${version}.3 and so on are created.
   manpages = skawarePackages.buildManPages {
     pname = "execline-man-pages";
-    version = "2.9.8.1.3";
-    sha256 = "sha256-jYNx15n9pOK4PPEf0ynvHpgGucgWQKd/4nggY7OmR4M=";
+    version = "2.9.9.1.1";
+    sha256 = "sha256-SMQLeiS03fW9HGDmk+MMfUbnvRGqTzXc/4CuS5LW18U=";
     description = "Port of the documentation for the execline suite to mdoc";
     maintainers = [ lib.maintainers.sternenseemann ];
   };

From 452f7ac753cff5a9ca2d685f84385c5d1296b00c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 23 May 2026 19:48:25 +0700
Subject: [PATCH 282/332] python3Packages.sigrok: fix build with swig 4.4

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

diff --git a/pkgs/development/python-modules/sigrok/default.nix b/pkgs/development/python-modules/sigrok/default.nix
index 5a0a6997df16..e31a42e1e98f 100644
--- a/pkgs/development/python-modules/sigrok/default.nix
+++ b/pkgs/development/python-modules/sigrok/default.nix
@@ -25,6 +25,14 @@ toPythonModule (
       ./python-install.patch
     ];
 
+    postPatch = ''
+      ${orig.postPatch or ""}
+
+      # %init block lands in SWIG_mod_exec (returns int) under swig >= 4.4.
+      substituteInPlace bindings/python/sigrok/core/classes.i \
+        --replace-fail 'return nullptr;' 'return -1;'
+    '';
+
     nativeBuildInputs =
       orig.nativeBuildInputs or [ ]
       ++ [

From f7a72304854c6bcf8eaa1ce59adff43fcacd625c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 23 May 2026 20:02:24 +0700
Subject: [PATCH 283/332] python3Packages.swh-scheduler: disable
 test_task_exception

---
 pkgs/development/python-modules/swh-scheduler/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix
index ea4c798e2e71..947590aab44f 100644
--- a/pkgs/development/python-modules/swh-scheduler/default.nix
+++ b/pkgs/development/python-modules/swh-scheduler/default.nix
@@ -86,7 +86,10 @@ buildPythonPackage (finalAttrs: {
     types-requests
   ];
 
-  disabledTests = [ "test_setup_log_handler_with_env_configuration" ];
+  disabledTests = [
+    "test_setup_log_handler_with_env_configuration"
+    "test_task_exception"
+  ];
 
   meta = {
     changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler/-/tags/${finalAttrs.src.tag}";

From 69004d6c9b80163a6676cefc2b163916fcc818a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 13:12:34 +0000
Subject: [PATCH 284/332] qwen-code: 0.15.11 -> 0.16.0

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

diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index f4c863b0d39c..50a1d4e02c9c 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -14,17 +14,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.15.11";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ArEbnJOAKexoSy7Epis5OC8XYmmQpZPILtUEv4E0k4=";
+    hash = "sha256-XWhQ5GlAGW0WAyiPwBULLz1yQps2IdjVkusQ0a88tCs=";
   };
 
   npmDepsFetcherVersion = 3;
-  npmDepsHash = "sha256-J/dvHeC38uiZKgB6mGAnlCbAKXdai/mMzdP1E1Pa6Yg=";
+  npmDepsHash = "sha256-dRc+hTk5ELw0rJhT71heFnLjTmjN1UpIOHUMXKt4YwU=";
 
   # npm 11 incompatible with fetchNpmDeps
   # https://github.com/NixOS/nixpkgs/issues/474535

From 2622050d916555458a7c0c352aea82060a9fcc8e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 May 2026 16:27:05 +0300
Subject: [PATCH 285/332] Revert "mdbook: 0.5.2 -> 0.5.3"

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

diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index fa23ac200d96..66c14abfb130 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -8,7 +8,7 @@
   installShellFiles,
 }:
 let
-  version = "0.5.3";
+  version = "0.5.2";
 in
 rustPlatform.buildRustPackage rec {
   inherit version;
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "mdBook";
     tag = "v${version}";
-    hash = "sha256-RMJQn58hshBGQSpu30NdUOb3Prywn6NfhauSzFZ35xQ=";
+    hash = "sha256-gyjD47ZR9o2lIxipzesyJ6mxb9J9W+WS77TNWhKHP6U=";
   };
 
-  cargoHash = "sha256-LlImOjTQjMQURQ81Gn73v+DEHXqyyiz39K9T+MrE7S0=";
+  cargoHash = "sha256-230KljOUSrDy8QCQki7jvJvdAsjVlUEjKDNVyTF4tWs=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 71fa9158c78ca9348ec8f6bee7dbae7826ca4417 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 23 May 2026 20:27:53 +0700
Subject: [PATCH 286/332] python3Packages.pycyphal: disable doctests broken by
 asyncio task leaks on python 3.14

---
 pkgs/development/python-modules/pycyphal/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 8fed197d2e4d..a53a14fde62c 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -95,6 +95,13 @@ buildPythonPackage rec {
     "pycyphal/application/register/_value.py"
   ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    # leaked tasks from prior doctest's event loop break doctest stdout capture, causing "Got nothing" on REPL-style assertions
+    "MonotonicClusteringSynchronizer"
+    "TransferIDSynchronizer"
+    "PythonCANMedia"
+  ];
+
   pythonImportsCheck = [ "pycyphal" ];
 
   meta = {

From 3821e9e8bc1cace1569c0f3015393536bbd62484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 10:49:36 -0700
Subject: [PATCH 287/332] python3Packages.aiolyric: 2.1.0 -> 2.1.1

Diff: https://github.com/timmo001/aiolyric/compare/2.1.0...2.1.1

Changelog: https://github.com/timmo001/aiolyric/releases/tag/2.1.1
---
 .../development/python-modules/aiolyric/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix
index 316e1f3aed84..df2a318f6ac2 100644
--- a/pkgs/development/python-modules/aiolyric/default.nix
+++ b/pkgs/development/python-modules/aiolyric/default.nix
@@ -4,7 +4,7 @@
   aioresponses,
   buildPythonPackage,
   fetchFromGitHub,
-  incremental,
+  packaging,
   pytest-asyncio,
   pytestCheckHook,
   setuptools,
@@ -12,24 +12,27 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiolyric";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "aiolyric";
     tag = finalAttrs.version;
-    hash = "sha256-kLsq1pBRWz49DZgX47k132OipDcfn+kby6/GYDL3pPc=";
+    hash = "sha256-+OYMe63sX5TtvJpNn6dzvnephlhS/MyFXmUerYZqF5A=";
   };
 
   build-system = [
-    incremental
     setuptools
   ];
 
+  pythonRelaxDeps = [
+    "packaging"
+  ];
+
   dependencies = [
     aiohttp
-    incremental
+    packaging
   ];
 
   nativeCheckInputs = [

From e956b9e3b1769631f98ae6d0d51a9143402307f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 10:49:56 -0700
Subject: [PATCH 288/332] python3Packages.python-roborock: 5.5.1 -> 5.12.0

Diff: https://github.com/Python-roborock/python-roborock/compare/v5.5.1...v5.12.0

Changelog: https://github.com/Python-roborock/python-roborock/blob/v5.12.0/CHANGELOG.md
---
 pkgs/development/python-modules/python-roborock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 8e4d835f553e..34f860deabfa 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-roborock";
-  version = "5.5.1";
+  version = "5.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2ShXt2mtMhMugzqOHhY1GT7cQ0K78k/4/bPmmP/uheI=";
+    hash = "sha256-v4hONQ3EmpenjnAVKm8YMrynVyxtduefN5oqGW9MoE0=";
   };
 
   pythonRelaxDeps = [

From e875e2a1f3951b5b2cda249bf7657ddb3450987c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 10:52:44 -0700
Subject: [PATCH 289/332] python3Packages.renault-api: 0.5.8 -> 0.5.10

Diff: https://github.com/hacf-fr/renault-api/compare/v0.5.8...v0.5.10

Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.5.10
---
 pkgs/development/python-modules/renault-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 978dfc6425dd..5302b73e4355 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "renault-api";
-  version = "0.5.8";
+  version = "0.5.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hacf-fr";
     repo = "renault-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ZvMrEe3qgtMpg49OLZH1YTXQKSGR8e3yaShghnyMv4=";
+    hash = "sha256-1ym2xDJo8Ax76jC7rvVYI+EADKkdjGiKKvtiyE/rk/4=";
   };
 
   build-system = [ poetry-core ];

From b73acd96949ccbc124721c6aa74d71e2cb3cf7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:01:52 -0700
Subject: [PATCH 290/332] python3Packages.python-backoff: init at 2.3.1

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

diff --git a/pkgs/development/python-modules/python-backoff/default.nix b/pkgs/development/python-modules/python-backoff/default.nix
new file mode 100644
index 000000000000..32b863d24f68
--- /dev/null
+++ b/pkgs/development/python-modules/python-backoff/default.nix
@@ -0,0 +1,42 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  requests,
+  responses,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "python-backoff";
+  version = "2.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "python-backoff";
+    repo = "backoff";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Os20Gz+uWaEdUPPF9/tT7LNxbmN0W/tuzVZa3H+ZG2A=";
+  };
+
+  build-system = [ hatchling ];
+
+  pythonImportsCheck = [ "backoff" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+    requests
+    responses
+  ];
+
+  meta = {
+    changelog = "https://github.com/python-backoff/backoff/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    description = "Python library providing function decorators for configurable backoff and retry";
+    homepage = "https://github.com/python-backoff/backoff";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6df32da3a38b..1b1e05ea5616 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15756,6 +15756,8 @@ self: super: with self; {
 
   python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
 
+  python-backoff = callPackage ../development/python-modules/python-backoff { };
+
   python-barbicanclient = callPackage ../development/python-modules/python-barbicanclient { };
 
   python-barcode = callPackage ../development/python-modules/python-barcode { };

From e18c3ff6bfe29d385cc0065cdf3cd4381b849935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 10:53:24 -0700
Subject: [PATCH 291/332] python3Packages.wled: 0.22.0 -> 0.23.0

Diff: https://github.com/frenck/python-wled/compare/v0.22.0...v0.23.0

Changelog: https://github.com/frenck/python-wled/releases/tag/v0.23.0
---
 pkgs/development/python-modules/wled/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index 8aa2d8395ae3..c61060adfd24 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -3,9 +3,7 @@
   aiohttp,
   aioresponses,
   awesomeversion,
-  backoff,
   buildPythonPackage,
-  cachetools,
   fetchFromGitHub,
   mashumaro,
   orjson,
@@ -14,6 +12,7 @@
   pytest-cov-stub,
   pytest-xdist,
   pytestCheckHook,
+  python-backoff,
   syrupy,
   typer,
   yarl,
@@ -22,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "wled";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-wled";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CUTuIQf6gj9teLicIOtu1FUsYiYXtKeLNuDbNh/21sc=";
+    hash = "sha256-1JLW3wze4W3Uva9xIeSAmYw8f9tDfGxe9rueixVedms=";
   };
 
   postPatch = ''
@@ -43,10 +42,9 @@ buildPythonPackage (finalAttrs: {
   dependencies = [
     aiohttp
     awesomeversion
-    backoff
-    cachetools
     mashumaro
     orjson
+    python-backoff
     yarl
   ];
 
@@ -70,6 +68,8 @@ buildPythonPackage (finalAttrs: {
   disabledTests = [
     # wled release table rendering is inconsistent
     "test_releases_command"
+    # outdated snapshots
+    "test_device_version_fixture"
   ];
 
   pythonImportsCheck = [ "wled" ];

From 31ca7d375344e62df00b7160aa8792097d59c8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 10:46:09 -0700
Subject: [PATCH 292/332] home-assistant: 2026.5.3 -> 2026.5.4

Diff: https://github.com/home-assistant/core/compare/2026.5.3...2026.5.4

Changelog: https://github.com/home-assistant/core/releases/tag/2026.5.4
---
 .../home-assistant/component-packages.nix     |  2 +-
 pkgs/servers/home-assistant/default.nix       | 20 ++++++++++++++++---
 pkgs/servers/home-assistant/tests.nix         |  5 +++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 5dc925bea9e1..4f36bf596988 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.5.3";
+  version = "2026.5.4";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index dfc6e7a1e9f1..e930d470b54a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -4,6 +4,7 @@
   callPackage,
   fetchFromGitHub,
   fetchPypi,
+  fetchpatch,
   python314,
   replaceVars,
   ffmpeg-headless,
@@ -262,7 +263,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.5.3";
+  hassVersion = "2026.5.4";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -283,13 +284,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-U3P97V/3+4eKMPyT6JzqLiDgei84iEOyWdknFvJBn1o=";
+    hash = "sha256-Z5FUkljaWRr9tfBb6RXJCC86ZbyNkw0PvUcOl+bZ2cc=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-SAeqGo+fTQG//Abix+6pjHKQJY1XBrNL7IexgqoXsYc=";
+    hash = "sha256-o5S6rnOTqzPLZpMBxgmp9IpmLlEHLvHTH68ql2EkVbI=";
   };
 
   build-system = with python.pkgs; [
@@ -318,6 +319,19 @@ python.pkgs.buildPythonApplication rec {
     (replaceVars ./patches/ffmpeg-path.patch {
       ffmpeg = "${lib.getExe ffmpeg-headless}";
     })
+
+    (fetchpatch {
+      name = "2026.5.4-shelly-tests-fix.patch";
+      url = "https://github.com/home-assistant/core/commit/072e9b51a2321b0d4489bae6f1e04f7ed845222f.patch";
+      includes = [ "tests/components/shelly/test_coordinator.py" ];
+      hash = "sha256-0XQdw2MnwzrHKYY06TotfJJem0bqremmi7k8SyVQVGA=";
+    })
+
+    (fetchpatch {
+      name = "2026.5.4-homewizard-tests-fix.patch";
+      url = "https://github.com/home-assistant/core/commit/e796d9c46744097585bfada483108a55ae16344a.patch";
+      hash = "sha256-T0Nb6LcL/21WdUm8RmczhHaVX92n5O/rpMdpqDVQ2VU=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index a4c17265f8cd..c1c60a74c2d8 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -142,6 +142,11 @@ let
       # [2026.5.2] Failed: Description not found for placeholder `modulation` in component.honeywell_string_lights.config.abort.no_compatible_transmitters"
       "test_no_compatible_transmitters"
     ];
+    lutron_caseta = [
+      # [2026.5.4] creates binary_sensor.basement_bedroom_left_shade_battery
+      #            expects binary_sensor.basement_bedroom_basement_bedroom_left_shade_battery
+      "test_battery_sensor_handles_bridge_response_error"
+    ];
     novy_cooker_hood = [
       # [2026.5.2] Failed: Description not found for placeholder `modulation` in component.novy_cooker_hood.config.abort.no_compatible_transmitters
       "test_no_compatible_transmitters"

From 95c37c86b21d562286bf330197390284dfa29d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:16:35 -0700
Subject: [PATCH 293/332] home-assistant-custom-components.alarmo: 1.10.17 ->
 1.10.18

Diff: https://github.com/nielsfaber/alarmo/compare/v1.10.17...v1.10.18

Changelog: https://github.com/nielsfaber/alarmo/releases/tag/v1.10.18
---
 .../home-assistant/custom-components/alarmo/package.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
index 25d688430fc6..dcf7a722f78c 100644
--- a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "nielsfaber";
   domain = "alarmo";
-  version = "1.10.17";
+  version = "1.10.18";
 
   src = fetchFromGitHub {
     owner = "nielsfaber";
     repo = "alarmo";
     tag = "v${version}";
-    hash = "sha256-LVTwqJsuFvAGUgZDq6lkUUI/Ch0Ex+ApNxsyuUbDz14=";
+    hash = "sha256-SBR/NVz7E+gsVLnEO3o30irNeFnnBZb5YVJImWHLk2Y=";
   };
 
   postPatch = ''

From 32cc9809bf4bbefbb280a50eae0268d1032a438c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:31:22 -0700
Subject: [PATCH 294/332] home-assistant-custom-components.entity-notes: 3.3.4
 -> 3.3.10

Diff: https://github.com/martindell/ha-entity-notes/compare/v3.3.4...v3.3.10

Changelog: https://github.com/martindell/ha-entity-notes/releases/tag/v3.3.10
---
 .../home-assistant/custom-components/entity-notes/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/entity-notes/package.nix b/pkgs/servers/home-assistant/custom-components/entity-notes/package.nix
index 5318b402b1c7..bc71285acac1 100644
--- a/pkgs/servers/home-assistant/custom-components/entity-notes/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/entity-notes/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "martindell";
   domain = "entity_notes";
-  version = "3.3.4";
+  version = "3.3.10";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-entity-notes";
     tag = "v${version}";
-    hash = "sha256-5JKZ/KC2sSDQQeg3taLyuZdF6QJHdc7pJ1jaFD9S3kc=";
+    hash = "sha256-2ZwIqqF3OQ6wjfi5c3cV8NyJNcucd95Nkrs/OimHrb0=";
   };
 
   dependencies = [

From 6bbd96dd7b73879c18b048b4e34f9bcda0dccf46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:39:42 -0700
Subject: [PATCH 295/332] python3Packages.ha-garmin: 0.1.22 -> 0.1.23

Diff: https://github.com/cyberjunky/ha-garmin/compare/v0.1.22...v0.1.23

Changelog: https://github.com/cyberjunky/ha-garmin/releases/tag/v0.1.23
---
 pkgs/development/python-modules/ha-garmin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ha-garmin/default.nix b/pkgs/development/python-modules/ha-garmin/default.nix
index 3b29e289b009..2ff56875c109 100644
--- a/pkgs/development/python-modules/ha-garmin/default.nix
+++ b/pkgs/development/python-modules/ha-garmin/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ha-garmin";
-  version = "0.1.22";
+  version = "0.1.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "ha-garmin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q5bNa6HT2GeqdElsSG7Rgk3a14GsjGyLkHWVrg3CTYs=";
+    hash = "sha256-0x7+pABt0i9QFty/i8IeU2CLmDUQiw16pYZ1Wr7CARI=";
   };
 
   build-system = [ setuptools ];

From b37108be35826d7b071002e4b6188bb0b3dd7207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:33:18 -0700
Subject: [PATCH 296/332] home-assistant-custom-components.garmin_connect:
 3.0.7 -> 3.0.8

Diff: https://github.com/cyberjunky/home-assistant-garmin_connect/compare/3.0.7...3.0.8

Changelog: https://github.com/cyberjunky/home-assistant-garmin_connect/releases/tag/3.0.8
---
 .../custom-components/garmin_connect/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
index d2c0983671a4..0d440ae0a62e 100644
--- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "cyberjunky";
   domain = "garmin_connect";
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "home-assistant-garmin_connect";
     tag = version;
-    hash = "sha256-qCpUMmxH/Fjm2vlC9o5IUuip8QvOUGuPCZTZOnC/uuM=";
+    hash = "sha256-F/zMwaGt9lbMzhgy3Jk23ylalMJqMT5xf90YUeH0Fv4=";
   };
 
   dependencies = [

From bb0fa7f67f47831d0aca96d9c670743f0d11bf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:36:44 -0700
Subject: [PATCH 297/332] home-assistant-custom-components.oref_alert: 6.18.2
 -> 6.18.3

Diff: https://github.com/amitfin/oref_alert/compare/v6.18.2...v6.18.3

Changelog: https://github.com/amitfin/oref_alert/releases/tag/v6.18.3
---
 .../home-assistant/custom-components/oref_alert/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
index 30aaf68b387a..e1af2e00991a 100644
--- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
@@ -15,13 +15,13 @@
 buildHomeAssistantComponent rec {
   owner = "amitfin";
   domain = "oref_alert";
-  version = "6.18.2";
+  version = "6.18.3";
 
   src = fetchFromGitHub {
     owner = "amitfin";
     repo = "oref_alert";
     tag = "v${version}";
-    hash = "sha256-1z/0nvwQ0cyYWl+LDhCTZQhEzKU/RgSbHejqoZLDRSo=";
+    hash = "sha256-gF8JemhOxnwDHoMcC3Znp9lx92bPdRk/a8e3Upbhb+o=";
   };
 
   # Do not publish cards, currently broken, attempting to write to nix store.

From a7ced7272ec8b3f3850e1a45197fb787b8c2611c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:41:36 -0700
Subject: [PATCH 298/332] home-assistant-custom-components.yandex-station:
 3.20.3 -> 3.21.1

Diff: https://github.com/AlexxIT/YandexStation/compare/v3.20.3...v3.21.1

Changelog: https://github.com/AlexxIT/YandexStation/releases/tag/v3.21.1
---
 .../custom-components/yandex-station/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
index 2b3ea307a515..e27df2137651 100644
--- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "yandex_station";
-  version = "3.20.3";
+  version = "3.21.1";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "YandexStation";
     tag = "v${version}";
-    hash = "sha256-odI16EkIqQ6tubr0BZHwRWwnAC7816DezNA8FoRcwyc=";
+    hash = "sha256-5a+631Gu7xaPq8EF+34bybm40YVTXPA/ylq6k8LPBNU=";
   };
 
   dependencies = [

From 466a800c2b71a1e11d153e1682a03f01dfbf03dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 23 May 2026 13:55:06 +0200
Subject: [PATCH 299/332] python314Packages.homeassistant-stubs: 2026.5.3 ->
 2026.5.4

https://github.com/KapJI/homeassistant-stubs/releases/tag/2026.5.4
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 8f1d055b6a8d..b91aba91147f 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2026.5.3";
+  version = "2026.5.4";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-kgfnT+qTsbB3T8PPsSA698QcxcM1o1QW8hLnfXjGm5M=";
+    hash = "sha256-AMJZxGN/asXcWbT/X92tQQ82/f8vI8MYft/Xx43GInc=";
   };
 
   build-system = [

From 297e75917e9c0e1f0e9fc8f606c9c5585ab32a70 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 23 May 2026 13:57:37 +0200
Subject: [PATCH 300/332] 
 home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.332 ->
 0.13.333

https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/0.13.333/CHANGELOG.md
---
 .../home-assistant/pytest-homeassistant-custom-component.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index cdbf0b08a477..43bb5b244499 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.332";
+  version = "0.13.333";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     tag = version;
-    hash = "sha256-zkRmuNUmRVvnIwIx494xzFKT0/00GZzkVo6cva9tut4=";
+    hash = "sha256-zSssvqYxgGguKUanzpAYzammeWrBOi0bZrLIfg8NwC0=";
   };
 
   build-system = [ setuptools ];

From 7bfd4f2adfe8e5f048930766d159948df19c099d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 23 May 2026 14:35:49 +0200
Subject: [PATCH 301/332] home-assistant-custom-components.mypyllant: 0.9.12 ->
 0.9.13

Diff: https://github.com/signalkraft/mypyllant-component/compare/v0.9.12...v0.9.13

Changelog: https://github.com/signalkraft/mypyllant-component/releases/tag/v0.9.13
---
 .../home-assistant/custom-components/mypyllant/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix
index 5a4dd545c493..7d1e88102d05 100644
--- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix
@@ -19,13 +19,13 @@
 buildHomeAssistantComponent rec {
   owner = "signalkraft";
   domain = "mypyllant";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchFromGitHub {
     owner = "signalkraft";
     repo = "mypyllant-component";
     tag = "v${version}";
-    hash = "sha256-vXzcVua2cGQXXeug6Zy4AAeTok+BLH5k+krq3UBuQjw=";
+    hash = "sha256-ydayYZjebVQULYyF3KWJHuSg89dY+bGYe+5zHGxfnEw=";
   };
 
   dependencies = [

From 4eed681ae89edb2be82f3470da47386095faa133 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 14:11:42 +0000
Subject: [PATCH 302/332] allure: 2.41.0 -> 2.42.0

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

diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix
index 714ce4761baa..7c5922f260b4 100644
--- a/pkgs/by-name/al/allure/package.nix
+++ b/pkgs/by-name/al/allure/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "allure";
-  version = "2.41.0";
+  version = "2.42.0";
 
   src = fetchurl {
     url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-3dhrL0L24suVAEeMDQDKPs7A4c+a4V8X4AYQMAXj7lE=";
+    hash = "sha256-cpEtOo/fIH9RTvVbvu4gD2idIZ5PG7S7SaOmeQ7QTf4=";
   };
 
   dontConfigure = true;

From 227390cd4794adf1932ab9f4c7014f2a8ef0364f Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Fri, 22 May 2026 12:04:42 +0000
Subject: [PATCH 303/332] home-assistant-custom-components.local_openai: init
 at 1.6.0

---
 .../local_openai/package.nix                  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/local_openai/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/local_openai/package.nix b/pkgs/servers/home-assistant/custom-components/local_openai/package.nix
new file mode 100644
index 000000000000..d0d446d34d25
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/local_openai/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  openai,
+  demoji,
+}:
+
+buildHomeAssistantComponent (finalAttrs: {
+  owner = "skye-harris";
+  domain = "local_openai";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    inherit (finalAttrs) owner;
+    repo = "hass_local_openai_llm";
+    tag = finalAttrs.version;
+    hash = "sha256-S7gtm9JRaxNh6xbeKRyW6l6nXqE4+h9kgyUZ9RkbLR0=";
+  };
+
+  dependencies = [
+    openai
+    demoji
+  ];
+
+  meta = {
+    changelog = "https://github.com/skye-harris/hass_local_openai_llm/releases/tag/${finalAttrs.src.tag}";
+    description = "Home Assistant LLM integration for local OpenAI-compatible services (llama.cpp, vLLM, etc.)";
+    homepage = "https://github.com/skye-harris/hass_local_openai_llm";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jpds ];
+  };
+})

From 7925ada369b63ffe5e42a94b9dd501cf84122f45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 14:34:06 +0000
Subject: [PATCH 304/332] python3Packages.oelint-data: 1.4.14 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 6066acef80cf..49a93b0021d6 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.4.14";
+  version = "1.5.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-0uW/4m7gacJWArGaTTNJQcWETD6BxObYbThqSurEmlg=";
+    hash = "sha256-9dsiyWVQ5FGspOXq9pyHatSfOtmOYKUP74CHDS7RoD8=";
   };
 
   build-system = [

From 2fa56d6e1ea9d3220237c80c55a5591cfeac195b Mon Sep 17 00:00:00 2001
From: TheToddLuci0 <26094248+TheToddLuci0@users.noreply.github.com>
Date: Thu, 21 May 2026 09:44:02 -0500
Subject: [PATCH 305/332] streamcontroller: 1.5.0-beta.13 -> 1.5.0-beta.14

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

diff --git a/pkgs/by-name/st/streamcontroller/package.nix b/pkgs/by-name/st/streamcontroller/package.nix
index 14a47105110d..c61531459adc 100644
--- a/pkgs/by-name/st/streamcontroller/package.nix
+++ b/pkgs/by-name/st/streamcontroller/package.nix
@@ -18,19 +18,19 @@
 }:
 let
   # We have to hardcode revision because upstream often create multiple releases for the same version number.
-  # This is the commit hash that maps to 1.5.0-beta.13 released on 2025-12-30
-  rev = "359de976eb23120d6e6a2d31104e15b37d1edfeb";
+  # This is the commit hash that maps to 1.5.0-beta.14 released on 2026-5-21
+  rev = "12052dec15d0e0948032c7ec11eff2da0d109106";
 in
 stdenv.mkDerivation {
   pname = "streamcontroller";
 
-  version = "1.5.0-beta.13";
+  version = "1.5.0-beta.14";
 
   src = fetchFromGitHub {
     repo = "StreamController";
     owner = "StreamController";
     inherit rev;
-    hash = "sha256-b5tRhXEQGRhaJd1Q/hlmqUTO+0F+3+lziYSi8QpUa9c=";
+    hash = "sha256-JGJc7bj58oZwvtExSv+tv7Ug84RYdEkcMBI3ZmqpaKY=";
   };
 
   # The installation method documented upstream
@@ -200,7 +200,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elegant Linux app for the Elgato Stream Deck with support for plugins";
-    homepage = "https://core447.com/";
+    homepage = "https://streamcontroller.core447.com/";
     license = lib.licenses.gpl3;
     mainProgram = "streamcontroller";
     maintainers = with lib.maintainers; [ sifmelcara ];

From 2d8469b0101800134c1ceeea7c5777927dd51deb Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sat, 23 May 2026 14:13:37 +0000
Subject: [PATCH 306/332] home-assistant-custom-components.closest_intent: init
 at 0.1.0

---
 .../closest_intent/package.nix                | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/closest_intent/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix b/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix
new file mode 100644
index 000000000000..11c480e8954e
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  rapidfuzz,
+  # Test dependencies
+  pytestCheckHook,
+  pytest-asyncio,
+  pyyaml,
+}:
+
+buildHomeAssistantComponent (finalAttrs: {
+  owner = "charludo";
+  domain = "closest_intent";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    inherit (finalAttrs) owner;
+    repo = "hass-closest-intent";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8ST+xYqmDwovDqNLnDsoIvIoPIDussAswGOOvMhRQWk=";
+  };
+
+  dependencies = [
+    rapidfuzz
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pyyaml
+  ];
+
+  meta = {
+    changelog = "https://github.com/charludo/hass-closest-intent/releases/tag/${finalAttrs.src.tag}";
+    description = "Fuzzy intent matcher for Home Assistant; garbled STT output in, actual intent out";
+    homepage = "https://github.com/charludo/hass-closest-intent";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      charludo
+      jpds
+    ];
+  };
+})

From 2c818b9d9c4d5693ac387811ec54a8ca9e1b0efe Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Sat, 23 May 2026 11:13:40 -0300
Subject: [PATCH 307/332] opencode: disable x86_64-darwin platform

---
 pkgs/by-name/op/opencode/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 576014d1704a..aedd00947a71 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -187,13 +187,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
     mainProgram = "opencode";
-    badPlatforms = [
-      # Broken as 2026-04-23, errors as:
-      # CPU lacks AVX support, strange crashes may occur. Reinstall Bun
-      "x86_64-darwin"
-    ];
   };
 })

From ef379833724d1aef27a05223f0f92e51a77a039a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 16:32:59 +0000
Subject: [PATCH 308/332] rtk: 0.40.0 -> 0.41.0

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

diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix
index 239b12843bef..942cbf312e8c 100644
--- a/pkgs/by-name/rt/rtk/package.nix
+++ b/pkgs/by-name/rt/rtk/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rtk";
-  version = "0.40.0";
+  version = "0.41.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rtk-ai";
     repo = "rtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xWHIOZRpSyyOPQe/db9dxoODcnheBlpXrnKET010vVg=";
+    hash = "sha256-C8ns53qLpBdb5osdX68UBGMqM2Rs5UJyfal/iDns6a4=";
   };
 
-  cargoHash = "sha256-DJazpSx1FCt9pjFjqsoL3MLEQLdFvLwEj3UsP0aYHmc=";
+  cargoHash = "sha256-gDkXAiW8ajEpsEBb7KT9MO5fPEWyUqS+2ak34cipPdc=";
 
   nativeBuildInputs = [
     makeWrapper

From ebc165237166e4f23e47a3539678b2b5a6d99ead Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Sat, 23 May 2026 12:56:47 -0400
Subject: [PATCH 309/332] xqilla: enable parallel building

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

diff --git a/pkgs/by-name/xq/xqilla/package.nix b/pkgs/by-name/xq/xqilla/package.nix
index dabfcd32d2ed..15df00cf7510 100644
--- a/pkgs/by-name/xq/xqilla/package.nix
+++ b/pkgs/by-name/xq/xqilla/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     "CXXFLAGS=-std=c++14"
   ];
 
+  enableParallelBuilding = true;
+
   buildInputs = [
     xercesc
   ];

From 76d6bbaf68b74eeef95b608a6ccb471231fbf661 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 17:03:32 +0000
Subject: [PATCH 310/332] scip-go: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 9d828bc6aa37..979d4ab95983 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "scip-go";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XRnN130UMJtf6yHytvwYBFY1yNBda3Elk2MzwfPQ9Xo=";
+    hash = "sha256-QtfGiMRrGHgL1VHLMX9icXkY/jv567On3xe/dYmoaQI=";
   };
 
   vendorHash = "sha256-aKOjU6LhixVpMW2JUkI++jjd4eQbv3w4apBjLbfqpvw=";

From 00a0adb86376058da7bb193e7efa90c43dbc5963 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 17:07:52 +0000
Subject: [PATCH 311/332] turingdb: 1.31 -> 1.32

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

diff --git a/pkgs/by-name/tu/turingdb/package.nix b/pkgs/by-name/tu/turingdb/package.nix
index 3f842534fed4..58eb893f508e 100644
--- a/pkgs/by-name/tu/turingdb/package.nix
+++ b/pkgs/by-name/tu/turingdb/package.nix
@@ -28,13 +28,13 @@ let
 in
 turingstdenv.mkDerivation (finalAttrs: {
   pname = "turingdb";
-  version = "1.31";
+  version = "1.32";
 
   src = fetchFromGitHub {
     owner = "turing-db";
     repo = "turingdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dorRoDWylZo/QRJbqEZOUf+JNHSKCIi/s8wxZ2HwZsI=";
+    hash = "sha256-cpaMX7TUdUl6hJTFz1UQ7cmgE6cb7sKIMdT55jRO5Bo=";
 
     fetchSubmodules = true;
 

From 2f50367ee5158d50a9b82ace2b197b4b08710af8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 17:08:33 +0000
Subject: [PATCH 312/332] apidog: 2.8.28 -> 2.8.30

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

diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index cbf57de68d1b..9abfb1a8c63b 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "apidog";
-  version = "2.8.28";
+  version = "2.8.30";
 
   src = fetchurl {
     url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
-    hash = "sha256-P338wk3YrNaeMwhMyMCKZOY2mIi2A6V+RG4f9qSHBhg=";
+    hash = "sha256-h5h/zhUbnYYtYVyWySLZk3QISd4VWs5Gl/JdhgMJKh8=";
   };
 
   appimageContents = appimageTools.extract {

From de33a4ea3785cca83ff5a5965c0f1652124338cf Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Fri, 15 May 2026 19:39:00 +0000
Subject: [PATCH 313/332] updatecli: 0.116.3 -> 0.117.0

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/by-name/up/updatecli/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index ccba32226c20..45243ebb97de 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -12,16 +12,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "updatecli";
-  version = "0.116.3";
+  version = "0.117.0";
 
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5dJfbw0xoB34XuCym/TcqwdeUORZezfJNu7Plt82VPM=";
+    hash = "sha256-9nA+sOlcIm5Try0oag1Oz/ALPDaMag0jZKzHrS0Brf8=";
   };
 
-  vendorHash = "sha256-cMXepPUJoJGRlQSRSByA2/pjsQXfyH8Va320CywxxDw=";
+  proxyVendor = true;
+  vendorHash = "sha256-8WPwZjoDbRDi1IbjdZ40796JA5PRh8T75wRlWgTF7dI=";
 
   # tests require network access
   doCheck = false;

From f517e08a02d7eeb73993dd0335557db26b97e6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ha=CC=88cker?= <spamfaenger@gmx.de>
Date: Sat, 23 May 2026 19:27:23 +0200
Subject: [PATCH 314/332] fresh-editor: enable structuredAttrs support

---
 pkgs/by-name/fr/fresh-editor/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index 7becc714d075..6785fab48992 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-hJtLn4pW581Nazj+f4csHt/PQaxgOTfewmSZbyZKnNw=";
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     gzip
     makeBinaryWrapper

From 5a37f4eca8c2c9e7004d4d1d44b881ba069908d1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 May 2026 20:28:13 +0300
Subject: [PATCH 315/332] qui: 1.18.0 -> 1.19.0

---
 pkgs/by-name/qu/qui/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix
index a9b394da46d9..02ea8d115375 100644
--- a/pkgs/by-name/qu/qui/package.nix
+++ b/pkgs/by-name/qu/qui/package.nix
@@ -6,7 +6,7 @@
   nixosTests,
   nix-update-script,
   nodejs,
-  pnpm_9,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
   typescript,
@@ -14,12 +14,12 @@
 }:
 buildGo126Module (finalAttrs: {
   pname = "qui";
-  version = "1.18.0";
+  version = "1.19.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "qui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Rdg8fcoUY7WrNXj+LZyMXx6hFo8+OGrCLjhE3JD1y4o=";
+    hash = "sha256-h6GmxwOxqh88Zy7tFD/GFQ8NrpBcanFPBXGUmfoIe3I=";
   };
 
   qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
@@ -29,7 +29,7 @@ buildGo126Module (finalAttrs: {
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
-      pnpm_9
+      pnpm_11
       typescript
     ];
 
@@ -42,9 +42,9 @@ buildGo126Module (finalAttrs: {
         src
         sourceRoot
         ;
-      pnpm = pnpm_9;
+      pnpm = pnpm_11;
       fetcherVersion = 3;
-      hash = "sha256-hCiIbVroyMhl2xT0WAGbmLSXfUH6RJHlC1g3isMlUJs=";
+      hash = "sha256-OEr5uyMnwP1TkSxRFNaopB9AAx2OVE7lNEzGyQwF6kc=";
     };
 
     postBuild = ''
@@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: {
     '';
   });
 
-  vendorHash = "sha256-7MzKE3pBvoW/ajB6gHtBBS1M/NuQsRw3ZSNtCJzrEyI=";
+  vendorHash = "sha256-pkktl+0dBSbUuxZ1ycTV0HZl/wO79LtmNaamyZ+Z9lY=";
 
   preBuild = ''
     cp -r ${finalAttrs.qui-web}/* web/dist

From 48412697e89d6e9bc7837eb420bc44b1e313244c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 May 2026 20:30:00 +0300
Subject: [PATCH 316/332] netbird: 0.71.3 -> 0.71.4

Diff: https://github.com/netbirdio/netbird/compare/v0.71.3...v0.71.4

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index c67befca45d6..d2b9c19e7bba 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -67,13 +67,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.71.3";
+  version = "0.71.4";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1doOf/rgGbD/YtMY0+j1VM7933zR+G+Vyq6bF5fyuMg=";
+    hash = "sha256-e/fe4wEjz7apA5RZ4nGIaunp0+5NVH4yMHK/l/MfcWI=";
   };
 
   vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";

From 80b5556ba2c12f9393dd2562909aa1e674584465 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 23 May 2026 10:39:07 -0400
Subject: [PATCH 317/332] vector: fix build failure

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

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 894be3d0b34c..47d0d6fd626e 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -87,6 +87,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
   };
 
+  # https://github.com/vectordotdev/vector/pull/25406
+  postPatch = ''
+    substituteInPlace lib/vector-config/src/schema/visitors/merge.rs \
+      --replace-fail 'destination.merge(source);' 'Mergeable::merge(destination, source);'
+  '';
+
   doCheck = true;
   checkType = "debug";
 

From 81bc187c988a0ede9d228e00c204045c17228088 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 23 May 2026 13:18:09 -0400
Subject: [PATCH 318/332] vector: fix tests recursion, drop broken quickwit
 test

---
 nixos/tests/vector/default.nix         |   1 -
 nixos/tests/vector/syslog-quickwit.nix | 160 -------------------------
 pkgs/by-name/ve/vector/package.nix     |   4 +-
 3 files changed, 1 insertion(+), 164 deletions(-)
 delete mode 100644 nixos/tests/vector/syslog-quickwit.nix

diff --git a/nixos/tests/vector/default.nix b/nixos/tests/vector/default.nix
index 360fbd9a716f..03d4b0db2b30 100644
--- a/nixos/tests/vector/default.nix
+++ b/nixos/tests/vector/default.nix
@@ -7,5 +7,4 @@
   dnstap = runTest ./dnstap.nix;
   journald-clickhouse = runTest ./journald-clickhouse.nix;
   nginx-clickhouse = runTest ./nginx-clickhouse.nix;
-  syslog-quickwit = runTest ./syslog-quickwit.nix;
 }
diff --git a/nixos/tests/vector/syslog-quickwit.nix b/nixos/tests/vector/syslog-quickwit.nix
deleted file mode 100644
index affae5f86b3d..000000000000
--- a/nixos/tests/vector/syslog-quickwit.nix
+++ /dev/null
@@ -1,160 +0,0 @@
-{ lib, pkgs, ... }:
-
-# Based on https://quickwit.io/docs/log-management/send-logs/using-vector
-
-{
-  name = "vector-syslog-quickwit";
-  meta.maintainers = [ pkgs.lib.maintainers.happysalada ];
-
-  nodes = {
-    quickwit =
-      { config, pkgs, ... }:
-      {
-        environment.systemPackages = [ pkgs.jq ];
-
-        networking.firewall.allowedTCPPorts = [ 7280 ];
-
-        services.quickwit = {
-          enable = true;
-          settings = {
-            listen_address = "::";
-          };
-        };
-      };
-
-    syslog =
-      { config, pkgs, ... }:
-      {
-        services.vector = {
-          enable = true;
-
-          settings = {
-            sources = {
-              generate_syslog = {
-                type = "demo_logs";
-                format = "syslog";
-                interval = 0.5;
-              };
-            };
-
-            transforms = {
-              remap_syslog = {
-                inputs = [ "generate_syslog" ];
-                type = "remap";
-                source = ''
-                  structured = parse_syslog!(.message)
-                  .timestamp_nanos = to_unix_timestamp!(structured.timestamp, unit: "nanoseconds")
-                  .body = structured
-                  .service_name = structured.appname
-                  .resource_attributes.source_type = .source_type
-                  .resource_attributes.host.hostname = structured.hostname
-                  .resource_attributes.service.name = structured.appname
-                  .attributes.syslog.procid = structured.procid
-                  .attributes.syslog.facility = structured.facility
-                  .attributes.syslog.version = structured.version
-                  .severity_text = if includes(["emerg", "err", "crit", "alert"], structured.severity) {
-                    "ERROR"
-                  } else if structured.severity == "warning" {
-                    "WARN"
-                  } else if structured.severity == "debug" {
-                    "DEBUG"
-                  } else if includes(["info", "notice"], structured.severity) {
-                    "INFO"
-                  } else {
-                   structured.severity
-                  }
-                  .scope_name = structured.msgid
-                  del(.message)
-                  del(.host)
-                  del(.timestamp)
-                  del(.service)
-                  del(.source_type)
-                '';
-              };
-            };
-
-            sinks = {
-              #emit_syslog = {
-              #  inputs = ["remap_syslog"];
-              #  type = "console";
-              #  encoding.codec = "json";
-              #};
-              quickwit_logs = {
-                type = "http";
-                method = "post";
-                inputs = [ "remap_syslog" ];
-                encoding.codec = "json";
-                framing.method = "newline_delimited";
-                uri = "http://quickwit:7280/api/v1/otel-logs-v0_7/ingest";
-              };
-            };
-          };
-        };
-      };
-  };
-
-  testScript =
-    let
-      aggregationQuery = pkgs.writeText "aggregation-query.json" ''
-        {
-          "query": "*",
-          "max_hits": 0,
-          "aggs": {
-            "count_per_minute": {
-              "histogram": {
-                  "field": "timestamp_nanos",
-                  "interval": 60000000
-              },
-              "aggs": {
-                "severity_text_count": {
-                  "terms": {
-                    "field": "severity_text"
-                  }
-                }
-              }
-            }
-          }
-        }
-      '';
-    in
-    ''
-      quickwit.wait_for_unit("quickwit")
-      quickwit.wait_for_open_port(7280)
-      quickwit.wait_for_open_port(7281)
-
-      quickwit.wait_until_succeeds(
-        "journalctl -o cat -u quickwit.service | grep 'transitioned to ready state'"
-      )
-
-      syslog.wait_for_unit("vector")
-      syslog.wait_until_succeeds(
-        "journalctl -o cat -u vector.service | grep 'Vector has started'"
-      )
-
-      quickwit.wait_until_succeeds(
-        "journalctl -o cat -u quickwit.service | grep 'publish-new-splits'"
-      )
-
-      # Wait for logs to be generated
-      # Test below aggregates by the minute
-      syslog.sleep(60 * 2)
-
-      quickwit.wait_until_succeeds(
-        "curl -sSf -XGET http://127.0.0.1:7280/api/v1/otel-logs-v0_7/search?query=severity_text:ERROR |"
-        + " jq '.num_hits' | grep -v '0'"
-      )
-
-      quickwit.wait_until_succeeds(
-        "journalctl -o cat -u quickwit.service | grep 'SearchRequest'"
-      )
-
-      quickwit.wait_until_succeeds(
-        "curl -sSf -XPOST -H 'Content-Type: application/json' http://127.0.0.1:7280/api/v1/otel-logs-v0_7/search --data @${aggregationQuery} |"
-        + " jq '.num_hits' | grep -v '0'"
-      )
-
-      quickwit.wait_until_succeeds(
-        "journalctl -o cat -u quickwit.service | grep 'count_per_minute'"
-      )
-    '';
-}
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 47d0d6fd626e..2e0ab974c2f3 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -158,9 +158,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
 
   passthru = {
-    tests = {
-      inherit (nixosTests) vector;
-    };
+    tests = nixosTests.vector;
     updateScript = nix-update-script { };
   };
 

From 3b4851b81763dc5888d934ed9f942f3138ceb508 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 23 May 2026 20:32:04 +0700
Subject: [PATCH 319/332] python3Packages.obstore: drop removed
 --mypy-only-local-stub pytest flag

---
 pkgs/development/python-modules/obstore/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/obstore/default.nix b/pkgs/development/python-modules/obstore/default.nix
index 4776c1a2c09a..9656b7a60eb1 100644
--- a/pkgs/development/python-modules/obstore/default.nix
+++ b/pkgs/development/python-modules/obstore/default.nix
@@ -35,6 +35,12 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-ZOYTGklsla89I1K2sI46AWy2xGfSfBVmnBcbCdSLKkg=";
   };
 
+  # pytest-mypy-plugins 4.0 removed --mypy-only-local-stub
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '-v --mypy-only-local-stub' '-v'
+  '';
+
   build-system = [
     rustPlatform.maturinBuildHook
     rustPlatform.cargoSetupHook

From d4bf4b109d1e0cc7f91fa378145f3f498af5db87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 18:17:30 +0000
Subject: [PATCH 320/332] zed-editor: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 6b8e53d4cdb0..6405f5c1bbe2 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -97,7 +97,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "1.3.5";
+  version = "1.3.6";
 
   outputs = [
     "out"
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ToOIxcbK7cSfl1IJKFR8gg+Ps4zoLHlLqHII3cVXpbg=";
+    hash = "sha256-GUjKj2p1EP9Sn2eihF745JzKH2t01h7JH4HyAyiJfDI=";
   };
 
   postPatch = ''
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-TFYrJnnovUg6whhqYc/CRvYA8nATfVeKBR0EvAIczAg=";
+  cargoHash = "sha256-OptshSughuv3ZRtM+7syxagtZSdvsUjHuYSKEHvYIWc=";
 
   __structuredAttrs = true;
 

From 69c641dd96c062f71300109c831c8886538b8233 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 18:29:26 +0000
Subject: [PATCH 321/332] warmup-s3-archives: 1.1.4 -> 1.2.0

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

diff --git a/pkgs/by-name/wa/warmup-s3-archives/package.nix b/pkgs/by-name/wa/warmup-s3-archives/package.nix
index 4371ab758bfe..b37345dfbced 100644
--- a/pkgs/by-name/wa/warmup-s3-archives/package.nix
+++ b/pkgs/by-name/wa/warmup-s3-archives/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "warmup-s3-archives";
-  version = "1.1.4";
+  version = "1.2.0";
 
   src = fetchFromGitLab {
     owner = "philipmw";
     repo = "warmup-s3-archives";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O2gLnCQ7Y7PKFeXlQqzL6FAoj7m7UI5NpKcYTexaKo4=";
+    hash = "sha256-SIbynXs81EJz+r5vwl7BIj8UW6sXRWefU1h5D1g4V+4=";
   };
 
-  cargoHash = "sha256-cOUIbeGAhAiAPbXU8OxCuaczJcUGkjPaTKRvMceeM+Y=";
+  cargoHash = "sha256-Ck+xhPz2e+FtaaG3DI/7OJXHxjaNajPJg45xGWAjh+w=";
 
   passthru.updateScript = nix-update-script { };
 

From 4a1111f841b5c9cd4ce3d41e67cfd45c03b9de69 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 23 May 2026 13:13:47 +0000
Subject: [PATCH 322/332] xbase: unbreak

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

diff --git a/pkgs/by-name/xb/xbase/package.nix b/pkgs/by-name/xb/xbase/package.nix
index 9ef560c9e929..e3f9225af75b 100644
--- a/pkgs/by-name/xb/xbase/package.nix
+++ b/pkgs/by-name/xb/xbase/package.nix
@@ -4,12 +4,12 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xbase";
   version = "3.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xdb/xbase64-${version}.tar.gz";
+    url = "mirror://sourceforge/xdb/xbase64-${finalAttrs.version}.tar.gz";
     sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r";
   };
 
@@ -30,11 +30,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    sed -i '1i#include <cstdarg>' xbase64/xbstring.cpp
+  '';
+
   meta = {
     homepage = "https://sourceforge.net/projects/xdb/";
     description = "C++ class library formerly known as XDB";
     platforms = lib.platforms.linux;
-    broken = true; # Fails to build against gcc-14, no upstream activity.
     license = lib.licenses.lgpl2;
   };
-}
+})

From e7048ced443a9b3ef58db23c8749197476f2a2ef Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 23 May 2026 19:08:31 +0000
Subject: [PATCH 323/332] xbase: add tbutter as maintainer

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

diff --git a/pkgs/by-name/xb/xbase/package.nix b/pkgs/by-name/xb/xbase/package.nix
index e3f9225af75b..e149e9f0ecf6 100644
--- a/pkgs/by-name/xb/xbase/package.nix
+++ b/pkgs/by-name/xb/xbase/package.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://sourceforge.net/projects/xdb/";
     description = "C++ class library formerly known as XDB";
+    maintainers = with lib.maintainers; [ tbutter ];
     platforms = lib.platforms.linux;
     license = lib.licenses.lgpl2;
   };

From 2a53fc03bb9678e78b827b481c823ad2e7fe7bca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 19:26:15 +0000
Subject: [PATCH 324/332] vespa-cli: 8.685.1 -> 8.692.16

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

diff --git a/pkgs/by-name/ve/vespa-cli/package.nix b/pkgs/by-name/ve/vespa-cli/package.nix
index 7297ff304bd0..9d9bd34ebcc7 100644
--- a/pkgs/by-name/ve/vespa-cli/package.nix
+++ b/pkgs/by-name/ve/vespa-cli/package.nix
@@ -9,14 +9,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "vespa-cli";
-  version = "8.685.1";
+  version = "8.692.16";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "vespa-engine";
     repo = "vespa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RRuUDeHYYCbEeeaUk+lz8rv+ZG3UD/OK3HrmmuOe5HI=";
+    hash = "sha256-xpulYJ9qA7loxr2USE0/7ITOA5Sc55Y4k/1SDCAt2AA=";
   };
 
   # case-insensitive conflicts which produce platform `vendorHash` checksumm
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/client/go";
 
-  vendorHash = "sha256-qC/8pIhsVbt9uUyLDiAW18tCUWDw3Agvmcx/CIUsCKQ=";
+  vendorHash = "sha256-OFZsGtarujDxiFgdY7bLnnJZzmnez9uqfEAWuap2+8I=";
 
   env.CGO_ENABLED = 0;
 

From b0d699845301dfb701503a4f8b6f9f39bece4254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 5 Mar 2026 00:00:42 +0100
Subject: [PATCH 325/332] svox: combine with picotts

They where packaged from the same source, one using the upstream Android
library name, the other the new project name. Lets combine them into
one.
---
 .../picotts}/fix-compilation-darwin.patch     |  0
 pkgs/by-name/pi/picotts/package.nix           | 36 +++++++++-------
 pkgs/by-name/sp/speechd/package.nix           |  7 ++--
 pkgs/by-name/sv/svox/package.nix              | 42 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 5 files changed, 25 insertions(+), 61 deletions(-)
 rename pkgs/by-name/{sv/svox => pi/picotts}/fix-compilation-darwin.patch (100%)
 delete mode 100644 pkgs/by-name/sv/svox/package.nix

diff --git a/pkgs/by-name/sv/svox/fix-compilation-darwin.patch b/pkgs/by-name/pi/picotts/fix-compilation-darwin.patch
similarity index 100%
rename from pkgs/by-name/sv/svox/fix-compilation-darwin.patch
rename to pkgs/by-name/pi/picotts/fix-compilation-darwin.patch
diff --git a/pkgs/by-name/pi/picotts/package.nix b/pkgs/by-name/pi/picotts/package.nix
index cd3f9c3764e6..3c45f83304bd 100644
--- a/pkgs/by-name/pi/picotts/package.nix
+++ b/pkgs/by-name/pi/picotts/package.nix
@@ -2,38 +2,44 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  autoconf,
-  automake,
-  libtool,
+  autoreconfHook,
   popt,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "picotts";
-  version = "0-unstable-2018-10-19";
+  version = "0-unstable-2021-05-06";
 
   src = fetchFromGitHub {
+    owner = "ihuguet";
     repo = "picotts";
-    owner = "naggety";
-    rev = "2f86050dc5da9ab68fc61510b594d8e6975c4d2d";
-    sha256 = "1k2mdv9llkh77jr4qr68yf0zgjqk87np35fgfmnc3rpdp538sccl";
+    rev = "21089d223e177ba3cb7e385db8613a093dff74b5";
+    sha256 = "sha256-NmmYa3mVUSMsLC1blFAET3zLY66anGY2ff6ZQ424h1s=";
   };
-  nativeBuildInputs = [
-    autoconf
-    automake
+
+  patches = [
+    # upstream PR: https://github.com/ihuguet/picotts/pull/14
+    ./fix-compilation-darwin.patch
   ];
+
+  postPatch = ''
+    cd pico
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   buildInputs = [
-    libtool
     popt
   ];
-  sourceRoot = "${finalAttrs.src.name}/pico";
-  preConfigure = "./autogen.sh";
+
   meta = {
     description = "Text to speech voice sinthesizer from SVox";
-    homepage = "https://github.com/naggety/picotts";
+    homepage = "https://github.com/ihuguet/picotts";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.canndrew ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     mainProgram = "pico2wave";
   };
 })
diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix
index cb10fc36fa1f..c18482000427 100644
--- a/pkgs/by-name/sp/speechd/package.nix
+++ b/pkgs/by-name/sp/speechd/package.nix
@@ -16,7 +16,6 @@
   glib,
   dotconf,
   libsndfile,
-  runtimeShell,
   withLibao ? true,
   libao,
   withPulse ? false,
@@ -32,7 +31,7 @@
   pcaudiolib,
   mbrola,
   withPico ? true,
-  svox,
+  picotts,
   libsOnly ? false,
 }:
 
@@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     flite
   ]
   ++ lib.optionals withPico [
-    svox
+    picotts
   ];
 
   pythonPath = [
@@ -134,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = lib.optionalString withPico ''
-    substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang"
+    substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${picotts}/share/pico/lang"
   '';
 
   installFlags = [
diff --git a/pkgs/by-name/sv/svox/package.nix b/pkgs/by-name/sv/svox/package.nix
deleted file mode 100644
index 6c329a30c110..000000000000
--- a/pkgs/by-name/sv/svox/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  popt,
-}:
-
-stdenv.mkDerivation {
-  pname = "svox";
-  version = "0-unstable-2021-05-06";
-
-  # basically took the source code from android and borrowed autotool patches from debian
-  src = fetchFromGitHub {
-    owner = "naggety";
-    repo = "picotts";
-    rev = "21089d223e177ba3cb7e385db8613a093dff74b5";
-    hash = "sha256-NmmYa3mVUSMsLC1blFAET3zLY66anGY2ff6ZQ424h1s=";
-  };
-
-  patches = [
-    # upstream PR: https://github.com/ihuguet/picotts/pull/14
-    ./fix-compilation-darwin.patch
-  ];
-
-  postPatch = ''
-    cd pico
-  '';
-
-  buildInputs = [ popt ];
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  meta = {
-    description = "Text-to-speech engine";
-    homepage = "https://android.googlesource.com/platform/external/svox";
-    platforms = lib.platforms.unix;
-    license = lib.licenses.asl20;
-    maintainers = [ ];
-    mainProgram = "pico2wave";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 54bd0b221857..276b7f6e249f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1859,6 +1859,7 @@ mapAliases {
   superTux = warnAlias "'superTux' has been renamed to 'supertux'" supertux; # Added 2026-02-12
   superTuxKart = warnAlias "'superTuxKart' has been renamed to 'supertuxkart'" supertuxkart; # Added 2026-02-12
   surge-XT = warnAlias "'surge-XT' has been renamed to 'surge-xt'" surge-xt; # Added 2026-02-12
+  svox = warnAlias "'svox' has been renamed to/replaced by 'picotts'" picotts; # Added 2026-03-04
   svt-av1-psy = warnAlias "'svt-av1-psy' has been replaced by 'svt-av1-psyex'" svt-av1-psyex; # Added 2026-01-10
   swig4 = throw "'swig4' has been renamed to/replaced by 'swig'"; # Converted to throw 2025-10-27
   swiProlog = throw "'swiProlog' has been renamed to/replaced by 'swi-prolog'"; # Converted to throw 2025-10-27

From 00913fc7780ba2cc0aad7c6b9f00b8827ca0c841 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 23 May 2026 18:47:34 +0000
Subject: [PATCH 326/332] linux_xanmod: 6.18.32 -> 6.18.33

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index c63fee56ceaf..6a11b978876b 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.18.32";
-      hash = "sha256-XgqytdTnL3Jjcs9riMRGgRVfyy76jxdBcC0hSt4rc58=";
+      version = "6.18.33";
+      hash = "sha256-J/dbwzxkNE7bnhFygInJ3Ve67yrMQ34z10nMb/vtoWY=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From c7c53b4c7949429e1d98dd1dcb3f8da1903159bd Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 23 May 2026 18:49:39 +0000
Subject: [PATCH 327/332] linux_xanmod_latest: 7.0.9 -> 7.0.10

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 6a11b978876b..c852e04453be 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "7.0.9";
-      hash = "sha256-QlCbzTqHtVROdIEoqwrAf8mylLh2WHSqFY/eQ3jvrW8=";
+      version = "7.0.10";
+      hash = "sha256-6sanwas9XXjeGVHe7WvLOVnbHJ6g0RXek9sfOCE8080=";
     };
   };
 

From 982d9e78b7f408966c97879a74d4ec50852638e0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 00:45:03 +0200
Subject: [PATCH 328/332] python3Packages.django-stubs: don't run mypy tests

ext/tests/typecheck/test_patching.yml::patch_reveal_type_during_django_setup /build/pytest-mypy-z8f1c29u/mypy.ini:21: error: Error importing plugin "mypy_django_plugin.main": No module named 'mypy_django_plugin'
---
 pkgs/development/python-modules/django-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index d601c1a6063b..62d5cc820f51 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -7,7 +7,6 @@
   uv-build,
   redis,
   mypy,
-  pytest-mypy-plugins,
   oracledb,
   pytestCheckHook,
   types-pytz,
@@ -31,6 +30,8 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "uv_build>=0.9.9,<0.10.0" "uv_build>=0.9.9"
+
+    sed -i "/mypy/d" pytest.ini
   '';
 
   build-system = [ uv-build ];
@@ -53,7 +54,6 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    pytest-mypy-plugins
     pytestCheckHook
   ]
   ++ lib.concatAttrValues optional-dependencies;

From 2cad0483e0fc5502ed787743c7d2a9cbe55383d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 01:04:07 +0200
Subject: [PATCH 329/332] nixos/tests/lasuite-meet: run in container

---
 nixos/tests/web-apps/lasuite-meet.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/tests/web-apps/lasuite-meet.nix b/nixos/tests/web-apps/lasuite-meet.nix
index 4df15e79ecc7..748198635a91 100644
--- a/nixos/tests/web-apps/lasuite-meet.nix
+++ b/nixos/tests/web-apps/lasuite-meet.nix
@@ -8,11 +8,9 @@ in
   name = "lasuite-meet";
   meta.maintainers = with lib.maintainers; [ soyouzpanda ];
 
-  nodes.machine =
+  containers.machine =
     { pkgs, ... }:
     {
-      virtualisation.memorySize = 4 * 1024;
-
       networking.hosts."127.0.0.1" = [ domain ];
 
       environment.systemPackages = with pkgs; [ jq ];

From 8ee70d796fc432cddc10985eabe34f96b6f8980a Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Sat, 23 May 2026 19:43:54 -0400
Subject: [PATCH 330/332] x3270: enable parallel builds

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

diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index 50d615ded7ab..051f408d4260 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-tcl3270"
   ];
 
+  enableParallelBuilding = true;
+
   preBuild = ''
     if [ -n "$SOURCE_DATE_EPOCH" ]; then
       export SOURCE_DATE_EPOCH="$(date -u -d "@$SOURCE_DATE_EPOCH" '+%a %b %d %H:%M:%S UTC %Y')"

From 22c804c6ad177ca309199a6513cfcc4ad29f7eb7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 24 May 2026 02:18:58 +0200
Subject: [PATCH 331/332] runit: add meta.mainProgram

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

diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix
index 4b7cd61ea04a..94e5346abcd7 100644
--- a/pkgs/by-name/ru/runit/package.nix
+++ b/pkgs/by-name/ru/runit/package.nix
@@ -68,5 +68,6 @@ stdenv.mkDerivation rec {
     homepage = "http://smarden.org/runit";
     maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    mainProgram = "runit";
   };
 }

From 5d8485d610aed6288d2b1292a3adc2a61267dd74 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 24 May 2026 02:20:54 +0200
Subject: [PATCH 332/332] runit: use finalAttrs

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

diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix
index 94e5346abcd7..1bd3067e90ea 100644
--- a/pkgs/by-name/ru/runit/package.nix
+++ b/pkgs/by-name/ru/runit/package.nix
@@ -7,13 +7,13 @@
   static ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "runit";
   version = "2.3.1";
 
   src = fetchurl {
-    url = "https://smarden.org/runit/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k=";
+    url = "https://smarden.org/runit/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k=";
   };
 
   patches = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  sourceRoot = "admin/${pname}-${version}";
+  sourceRoot = "admin/${finalAttrs.pname}-${finalAttrs.version}";
 
   doCheck = true;
 
@@ -70,4 +70,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "runit";
   };
-}
+})