From bdf0f78441fed57554d61c43c3ce8bdb7838403f Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 1 May 2026 20:44:45 +0200
Subject: [PATCH 001/110] python3Packages.sphinx-last-updated-by-git: remove
 changelog

---
 .../python-modules/sphinx-last-updated-by-git/default.nix        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
index dbafa2b0550a..3e1a4f8069fd 100644
--- a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
+++ b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
@@ -55,7 +55,6 @@ buildPythonPackage (finalAttrs: {
   ];
 
   meta = {
-    changelog = "https://github.com/mgeier/sphinx-last-updated-by-git/blob/${finalAttrs.version}/NEWS.rst";
     description = "Get the last updated time for each Sphinx page from Git";
     homepage = "https://github.com/mgeier/sphinx-last-updated-by-git";
     license = lib.licenses.bsd2;

From 4dbea5a634acfc2098083859d9709af79373bad4 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 08:47:46 +0700
Subject: [PATCH 002/110] python3Packages.bnnumerizer: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/bnnumerizer/default.nix b/pkgs/development/python-modules/bnnumerizer/default.nix
index f9a6a36daa4a..1a0f3eadb8ec 100644
--- a/pkgs/development/python-modules/bnnumerizer/default.nix
+++ b/pkgs/development/python-modules/bnnumerizer/default.nix
@@ -2,18 +2,21 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "bnnumerizer";
   version = "0.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-Qd9v0Le1GqTsR3a2ZDzt6+5f0R4zXX1W1KIMCFFeXw0=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "bnnumerizer" ];
 
   # https://github.com/mnansary/bnUnicodeNormalizer/issues/10

From 93e6226740d8d01e90759aaa06f75ab94c8873d6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 08:52:06 +0700
Subject: [PATCH 003/110] python3Packages.bnnumerizer: modernize

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

diff --git a/pkgs/development/python-modules/bnnumerizer/default.nix b/pkgs/development/python-modules/bnnumerizer/default.nix
index 1a0f3eadb8ec..a5544f9f4557 100644
--- a/pkgs/development/python-modules/bnnumerizer/default.nix
+++ b/pkgs/development/python-modules/bnnumerizer/default.nix
@@ -5,13 +5,15 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bnnumerizer";
   version = "0.0.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Qd9v0Le1GqTsR3a2ZDzt6+5f0R4zXX1W1KIMCFFeXw0=";
   };
 
@@ -28,4 +30,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     teams = [ lib.teams.tts ];
   };
-}
+})

From 1eceba956fa235333e485e9747d6f370977f89b9 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Fri, 12 Jun 2026 02:11:17 +0200
Subject: [PATCH 004/110] maintainers: add Soliprem

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d7605ec55ebe..908f1ce4e8ef 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26091,6 +26091,14 @@
     githubId = 7116239;
     keys = [ { fingerprint = "E067 520F 5EF2 C175 3F60  50C0 BA46 725F 6A26 7442"; } ];
   };
+  Soliprem = {
+    email = "me@soliprem.eu";
+    matrix = "@soliprem:soliprem.eu";
+    name = "Francesco Prem Solidoro";
+    github = "Soliprem";
+    githubId = 73885403;
+    keys = [ { fingerprint = "F779 4E05 D8BB A608 73D0  1312 4FD6 B0D5 1C9A B6BD"; } ];
+  };
   solson = {
     email = "scott@solson.me";
     matrix = "@solson:matrix.org";

From 451d7918ff45f631dcce4788a7e218f091b13f79 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Fri, 12 Jun 2026 02:10:13 +0200
Subject: [PATCH 005/110] watt: init at 1.2.0

---
 .../manual/release-notes/rl-2611.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/hardware/watt.nix      | 71 +++++++++++++++++++
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/watt.nix                          | 19 +++++
 pkgs/by-name/wa/watt/package.nix              | 64 +++++++++++++++++
 6 files changed, 158 insertions(+)
 create mode 100644 nixos/modules/services/hardware/watt.nix
 create mode 100644 nixos/tests/watt.nix
 create mode 100644 pkgs/by-name/wa/watt/package.nix

diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index 4f3ce80f917a..6b0d08604a41 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -16,6 +16,8 @@
 
 - [Nezha](https://github.com/nezhahq/nezha), a self-hosted, lightweight server and website monitoring and O&M tool. Available as [services.nezha](#opt-services.nezha.enable).
 
+- [Watt](https://github.com/NotAShelf/watt), a CPU frequency and power management daemon for Linux. Available as [services.watt](#opt-services.watt.enable).
+
 - [mail-tlsa-check-exporter](https://github.com/ietf-tools/mail-tlsa-check-exporter), validates SMTP / IMAP server certificates against a TLSA record as a Prometheus exporter. Available as [services.prometheus.exporters.mail-tlsa-check](#opt-services.prometheus.exporters.mail-tlsa-check.enable).
 
 - [CastSponsorSkip](https://github.com/gabe565/CastSponsorSkip/), skips YouTube sponsorships (and sometimes ads) on all local Google Cast devices.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0f420ffecbd3..b1ccf381f875 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -727,6 +727,7 @@
   ./services/hardware/usbmuxd.nix
   ./services/hardware/usbrelayd.nix
   ./services/hardware/vdr.nix
+  ./services/hardware/watt.nix
   ./services/home-automation/deye-dummycloud.nix
   ./services/home-automation/ebusd.nix
   ./services/home-automation/esphome.nix
diff --git a/nixos/modules/services/hardware/watt.nix b/nixos/modules/services/hardware/watt.nix
new file mode 100644
index 000000000000..56b3d6f5036d
--- /dev/null
+++ b/nixos/modules/services/hardware/watt.nix
@@ -0,0 +1,71 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib)
+    mkIf
+    mkOption
+    mkEnableOption
+    mkPackageOption
+    getExe
+    ;
+  inherit (lib.types) submodule;
+
+  cfg = config.services.watt;
+
+  format = pkgs.formats.toml { };
+  cfgFile = format.generate "watt-config.toml" cfg.settings;
+
+  conflictingServices = [
+    "power-profiles-daemon"
+    "auto-cpufreq"
+    "tlp"
+    "cpupower-gui"
+    "thermald"
+  ];
+
+in
+{
+  options.services.watt = {
+    enable = mkEnableOption "automatic CPU speed & power optimizer for Linux";
+    package = mkPackageOption pkgs "watt" { };
+
+    settings = mkOption {
+      default = { };
+      type = submodule { freeformType = format.type; };
+      description = "Configuration for Watt. Options at https://github.com/notaShelf/watt";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = map (service: {
+      assertion = !config.services.${service}.enable;
+      message = "You have set services.${service}.enable = true; which conflicts with Watt.";
+    }) conflictingServices;
+
+    environment.systemPackages = [ cfg.package ];
+
+    # This is necessary for the Watt CLI. The environment variable
+    # passed to the systemd service will take priority in read order.
+    environment.etc."watt.toml".source = cfgFile;
+
+    services.dbus.packages = [ cfg.package ];
+
+    systemd.services.watt = {
+      wantedBy = [ "multi-user.target" ];
+      conflicts = map (service: "${service}.service") conflictingServices;
+      serviceConfig = {
+        WorkingDirectory = "";
+        ExecStart = getExe cfg.package;
+        Restart = "on-failure";
+
+        RuntimeDirectory = "watt";
+        RuntimeDirectoryMode = "0755";
+      };
+    };
+
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 09b0a4632d28..9f43f9bb6c14 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1825,6 +1825,7 @@ in
   wasabibackend = runTest ./wasabibackend.nix;
   wastebin = runTest ./wastebin.nix;
   watchdogd = runTest ./watchdogd.nix;
+  watt = runTest ./watt.nix;
   webhook = runTest ./webhook.nix;
   weblate = runTest ./web-apps/weblate.nix;
   wg-access-server = runTest ./wg-access-server.nix;
diff --git a/nixos/tests/watt.nix b/nixos/tests/watt.nix
new file mode 100644
index 000000000000..b06661b4b79f
--- /dev/null
+++ b/nixos/tests/watt.nix
@@ -0,0 +1,19 @@
+{ pkgs, lib, ... }:
+{
+  name = "watt";
+  meta.maintainers = with lib.maintainers; [ Soliprem ];
+
+  nodes.machine = _: {
+    services.watt.enable = true;
+  };
+
+  testScript = ''
+    machine.wait_for_unit("watt.service")
+    machine.succeed("watt --version | grep ${pkgs.watt.version}")
+    machine.wait_until_succeeds("busctl --system status net.hadess.PowerProfiles")
+    machine.wait_until_succeeds("busctl --system status dev.notashelf.Watt")
+    machine.succeed("busctl --system introspect net.hadess.PowerProfiles /net/hadess/PowerProfiles net.hadess.PowerProfiles")
+    machine.succeed("busctl --system introspect dev.notashelf.Watt /dev/notashelf/Watt dev.notashelf.Watt")
+    machine.succeed("busctl --system get-property dev.notashelf.Watt /dev/notashelf/Watt dev.notashelf.Watt Version | grep ${pkgs.watt.version}")
+  '';
+}
diff --git a/pkgs/by-name/wa/watt/package.nix b/pkgs/by-name/wa/watt/package.nix
new file mode 100644
index 000000000000..0181a43cb306
--- /dev/null
+++ b/pkgs/by-name/wa/watt/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nixosTests,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "watt";
+  version = "1.2.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "notashelf";
+    repo = "watt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mb7z1NHhS5DtFNzi/H/XQR5RfhYY5ELxJg8DFMWtzmU=";
+  };
+  cargoHash = "sha256-2eHr88gMfiwimpcPa/ZQ08C2YalO91fH6BSvcyLNcso=";
+
+  cargoBuildFlags = [
+    "-p=watt"
+    "-p=xtask"
+  ];
+
+  enableParallelBuilding = true;
+  useNextest = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  # xtask doesn't support passing --target
+  # but nix hooks expect the folder structure from when it's set
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget;
+
+  postInstall =
+    lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      # Install required files with the 'dist' task
+      $out/bin/xtask dist --completions-dir $out/share/completions
+    ''
+    + ''
+      # Avoid populating PATH with an 'xtask' cmd
+      rm $out/bin/xtask
+
+      install -Dm644 dbus/net.hadess.PowerProfiles.conf \
+        $out/share/dbus-1/system.d/net.hadess.PowerProfiles.conf
+    '';
+
+  passthru = {
+    tests.nixos = nixosTests.watt;
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Modern CPU frequency and power management utility for Linux";
+    homepage = "https://github.com/NotAShelf/watt";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ Soliprem ];
+    mainProgram = "watt";
+    platforms = lib.platforms.linux;
+  };
+})

From c1b6dca6ceb74d84706f6682d268b1c974d17359 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 2 Jul 2026 14:02:16 +0700
Subject: [PATCH 006/110] python3Packages.setuptools-lint: migrate to pyproject

---
 .../development/python-modules/setuptools-lint/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix
index 8cb3496bd8a6..4e0137cf2d95 100644
--- a/pkgs/development/python-modules/setuptools-lint/default.nix
+++ b/pkgs/development/python-modules/setuptools-lint/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pylint,
 }:
 
 buildPythonPackage rec {
   pname = "setuptools-lint";
   version = "0.6.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577";
   };
 
-  propagatedBuildInputs = [ pylint ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pylint ];
 
   meta = {
     description = "Package to expose pylint as a lint command into setup.py";

From 5518fd2221360a7eaad276e5069c357f91ec45d2 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 2 Jul 2026 14:07:54 +0700
Subject: [PATCH 007/110] python3Packages.setuptools-lint: modernize

---
 .../python-modules/setuptools-lint/default.nix      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix
index 4e0137cf2d95..1672d68b2333 100644
--- a/pkgs/development/python-modules/setuptools-lint/default.nix
+++ b/pkgs/development/python-modules/setuptools-lint/default.nix
@@ -6,24 +6,29 @@
   pylint,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "setuptools-lint";
   version = "0.6.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577";
+    pname = "setuptools-lint";
+    inherit (finalAttrs) version;
+    hash = "sha256-55ThXHyN3pcLYY2cetRYiurqBn8DTMtK6PrMYwtTQZk=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [ pylint ];
 
+  pythonImportsCheck = [ "setuptools_lint" ];
+
   meta = {
     description = "Package to expose pylint as a lint command into setup.py";
     homepage = "https://github.com/johnnoone/setuptools-pylint";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ nickhu ];
   };
-}
+})

From 8b56d4c4c263c532178236592da110f1c98cb8e4 Mon Sep 17 00:00:00 2001
From: algorithmiker <104317939+algorithmiker@users.noreply.github.com>
Date: Wed, 24 Jun 2026 16:37:04 +0200
Subject: [PATCH 008/110] debcraft: init at 0.9.2

---
 pkgs/by-name/de/debcraft/package.nix | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/de/debcraft/package.nix

diff --git a/pkgs/by-name/de/debcraft/package.nix b/pkgs/by-name/de/debcraft/package.nix
new file mode 100644
index 000000000000..02a68241fbad
--- /dev/null
+++ b/pkgs/by-name/de/debcraft/package.nix
@@ -0,0 +1,52 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  help2man,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "debcraft";
+  version = "0.9.2";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = "debcraft";
+    tag = "debian/${finalAttrs.version}";
+    hash = "sha256-U8qWT26qno2zpfdsLqlqZg0SipvHCN6dUjUCjGuyrkY=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [ help2man ];
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  # debcraft ships with some scripts it'll execute inside a docker/podman container
+  # this'd patch the shebangs of the scripts executed in the container too, breaking them.
+  dontPatchShebangs = true;
+
+  postPatch = ''
+    substituteInPlace debcraft.sh --replace-fail \
+      'DEBCRAFT_LIB_DIR="/usr/share/debcraft"' \
+      "DEBCRAFT_LIB_DIR=\"$out/share/debcraft\""
+
+    # their Makefile installs in DESTDIR/usr for some reason
+    substituteInPlace Makefile --replace-fail '$(DESTDIR)/usr' '$(DESTDIR)'
+  '';
+
+  preBuild = ''
+    # the makefile runs help2man on the script, which needs it to be executable
+    # (and the shebang would need to be patched later anyways)
+    patchShebangs debcraft.sh
+  '';
+
+  meta = {
+    description = "Easy, fast and secure way to build Debian packages";
+    homepage = "https://salsa.debian.org/debian/debcraft";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.gilice ];
+    platforms = lib.platforms.unix;
+    mainProgram = "debcraft";
+  };
+})

From 97ad497ca18f4896740632759e983f56f47e5855 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 5 May 2026 15:12:06 +0200
Subject: [PATCH 009/110] passless: init at 0.12.0

---
 pkgs/by-name/pa/passless/package.nix | 56 ++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/pa/passless/package.nix

diff --git a/pkgs/by-name/pa/passless/package.nix b/pkgs/by-name/pa/passless/package.nix
new file mode 100644
index 000000000000..844a9ba6652d
--- /dev/null
+++ b/pkgs/by-name/pa/passless/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  installShellFiles,
+  udev,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "passless";
+  version = "0.12.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "pando85";
+    repo = "passless";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tPlCiXokONUswwEDB2e23gR/NU6G+VYHgqfE+RyRsxw=";
+  };
+
+  cargoHash = "sha256-cNVmzK/W1jER6eK33JgFVnAN/6vGY4gw3GHB/H5DbIQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+
+  buildInputs = [
+    udev
+  ];
+
+  postInstall = ''
+    install -Dm644 contrib/udev/* $out/etc/udev/rules.d
+
+    export COMPLETIONS="target/${stdenv.targetPlatform.config}/$cargoBuildType/build/passless-rs-*/out/completions"
+
+    installShellCompletion --cmd passless \
+      --bash $COMPLETIONS/passless.bash \
+      --fish $COMPLETIONS/passless.fish \
+      --zsh $COMPLETIONS/_passless
+  '';
+
+  meta = {
+    homepage = "https://github.com/pando85/passless";
+    description = "Virtual FIDO2 device and client FIDO 2 utility";
+    changelog = "https://github.com/pando85/passless/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "passless";
+    maintainers = [ lib.maintainers.erictapen ];
+    platforms = lib.platforms.linux;
+  };
+
+})

From 71e8d361473aa848f78e24e84d643546ff09f94f Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Tue, 5 May 2026 15:41:21 +0200
Subject: [PATCH 010/110] nixos/passless: init

---
 .../manual/release-notes/rl-2605.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/programs/passless.nix           | 134 ++++++++++++++++++
 3 files changed, 137 insertions(+)
 create mode 100644 nixos/modules/programs/passless.nix

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index 0da2ba935bcc..8cdd2f9b64d6 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -110,6 +110,8 @@
 
 - [clevis-luks-askpass](https://github.com/latchset/clevis), automatic LUKS unlocking in initrd using clevis token bindings stored in LUKS headers. Available as [boot.initrd.clevisLuksAskpass](#opt-boot.initrd.clevisLuksAskpass.enable).
 
+- [passless](https://github.com/pando85/passless), a daemon for using Webauthn Passkeys backed by password-store.
+
 - [bentopdf](https://github.com/alam00000/bentopdf), a privacy-first PDF toolkit running completely in-browser. Available as [services.bentopdf](#opt-services.bentopdf.enable).
 
 - [hyprwhspr-rs](https://github.com/better-slop/hyprwhspr-rs), a keybind activated speech-to-text voice dictation utility built for use with Hyprland. Available as [services.hyprwhspr-rs](#opt-services.hyprwhspr-rs.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5c360229753f..ea0a206a0cc3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -295,6 +295,7 @@
   ./programs/opengamepadui.nix
   ./programs/openvpn3.nix
   ./programs/partition-manager.nix
+  ./programs/passless.nix
   ./programs/pay-respects.nix
   ./programs/plotinus.nix
   ./programs/pmount.nix
diff --git a/nixos/modules/programs/passless.nix b/nixos/modules/programs/passless.nix
new file mode 100644
index 000000000000..b25b2bd3d15d
--- /dev/null
+++ b/nixos/modules/programs/passless.nix
@@ -0,0 +1,134 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.passless;
+  settingsFormat = pkgs.formats.toml { };
+  settingsFile = settingsFormat.generate "passless.toml" cfg.settings;
+in
+{
+
+  options.programs.passless = {
+    enable = lib.mkEnableOption "passless";
+
+    package = lib.mkPackageOption pkgs "passless" { };
+
+    users = lib.options.mkOption {
+      type = with lib.types; listOf str;
+      description = ''
+        Users that intend to use passless and should be added to the fido group.
+      '';
+      default = [ ];
+      example = [ "alice" ];
+    };
+
+    settings = lib.mkOption {
+      inherit (settingsFormat) type;
+      default = { };
+      example = {
+        pass.store-path = "/home/alice/.local/share/password-store";
+      };
+      description = ''
+        Configuration included in `config.toml`.
+
+        See <https://github.com/pando85/passless#configuration-1> for documentation or run `passless config print` to see default configuration.
+      '';
+    };
+  };
+
+  config = lib.mkIf config.programs.passless.enable {
+    users.groups.fido.members = cfg.users;
+
+    boot.kernelModules = [ "uhid" ];
+
+    services.udev.extraRules = ''
+      KERNEL=="uhid", GROUP="fido", MODE="0660"
+    '';
+
+    # From https://github.com/pando85/passless/blob/master/contrib/systemd/passless.service
+    systemd.user.services.passless = {
+      description = "Passless FIDO2 Software Authenticator";
+      documentation = [ "https://github.com/pando85/passless" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "default.target" ];
+      path = [ config.programs.gnupg.package ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${lib.getExe cfg.package} --config-path ${settingsFile}";
+        Restart = "on-failure";
+        RestartSec = "5s";
+        # Security hardening
+        # The application already handles its own memory locking and core dump prevention
+        # but we can add additional systemd protections
+        NoNewPrivileges = true;
+        LimitMEMLOCK = "2M";
+        SyslogIdentifier = "passless";
+
+        # Found with shh
+        ProtectSystem = "strict";
+        PrivateTmp = "disconnected";
+        PrivateMounts = "true";
+        ProtectKernelTunables = "true";
+        ProtectKernelModules = true;
+        ProtectKernelLogs = true;
+        LockPersonality = true;
+        RestrictRealtime = true;
+        ProtectClock = true;
+        MemoryDenyWriteExecute = true;
+        RestrictAddressFamilies = "AF_UNIX";
+        SocketBindDeny = [
+          "ipv4:tcp"
+          "ipv4:udp"
+          "ipv6:tcp"
+          "ipv6:udp"
+        ];
+        CapabilityBoundingSet = [
+          "~CAP_BLOCK_SUSPEND"
+          "CAP_BPF"
+          "CAP_CHOWN"
+          "CAP_MKNOD"
+          "CAP_NET_RAW"
+          "CAP_PERFMON"
+          "CAP_SYS_BOOT"
+          "CAP_SYS_CHROOT"
+          "CAP_SYS_MODULE"
+          "CAP_SYS_NICE"
+          "CAP_SYS_PACCT"
+          "CAP_SYS_PTRACE"
+          "CAP_SYS_TIME"
+          "CAP_SYSLOG"
+          "CAP_WAKE_ALARM"
+        ];
+        SystemCallFilter = [
+          "~@aio:EPERM"
+          "@chown:EPERM"
+          "@clock:EPERM"
+          "@cpu-emulation:EPERM"
+          "@debug:EPERM"
+          "@ipc:EPERM"
+          "@keyring:EPERM"
+          "@module:EPERM"
+          "@mount:EPERM"
+          "@obsolete:EPERM"
+          "@pkey:EPERM"
+          "@privileged:EPERM"
+          "@raw-io:EPERM"
+          "@reboot:EPERM"
+          "@resources:EPERM"
+          "@sandbox:EPERM"
+          "@setuid:EPERM"
+          "@swap:EPERM"
+          "@sync:EPERM"
+        ];
+
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ erictapen ];
+
+}

From d04dfa7617766bdd55493ab6795c7548c83504ea 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 18:32:48 -0400
Subject: [PATCH 011/110] cataclysm-dda: fix desktop file name in wrapper

---
 pkgs/games/cataclysm-dda/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/cataclysm-dda/wrapper.nix b/pkgs/games/cataclysm-dda/wrapper.nix
index 58d09b132686..8d377e7fe080 100644
--- a/pkgs/games/cataclysm-dda/wrapper.nix
+++ b/pkgs/games/cataclysm-dda/wrapper.nix
@@ -39,7 +39,7 @@ else
           mv "''${1}.bk" "$1"
           sed -i "$1" -e "s,${builtins.storeDir}/.\+\(/bin/cataclysm-tiles\),$out\1,"
       }
-      for script in "$out/share/applications/cataclysm-dda.desktop" \
+      for script in "$out/share/applications/org.cataclysmdda.CataclysmDDA.desktop" \
                     "$out/Applications/Cataclysm.app/Contents/MacOS/Cataclysm.sh"
       do
           if [ -e "$script" ]; then

From e0d5fc661f2f87880c00db8d38670bb8945a03ac 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 18:32:59 -0400
Subject: [PATCH 012/110] cataclysm-dda: update locale-path.patch for new
 upstream path API

---
 pkgs/games/cataclysm-dda/locale-path.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/cataclysm-dda/locale-path.patch b/pkgs/games/cataclysm-dda/locale-path.patch
index 8f18b0ffb71e..b36fa8845ba7 100644
--- a/pkgs/games/cataclysm-dda/locale-path.patch
+++ b/pkgs/games/cataclysm-dda/locale-path.patch
@@ -6,8 +6,8 @@ diff --git a/src/translations.cpp b/src/translations.cpp
  #endif
 
 -#if !defined(__ANDROID__) && ((defined(__linux__) || defined(CATA_IS_ON_BSD) || (defined(MACOSX) && !defined(TILES))))
-     if( !PATH_INFO::base_path().empty() ) {
-         loc_dir = PATH_INFO::base_path() + "share/locale";
+     if( !PATH_INFO::base_path().get_logical_root_path().empty() ) {
+         loc_dir = ( PATH_INFO::base_path() / "share" / "locale" ).generic_u8string();
      } else {
          loc_dir = PATH_INFO::langdir();
      }

From df09156e111c2b23d000c1db9840a1f4990021f5 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 18:33:01 -0400
Subject: [PATCH 013/110] cataclysm-dda: refactor common.nix

---
 pkgs/games/cataclysm-dda/common.nix | 70 +++++++++++++----------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index b6aab0214858..e9270ad40398 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  runtimeShell,
   pkg-config,
   gettext,
   ncurses,
@@ -19,54 +18,32 @@
 
 let
   inherit (lib) optionals optionalString;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cataclysm-dda";
 
-  commonDeps = [
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
     gettext
     zlib
-  ];
-
-  cursesDeps = commonDeps ++ [ ncurses ];
-
-  tilesDeps = commonDeps ++ [
+  ]
+  ++ lib.optionals tiles [
     SDL2
     SDL2_image
     SDL2_mixer
     SDL2_ttf
     libx11
     freetype
-  ];
-
-  patchDesktopFile = ''
-    substituteInPlace $out/share/applications/org.cataclysmdda.CataclysmDDA.desktop \
-      --replace-fail "Exec=cataclysm-tiles" "Exec=$out/bin/cataclysm-tiles"
-  '';
-
-  installMacOSAppLauncher = ''
-    app=$out/Applications/Cataclysm.app
-    install -D -m 444 build-data/osx/Info.plist -t $app/Contents
-    install -D -m 444 build-data/osx/AppIcon.icns -t $app/Contents/Resources
-    mkdir $app/Contents/MacOS
-    launcher=$app/Contents/MacOS/Cataclysm.sh
-    cat << EOF > $launcher
-    #!${runtimeShell}
-    $out/bin/cataclysm-tiles
-    EOF
-    chmod 555 $launcher
-  '';
-in
-
-stdenv.mkDerivation {
-  pname = "cataclysm-dda";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = if tiles then tilesDeps else cursesDeps;
+  ]
+  ++ lib.optional (!tiles) ncurses;
 
   postPatch = ''
     patchShebangs lang/compile_mo.sh
+    substituteInPlace data/fontdata.json \
+      --replace-fail 'data/font/' 'font/'
   '';
 
-  # remove once on O.I/ahead of upstream commit 15b3cb0
   env.NIX_CFLAGS_COMPILE = optionalString stdenv.hostPlatform.isDarwin "-Wno-missing-noreturn";
 
   makeFlags = [
@@ -87,9 +64,22 @@ stdenv.mkDerivation {
     "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}"
   ];
 
-  postInstall = optionalString tiles (
-    if !stdenv.hostPlatform.isDarwin then patchDesktopFile else installMacOSAppLauncher
-  );
+  postInstall =
+    optionalString tiles ''
+      install -Dm644 data/xdg/org.cataclysmdda.CataclysmDDA.svg \
+        $out/share/icons/hicolor/scalable/apps/org.cataclysmdda.CataclysmDDA.svg
+
+      install -Dm644 data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml \
+        $out/share/metainfo/org.cataclysmdda.CataclysmDDA.appdata.xml
+    ''
+    + optionalString (tiles && stdenv.hostPlatform.isDarwin) ''
+      app=$out/Applications/Cataclysm.app
+
+      install -Dm444 build-data/osx/Info.plist -t $app/Contents
+      install -Dm444 build-data/osx/AppIcon.icns -t $app/Contents/Resources
+      install -Dm555 build-data/osx/Cataclysm.sh $app/Contents/MacOS/Cataclysm.sh
+      ln -sf $out/bin/cataclysm-tiles $app/Contents/Resources/cataclysm-tiles
+    '';
 
   dontStrip = debug;
   enableParallelBuilding = true;
@@ -100,7 +90,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Free, post apocalyptic, zombie infested rogue-like";
+    description = "Free post-apocalyptic zombie-infested roguelike";
     mainProgram = "cataclysm-tiles";
     longDescription = ''
       Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.
@@ -133,4 +123,4 @@ stdenv.mkDerivation {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 381f2ab87456dfccc9ce2f719c3ecada9322ee6d 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 18:33:15 -0400
Subject: [PATCH 014/110] cataclysm-dda: 0.H -> 0.I

---
 pkgs/games/cataclysm-dda/stable.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix
index 224b4f097970..4e7aba8b518b 100644
--- a/pkgs/games/cataclysm-dda/stable.nix
+++ b/pkgs/games/cataclysm-dda/stable.nix
@@ -1,10 +1,7 @@
 {
-  lib,
   callPackage,
   fetchFromGitHub,
-  fetchpatch,
   pkgs,
-  wrapCDDA,
   attachPkgs,
   tiles ? true,
   debug ? false,
@@ -17,14 +14,14 @@ let
   };
 
   self = common.overrideAttrs (common: rec {
-    version = "0.H-2025-07-10-0402";
+    # 0.I is the latest stable release tag (https://github.com/CleverRaven/Cataclysm-DDA/releases/tag/0.I)
+    version = "0.I-2026-06-11-1250";
 
     src = fetchFromGitHub {
       owner = "CleverRaven";
       repo = "Cataclysm-DDA";
-      # Head of 0.H-branch
       tag = "cdda-${version}";
-      sha256 = "sha256-r4cl8cij68WmQRfg+DHQIeDBIwhgwSre6kAUYZaCPR8=";
+      hash = "sha256-DpB9OlSpg0t4L1JdMMPeQC+cLd0zs/ZkCdXSFGWgRhA=";
     };
 
     patches = [

From 1b2ecf38c96ba6f709fa121790fbb34cf4bd2037 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, 16 Jun 2026 21:53:32 -0400
Subject: [PATCH 015/110] cataclysm-dda: added maintainer philocalyst

---
 pkgs/games/cataclysm-dda/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index e9270ad40398..df6a40b8afc0 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -120,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       mnacamura
       DeeUnderscore
+      philocalyst
     ];
     platforms = lib.platforms.unix;
   };

From 4a15302734fb21405ded14853fd2fd65e686d4e9 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:04:48 +0200
Subject: [PATCH 016/110] python3Packages.telegraph: use finalAttrs

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

diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix
index 9a070eaff25c..31329028ff37 100644
--- a/pkgs/development/python-modules/telegraph/default.nix
+++ b/pkgs/development/python-modules/telegraph/default.nix
@@ -7,7 +7,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "telegraph";
   version = "2.2.0";
   format = "setuptools";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "telegraph";
     owner = "python273";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xARX8lSOftNVYY4InR5vU4OiguCJJJZv/W76G9eLgNY=";
   };
 
@@ -36,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Telegraph API wrapper";
     homepage = "https://github.com/python273/telegraph";
-    changelog = "https://github.com/python273/telegraph/releases/tag/v${version}";
+    changelog = "https://github.com/python273/telegraph/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gp2112 ];
   };
-}
+})

From fcb45ff01f9a9947ca9bfee0fc207198dd059cef Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:07:51 +0200
Subject: [PATCH 017/110] python3Packages.telegraph: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix
index 31329028ff37..6785f0ced295 100644
--- a/pkgs/development/python-modules/telegraph/default.nix
+++ b/pkgs/development/python-modules/telegraph/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage (finalAttrs: {
   version = "2.2.0";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     repo = "telegraph";
     owner = "python273";

From 4be036d83e49ad5b2c78babb8faa548527e847f1 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:18:18 +0200
Subject: [PATCH 018/110] python3Packages.telegraph: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix
index 6785f0ced295..faa380845956 100644
--- a/pkgs/development/python-modules/telegraph/default.nix
+++ b/pkgs/development/python-modules/telegraph/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   requests,
   httpx,
   pytestCheckHook,
@@ -10,7 +11,7 @@
 buildPythonPackage (finalAttrs: {
   pname = "telegraph";
   version = "2.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -21,7 +22,9 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-xARX8lSOftNVYY4InR5vU4OiguCJJJZv/W76G9eLgNY=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   optional-dependencies = {
     aio = [ httpx ];
@@ -31,6 +34,7 @@ buildPythonPackage (finalAttrs: {
 
   enabledTestPaths = [ "tests/" ];
 
+  # Needs networking
   disabledTests = [ "test_get_page" ];
 
   pythonImportsCheck = [ "telegraph" ];

From b0f9b7c98b42368f83721deb38fdf60c89f8fd39 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:39:04 +0200
Subject: [PATCH 019/110] python3Packages.persim: use finalAttrs

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

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 9c8dbff7ac49..b3231169d3b9 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -12,13 +12,14 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "persim";
   version = "0.3.8";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) version;
+    pname = "persim";
     hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0=";
   };
 
@@ -62,8 +63,8 @@ buildPythonPackage rec {
   meta = {
     description = "Distances and representations of persistence diagrams";
     homepage = "https://persim.scikit-tda.org";
-    changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}";
+    changelog = "https://github.com/scikit-tda/persim/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From f97932818283b2d1f3ba55f99e262037d235fa72 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:40:41 +0200
Subject: [PATCH 020/110] python3Packages.persim: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index b3231169d3b9..ec7df3e4daad 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -17,6 +17,8 @@ buildPythonPackage (finalAttrs: {
   version = "0.3.8";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "persim";

From 824e852e22f6dcb177ff5e668fb74fc3252d13c7 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:47:58 +0200
Subject: [PATCH 021/110] python3Packages.persim: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index ec7df3e4daad..1042afdc1992 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   deprecated,
   hopcroftkarp,
   joblib,
@@ -15,7 +16,7 @@
 buildPythonPackage (finalAttrs: {
   pname = "persim";
   version = "0.3.8";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -25,7 +26,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     deprecated
     hopcroftkarp
     joblib

From b6a8cca450ab3958ebf78b7c6de187dbf183fcec Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 8 Jul 2026 16:52:16 +0200
Subject: [PATCH 022/110] python3Packages.persim: reenable disabled tests

---
 .../python-modules/persim/default.nix            | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 1042afdc1992..b54a4d1ff558 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -51,22 +51,6 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "persim" ];
 
-  disabledTests = [
-    # AttributeError: module 'collections' has no attribute 'Iterable'
-    "test_empyt_diagram_list"
-    "test_empty_diagram_list"
-    "test_fit_diagram"
-    "test_integer_diagrams"
-    "test_lists_of_lists"
-    "test_mixed_pairs"
-    "test_multiple_diagrams"
-    "test_n_pixels"
-    # https://github.com/scikit-tda/persim/issues/67
-    "test_persistenceimager"
-    # ValueError: setting an array element with a sequence
-    "test_exact_critical_pairs"
-  ];
-
   meta = {
     description = "Distances and representations of persistence diagrams";
     homepage = "https://persim.scikit-tda.org";

From cfd9a687d6c351c03ede3555f614bfa7a6b1df3d Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 9 Jul 2026 00:27:15 +0200
Subject: [PATCH 023/110] kew: 4.0.0 -> 4.1.8

Changelog: https://codeberg.org/ravachol/kew/releases/tag/v4.1.8
Diff: https://codeberg.org/ravachol/kew/compare/v4.0.0...v4.1.8
---
 pkgs/by-name/ke/kew/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index ee65e8acfc15..18c673079514 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "4.0.0";
+  version = "4.1.8";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DtYiqAM5q6H5f1s39CMO/kA1tPFvwcmzS31gZqPz8MQ=";
+    hash = "sha256-qT1hroZPmZezAQ1PzpDMLDgN8PufwbFtuIYGqvAcvNo=";
   };
 
   postPatch = ''
@@ -83,9 +83,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
   installFlags = [
     "MAN_DIR=${placeholder "out"}/share/man"
-    "PREFIX=${placeholder "out"}"
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];

From fe257763bd4fa5fadbdbc9d1bd3ca4a304a95b0d Mon Sep 17 00:00:00 2001
From: Ingo Reitz <9l@9lo.re>
Date: Thu, 9 Jul 2026 00:56:13 +0200
Subject: [PATCH 024/110] picocom: add myself as maintainer

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

diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix
index bca2dbd1f25d..38766e468d92 100644
--- a/pkgs/by-name/pi/picocom/package.nix
+++ b/pkgs/by-name/pi/picocom/package.nix
@@ -61,5 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     mainProgram = "picocom";
+    maintainers = [ lib.maintainers.ninelore ];
   };
 })

From 9ea8264500b87994378db382e93447bb9013aba1 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Thu, 9 Jul 2026 01:51:45 +0200
Subject: [PATCH 025/110] nixos/emacs: don't restartIfChanged

Fixes https://github.com/NixOS/nixpkgs/issues/535449

This probably started happening with the rust rewrite of the switcher also
restarting user units now.
---
 nixos/modules/services/editors/emacs.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 2cf753484a80..c47577a6ce09 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -80,6 +80,9 @@ in
       unitConfig = lib.optionalAttrs cfg.startWithGraphical {
         After = "graphical-session.target";
       };
+
+      # Long-lived session that ought to only be restarted manually
+      restartIfChanged = false;
     }
     // lib.optionalAttrs cfg.enable {
       wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ];

From a82428a92e40d177b640c2fdcd45e489f5a12aa1 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 8 Jul 2026 17:29:52 -0700
Subject: [PATCH 026/110] gimp: add adwaita fallback theme

---
 pkgs/applications/graphics/gimp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 59d035b32d97..4a0ef5e72bb8 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -310,7 +310,8 @@ stdenv.mkDerivation (finalAttrs: {
         # for gimp-script-fu-interpreter-3.0 invoked by shebang of some plug-ins
         "$out"
       ]
-    }")
+    }"
+    --suffix XDG_DATA_DIRS : "${adwaita-icon-theme}/share")
   '';
 
   postFixup = ''

From 80f3b8c11343deee1491fbee64fa7ea33485a990 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 9 Jul 2026 18:02:43 +0200
Subject: [PATCH 027/110] firefox/wrapper: enable strictDeps

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 149a3f13e54d..e42db623c81e 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -215,6 +215,7 @@ let
     in
     stdenv.mkDerivation (finalAttrs: {
       __structuredAttrs = true;
+      strictDeps = true;
       inherit pname version;
 
       desktopItem = makeDesktopItem (

From ba5d1c384d8caba6600e1b385b9bbfdcc2b16d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 9 Jul 2026 20:36:56 +0200
Subject: [PATCH 028/110] python3Packages.bandcamp-async-api: init at 0.2.2

---
 .../bandcamp-async-api/default.nix            | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/bandcamp-async-api/default.nix

diff --git a/pkgs/development/python-modules/bandcamp-async-api/default.nix b/pkgs/development/python-modules/bandcamp-async-api/default.nix
new file mode 100644
index 000000000000..c3cc1b22eb26
--- /dev/null
+++ b/pkgs/development/python-modules/bandcamp-async-api/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  python-dotenv,
+  pytestCheckHook,
+  uv-build,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "bandcamp-async-api";
+  version = "0.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ALERTua";
+    repo = "bandcamp_async_api";
+    tag = finalAttrs.version;
+    hash = "sha256-pL1V3xAcI48cgddf0tmE+djGI7sagGAI3w0Qu7/O8pI=";
+  };
+
+  build-system = [
+    uv-build
+  ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "bandcamp_async_api" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    python-dotenv
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Modern, asynchronous Python client for the Bandcamp API";
+    homepage = "https://github.com/ALERTua/bandcamp_async_api";
+    # https://github.com/ALERTua/bandcamp_async_api/issues/34
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5108c480dd04..9ff1c407698f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2155,6 +2155,8 @@ self: super: with self; {
 
   bandcamp-api = callPackage ../development/python-modules/bandcamp-api { };
 
+  bandcamp-async-api = callPackage ../development/python-modules/bandcamp-async-api { };
+
   bandit = callPackage ../development/python-modules/bandit { };
 
   bangla = callPackage ../development/python-modules/bangla { };

From e348e6e76fc2bdd43947ba8833122a0639e49222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 9 Jul 2026 20:52:08 +0200
Subject: [PATCH 029/110] music-assistant: regen providers

---
 pkgs/by-name/mu/music-assistant/providers.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 8c75a4f5c2c2..b2fbdc609ad0 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -48,8 +48,10 @@
       ps: with ps; [
         aioaudiobookshelf
       ];
-    bandcamp = ps: [
-    ]; # missing bandcamp-async-api
+    bandcamp =
+      ps: with ps; [
+        bandcamp-async-api
+      ];
     bbc_sounds =
       ps: with ps; [
         pytz

From 6ec1c2cf41be98a47ce41bef0f110c78739fda9f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 14:44:59 +0700
Subject: [PATCH 030/110] python3Packages.types-retry: migrate to pyproject

---
 pkgs/development/python-modules/types-retry/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix
index 1eb6f6218491..3fcff608c193 100644
--- a/pkgs/development/python-modules/types-retry/default.nix
+++ b/pkgs/development/python-modules/types-retry/default.nix
@@ -2,12 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "types-retry";
   version = "0.9.9.20250322";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "types_retry";
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-LqpvS4MsGHEhBWmIu+bS0Lb06wNjH9yXUuKsKAL3tyY=";
   };
 
+  build-system = [ setuptools ];
+
   # Modules doesn't have tests
   doCheck = false;
 

From 3f6f76ca522cc3b0a4b2baa8425b2254a0920dcc Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 14:48:34 +0700
Subject: [PATCH 031/110] python3Packages.types-retry: modernize

---
 pkgs/development/python-modules/types-retry/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix
index 3fcff608c193..fb60b27d3efc 100644
--- a/pkgs/development/python-modules/types-retry/default.nix
+++ b/pkgs/development/python-modules/types-retry/default.nix
@@ -5,14 +5,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "types-retry";
   version = "0.9.9.20250322";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     pname = "types_retry";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-LqpvS4MsGHEhBWmIu+bS0Lb06wNjH9yXUuKsKAL3tyY=";
   };
 
@@ -29,4 +31,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From b90e85e10afbc3a73b80ce2f4569d2ac0a334010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 10 Jul 2026 19:16:49 +0200
Subject: [PATCH 032/110] python314Packages.samplerate-ledfx: fix Python 3.14
 support

---
 .../samplerate-ledfx/default.nix              | 10 +++--
 .../fix-python3.14-support.diff               | 38 +++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/samplerate-ledfx/fix-python3.14-support.diff

diff --git a/pkgs/development/python-modules/samplerate-ledfx/default.nix b/pkgs/development/python-modules/samplerate-ledfx/default.nix
index cd95073ca359..cb6fc5443fcb 100644
--- a/pkgs/development/python-modules/samplerate-ledfx/default.nix
+++ b/pkgs/development/python-modules/samplerate-ledfx/default.nix
@@ -3,12 +3,12 @@
   buildPythonPackage,
   cmake,
   fetchFromGitHub,
+  fetchpatch,
   libsamplerate,
   numpy,
   pybind11,
   pytest-asyncio,
   pytestCheckHook,
-  pythonAtLeast,
   setuptools,
   setuptools-scm,
 }:
@@ -18,8 +18,6 @@ buildPythonPackage (finalAttrs: {
   version = "0.2.6";
   pyproject = true;
 
-  disabled = pythonAtLeast "3.14";
-
   src = fetchFromGitHub {
     owner = "LedFx";
     repo = "python-samplerate-ledfx";
@@ -27,6 +25,12 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-SLmaWSq/Ou23BfdWKlzE9gIfORgF9skUVEw1Tzpd5b4=";
   };
 
+  patches = [
+    # Fix Python 3.14 support based on https://github.com/tuxu/python-samplerate/commit/06e88d1a869db30ce9037498f4dec2f74601d127
+    # but with fixes that it applies
+    ./fix-python3.14-support.diff
+  ];
+
   # unvendor pybind11, libsamplerate
   postPatch = ''
     rm -r external
diff --git a/pkgs/development/python-modules/samplerate-ledfx/fix-python3.14-support.diff b/pkgs/development/python-modules/samplerate-ledfx/fix-python3.14-support.diff
new file mode 100644
index 000000000000..089fbabff7b7
--- /dev/null
+++ b/pkgs/development/python-modules/samplerate-ledfx/fix-python3.14-support.diff
@@ -0,0 +1,38 @@
+diff --git a/src/samplerate.cpp b/src/samplerate.cpp
+index f0eba25..04f16fd 100644
+--- a/src/samplerate.cpp
++++ b/src/samplerate.cpp
+@@ -268,7 +268,9 @@ class Resampler {
+     // create a shorter view of the array
+     if ((size_t)output_frames_gen < new_size) {
+       out_shape[0] = output_frames_gen;
+-      output.resize(out_shape);
++      return py::array_t<float, py::array::c_style>(
++        out_shape, outbuf.strides, static_cast<float *>(outbuf.ptr),
++        output);
+     } else if ((size_t)output_frames_gen >= new_size) {
+       // This means our fudge factor is too small.
+       throw std::runtime_error("Generated more output samples than expected!");
+@@ -434,7 +436,10 @@ class CallbackResampler {
+     // create a shorter view of the array
+     if (output_frames_gen < frames) {
+       out_shape[0] = output_frames_gen;
+-      output.resize(out_shape);
++      auto strides = std::vector<py::ssize_t>(output.strides(),
++                                              output.strides() + output.ndim());
++      return py::array_t<float, py::array::c_style>(
++        out_shape, strides, static_cast<float *>(outbuf.ptr), output);
+     }
+ 
+     return output;
+@@ -561,7 +566,9 @@ py::array_t<float, py::array::c_style> resample(
+   // create a shorter view of the array
+   if ((size_t)output_frames_gen < new_size) {
+     out_shape[0] = output_frames_gen;
+-    output.resize(out_shape);
++    auto base = output;
++    output = py::array_t<float, py::array::c_style>(
++      out_shape, outbuf.strides, static_cast<float *>(outbuf.ptr), base);
+   } else if ((size_t)output_frames_gen >= new_size) {
+     // This means our fudge factor is too small.
+     throw std::runtime_error("Generated more output samples than expected!");

From 1fe4483927abf3b2b4adec7b32b5e99b59ce2a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 10 Jul 2026 19:56:44 +0200
Subject: [PATCH 033/110] python314Packages.samplerate-ledfx: ignore timing
 sensitive test

---
 pkgs/development/python-modules/samplerate-ledfx/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/samplerate-ledfx/default.nix b/pkgs/development/python-modules/samplerate-ledfx/default.nix
index cb6fc5443fcb..13f342d05c5f 100644
--- a/pkgs/development/python-modules/samplerate-ledfx/default.nix
+++ b/pkgs/development/python-modules/samplerate-ledfx/default.nix
@@ -56,6 +56,11 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # timing sensitive: AssertionError: Expected speedup > 1.0, got 0.68x
+    "tests/test_threading_performance.py::test_conditional_gil_release_large_data_threading"
+  ];
+
   pythonImportsCheck = [ "samplerate" ];
 
   meta = {

From 27f44c826e30b6dd1b1ced28457f5eb5b8d28566 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 18:12:04 +0000
Subject: [PATCH 034/110] itgmaniaPackages.zmod-simply-love: 5.8.1-april ->
 5.9.0-july-2

---
 pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix b/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix
index c54f6d9cb8a6..912ab62186ea 100644
--- a/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix
+++ b/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "zmod-simply-love";
-  version = "5.8.1-april";
+  version = "5.9.0-july-2";
 
   src = fetchFromGitHub {
     owner = "zarzob";
     repo = "Simply-Love-SM5";
     tag = finalAttrs.version;
-    hash = "sha256-4EkCR9M8xip2b8ddWyUIom2HM72Ba8KdVodIyc5h4p8=";
+    hash = "sha256-1sUiUPg5MzPZhdGdx3LqDbUIcSD+TkGKifj55S8MieQ=";
   };
 
   postInstall = ''

From 9ac98e421bd17b3110e9057f05db0fbbb0826080 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 18:14:55 +0000
Subject: [PATCH 035/110] itgmaniaPackages.itg3encore: 0-unstable-2026-06-28 ->
 0-unstable-2026-07-07

---
 pkgs/by-name/it/itgmania/themes/itg3encore.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/it/itgmania/themes/itg3encore.nix b/pkgs/by-name/it/itgmania/themes/itg3encore.nix
index 76c915a9be1f..8408bd76f058 100644
--- a/pkgs/by-name/it/itgmania/themes/itg3encore.nix
+++ b/pkgs/by-name/it/itgmania/themes/itg3encore.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "itg3encore";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-07-07";
 
   src = fetchFromGitHub {
     owner = "DarkBahamut162";
     repo = "itg3encore";
-    rev = "408a726f31287bfe98144fa62f64abac5a4fbb92";
-    hash = "sha256-6MGbwkU8dppAs/mg6hA2jmDjrHU7sgITouUjKh92ozE=";
+    rev = "3293fba56b1559f56209fe53574d7d0099e4a74a";
+    hash = "sha256-fFPfYipPbgN1F00m1IO2ef/pqnJfN2TrPE4AUpTTUjc=";
   };
 
   postInstall = ''

From defcfce7b2f1942bec0d6e5ba6e118d55a5a3fe3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 10 Jul 2026 22:02:19 +0100
Subject: [PATCH 036/110] diffoscope: 323 -> 324

Changes: https://diffoscope.org/news/diffoscope-324-released/
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 5898aba19644..3619e0dcb3d6 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -109,12 +109,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "323";
+  version = "324";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-TFSeCS7D2D496rUrosYAWP4kHsu6x386c8AJ5c4aKYs=";
+    hash = "sha256-+OsGilo9bgNWbg/Jl6/CGAdLXlA8fzfh4HrIN1VMxOE=";
   };
 
   outputs = [

From 26309b17744721b41eb7e93f8fdd039422aab5ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 02:41:42 +0000
Subject: [PATCH 037/110] semantic-release: 25.0.5 -> 25.0.6

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

diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index 5d14366f595d..f39028b65134 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "semantic-release";
-  version = "25.0.5";
+  version = "25.0.6";
 
   src = fetchFromGitHub {
     owner = "semantic-release";
     repo = "semantic-release";
     rev = "v${version}";
-    hash = "sha256-D1UIRAbLJBJ9IpIgq90fYh1B5295gUaDP4TKwNUoldI=";
+    hash = "sha256-5k8asT62OasHrcNb2hZYQYEpR3eGe2gVa5AkDbK35Og=";
   };
 
-  npmDepsHash = "sha256-WADHFSDyZ9jCYERaux/0BV31l24Dh4vdwDUC98Jx754=";
+  npmDepsHash = "sha256-31Bb5OyxX4i3x2m+2t8p927GXsaHM7TQQRi8X1TSdB8=";
 
   dontNpmBuild = true;
 

From 38f5bea0ea237f10b274ee590468ae4e88891a6d Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 11 Jul 2026 07:37:12 +0300
Subject: [PATCH 038/110] keycastr: 0.10.3 -> 0.10.5

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

diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix
index 3bcfce43aba7..6763809f126f 100644
--- a/pkgs/by-name/ke/keycastr/package.nix
+++ b/pkgs/by-name/ke/keycastr/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "keycastr";
-  version = "0.10.3";
+  version = "0.10.5";
 
   src = fetchurl {
     url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip";
-    hash = "sha256-4zhLsIaG0rK7pQnQ0RmhwrcUBGtUB4ca38GlFXQpiiU=";
+    hash = "sha256-yXxj6tv0MEwEgCwMg3XJm1gIRYS+MU6WTINm7KMYt1I=";
   };
 
   sourceRoot = ".";

From 22aeed43d24e0fa937ff72378444178676677258 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 05:32:27 +0000
Subject: [PATCH 039/110] weaviate: 1.38.2 -> 1.38.3

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

diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index ef498972eeaf..276cb28987a7 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "weaviate";
-  version = "1.38.2";
+  version = "1.38.3";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qWb1jTC3pmyK7WZ/mw5aF3spXL130WCKglYEoJVmsO8=";
+    hash = "sha256-S37l12pMPrMjHRJ8n9/1vT2lZ5Ma6riX8Q7MGAhioGk=";
   };
 
-  vendorHash = "sha256-+I7yxIql/ttC7zTcK870GX52LDfSbfCZvDW+eeCYnB0=";
+  vendorHash = "sha256-MxCR1Owy0tOYU2GGHbxI9STfT5ZitsZGbI0ttYuFeAQ=";
 
   subPackages = [ "cmd/weaviate-server" ];
 

From 2eb699c2e0819ac5922a414f52288f95dd285728 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 06:35:45 +0000
Subject: [PATCH 040/110] microsoft-edge: 149.0.4022.98 -> 150.0.4078.65

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 pkgs/by-name/ms/msedgedriver/package.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 795e9a0cb672..32c6100777b5 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -164,11 +164,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "149.0.4022.98";
+  version = "150.0.4078.65";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-tM5RsesBd3CyaCrkXa/wn5OF05k3OlRwzKGzg2lxNtI=";
+    hash = "sha256-mt8fx6gJE5PGFiMLeceJ5rmLmwmQXaxx7VY8yPIQqyE=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix
index bb027f423777..663bcc23ce70 100644
--- a/pkgs/by-name/ms/msedgedriver/package.nix
+++ b/pkgs/by-name/ms/msedgedriver/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "msedgedriver";
-  version = "149.0.4022.98";
+  version = "150.0.4078.65";
 
   src = fetchzip {
     url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
-    hash = "sha256-itfjetfyfKayowWickDYVd2drBXWTNIYCdUUKTnnZzM=";
+    hash = "sha256-TwGjt8Hw4rvwW2OwkIcqRzKLXu1dRL7/9n+Zq3VmKag=";
     stripRoot = false;
   };
 

From 3896bc5ff9eb6b594b694100948f0a3389935e82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 07:24:39 +0000
Subject: [PATCH 041/110] jinja-lsp: 0.2.1 -> 0.2.3

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

diff --git a/pkgs/by-name/ji/jinja-lsp/package.nix b/pkgs/by-name/ji/jinja-lsp/package.nix
index 2f4f3a468588..afb61fae645a 100644
--- a/pkgs/by-name/ji/jinja-lsp/package.nix
+++ b/pkgs/by-name/ji/jinja-lsp/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jinja-lsp";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "uros-5";
     repo = "jinja-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ve/FapX2hpyFlFFRbD4hAeQQlHaOkG2MiC9Sy68dtY8=";
+    hash = "sha256-Fjn4iJH3/Cgo+mD/tnJL12i+teVLNqb2xryZfhrZckg=";
   };
 
-  cargoHash = "sha256-8sxXo2nOj30OsyrihlnpzKiS/Hz3NgpvrnctNBWzgOI=";
+  cargoHash = "sha256-8fKuqidgvtHanFgxyETbs7SrFVO9tmf0IogSq5URdF0=";
 
   cargoBuildFlags = [
     "-p"

From 42822c45e71b5de80777af04ee89e7f2aa55a36d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 11:14:53 +0200
Subject: [PATCH 042/110] luarocks-packages-updater: parse more licenses

---
 pkgs/by-name/lu/luarocks-packages-updater/updater.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index 951d5fddf4dd..80221bc6c75a 100755
--- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -72,6 +72,7 @@ LICENSE_NORMALIZATION = {
     "Apache 2.0": "lib.licenses.asl20",
     "Apache-2.0": "lib.licenses.asl20",
     "Apache License Version 2": "lib.licenses.asl20",
+    "BSD": "lib.licenses.free", # Too unspecific
     "BSD-2-Clause": "lib.licenses.bsd2",
     "BSD-3-Clause": "lib.licenses.bsd3",
     "GPL-2+": "lib.licenses.gpl2Plus",
@@ -82,16 +83,23 @@ LICENSE_NORMALIZATION = {
     "GPL-3.0": "lib.licenses.gpl3Only",
     "GPL-3.0-only": "lib.licenses.gpl3Only",
     "GPL-3.0-or-later": "lib.licenses.gpl3Plus",
+    "GPLv3+ and other free licenses": "lib.licenses.AND [ lib.licenses.gpl3Plus lib.licenses.free ]",
     "ISC": "lib.licenses.isc",
+    "LGPL": "lib.licenses.free", # Too unspecific
     "LGPL-2.0": "lib.licenses.lgpl2Only",
     "LGPL-2.1": "lib.licenses.lgpl21Only",
     "LGPL-3.0": "lib.licenses.lgpl3Only",
     "MIT": "lib.licenses.mit",
     "MIT <http://opensource.org/licenses/MIT>": "lib.licenses.mit",
+    "MIT/X11": "lib.licenses.AND [ lib.licenses.mit lib.licenses.x11 ]",
+    "MIT/X license": "lib.licenses.AND [ lib.licenses.mit lib.licenses.x11 ]",
+    "MIT/ICU": "lib.licenses.AND [ lib.licenses.mit lib.licenses.unicode-30 ]",
     "MPL-2.0": "lib.licenses.mpl20",
     "Unlicense": "lib.licenses.unlicense",
     "2-clause BSD": "lib.licenses.bsd2",
     "Two-clause BSD": "lib.licenses.bsd2",
+    "Public domain": "lib.licenses.publicDomain",
+    "UNKNOWN": "lib.licenses.unfree"
 }
 
 LICENSE_FULL_NAME_RE = re.compile(r'(?P<indent>\s*)license\.fullName = "(?P<license>[^"]+)";')

From 7605a7ffd6dc28914672d5da5e18e3d72a4c808d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 10:52:34 +0200
Subject: [PATCH 043/110] luaPackages: update licenses

---
 .../lua-modules/generated-packages.nix        | 258 ++++++++++++++----
 1 file changed, 201 insertions(+), 57 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 7d7c6c382d17..af27c4e2f185 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -40,7 +40,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/cheusov/lua-alt-getopt";
         maintainers = with lib.maintainers; [ arobyn ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Process application arguments the same way as getopt_long";
         longDescription = ''
           alt-getopt is a module for Lua programming language for processing
@@ -204,7 +207,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/Tieske/binaryheap.lua";
         maintainers = with lib.maintainers; [ vcunat ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Binary heap implementation in pure Lua";
         longDescription = ''
           Binary heaps are an efficient sorting algorithm. This module
@@ -414,7 +420,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/alerque/cldr-lua";
         maintainers = with lib.maintainers; [ alerque ];
-        license.fullName = "MIT/ICU";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.unicode-30
+        ];
         description = "Lua interface to Unicode CLDR data";
         longDescription = "Unicode CLDR (Common Locale Data Repository) data and Lua interface.";
       };
@@ -548,7 +557,10 @@ final: prev: {
 
       meta = {
         homepage = "http://cosmo.luaforge.net";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Safe templates for Lua";
         longDescription = ''
           Cosmo is a "safe templates" engine. It allows you to fill nested templates,
@@ -582,7 +594,10 @@ final: prev: {
 
       meta = {
         homepage = "http://keplerproject.github.io/coxpcall";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Coroutine safe xpcall and pcall";
         longDescription = ''
           Encapsulates the protected calls with a coroutine based loop, so errors can
@@ -617,7 +632,10 @@ final: prev: {
       meta = {
         homepage = "http://25thandclement.com/~william/projects/cqueues.html";
         maintainers = with lib.maintainers; [ vcunat ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix.";
       };
     }
@@ -690,7 +708,10 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/hishamhm/datafile";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A library for handling paths when loading data files";
         longDescription = ''
           datafile is a library for avoiding hardcoded paths
@@ -732,7 +753,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/astoff/digestif/";
-        license.fullName = "GPLv3+ and other free licenses";
+        license = lib.licenses.AND [
+          lib.licenses.gpl3Plus
+          lib.licenses.free
+        ];
         description = "A code analyzer for TeX";
         longDescription = ''
           A code analyzer for TeX documents, including LaTeX and BibTeX.  It
@@ -767,7 +791,10 @@ final: prev: {
 
       meta = {
         homepage = "https://dkolf.de/dkjson-lua/";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "David Kolf's JSON module for Lua";
         longDescription = ''
           dkjson is a module for encoding and decoding JSON data. It supports UTF-8.
@@ -950,7 +977,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/fifo.lua";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A lua library/'class' that implements a FIFO";
       };
     }
@@ -1371,7 +1401,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/ldbus";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A Lua library to access dbus.";
       };
     }
@@ -1445,7 +1478,10 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/pavouk/lgi";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Lua bindings to GObject libraries";
         longDescription = ''
           Dynamic Lua binding to any library which is introspectable
@@ -1475,7 +1511,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hoelzro/lua-linenoise";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A binding for the linenoise command line library";
       };
     }
@@ -1578,7 +1617,7 @@ final: prev: {
       meta = {
         homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lmathx";
         maintainers = with lib.maintainers; [ alexshpilkin ];
-        license.fullName = "Public domain";
+        license = lib.licenses.publicDomain;
         description = "C99 extensions for the math library";
         longDescription = ''
           An extension of the Lua math library with the functions
@@ -1613,7 +1652,7 @@ final: prev: {
       meta = {
         homepage = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.html";
         maintainers = with lib.maintainers; [ alexshpilkin ];
-        license.fullName = "LGPL";
+        license = lib.licenses.free;
         description = "Lua API for the GNU MPFR library";
         longDescription = "The MPFR library is a C library for multi-precision floating-point computations with correct rounding. This extension allows the use of the MPFR library from within Lua.";
       };
@@ -1681,7 +1720,10 @@ final: prev: {
 
       meta = {
         homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Parsing Expression Grammars For Lua";
         longDescription = ''
           LPeg is a new pattern-matching library for Lua, based on Parsing
@@ -1748,7 +1790,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/sqmedeiros/lpeglabel/";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Parsing Expression Grammars For Lua with Labeled Failures";
         longDescription = ''
           LPegLabel is a conservative extension of the LPeg library that provides
@@ -1788,7 +1833,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Regular expression library binding (GNU flavour).";
         longDescription = ''
           Lrexlib is a regular expression library for Lua 5.1-5.4, which
@@ -1825,7 +1873,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
         maintainers = with lib.maintainers; [ junestepp ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Regular expression library binding (oniguruma flavour).";
         longDescription = ''
           Lrexlib is a regular expression library for Lua 5.1-5.4, which
@@ -1861,7 +1912,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Regular expression library binding (PCRE flavour).";
         longDescription = ''
           Lrexlib is a regular expression library for Lua 5.1-5.4, which
@@ -1898,7 +1952,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
         maintainers = with lib.maintainers; [ wishstudio ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Regular expression library binding (PCRE2 flavour).";
         longDescription = ''
           Lrexlib is a regular expression library for Lua 5.1-5.4, which
@@ -1934,7 +1991,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Regular expression library binding (POSIX flavour).";
         longDescription = ''
           Lrexlib is a regular expression library for Lua 5.1-5.4, which
@@ -2170,7 +2230,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/Lua-cURL";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Lua binding to libcurl";
         longDescription = "";
       };
@@ -2231,7 +2294,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-iconv/";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Lua binding to the iconv";
         longDescription = ''
           Lua binding to the POSIX 'iconv' library, which converts a sequence of
@@ -2317,7 +2383,10 @@ final: prev: {
 
       meta = {
         homepage = "https://fperrad.frama.io/lua-MessagePack/";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "a pure Lua implementation of the MessagePack serialization format";
         longDescription = ''
           MessagePack is an efficient binary serialization format.
@@ -2512,7 +2581,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/fffonion/lua-resty-openssl";
-        license.fullName = "BSD";
+        license = lib.licenses.free;
         description = "No summary";
         longDescription = "FFI-based OpenSSL binding for LuaJIT.";
       };
@@ -2551,7 +2620,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/bungle/lua-resty-session";
-        license.fullName = "BSD";
+        license = lib.licenses.free;
         description = "Session Library for OpenResty - Flexible and Secure";
         longDescription = "lua-resty-session is a secure, and flexible session library for OpenResty.";
       };
@@ -2635,7 +2704,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hoelzro/lua-term";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Terminal functions for Lua";
       };
     }
@@ -2737,7 +2809,10 @@ final: prev: {
       meta = {
         homepage = "http://github.com/brimworks/lua-yajl";
         maintainers = with lib.maintainers; [ pstn ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Integrate the yajl JSON library with Lua.";
       };
     }
@@ -2842,7 +2917,10 @@ final: prev: {
 
       meta = {
         homepage = "http://bitop.luajit.org/";
-        license.fullName = "MIT/X license";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Lua Bit Operations Module";
         longDescription = ''
           Lua BitOp is a C extension module for Lua 5.1 which adds bitwise operations on numbers. 
@@ -2997,7 +3075,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Database abstraction layer";
         longDescription = ''
           LuaDBI is a database interface library for Lua. It is designed 
@@ -3042,7 +3123,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Database abstraction layer";
         longDescription = ''
           LuaDBI is a database interface library for Lua. It is designed 
@@ -3087,7 +3171,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Database abstraction layer";
         longDescription = ''
           LuaDBI is a database interface library for Lua. It is designed 
@@ -3132,7 +3219,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Database abstraction layer";
         longDescription = ''
           LuaDBI is a database interface library for Lua. It is designed 
@@ -3249,7 +3339,10 @@ final: prev: {
           arobyn
           flosse
         ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "XML Expat parsing";
         longDescription = ''
           LuaExpat is a SAX (Simple API for XML) XML parser based on the
@@ -3285,7 +3378,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/facebook/luaffifb";
-        license.fullName = "BSD";
+        license = lib.licenses.free;
         description = "FFI library for calling C functions from lua";
         longDescription = "";
       };
@@ -3319,7 +3412,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/lunarmodules/luafilesystem";
         maintainers = with lib.maintainers; [ flosse ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "File System Library for the Lua Programming Language";
         longDescription = ''
           LuaFileSystem is a Lua library developed to complement the set of
@@ -3429,7 +3525,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lualogging";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A simple API to use logging features";
         longDescription = ''
           LuaLogging provides a simple API to use logging features in Lua. Its design was
@@ -3461,7 +3560,10 @@ final: prev: {
 
       meta = {
         homepage = "http://25thandclement.com/~william/projects/luaossl.html";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Most comprehensive OpenSSL module in the Lua universe.";
       };
     }
@@ -3493,7 +3595,10 @@ final: prev: {
       meta = {
         homepage = "http://github.com/luaposix/luaposix/";
         maintainers = with lib.maintainers; [ lblasc ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Lua bindings for POSIX";
         longDescription = ''
           A library binding various POSIX APIs. POSIX is the IEEE Portable
@@ -3532,7 +3637,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/dpapavas/luaprompt";
         maintainers = with lib.maintainers; [ Freed-Wu ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A Lua command prompt with pretty-printing and auto-completion";
         longDescription = ''
           luaprompt is both an interactive Lua prompt that can be used instead
@@ -3593,7 +3701,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hoelzro/lua-repl";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A reusable REPL component for Lua, written in Lua";
       };
     }
@@ -3902,7 +4013,10 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/luasql/";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Database connectivity for Lua (SQLite3 driver)";
         longDescription = ''
           LuaSQL is a simple interface from Lua to a DBMS. It enables a
@@ -4079,7 +4193,7 @@ final: prev: {
       meta = {
         homepage = "http://github.com/bluebird75/luaunit";
         maintainers = with lib.maintainers; [ lockejan ];
-        license.fullName = "BSD";
+        license = lib.licenses.free;
         description = "A unit testing framework for Lua";
         longDescription = ''
           LuaUnit is a popular unit-testing framework for Lua, with an interface typical
@@ -4237,7 +4351,10 @@ final: prev: {
       meta = {
         homepage = "https://github.com/rktjmp/lush.nvim";
         maintainers = with lib.maintainers; [ teto ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Define Neovim themes as a DSL in lua, with real-time feedback.";
         longDescription = ''
           Lush is a colorscheme creation aid, written in Lua, for Neovim.
@@ -4270,7 +4387,7 @@ final: prev: {
 
       meta = {
         homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
-        license.fullName = "Public domain";
+        license = lib.licenses.publicDomain;
         description = "A library for UUID generation";
         longDescription = ''
           A library for generating universally unique identifiers based on
@@ -4306,7 +4423,10 @@ final: prev: {
       meta = {
         homepage = "http://github.com/gvvaughan/lyaml";
         maintainers = with lib.maintainers; [ lblasc ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "libYAML binding for Lua";
         longDescription = "Read and write YAML format files with Lua.";
       };
@@ -4508,7 +4628,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mpeterv/markdown";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Markdown text-to-html markup system.";
         longDescription = "A pure-lua implementation of the Markdown text-to-html markup system.";
       };
@@ -4538,7 +4661,10 @@ final: prev: {
 
       meta = {
         homepage = "http://keplerproject.github.io/md5/";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Checksum library";
         longDescription = "MD5 offers checksum facilities for Lua 5.X: a hash (digest) function, a pair crypt/decrypt based on MD5 and CFB, and a pair crypt/decrypt based on DES with 56-bit keys.";
       };
@@ -4693,7 +4819,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-mimetypes";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "A simple library for looking up the MIME types of files.";
         longDescription = ''
           This is a simple library for guessing a file's MIME type. It includes
@@ -5304,7 +5433,10 @@ final: prev: {
       meta = {
         homepage = "https://lunarmodules.github.io/penlight";
         maintainers = with lib.maintainers; [ alerque ];
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Lua utility libraries loosely based on the Python standard libraries";
         longDescription = ''
           Penlight is a set of pure Lua libraries for making it easier to work with common tasks like
@@ -5339,7 +5471,10 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/nvim-lua/plenary.nvim";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "lua functions you don't want to write ";
         longDescription = ''
           plenary: full; complete; entire; absolute; unqualified. All the lua functions I don't want to write twice.
@@ -5884,7 +6019,10 @@ final: prev: {
 
       meta = {
         homepage = "http://lua-stdlib.github.io/_debug";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Debug Hints Library";
         longDescription = ''
           Manage an overall debug state, and associated hint substates.
@@ -5920,7 +6058,10 @@ final: prev: {
 
       meta = {
         homepage = "https://lua-stdlib.github.io/normalize";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "Normalized Lua Functions";
         longDescription = ''
           This module can inject deterministic versions of core Lua
@@ -5959,7 +6100,10 @@ final: prev: {
 
       meta = {
         homepage = "http://lua-stdlib.github.io/lua-stdlib";
-        license.fullName = "MIT/X11";
+        license = lib.licenses.AND [
+          lib.licenses.mit
+          lib.licenses.x11
+        ];
         description = "General Lua Libraries";
         longDescription = "stdlib is a library of modules for common programming tasks, including list, table and functional operations, objects, pickling, pretty-printing and command-line option parsing.";
       };
@@ -6292,7 +6436,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rest-nvim/tree-sitter-http";
-        license.fullName = "UNKNOWN";
+        license = lib.licenses.unfree;
         description = "tree-sitter parser for http";
       };
     }
@@ -6445,7 +6589,7 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/euclidianAce/tree-sitter-teal";
-        license.fullName = "UNKNOWN";
+        license = lib.licenses.unfree;
         description = "tree-sitter parser for teal";
       };
     }

From d278f3dd4db11e30dd102d42b7753056d576c396 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 8 Jul 2026 18:48:08 +0100
Subject: [PATCH 044/110] aube: 1.9.1 -> 1.26.0

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

diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix
index 4a27586e5777..b4c777b2ebba 100644
--- a/pkgs/by-name/au/aube/package.nix
+++ b/pkgs/by-name/au/aube/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aube";
-  version = "1.9.1";
+  version = "1.26.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "aube";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uwOEou6DH+bePNupYKmTc82xQV9T08bDmSPG9RU9yBk=";
+    hash = "sha256-bQDDLgO5dG9kMF9VDnHGwuMZjWrbNT5Ia90rJrERDaE=";
   };
 
-  cargoHash = "sha256-CBI44O2iMwdMym+ZOO9MvJQ73n+12J6FjzIXAOQTGT0=";
+  cargoHash = "sha256-L9UiSO9UL8kBOebFXrZqbIJ/V4tobl1NYAdlktmX2lY=";
 
   nativeBuildInputs = [ cmake ]; # libz-ng-sys
 
@@ -41,9 +41,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Fast Node.js package manager";
     homepage = "https://github.com/jdx/aube";
-    changelog = "https://github.com/jdx/aube/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/jdx/aube/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ chillcicada ];
+    maintainers = with lib.maintainers; [
+      chillcicada
+      Br1ght0ne
+    ];
     mainProgram = "aube";
   };
 })

From 9d75f22a1db7ac5bd8861953b458a33747e9453d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 11 Jul 2026 16:56:55 +0200
Subject: [PATCH 045/110] grafana: 13.0.3 -> 13.1.0

ChangeLog: https://github.com/grafana/grafana/releases/tag/v13.1.0
---
 pkgs/by-name/gr/grafana/missing-hashes.json   | 210 ++++++++++++------
 pkgs/by-name/gr/grafana/package.nix           |  16 +-
 .../gr/grafana/yarn-4.14-support.patch        |  23 --
 3 files changed, 144 insertions(+), 105 deletions(-)
 delete mode 100644 pkgs/by-name/gr/grafana/yarn-4.14-support.patch

diff --git a/pkgs/by-name/gr/grafana/missing-hashes.json b/pkgs/by-name/gr/grafana/missing-hashes.json
index 9107957eb5a9..c09679ae9185 100644
--- a/pkgs/by-name/gr/grafana/missing-hashes.json
+++ b/pkgs/by-name/gr/grafana/missing-hashes.json
@@ -1,56 +1,56 @@
 {
   "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129",
-  "@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
+  "@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3",
   "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49",
-  "@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
+  "@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6",
   "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1",
-  "@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
+  "@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848",
   "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec",
-  "@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
+  "@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3",
   "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001",
-  "@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
+  "@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d",
   "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a",
-  "@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
+  "@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524",
   "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f",
-  "@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
+  "@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3",
   "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7",
-  "@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
+  "@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021",
   "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c",
-  "@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
+  "@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f",
   "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4",
-  "@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
+  "@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689",
   "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a",
-  "@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
+  "@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b",
   "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8",
-  "@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
+  "@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a",
   "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d",
-  "@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
+  "@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1",
   "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1",
-  "@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
+  "@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d",
   "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1",
-  "@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
+  "@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb",
   "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055",
-  "@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
+  "@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0",
   "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99",
-  "@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
+  "@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3",
   "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682",
-  "@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
+  "@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3",
   "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7",
-  "@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
+  "@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6",
   "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f",
-  "@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
+  "@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41",
   "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a",
-  "@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
+  "@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051",
   "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d",
-  "@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
+  "@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec",
   "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62",
-  "@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
+  "@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745",
   "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936",
-  "@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
+  "@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951",
   "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e",
-  "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
+  "@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029",
   "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855",
-  "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
+  "@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0",
   "@nx/nx-darwin-arm64@npm:22.5.4": "003e36b1b5c7e97cb253133a6a978d59edd2d75d4d57202169647ed8efaa052ea6b8025d79aefd6eec119b18423a3d6fef96c70e73a33a9a53134a64d25a3a4d",
   "@nx/nx-darwin-x64@npm:22.5.4": "e23cd9122715c8089393ead47a0ecd0948437c10fa4cb335fae237cbd984a7e464089bd2adb27837684eddfe0e5b0c469a069a8054d379b552b3e22d2799cb9e",
   "@nx/nx-freebsd-x64@npm:22.5.4": "1158a781e28cf886e131248ac1a70581578e51788eac92fd972938d21712085aed97116887bb687c7493548f8baba833f7baaefe9a96ec58515b9c5f2511ac14",
@@ -61,6 +61,46 @@
   "@nx/nx-linux-x64-musl@npm:22.5.4": "f2be6705e8203c0db17e5fc900f609de160052617075344429d5fa6da3a0f13a90ac654e90124df6100d7b2cde62acb84d9981d791eb8c494098896c19762274",
   "@nx/nx-win32-arm64-msvc@npm:22.5.4": "dbef169673a327f5764992da802e4adb4252d35ae8d708bef87b6f321cfb989165d2be80d35021278cbcd4243159cdd149be09519d8f694e9775bc6cbf46297d",
   "@nx/nx-win32-x64-msvc@npm:22.5.4": "8071d2641f0959957503e353fb6fa4357910fcc3eef403fab8400d8363dbbf959d8f0c225475516e903fc32cdd5389fee7c36e784d164620cb67632ccc944797",
+  "@oxc-parser/binding-android-arm-eabi@npm:0.130.0": "dee6fe4776c32499ea409eb9de646a61d14e3ceac9d0cce1a0cbf2d5da68ee39f406cadee362b1424a4baab14ddd3f4cbde999ec3e8dadd0f69c78ba74277514",
+  "@oxc-parser/binding-android-arm64@npm:0.130.0": "4c406c48f914da9419bcee033cc4738be2ec2b3683044b8d464a0cd58676c8b928a9a8bb40e57a6404f92a098b7a2b2870bf3fbf92471e5f1f68fe18e71f6858",
+  "@oxc-parser/binding-darwin-arm64@npm:0.130.0": "b4584d7f9ed971c0a8a25ed5d3d3d7c356427b220c519212551e4c6ed85df8d75bae92294866858f053d527ab5755cc4871346abaacb5e888db232f920c986e5",
+  "@oxc-parser/binding-darwin-x64@npm:0.130.0": "564e32d8225de688270ca263c20ed5fbcdac1afd38a00027e548b6bf3a5427e7860d6321fa3364d58fe6477e8a996cee0060ffce85791e310c55ac3fd74d4090",
+  "@oxc-parser/binding-freebsd-x64@npm:0.130.0": "8e84a9a00f3cc030073e8435d2822c56c735bf5d681d8221ff70a36e288cefc593200fdf0e0a49795f1977456bcc9bf0fbc50f06063f825fe38f373e9a864a35",
+  "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.130.0": "f4bc5b1095be58d1fa4bdc7a884aa28f95511fb1b491dd78a5874f1cbec12c5710f79ccc13531881e081b4f8ccfadd73551f268ad1187d2f6f63a8085a05954e",
+  "@oxc-parser/binding-linux-arm-musleabihf@npm:0.130.0": "19b0463a3f4890aa80d726b8c92c8ac3da85a43fe80fc8173e4fdf7b24775d7dfdf9d131743e35a16d6c32bec99f6a5a1b3a6c6a8a497d57cd9d067314016d29",
+  "@oxc-parser/binding-linux-arm64-gnu@npm:0.130.0": "816ac7e05245e63f621162aa416bee946c25f44b518b8f02d4f1724d50c80db3feaf4e902fd8d0ab650071a335aaade613b2b6c7215e4fb23759aaaf074fe4e5",
+  "@oxc-parser/binding-linux-arm64-musl@npm:0.130.0": "3249219bef1e45e9a846856e00740a5f10a0217766774e3a5870cf63bd4693cf672709143e7979fa79911a5a37ec51710648993d0c863a5c4037d02f09597298",
+  "@oxc-parser/binding-linux-ppc64-gnu@npm:0.130.0": "3e4727f96ab39a3e8635fd4598f6fccd6fcd7379f516868717d77c1b572dfadeab7fe94bf16004123af461f4c5ea99ec8a2ae44183ba861aef0d0654d4e42f73",
+  "@oxc-parser/binding-linux-riscv64-gnu@npm:0.130.0": "fca1a09abccaca5b1037ad76f5ff87a44983818e62898b0839373a2b98a102b0de5821d9b87ea052f877127d019c34ac5f82121313a8ca3362d3d45cdd8f29ab",
+  "@oxc-parser/binding-linux-riscv64-musl@npm:0.130.0": "7bc889130bed795bee462fcd1fa63944980224fe7b8fef517c7f5622bdd1cb657e168c0244a9d8df4be71f5f7101d5ae47a7c486bc7b582705bdc66f0ad76248",
+  "@oxc-parser/binding-linux-s390x-gnu@npm:0.130.0": "7e98ea39ccf9d08a0000d82dd7a626b92ccf23dfa4f6a80ac30204435108050a389bfac14f1c36ee80d25d325c83e3384fbda3b9a88abea4f6a500971182e333",
+  "@oxc-parser/binding-linux-x64-gnu@npm:0.130.0": "bf365787c7dcf19f89070d241a01fef024a1242569070db3e005d329eca8317084630257501888db21bbb9309e74118e5713d319e3505cd6034ff6e4bc78321b",
+  "@oxc-parser/binding-linux-x64-musl@npm:0.130.0": "ca469b64eaeaa1a1f942ae4c5c00190276e933980a2fe2c1e491bdf50032323a2e22a906d6666f3c77aa0bc9cbb1d8d629fc6408ca0e53730d9d4146733bf62a",
+  "@oxc-parser/binding-openharmony-arm64@npm:0.130.0": "5a12f4e9d0cdbc00abbaa3cdb24e12b70d1204ee51da2aeba14ac8303cd64e2819e42e60841dd5bb5d5293bc1eca89e9366e7466b67392a1a8db3cc7aeba9674",
+  "@oxc-parser/binding-wasm32-wasi@npm:0.130.0": "2f6ba8f0f608273474188c7d984ac94495dac316aa5f3b9e230b398e3a1815e6588588c1b542b421f482004d814ff59e6d2e01c19be0d141010e354c48b60b35",
+  "@oxc-parser/binding-win32-arm64-msvc@npm:0.130.0": "d450bb6ecc0d0edf70d2cd8153fd39051c182addeda6a70bc4b755760f4079f0c749f520666a101e0046ee566f0ca32c0dadbc3def2db55303d04bd41a98d5ca",
+  "@oxc-parser/binding-win32-ia32-msvc@npm:0.130.0": "700738730e994801d9d378914498047f2a2999a73b46389a685260970e863cb839c8f2bbcb504c716b5d0fc56c75e93861196ce7befa6fcb8bede466261a25a3",
+  "@oxc-parser/binding-win32-x64-msvc@npm:0.130.0": "16a2c2f9a1c5d6bd254839388489e37d860cb67d28b6bb605561aacb460a0f77c2a39e4b96f869c9223f554d8a42e9f386b032f0a86fbbcc6db1b5b6be4b9337",
+  "@oxc-resolver/binding-android-arm-eabi@npm:11.19.1": "c727f6fba8c3f003494dccbcd1885a694871bb5e90c569751528cdc22ed860ca9b3a1aa63780f6b3d135839fbcb05dc00b96593ef63391334e4f39593eec817a",
+  "@oxc-resolver/binding-android-arm64@npm:11.19.1": "db14204c0a051ee3ae4c1f28faa3ec3e6de0083c0b92e75d17041a42be4035b799e650dda8aed9f3c278374f95f4423761cc49cb94b225a3dbf1ae22bfdc7689",
+  "@oxc-resolver/binding-darwin-arm64@npm:11.19.1": "9f6c21d248904d315df581f5d3d3a62bf302ca6e50c6b35d425ed64f886d6ca84ce29e156f0fda0cbc00f39d20c067fd6e66226c3a18d24d1c7ad6456f30ebee",
+  "@oxc-resolver/binding-darwin-x64@npm:11.19.1": "9bc9dcffcea10b8b49f515b81146104359afe4895ad94b164f436632029767f20ebbcc1481cad91d08d6e6b845f1f45229efe0dc1a64a9839c6d62d4efd82ad6",
+  "@oxc-resolver/binding-freebsd-x64@npm:11.19.1": "19e14b2de592215f53a29bd992b0bcd8b73e23f0b75e095e43a7fe02f8630c1e0556c4dcad9771565876b8cbc0005bdab07c375b000221899a9f89d64d078255",
+  "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.19.1": "5830e77af5d8bdc7cd24def91ae2a0cacd86cdf1ccc9a113ea2ed15392135e8e5eba7f50b0a68a4c3c3b80ea052d1896b8954d16343804458bdefc085ae3d56f",
+  "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.19.1": "84141385161c4e1fc27069f4d4a108b86fa501888e355415adcef4991a8e7d50ba97bdaa48d09caa66637079edc4f8f40218e6419d72c25b014aef4de9d9156a",
+  "@oxc-resolver/binding-linux-arm64-gnu@npm:11.19.1": "17a77a2df6095bc0dbc119652ac978154ccedf1f4147767a90e24862f98d1a070c5035c8a6b598d4ffedd3abfbb56e617485db49db212a71d0b0a5682ef752ff",
+  "@oxc-resolver/binding-linux-arm64-musl@npm:11.19.1": "eca0e0c1266040eba78c2cca4fc67878c672cc51350f7f258e6f3b2fd0721fb458fd37e60d4abc2dc5aa467264fb58bfeb7eb056bad0963b511547cb1811d915",
+  "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.19.1": "944c9c6f306fdb48b5f5a7e940619dd00d9c70e07d96c784ce43167d68558f5067c2345fad40e63aecabaa8eaebea3fc5a08bc2253f8a93a62f729b054abbd55",
+  "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.19.1": "b161c4ba912c816007a7c9aee2a202924eec39700affeee365b88ea4174c15dd5713d0cfd1baaa6e5bfe6cb43d99de841ba3653cac18c610ec9bf39bb0fef05d",
+  "@oxc-resolver/binding-linux-riscv64-musl@npm:11.19.1": "6edaee8d1d468764d5034ad430a13097d81f5b80b67d0b71b738ed986a268f1d8504f233e6709ad504105014dcf91cdbccfa3458ffb5992d0a1a79a852e1b855",
+  "@oxc-resolver/binding-linux-s390x-gnu@npm:11.19.1": "3132d420ecae98cdaab5cd88e808197809ed471b5a60544d1be6576fcb6f286fd881ffb70fca61301411eaa10ce5bf3aab9dc41ad53b697fb93cf9d36f6ac5b7",
+  "@oxc-resolver/binding-linux-x64-gnu@npm:11.19.1": "b7d007688ca198b83fe7eb06e532dfbda1a9afe30f2ae2f6204d9c6a247c66a2c4b3c3cc099d4f5ddfd506dbab1bf7fbf688143ac5b268a80fddebfa95e222a1",
+  "@oxc-resolver/binding-linux-x64-musl@npm:11.19.1": "0b47e764d1fc1270726338041e25d870269755b56e620125b6a5d4e6c82842d1e8e9b80bf6e481f12d6f7f7d1a20f8c6af5a2b6f3a0d29ce1803bc5008e557da",
+  "@oxc-resolver/binding-openharmony-arm64@npm:11.19.1": "1f84a346f64ae2a37a3b956f3624895a97bb89567680d5c184b0afd1d6f2d1ef97af88a04c10baa4dd839065bc450823e551a76321660c510ece6befb8ca46e8",
+  "@oxc-resolver/binding-wasm32-wasi@npm:11.19.1": "a8fa76d0c95f28c772c823923ef247ad8ac1b7f38e9f66b7b74d05c54be61c50bcdc905578655be0a58c94ecacc7677db8cb70607a8c1771cb85e61b2842e9de",
+  "@oxc-resolver/binding-win32-arm64-msvc@npm:11.19.1": "00268100351260e55df6f0c28271e3809093a164bdb368fba3575cd2aaf31a88e4e1ff179e3a399d808edda249b267ec12f8671af287591c57c359560250c3c6",
+  "@oxc-resolver/binding-win32-ia32-msvc@npm:11.19.1": "3a83d915e805ed0d65164a1cb41d3366624b088e072f4923c50ad7dc15e9b3f48da9faf2775fc226662c785475bd7a9e1a0ac49265984142191f13185ab7c9e3",
+  "@oxc-resolver/binding-win32-x64-msvc@npm:11.19.1": "8cde7acdaa684a2fbb979db42621132cc2fbb6505ce8cf37582b85091bc4846a006a42e12b58e7e6cc0019f524bd4811109c488d7c8865d8df2f796a7995d3c7",
   "@parcel/watcher-android-arm64@npm:2.4.1": "279ac643abaccb2f9c986f35e39478e242b33bdda3128ca9e728ca1429b923d5f1bdc22268946138b0ced130ac3b2294cf2a44ff080b27c06a79062a5bbba13c",
   "@parcel/watcher-darwin-arm64@npm:2.4.1": "312fd03aaf7e75824fb84b6b99649caa4db01d55320320d88fb75ad5151bd24876555ae19fe8fdf81f92952bcf01e0a82db7c3bf540e54cee5beb20b85a6a80c",
   "@parcel/watcher-darwin-x64@npm:2.4.1": "47d8fd40e17e419459294b75c455ac7ce2a53dfcc578f2c2ab0fb0f59ad1ee6a6e87b6ecb92708139f48ed8568ffdd675fe5e57ed1468abac6a2a650fe490926",
@@ -73,59 +113,87 @@
   "@parcel/watcher-win32-arm64@npm:2.4.1": "a1395a97d1373dd7075da7234af8996302e45cb9d2507633a0f8188c239e8121e63842dded6fc13613986e0833c88435a8750b3c6b35d86b9e1af2b97430b940",
   "@parcel/watcher-win32-ia32@npm:2.4.1": "05a294e24923a02febe852154d8f8dd75fdeb53db8522c3bc87860523f1dc70d41a7507318b3ac93a24feda44526720dba2f1a7e0e20de7ca815c7dd175e3c11",
   "@parcel/watcher-win32-x64@npm:2.4.1": "28dc8dc547c4ef8b24193356bab99c4e5aafb2c8097e2d06b875c2ce4d767a9034ff82fbfac34a86fd331f8daea91a3aeee5c179ed69120c02e035f72dd44877",
-  "@rollup/rollup-android-arm-eabi@npm:4.59.0": "b2c5a1b261311a80e412c747b1f8644d43a472d6d45486d19becd78a1a75ec87422199783ac23c1178a7e94c2924be730e822062fe040f4dbc0093e6695ca84a",
-  "@rollup/rollup-android-arm64@npm:4.59.0": "5eb6a5e2c73348d2362e1df2b6e7b7eeb3c86ac12e7a1dcbfa435e5cd0d35771d6da7c319f60934884b1a8168001d2882e99c14ffb68916e419503fa4da13c8b",
-  "@rollup/rollup-darwin-arm64@npm:4.59.0": "64b5aa35d5140be4f0df2726485a3d375fccde2279f6aea82d8d256a7325cb6094eb01108a5aefd95b295bff25010447adf1d849b496fdab911afc5807866eb1",
-  "@rollup/rollup-darwin-x64@npm:4.59.0": "b14fe9c114130c89baaf807c2a69fd4962d0a6eb5464ab6a846b2ea023a63e4e3eb092c1cd293c13c5867c61ff09f01877294755a72c202ceaf0e497316ba954",
-  "@rollup/rollup-freebsd-arm64@npm:4.59.0": "1ce79859de5a6e48c162268cf8a33deedc9a318cb6229489f705bb9fe3903b39c91cdc2529b65d09b57c8862650c0eac350df80f1b798c86f7abd652f3d44179",
-  "@rollup/rollup-freebsd-x64@npm:4.59.0": "751dd34d4aea1521f4671aa0aa1377c0f2cdf82b04c1e14c24778774298b0db6ae58a7d574a0802ccefe8ad0631c4f1b4f6a8f88729520dd20a2be313045523b",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.59.0": "6cc3a24c867feec15fe90d23920a480e95ff7ed216e57e258574dd4180086f416711724438cab144f132b4537a9d1728bd6866989a88d43c2de87a9036ef8550",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.59.0": "59022fc0788e950c15c9461a0b9b2b6e48fdf20678f97fc7c63e39c97c3200674f6ca4570eff40582e14be191361da8400c217e380a94a728d2190cab7443056",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.59.0": "78e80b5c7d01a30f4d7adaea126dc376021291d8328224eed9f29a0ff4f82ec2168afdff03d7fc5c4e4c1cb57c4056e8bb1007c5d3d5b2ef07f148130890ff2f",
-  "@rollup/rollup-linux-arm64-musl@npm:4.59.0": "35c6bda8aac1cc017b5a0841f9d392d9ba96379ac871593e9b7864a34356b1074982d0a0f7ee9d19af28f252ceeb61c026541b57e09c147c7475ab7bf1c5f6e5",
-  "@rollup/rollup-linux-loong64-gnu@npm:4.59.0": "fbb0cac0c248e465c32450cd3d369eb24cf1a75bded681a58cf99d1652b60ac5269ea6d619da429e5589360563cf6c6d879f940e3f436d8c283c957b49dace03",
-  "@rollup/rollup-linux-loong64-musl@npm:4.59.0": "39c1ef5d7e36bd84386cf8e50a7b26fabae26a7f819e481489ec8cba6528e6ae00d93e7d7aa54dda83a3166842e5e501edc1f743d31be4c971d2bb5e16f8ef90",
-  "@rollup/rollup-linux-ppc64-gnu@npm:4.59.0": "885029215e74dfd8a0afa747f53c597962c4186bfa16b86b986d85a3de460b177e1ba38f9823d5602f972dc33720a1a7b84a0bb441cc77aa2cb2b988eb90f3fb",
-  "@rollup/rollup-linux-ppc64-musl@npm:4.59.0": "6785e3d207e63b8f840da35b738b00090d20f85186ebf2654bd891556f970398847d3abf9b1ae5cf19aa098de8776454cd0b42b78e75d1142532051d6f9e9a58",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.59.0": "9ccfd99174d06ba523cad217068d527a6667a770e0332abc1f55a64b02fd09e586e542ec8731702888a771477257c00b6334911d72205093f1d10fc1baaec9b1",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.59.0": "3a1ebc6fc9683a10e8c5d4e0080897bc247a7ba52aa39b0f586e80b92cefaa5bcb570c0dcf1475b7ea87a44dc551524d7ab9f5717e6ebdf85a55d7d4447dbfd3",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.59.0": "df4cf92ef58379fd530ae14363bb8547352bf9c65ef68f6f01b6f4a1bcc558d0c4e2363361c35cb1627a2d87f30c579126dda1c91a36efe81e1002d26304f2a9",
-  "@rollup/rollup-linux-x64-gnu@npm:4.59.0": "fd48952a450a7c3f117445694878ab99941858f6c40920aef34678dea7880213af504ef490cdb269e038efbf5a497d4aab3cbf0a785ffcb0ee9bdc3b73e9c0a2",
-  "@rollup/rollup-linux-x64-musl@npm:4.59.0": "58811bbe6e78b4b0cce1b2c9f84768fe16bef8784152f01aa3e6479a92ebbe377cdd70c2d676cb5df93d62139a94eb0b5082f68347d57f2f364cc50cebc0a3b8",
-  "@rollup/rollup-openbsd-x64@npm:4.59.0": "f21f3d73b87f5298fa1d314d2d344319d55d9aea777d9551b5ede0176980a406a6e48b1f08ade1dd96e993460833a282b3abdce179f75af45d12b58ada8a1aed",
-  "@rollup/rollup-openharmony-arm64@npm:4.59.0": "b2eda04dd7fff48ca968a6a7a166aef4082cbeb2d1c41e45fd9824c80babc483ec86f6ed6e3b70ebeeedabb9f0d99cc611959652e87f6beaa9eea3c5d7691ae8",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.59.0": "656459997e6f192387a29e3a88e734f981db1af6e78c1ed857e3596b46d361398e47ab390774d2bfee17e94aa760dd16a0448fa868f3f56b5f639eede29345c8",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.59.0": "f0eabd43696d0a25bad55194bc0363ded364674ad0c1dd117d1e3fafbc4d0f077a2c60e81d756baaaa0859012949316d204c67b14c9f3ab8a80c9ea76983fc95",
-  "@rollup/rollup-win32-x64-gnu@npm:4.59.0": "c39d866bf3305397b1772c0ecc4d7bc9b9b1f0240d4425f1e938d4aaed206d8418d5b6e1e11608e7c4c4258cd723f101cc40e8beb1758d163adb1b6cd70bcc35",
-  "@rollup/rollup-win32-x64-msvc@npm:4.59.0": "34e03ac4acaf58e756ab0aec133d28c1cdcebde173e20a471f3f66292601a2a0c9b0bc2a24023ca30162ce039fddcc5c0264789d9f242945de169646b752c7cf",
+  "@rollup/rollup-android-arm-eabi@npm:4.60.1": "02e0a1742b32eacea5bd3f074145a0563d3ff7a8983d55e48453f71e23d4824869ad4a8c5a45a75e3bddbcb666177644f6ab7cea820d72702648e165bf4024e3",
+  "@rollup/rollup-android-arm64@npm:4.60.1": "088feba3a68b3fdf9b8f6bc25b93b6373fa705fc2a8650e2a8767cd14dfb0f38725d3b90cd784bb034d041fb704fdfeed94a0cdc711b74ad8fdf0f4ccbd1e208",
+  "@rollup/rollup-darwin-arm64@npm:4.60.1": "a69de43444a8313b4ed3550f2f6a756cca02baa37c0d4a6cecbe0ac1c50b76d7cd441c8ebc90c88c057f37830597082546261c86967e49fa3ed613767f54aa56",
+  "@rollup/rollup-darwin-x64@npm:4.60.1": "2d043947daa7fb9fce4fa28eac48a73c1edc11585c8320606e9a15e3db83264f0737d141b7969c2c0f95ffeac3816eefe2dab48e17d127bc4e999d28ba60faf9",
+  "@rollup/rollup-freebsd-arm64@npm:4.60.1": "c69cce5b2178252795852a95e90cd75dfdc753ebde161be4bee5bae6674db1ff5e5aaa3971a0c0a2e0321c162c1e9cf5f89619aa207d6b5596659149fd31f8c7",
+  "@rollup/rollup-freebsd-x64@npm:4.60.1": "04a6efd2098a3c3e5eea9714aa064442142bef9f7ab59212c2438907fdb3b8ff2f29f1f226fcb0ad04a969f8435838fbc424df6512932327d8235f08b17a9031",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.60.1": "6f1d9cfaaaa327a33f0555dabc37815c662be5089f21e57f507e79886c1d5fda7e4edb892893b711560105041e5e574ac49ffb5223e9030e1a460266e914ab34",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.60.1": "01786a2cf6c249e51331fa1faa381bad0cdc7681be77396fe81dccc5b4cfae0e1b82ad048081053bebec9365f7b1613b63cdbdc8fb8660a2733d2e2d3601c70b",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.60.1": "c3eaa2a6c142104a43f1f76f3a357d476afffab027b999872b759398f6d9358a002b29faa5913840d75e27d628a6e31dc433c18e6a49098b693d6a43f40daec7",
+  "@rollup/rollup-linux-arm64-musl@npm:4.60.1": "f080f94433fbd1a4d4d21c15742a5a8859250ef63a6fde6ca9356ee7b8719a32310fc911bb5015717a0c1a01aec139d69af296b3bc284b4d23543d30ac7e18de",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.60.1": "99feb6b3dd8cae53900a5a423d6d0ea4feb8f4c8c7a5ba8abf1b67b10fa3094486debf1a61cd8a285c776aa3539cc1a35a44923c108d31eda1975089c09e060f",
+  "@rollup/rollup-linux-loong64-musl@npm:4.60.1": "e57a6dc1ea603400ae975ddc1db77c06575ae6a921c0b082ecc4c9ca3dd79fd5d5a7ab49e643525f1c6792a9786d9d8817aa7d18c4a21ab88def7d2417601f57",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.60.1": "4920d6dfa70c168a55db40124842570f929663879b6e690b278419abd38989ae8ce3c44f626bb94d5bc620b8e95e5acaa6f1dda36e9c07957f935a92bd3a63f9",
+  "@rollup/rollup-linux-ppc64-musl@npm:4.60.1": "56d4b2f07052f31b9110ae5bdfc7949b7054dc3c6ab29d2ffd4b1df749b21a8e1d8374cec1ab40517747703bbc1ed8c55c8ea2830f2258bdbaea85fbe1936bf1",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.60.1": "4358b23ff3f0cc293826866d66628145581cc39cec1c4f360ede66d0fce68948ea58ab4e82761e9922e0b1f6f37442bdd79ff8dbb070d888907740e106f720ec",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.60.1": "696a7f7ef430b837e5fbf2772b5380383950cfa469b43a68fdf626a91739915afb33d51312e9006ae27deaeaecc9728590e7fd5ec0502235fa2a7d461dad5526",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.60.1": "36fc046b53aa7e174996987a80c4dbacf2543bb67542d04039221554d865ce7bb0881059ea9e153b50943b3da7ac992021124e88ad642caf4d5fb133b2a0044c",
+  "@rollup/rollup-linux-x64-gnu@npm:4.60.1": "00416ed510f926d62c483912e8dc04888494cbdfd03a2acec85ffe9c451f24095141a505c2ad7ba082cd72f29b6586ac11b2fef0f7ebd95c6d15c64ce9507cd1",
+  "@rollup/rollup-linux-x64-musl@npm:4.60.1": "a5591cff52082db7a40cc1beb62729b153c1c381cd365f19860cd8aa82920c8086ca213fc4c168c5cbf585e3a35d98fdd7c2b40347d1f8f3d0dfc4094d6a17d2",
+  "@rollup/rollup-openbsd-x64@npm:4.60.1": "2aca6ce67c865613d317f84ea73d940e099754c1462f2d40219232118330062f0534cc3bec5c154ee8fa93e4f53b5dfd57b0365ef76c03f4e89b8c0808e14af6",
+  "@rollup/rollup-openharmony-arm64@npm:4.60.1": "cfdca7233d29e2a293cdfff5ebb9d1cefb407c900d84884cc92a38f82d9fa81bbf5353a88930698ae780b92816813e27fc136cce08608851a247659487cbab24",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.60.1": "d55cc9cd6512e2a64572d9708ce0bc949ef597d5edf81b7b706e48f80d954b72c0d7564187c94a9a0aa0b496a3b443b412b94fb5b8632ed43395a8e49cb50e27",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.60.1": "5ace4fabec2f13139b4dbd48512f5c1520fd2d52df7123c3fb4534fd01e86fe7957aab70b54c14dd3b4b40c88ba9ec4532751bdbb6337b462f9cf0d92833638a",
+  "@rollup/rollup-win32-x64-gnu@npm:4.60.1": "f085d1721e4d0dec6f05a5488e61ca4c98f361952aec3badfa03da8156cae19db6d897a646b59dd5c65772b7bf4f3fca698d2615b27f40cf86881dace95bc082",
+  "@rollup/rollup-win32-x64-msvc@npm:4.60.1": "d0879e0c8278b612f9689e03fbccf01de06beded0319365892ab028811e2edc7b5773f57f2958559571dd2e47d08145b909b10d058a59e7c468a541caaa08634",
+  "@rspack/resolver-binding-darwin-arm64@npm:0.2.8": "fc62adf359f60ae5a62d78009ca993cd22ade917422447fe19763ab145e899284bbaec0ba58e885e81011b1f71b3c5f20946da8d5800ff9f824552e19fda4ea3",
+  "@rspack/resolver-binding-darwin-x64@npm:0.2.8": "ed8abe29b2a8950e9e799be5c4a8ec66039890349c97d183fc0a5391d8e1457dc85fc8e229cf5899e5475169e8c630ae2ba81f79f9b8ef05c8c2a982a8d8f865",
+  "@rspack/resolver-binding-linux-arm64-gnu@npm:0.2.8": "1d577bf4d55f4e3dd3a4310af840d6229d7ca39e17202d8bcfc3267f6934927a5a7a9ba36260b8c0449a1dc94eda33d663d6cb4d43c3d54269f600b6c1f39774",
+  "@rspack/resolver-binding-linux-arm64-musl@npm:0.2.8": "5c9f1a2fb839bf027830be3d62a7e67f10fd0f63d37d14444e37dd4d32b5057cc5e76ed16e1ef0d96c3b02bed20658919d93d0a922670f7b1f9a79f1cb4efcb1",
+  "@rspack/resolver-binding-linux-x64-gnu@npm:0.2.8": "86bf0596f3b0245320d68cfd73560520bcd15ac541a7e2260ac98f6d32a9f3277387590564e52e62ae4a8b72f7c05ef34b44eba80b9596e18aaa943595e65229",
+  "@rspack/resolver-binding-linux-x64-musl@npm:0.2.8": "72cc901398aba0956c28e292b5efee87e5cb04e2ac53d037c9cca9e53575ea274a43503157dbf63046fb1b40766a5e4570d0da5d7e07105520e08f01c7da9a9f",
+  "@rspack/resolver-binding-wasm32-wasi@npm:0.2.8": "dec2a801c9b7d2e348209c229bd18d8098e6f4532db1e987221ac541da2ea8fc98f09713ed56e386d0c6f7555b720d9768e16d5298a10a3dd7ddbc8147ce7ba5",
+  "@rspack/resolver-binding-win32-arm64-msvc@npm:0.2.8": "325846d2997d7bfca1feeb77a6f71f2b8354502bfde6c060efe837c41cd5976f1c0c680be03ae88aba223de3a9167b9ae5f67d294ee10bb9e8d655e33ea5b7bc",
+  "@rspack/resolver-binding-win32-ia32-msvc@npm:0.2.8": "effefdc9c3c8acc39002c454a492330ccecf958945218f229838d088fafa3133691b973186555fba94da64184f54f2a854eb527f153ab8548693adfe8439702c",
+  "@rspack/resolver-binding-win32-x64-msvc@npm:0.2.8": "c0e74d6b2056f58251a93d35e55c8c69dfed6fc02c69f7a5f91fb1d0cc28ead0e755f4b6d6c322b32704ba648f1b5563747f58288ee78b15656aae06165726bf",
   "@swc/core-darwin-arm64@npm:1.13.3": "02e4c06e113dbf57a560c04bdfb0d9abc9eefbf6277a19f8f78fb42be710defd41bfd784f427a94dd23b371ce5c604a8cfae92509fef213c9de427ab3e64b25d",
-  "@swc/core-darwin-arm64@npm:1.15.17": "5699f18e1a03441a625d9304913f5cc4ecc0a348817e5527ed2463261da3b868e21e60a0f76c1d8c032d0aa95da3b745ea92683b57be85a85d0073bc889f8f42",
-  "@swc/core-darwin-arm64@npm:1.15.18": "1597877545538954d6445a21f4a102766f098aa2b0d55ded3a766993b527bf1bae9bca54e50e3289b8f6a0cdb42b550f65da38564340d954690df15d2e27f56a",
+  "@swc/core-darwin-arm64@npm:1.15.40": "5229e431490705bd39ec1937dc97c0c783bc2149dbafb554a27882f932dff476a01ff7a75f6b36674e8be83945f46b61f83e45abe7e0b2bfb7dc5dabb47ab3bf",
   "@swc/core-darwin-x64@npm:1.13.3": "39ed8633b500b8a32fd507c0a57ecbaed1d4840d75a1dcee9d8cafe36b378029299d9f5552404230800c186b7b972dd476401d7c216cb16f2d87c5f95ff8c58e",
-  "@swc/core-darwin-x64@npm:1.15.17": "e52ead49ec28a4f5799436f222298b923566516a015caa667dac0a6e68c3a1d102a944e2f4b328a8ba731b3b2098453ad4a3359fa47113459ff8172ab3d009ac",
-  "@swc/core-darwin-x64@npm:1.15.18": "326b8c3309c303a53bf4ed6afbfb0baee0acdb527253e734fe5cefc6916cea598d75fb508265e482143e92fabaf2cacfe9e3a30301ed527c32a727f998a65239",
+  "@swc/core-darwin-x64@npm:1.15.40": "22642bb1a0aa9632bb118c72727ac8d679cbf1dfb5f1e91d88d5e40764566dff57b81e87b9472ec42350920408aaef88924a45f8d75cd410ce310588f4aa8922",
   "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "d3889724b5b787db220a65424b5e5e4b2a587f658582905d5a296e8931f30bd42202c356d05d650cfb649984884b05e1513412edaf4ce97c7a055547e3d26fd0",
-  "@swc/core-linux-arm-gnueabihf@npm:1.15.17": "eeae5f54a2a051fdbe45efb5b21aa08c5646afd9d5032e0388f1d55b1ecad1ba4fee27546ecd08a1076f9ae290451f73633405ea0782241e5c69294613eafdf0",
-  "@swc/core-linux-arm-gnueabihf@npm:1.15.18": "0d26738b4675ee1ff5b0322295c947f351e6d2494303248971b601e2fcfd666a17357a030f0a745e11b60065329652daa58db44abcfc7620f2da8d92733dd0ee",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.40": "7478570116139c720316bf6c565d81f3bbd07f33fbc5bbf1f4f0667f906034b26b89ad9919a27fba5c8906170f424561003be1d0ad1933674c24b8fc75b45cbf",
   "@swc/core-linux-arm64-gnu@npm:1.13.3": "9ab7ed4e31d4dba8df4b25109248c0225c33573a0046ef7380449fe348a9404dcf4115320e649ba5b5476a38a12dbc52dfe534f7dd7ad92dc5995e9aa9513dba",
-  "@swc/core-linux-arm64-gnu@npm:1.15.17": "56740456ab0df1238fab445a363a1cf4f29422710c67011efbaaaf17fa3b2260c731489836a80a84e75b8986de459251b60082e5f91ae42c403d704921771365",
-  "@swc/core-linux-arm64-gnu@npm:1.15.18": "96aa824334204b6ae8a9c337a745a64dedd4913331f313561eb9544b853e142d9a933230d06052eb677cffbed0b1c961389f1d626936a9b5fad6400ad254229e",
+  "@swc/core-linux-arm64-gnu@npm:1.15.40": "c08de62bc4adb387f57e86dfd1f18da32050cd44d3d28d33a69fde0bd5165081c5f5d953c1799a73628794e827c242d145ebfa99c6d134d0fa0d613be7660053",
   "@swc/core-linux-arm64-musl@npm:1.13.3": "39ce1201862d2368ed7a89a9f1960bcbf56da875c353da720894bccc75110d71ab2cb7f99a252518f96e678c5dd42ed2e1a588bf343e175f41a532785c03ffaf",
-  "@swc/core-linux-arm64-musl@npm:1.15.17": "c2c63181909bf180c4d57c60eeba7eab30680ff65944c7f76f4e89fd615acb68b3fc5aaba485ee63aeecefc183777261480eeb1de03668f5be43a28001190021",
-  "@swc/core-linux-arm64-musl@npm:1.15.18": "3781cb4bfce767fb85506a69bc6fb7745ec53be2a53735750ae88f51c3d6803725a3a906cb954888c529e7f675d3ff0f746bb22c646f1ac2caebdc2be64a852e",
+  "@swc/core-linux-arm64-musl@npm:1.15.40": "c2b7a9c9a57cbf8cbcdbe275b4c29c5eac30cf7db3b93fab993ad6d2d72b3f0a0004cddb20fb9de1e187feaba08303bedba457409355bfce84af2798f003312a",
+  "@swc/core-linux-ppc64-gnu@npm:1.15.40": "35127f033352094f67c16f3e4a0cb644574740285ece5e562c99398017478571b699909d0c36c927583ef122c43c7529ee9977bb1d9e774ede5d8723cd7294e7",
+  "@swc/core-linux-s390x-gnu@npm:1.15.40": "da840e6876c5868ab0effa37ddfa66b7bdada3c7e4ab73a942e9d81dc0fe89c4c665e8677e4705a843b01ac9995e4c06f8733aeb083dd047ba2ecebc1fc05569",
   "@swc/core-linux-x64-gnu@npm:1.13.3": "9e7edee322efd9b35a62d8507300adacbbcd53630a26e935cee8ede5ecf8710fac1ae60ce490cd2d6297d27196d8202a9281b6193da223689804ef9afab451c0",
-  "@swc/core-linux-x64-gnu@npm:1.15.17": "69321e9b263f07d11f98e389d8f6b94fdaabaf91adea24ccbe25107a75a7b348dafbffa2746aee1caeea24d0b3d29aa5d8d160419fe36b986a5a6350f1068d30",
-  "@swc/core-linux-x64-gnu@npm:1.15.18": "26f6fe774e88f8d58a48c18666eda6345cd7064cf065f02eae683f6eaac3e345a5fdbef22a8b3aa7069e332fe95c4b496cbab438bc2b474a9fdc8b37a616be0a",
+  "@swc/core-linux-x64-gnu@npm:1.15.40": "dfcbc023b2bfd67bd96d23e7c23c5b0dc1cff05139c7c194784c37b4bafad10d9d18acf8d596fdc7c7364e50becfefec2f42a8f6617fe185da32dc82dbe2412b",
   "@swc/core-linux-x64-musl@npm:1.13.3": "89f256a8a7da0317cf0b504846cf6d077695b7f86f3cb85e727deedcc82f00fbd42c36e5ec6ff9ead3a2ab1fda748b4d3fd59d93420b6abd3629e902f5a34828",
-  "@swc/core-linux-x64-musl@npm:1.15.17": "d02f7e4b55f2b22bf042093aa9c45356e851845a0ad8b87ff967033b6cbe474c196f03f2387ac9154a10988943674bbb80739a1c7ecc8a79fb174431bc5527ce",
-  "@swc/core-linux-x64-musl@npm:1.15.18": "96b5bd1bbacebbf806f9a6a02698d68ba2a677ce86b5c2d7a92ea6083b40d55a0a84abebd16b5afd7a574e727b8c19e9039315e8ef40f6c852bbfaee26f999cd",
+  "@swc/core-linux-x64-musl@npm:1.15.40": "f44a45cb822248bd3e15cf5f2301fde229cfd079c8f91aea6234fd731d86f7c874b7ba1bbc60d776258efa4338a40621240b306e052631f4725e12a4ff2d7532",
   "@swc/core-win32-arm64-msvc@npm:1.13.3": "18929504fef4c53a191512a9bdb5384fe2ef701f4cf43927aaaadd8fab199cf5c970f8ca48b9533e8190c4a88fc514147beb17768cf5232055b6ba075457ae09",
-  "@swc/core-win32-arm64-msvc@npm:1.15.17": "32f56af42c1ae67467479f72d9fa12c83d0242abf92dc79b001ce570341297e2e24b66682f28b514c6ac4ce794d426a599328b4bcb35c719cced967a4ccafb46",
-  "@swc/core-win32-arm64-msvc@npm:1.15.18": "3a170183da529015301e48bd305f9ea1bcbd38259ff25f1f6e778ee4bb68fda44552c696f067005729aa77407295b1388717a31d9429844725d7ee29645bde82",
+  "@swc/core-win32-arm64-msvc@npm:1.15.40": "99fabc56976a71f5a0500ea79ad9afd1b85b7e890573c613f602e64d841d47c5aa299aec3516e391754837d76cf942b67b8e848486cd3d92c9ef5657b19a79a8",
   "@swc/core-win32-ia32-msvc@npm:1.13.3": "0b7d5fc610de99bd24e0bd5430569e5b71dc0e2660a6e17aaffc7671ed0474a5a18096ea23acb83aadaa287fef5ff4c245a544c5ba38cb498ac4d843f7ca2256",
-  "@swc/core-win32-ia32-msvc@npm:1.15.17": "538f8276536cc51d790cd2f2b84e501f14796bba1bb96a09a2e4cb556efe90c8f525d42a8bdb79371b30c9a34ff32836dac34aef18fc70208ffef9a3f689b067",
-  "@swc/core-win32-ia32-msvc@npm:1.15.18": "a950c9d1d6338939734249ddb766c495e86e05509bb6a42f58d2713d419d4412c06fb0c11c7711c6612ab3e74520a8c1581449340aa3f4fe26f71c53675f37b4",
+  "@swc/core-win32-ia32-msvc@npm:1.15.40": "3cf3c74b3351dc0fc301b73f80f9b3eecd2bbdd30fa5fd1af3b3003fc24d5aa42da3f3851ad4a36e0bab449085c8f31a26865bd934fd1848b5d970e512f1b539",
   "@swc/core-win32-x64-msvc@npm:1.13.3": "632eac6a4997f4299e710f8be1a1d6df862a852beaa3b30dc1dce9ba5acd128d6e93af6ce64f8b39e4c37318b254f4f10d27ad5df1cf5bb493de39d7f205d1b7",
-  "@swc/core-win32-x64-msvc@npm:1.15.17": "e8636df1516b3ab23c6eeb156dc0f97014d3a77af071f035876b3185fe51bb4172de3ac7976a4270baa8bd9b1cd58d488ee4ef176e0804507593c687c3276947",
-  "@swc/core-win32-x64-msvc@npm:1.15.18": "68eac0d5148e7326b748a0f0adf44bffcfb1d0c78e366448aad9859eda537941391ea95e1863118460a49a58235ce9791ae1b20afc04a034677167e6ea43a5e2"
+  "@swc/core-win32-x64-msvc@npm:1.15.40": "73ffc36b8ed8ceaf7c96b98f28625c1fc4f2e477aa6a4a8169f7e551844a25bdb9e972f4ee9c6f171e96774a5033d48dcdeec17cfabaac8070b7681c332af680",
+  "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260421.2": "12273bab953bbacf429e4895db7ac5e40b05f3e1511b7053119eafad99af9241f893e975e29735403f7247a4a1a22f56a5eca0d84ec300dc705c77ebc4292b61",
+  "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260421.2": "711451bef67dbe18e0a7fdfd5915f74935d76c8d22ac1f0bc74df55af66d6a782f7b91f3cdc7ff4773f02c5c84fbd3c79061e3888707735089d45148dc262910",
+  "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260421.2": "b1ffbf30be075be6cf8ed9da314326ca4050a31ed33fde3daa90fddc37518d62695abbbc1b1f212cbf160c22fff760fa2ee9b447a16fe6e14fcf36329df9bad5",
+  "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260421.2": "c7e6be5c67f8010519e3240eb821b452beed3dfffe880a5cd8ca19f1873e1c27283af100d9e2c0175b624dd4042337e1898b1c3e3c1122605f1e9d7c56638b24",
+  "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260421.2": "73a130ffe78755e48254d12d82399a5c479998142e98273d4edda8f10806ac31a4e52ea4ee61dd52999930545b93471e8620746f8552ea275b2a2f32b1cf4c8e",
+  "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260421.2": "903319a110c6348185aaa508db50d48ce0c981c5a745cbc57c36271caf6f3b37b7a577e549594edd1b185cd45f7bb50c7c98ac1bbea7f800bfef5dbd6d3d42bf",
+  "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260421.2": "a46bf36e4df25ac9bf60a39b4a4953d4cc43ec40c55bd1de9bb088ee4622d53955b39c07c8ed16b21c4bf841f22f997e17d9af50a376fd3c0349cf36e3857dfc",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "5c8769703d724915224711f718085f541d8558e95d8646c6cca5709f1f7dd00ce65d0e2d0bc03bb1c0c74d22d70d54cfc490176dbb7c6f5d06072365ec7ef6b6",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "7ab93a01b7f4cbc99bfaf8cd35a1454f78826bb2840f0387a19491cb4835b16d81d30ca2b4b71a43643f58aaceb83a63cd89274a3f16637e35887e67a93ea21e",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "f8bd59a69ca200f9590a94de5699a0cecbcba120f5b82b2295468d36f943be48d957a8ca466f3fb30466abafee4a9672831c382ff9dea4ccdaa0a92992bb41b1",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "423acf3a8032b6bde50fabcdeccd4c1954bbede56f8c2fc5134621fd957f931a08ad74b3690762e3e18e2f5f31f35dc93b826a1c2626031d218dc4b16d415efc",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "d6b88ea9447328f4f5e373e77524daa52d5630ecc7035ca67121082e2017a91dc9e3fd7b8230e41f1307137ee7487b0bc0c8a922dda1b77b01f735202486e36f",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "d4a3248f64ab92ea680b3bd5f74c19f15c8f82eb1628e32aeaa058a7fd2efdbba4b5d4e011e453389e42e79cbf00847c79a172ef66d8c9b555feada7a2693772",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "1426c4a182922d16b684cfaff9a2d1cc6ddb06eba6fbe966d8d5a88fc0ed6660f4742c7d90659dc14f9f152132fcbde4afd483b5d0c8aa22eedd1154b0f3c632",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "baa3911178e6462c8d682d3ec182e95fc33f308d5b50662f07108a9a5572d365c97604932887113053fada46949580fabc9ca704822c714160ba8eee0387b286",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "cb7763961f472f201e885753c3daf72231990c65fa5112a76a996f7c5754f2e6688cdc58f1861b05b5f176dae9255e34a860c40b21401318395eb4939759e46a",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "148d28b05c5d50bc4d429f5da3e675b1285387b54c8e5363d7c288b53f2f38688bf9472ac5f2e4ba7fa3c3d7f19bac19738b1815a8973ba29c6bae76990b66f7",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "40ba923597ae297b7be85de1769025578e16af29def72060e7603ec3311fefe537c9608520e771291e934af7e64e3a52d74ccb5ee1f7a657ba2f2a2fcfbf3df7",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "193da09875cf4ce3ea9ef24a141f9235da9095808b157b4dc83ce431f97732f2d19f65d4030771187d1a8424f6843e8a50ac6ba2ab4391271f80680c1166b2d7",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "c376fbbfbe0909844c188f23eec33c937fbf4a1f2fe81418726aa9bab91b44d9411ec98560ed73aaf15fa2082483fb0907a335535449623e3e4a604ee18b7ac3",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "c3011171259f4f4c5c1751e565fd6f0ec203558484234cc438279a26f6fb2ec0d4bbed72ed9bfbc9967e43351fd8e3aa716269b8e670a7c9421ff64a1a9123eb",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "27da30650ec1e6378bc47665a944913839ef95e9af1bc7892f6ad3fd7cd10468d5b4da8caa03f83e3c56e03253cae4034ba1ee64d3ceb19a3656f31d362eaabf",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "ca69e8caeed033c074d9413112264fe1c0bdaaedb4fa9e6f5bcbf3a64ee98fa8261a6b5e54c3d7b7144cf020217c9a89f308086ec64d11d78480bd5885dc2e1a",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "4aabb2e8c80590650bd2b46f205f24e9f345ead68e7b53c20adb219d0c3f030c605d5434f3895fde68ebfa521ea97ea6da974e342e19487086da6a16332860df",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "5b364708ea2985d0e59f235a00e05bf3668704a81e9d32e8929980c84fd0bd67102c2041337b08e266a8bc4883ddf618ac7cb5e1f64614d8f9861cc4e3208905",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "92ff0d27efe168480a14c8d705c0f68624f01251bdc5f8f41bbd6c7ed8ea23effb8481f01eb93270896822397fe2fd78a427c1756ecabc3cb13a746c918b5949"
 }
diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix
index c7ad9b9f092a..478bec0247dc 100644
--- a/pkgs/by-name/gr/grafana/package.nix
+++ b/pkgs/by-name/gr/grafana/package.nix
@@ -21,7 +21,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana";
-  version = "13.0.3";
+  version = "13.1.0";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -33,15 +33,9 @@ buildGoModule (finalAttrs: {
     owner = "grafana";
     repo = "grafana";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HOTArHAoqhyKiqJf0Py2JMiMBloSgNDnVPDcKWlnY3I=";
+    hash = "sha256-FyrClHQwkwNW9bFbFLyuE4s9Gg0tbg7v/s1I/4XaWmM=";
   };
 
-  patches = [
-    # Remove after upstream updates to Yarn 4.14
-    # https://github.com/grafana/grafana/blob/main/package.json#L483
-    ./yarn-4.14-support.patch
-  ];
-
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
   env = {
     CYPRESS_INSTALL_BINARY = 0;
@@ -54,13 +48,13 @@ buildGoModule (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   # Since this is not a dependency attribute the buildPackages has to be specified.
   offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
-    inherit (finalAttrs) src missingHashes patches;
-    hash = "sha256-pYuNW74ghHmBVzRcfXTXROjxo2FmsxmkTUbJpEFMkow=";
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-TAJYJ9oMVl9cT4Vs1SZVbhKuuWp/WxM99Wt7QzLq1WQ=";
   };
 
   disallowedRequisites = [ finalAttrs.offlineCache ];
 
-  vendorHash = "sha256-dVu95a6xc7fEK3epeY0ZzF4IUT+WhozAmSDicYoIL4A=";
+  vendorHash = "sha256-2OsgW52vQbeQu88eyoWsD8784gzI7/5SbLY62jYxukQ=";
 
   # Grafana seems to just set it to the latest version available
   # nowadays.
diff --git a/pkgs/by-name/gr/grafana/yarn-4.14-support.patch b/pkgs/by-name/gr/grafana/yarn-4.14-support.patch
deleted file mode 100644
index 6d3be05a1c1e..000000000000
--- a/pkgs/by-name/gr/grafana/yarn-4.14-support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/.yarnrc.yml b/.yarnrc.yml
---- a/.yarnrc.yml
-+++ b/.yarnrc.yml
-@@ -25,6 +25,7 @@ plugins:
-     path: .yarn/plugins/@yarnpkg/plugin-licenses.cjs
-     spec: "https://raw.githubusercontent.com/mhassan1/yarn-plugin-licenses/v0.15.0/bundles/@yarnpkg/plugin-licenses.js"
- 
--yarnPath: .yarn/releases/yarn-4.11.0.cjs
-+approvedGitRepositories:
-+  - "**"
- 
- enableScripts: false
-diff --git a/yarn.lock b/yarn.lock
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2,6 +2,6 @@
- # Manual changes might be lost - proceed with caution!
- 
- __metadata:
--  version: 8
-+  version: 9
-   cacheKey: 10
- 

From 51931ae4e38cd254b8b66c5b8220637bd7811bd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 16:40:45 +0000
Subject: [PATCH 046/110] rutorrent: 5.3.3 -> 5.3.6

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

diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix
index cf1af4777066..10bcbf1f57d1 100644
--- a/pkgs/by-name/ru/rutorrent/package.nix
+++ b/pkgs/by-name/ru/rutorrent/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rutorrent";
-  version = "5.3.3";
+  version = "5.3.6";
 
   src = fetchFromGitHub {
     owner = "Novik";
     repo = "ruTorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1quWNiG8oW4HQJ1KJ7MkY7XzPmcYZnMXFxarANavwYI=";
+    hash = "sha256-73dJbmveZQg9ogrvlxevutx6eQDXWizdvi28bGJyiFQ=";
   };
 
   installPhase = ''

From 2241fe89c503c4a3a25d4dea7cfa545b73b42a2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 19:33:21 +0000
Subject: [PATCH 047/110] python3Packages.ijson: 3.5.0 -> 3.5.1

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

diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index a5171ad9ca43..516fcdd8f488 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "ijson";
-  version = "3.5.0";
+  version = "3.5.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lGiHYHIOP1IScxs8uNMCZ/mgRfs4+zhwJU57lQQkbzE=";
+    hash = "sha256-r0C9GoX1XbC4swcVyFh2Ewa9ktVZAUhjb3XDMJ5udr0=";
   };
 
   build-system = [ setuptools ];

From f2f41d0109bec2f16614c22525b83ecb90730cac Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 21:15:39 +0000
Subject: [PATCH 048/110] python3Packages.jax-tap: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/jax-tap/default.nix b/pkgs/development/python-modules/jax-tap/default.nix
new file mode 100644
index 000000000000..1a4dcb5e2972
--- /dev/null
+++ b/pkgs/development/python-modules/jax-tap/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  jax,
+
+  # optional-dependencies
+  pandas,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "jax-tap";
+  version = "0.3.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "arcueil";
+    repo = "jax-tap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-B6Y8+9FXLhHZwQ9ayomffP3P7Uz7zuL52oxzJwCE2hM=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    jax
+  ];
+
+  optional-dependencies = {
+    pandas = [
+      pandas
+    ];
+  };
+
+  pythonImportsCheck = [ "jaxtap" ];
+
+  nativeCheckInputs = [
+    pandas
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Make print-debugging great again";
+    homepage = "https://github.com/arcueil/jax-tap";
+    changelog = "https://github.com/arcueil/jax-tap/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b11f4638909..eaeff52bca6f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8369,6 +8369,8 @@ self: super: with self; {
 
   jax-jumpy = callPackage ../development/python-modules/jax-jumpy { };
 
+  jax-tap = callPackage ../development/python-modules/jax-tap { };
+
   jaxlib = jaxlib-bin;
 
   jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { };

From 792815c4edd9cdbe33e3f21c40e0be83b403df92 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 21:11:58 +0000
Subject: [PATCH 049/110] python3Packages.blackjax: 1.5 -> 1.6

Diff: https://github.com/blackjax-devs/blackjax/compare/1.5...1.6

Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.6
---
 pkgs/development/python-modules/blackjax/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index df2e518d70e1..21bcd14d54fe 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -17,7 +17,8 @@
   typing-extensions,
 
   # optional-dependencies
-  fastprogress,
+  jax-tap,
+  tqdm,
 
   # checks
   chex,
@@ -27,14 +28,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "blackjax";
-  version = "1.5";
+  version = "1.6";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "blackjax-devs";
     repo = "blackjax";
     tag = finalAttrs.version;
-    hash = "sha256-tKJfukTqSiW2Xg3/8DakxtxlwGpJ14S/7qUE1OGM97I=";
+    hash = "sha256-qLOAmUQxr1xtlJB/TMnjFkvvHUwh0XKpPN+FVD8ju8Y=";
   };
 
   build-system = [
@@ -53,7 +55,8 @@ buildPythonPackage (finalAttrs: {
 
   optional-dependencies = {
     progress = [
-      fastprogress
+      jax-tap
+      tqdm
     ];
   };
 
@@ -77,6 +80,7 @@ buildPythonPackage (finalAttrs: {
 
     # AssertionError on numerical values
     "test_barker"
+    "test_imm_shrinkage_seed_influence_persists_diagonal"
     "test_laps"
     "test_mclmc"
     "test_mcse4"

From a26dc104b57e770bd84f27518a6cd669ec7cea8d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 22:18:23 +0000
Subject: [PATCH 050/110] python3Packages.minikanren: fix, cleanup

---
 .../python-modules/minikanren/default.nix     | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix
index ecfc66738735..457587e272b8 100644
--- a/pkgs/development/python-modules/minikanren/default.nix
+++ b/pkgs/development/python-modules/minikanren/default.nix
@@ -2,27 +2,35 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  toolz,
-  cons,
-  multipledispatch,
-  etuples,
-  logical-unification,
-  py,
-  pytestCheckHook,
-  pytest-html,
+
+  # build-system
   setuptools,
   setuptools-scm,
+
+  # dependencies
+  cons,
+  etuples,
+  logical-unification,
+  multipledispatch,
+  toolz,
+  typing-extensions,
+
+  # tests
+  py,
+  pytest-html,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "minikanren";
   version = "1.0.5";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "kanren";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lCQ0mKT99zK5A74uoo/9bP+eFdm3MC43Fh8+P2krXrs=";
   };
 
@@ -32,17 +40,18 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    toolz
     cons
-    multipledispatch
     etuples
     logical-unification
+    multipledispatch
+    toolz
+    typing-extensions
   ];
 
   nativeCheckInputs = [
     py
-    pytestCheckHook
     pytest-html
+    pytestCheckHook
   ];
 
   pytestFlags = [
@@ -55,8 +64,8 @@ buildPythonPackage rec {
   meta = {
     description = "Relational programming in Python";
     homepage = "https://github.com/pythological/kanren";
-    changelog = "https://github.com/pythological/kanren/releases/tag/${src.tag}";
+    changelog = "https://github.com/pythological/kanren/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ Etjean ];
   };
-}
+})

From 309eeecb42582febef85d44e605e93f8ec895297 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 22:33:38 +0000
Subject: [PATCH 051/110] python3Packages.arviz-base: ignore failing warning

---
 pkgs/development/python-modules/arviz-base/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/arviz-base/default.nix b/pkgs/development/python-modules/arviz-base/default.nix
index 99c5e909f275..814e3b911a0d 100644
--- a/pkgs/development/python-modules/arviz-base/default.nix
+++ b/pkgs/development/python-modules/arviz-base/default.nix
@@ -67,6 +67,11 @@ buildPythonPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
+  pytestFlags = [
+    # DeprecationWarning: Setting the shape on a NumPy array has been deprecated in NumPy 2.5.
+    "-Wignore::DeprecationWarning"
+  ];
+
   meta = {
     description = "Base ArviZ features and converters";
     homepage = "https://github.com/arviz-devs/arviz-base";

From e409745df771e9dcc11ffb002f118731bf3e4e4a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 22:47:53 +0000
Subject: [PATCH 052/110] python3Packages.corner: 2.2.3 -> 2.3.0

Diff: https://github.com/dfm/corner.py/compare/v2.2.3...v2.3.0

Changelog: https://github.com/dfm/corner.py/releases/tag/v2.3.0
---
 .../python-modules/corner/default.nix         | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix
index 6fb5d809ddf6..1c891a66d4b3 100644
--- a/pkgs/development/python-modules/corner/default.nix
+++ b/pkgs/development/python-modules/corner/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  writableTmpDirAsHomeHook,
 
   # build-system
   hatch-vcs,
@@ -13,6 +12,7 @@
 
   # optional-dependencies
   arviz,
+  arviz-base,
   ipython,
   myst-nb,
   pandoc,
@@ -23,28 +23,20 @@
 
   # tests
   pytestCheckHook,
-  corner,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "corner";
-  version = "2.2.3";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dfm";
     repo = "corner.py";
-    tag = "v${version}";
-    hash = "sha256-gK2yylteI3VLVJ0p7NB7bR7cirCo2BvFKnYIH3kfyh4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-H59IVXKPT4CLApn4kUuSuiYA9EWdOaH88Rd4YXf0VlQ=";
   };
 
-  nativeBuildInputs = [
-    # During `pythonImportsCheck`, `corner` imports `arviz` which wants to write a stamp file to the
-    # homedir. It then needs to be writable.
-    # https://github.com/arviz-devs/arviz/commit/4db612908f588d89bb5bfb6b83a08ada3d54fd02
-    writableTmpDirAsHomeHook
-  ];
-
   build-system = [
     hatch-vcs
     hatchling
@@ -53,9 +45,13 @@ buildPythonPackage rec {
   dependencies = [ matplotlib ];
 
   optional-dependencies = {
-    arviz = [ arviz ];
+    arviz = [
+      arviz
+      arviz-base
+    ];
     docs = [
       arviz
+      arviz-base
       ipython
       myst-nb
       pandoc
@@ -71,10 +67,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "corner" ];
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ corner.optional-dependencies.test;
+  nativeCheckInputs = [
+    arviz
+    pytestCheckHook
+    scipy
+  ];
 
-  # matplotlib.testing.exceptions.ImageComparisonFailure: images not close
   disabledTests = [
+    # matplotlib.testing.exceptions.ImageComparisonFailure: images not close
     "test_1d_fig_argument"
     "test_arviz"
     "test_basic"
@@ -110,8 +110,8 @@ buildPythonPackage rec {
   meta = {
     description = "Make some beautiful corner plots";
     homepage = "https://github.com/dfm/corner.py";
-    changelog = "https://github.com/dfm/corner.py/releases/tag/v${version}";
+    changelog = "https://github.com/dfm/corner.py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From 83b664637e9c6dc9ee25ea174f88aa83c141f1e2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 11 Jul 2026 14:36:54 -0700
Subject: [PATCH 053/110] timbreid: move to by-name/

---
 .../timbreid/default.nix => by-name/ti/timbreid/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/pd-plugins/timbreid/default.nix => by-name/ti/timbreid/package.nix} (96%)

diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/by-name/ti/timbreid/package.nix
similarity index 96%
rename from pkgs/applications/audio/pd-plugins/timbreid/default.nix
rename to pkgs/by-name/ti/timbreid/package.nix
index 83b29d1e6f7f..b9829d5c216b 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   unzip,
   puredata,
-  fftw,
+  fftwSinglePrec,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ unzip ];
   buildInputs = [
     puredata
-    fftw
+    fftwSinglePrec
   ];
 
   unpackPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc70e4476e16..024b739e834d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9586,10 +9586,6 @@ with pkgs;
     versionSuffix = "esr";
   };
 
-  timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
-    fftw = fftwSinglePrec;
-  };
-
   inherit
     ({
       timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { };

From 13f27af73b4687fa1b4497b36443698c53da31a2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 11 Jul 2026 20:29:25 +0000
Subject: [PATCH 054/110] python3Packages.pytensor: 3.1.2 -> 3.1.3

Diff: https://github.com/pymc-devs/pytensor/compare/rel-3.1.2...rel-3.1.3

Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-3.1.3
---
 .../python-modules/pytensor/default.nix         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index c6115797ae12..0741e59af6ba 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytensor";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -44,9 +44,16 @@ buildPythonPackage (finalAttrs: {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-kKfbVSWsaA9ytii4GXeEmE+Oq8Qi7QNUOozgemqJI+k=";
+    hash = "sha256-9Apjyg+wmAWrK7hMSF54b1u/3TT0GGitDlyF6rQA4OY=";
   };
 
+  # DeprecationWarning: scipy.linalg: the `lwork` keyword is deprecated and no longer in use as of
+  # SciPy 1.18.0 and will be removed in SciPy 1.20.0
+  postPatch = ''
+    substituteInPlace pytensor/link/numba/dispatch/linalg/decomposition/qr.py \
+      --replace-fail "lwork=lwork," ""
+  '';
+
   build-system = [
     setuptools
     cython
@@ -85,7 +92,11 @@ buildPythonPackage (finalAttrs: {
     rm -rf pytensor
   '';
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTests = [
+    # AssertionError: Not equal to tolerance rtol=0.0001, atol=0
+    "test_Searchsorted"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Numerical assertion error
     # tests.unittest_tools.WrongValue: WrongValue
     "test_op_sd"

From 3b3009dddc8d6005c8b65fe530be1bfcc7c2c359 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 12 Jul 2026 00:37:45 +0200
Subject: [PATCH 055/110] brioche: fix eval on unsupported systems

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

diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix
index e6597a43eebe..8b589de649a8 100644
--- a/pkgs/by-name/br/brioche/package.nix
+++ b/pkgs/by-name/br/brioche/package.nix
@@ -64,5 +64,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "brioche";
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
 })

From 0374b4e5acc7609fe2cd0a67e48826e709df64f6 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Sat, 11 Jul 2026 19:20:50 -0400
Subject: [PATCH 056/110] buildMozillaMach: backport BZ 2047651 patch for 153

---
 .../build-mozilla-mach/default.nix             | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 58f3f6000a56..f8298a4c6fe8 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -349,6 +349,24 @@ buildStdenv.mkDerivation {
       # https://bugzilla.mozilla.org/show_bug.cgi?id=2046162
       ./153-cbindgen-0.29.4-compat.patch
     ]
+    ++
+      # Fixes `ld.lld: error: undefined symbol: FREEBL_GetVector`
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=2047651
+      lib.optionals
+        (
+          lib.versionAtLeast version "153"
+          && lib.versionOlder version "154"
+          # We don't set --with-system-nss on Darwin, so it should be
+          # unaffected.
+          && !stdenv.hostPlatform.isDarwin
+        )
+        [
+          (fetchpatch {
+            name = "link-freebl-explicitly-for-system-nss-builds.patch";
+            url = "https://hg-edge.mozilla.org/mozilla-central/raw-rev/1a56071ddc0fe97a55c3b825e1dd33c8422b9fc1";
+            hash = "sha256-+HiU7RMPmV7I7SIzjP0Q6iSDJL/vBjc3UcwUTg57lNQ=";
+          })
+        ]
     ++ extraPatches;
 
   postPatch = ''

From 37a224dda763d15bc86df354624ac3be835e3454 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Sat, 11 Jul 2026 19:20:50 -0400
Subject: [PATCH 057/110] firefox-devedition-unwrapped: 152.0b3 -> 153.0b11

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 8b7ee5d85834..c7133df13e16 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "152.0b8";
+  version = "153.0b11";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "e76142f19c3eccfeedd069bb14a6732b73a848ecbd16e74b6902e73b560db023611fabfef238d2f92b522ad75bb24d9368e2a75dfac9a6ff6c665a542445f157";
+    sha512 = "b9cba9de51157db94ae421fcb82e2172e3a3b5026b01b1049c858e45302603dde9e8d859a163d1ec00e225788516fb769c1b7b1a4bd4f4ed3785c9552aab4e78";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From f03ea24eb13ee4d647def42e799ed0644e4d7ca8 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 11 Jul 2026 21:35:15 -0600
Subject: [PATCH 058/110] R: fix build on darwin

---
 pkgs/applications/science/math/R/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 6376bf4f08e8..f227a7f742f0 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -27,6 +27,7 @@
   pkg-config,
   bison,
   which,
+  llvmPackages,
   jdk,
   blas,
   lapack,
@@ -68,7 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     tzdata
     which
-  ];
+  ]
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+
   buildInputs = [
     bzip2
     gfortran
@@ -126,6 +130,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontDisableStatic = static;
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
   preConfigure = ''
     configureFlagsArray=(
       --disable-lto

From 495aaa888be18df470676a272488c5e087837d6f Mon Sep 17 00:00:00 2001
From: Nicola Squartini <tensor5@gmail.com>
Date: Sun, 12 Jul 2026 06:53:25 +0200
Subject: [PATCH 059/110] bitbox: 4.51.0 -> 4.51.3

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

diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index c8796f2e0c59..4a7f35c7a716 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -21,14 +21,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bitbox";
-  version = "4.51.0";
+  version = "4.51.3";
 
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-/S+UIYSntUb0fyR6T/Egj6LX9TCI1l0h8gPHMntiTYU=";
+    hash = "sha256-JdUoV4bp+pI8neyxHte1z7CULBwdNdLG/CaZFPmvDeg=";
   };
 
   postPatch = ''

From 9dad28e4d8beebe1a47dc93a04ad65efd9cbe48f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 12 Jul 2026 02:36:50 -0600
Subject: [PATCH 060/110] tandoor-recipes: 2.6.9 -> 2.6.13

https://github.com/TandoorRecipes/recipes/releases/tag/2.6.13
https://github.com/TandoorRecipes/recipes/releases/tag/2.6.12

Diff: https://github.com/TandoorRecipes/recipes/compare/2.6.9...2.6.13
---
 pkgs/by-name/ta/tandoor-recipes/common.nix         | 6 +++---
 pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index c66507a466d2..5e9c6b78eeea 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -1,15 +1,15 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "2.6.9";
+  version = "2.6.13";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     tag = version;
-    hash = "sha256-g151bUOpAp+7+K92kF+eK5SR2aCHPHdFc3UXqOO4aSw=";
+    hash = "sha256-7620qMp3Trg2be51CP0LKas/1egk3Rmo+aaMp0pe83k=";
   };
 
-  yarnHash = "sha256-Un5pHocZZrXajY3AGfqV1kjT9twE8B93rwoJMi4CILg=";
+  yarnHash = "sha256-EpmFGyuWZeqzdi8wPX7ABjfJKWP8r5qqpdfNKdOFiso=";
 
   meta = {
     homepage = "https://tandoor.dev/";
diff --git a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch
index 444b19df821f..012912f491a0 100644
--- a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch
+++ b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch
@@ -9,6 +9,3 @@ index 2755dc99..4026b96e 100644
 -addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
 +addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
  # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
--asyncio_default_fixture_loop_scope = fixture
-\ No newline at end of file
-+asyncio_default_fixture_loop_scope = function

From aa15810a3974fd7830aac2958e5a5d68da87b1c3 Mon Sep 17 00:00:00 2001
From: MartV0 <martijnvoordouw@gmail.com>
Date: Fri, 3 Jul 2026 15:17:50 +0200
Subject: [PATCH 061/110] nixos/isso: add secret file option

---
 nixos/modules/services/web-apps/isso.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/services/web-apps/isso.nix b/nixos/modules/services/web-apps/isso.nix
index 87804b7ea7cf..97076eaba37c 100644
--- a/nixos/modules/services/web-apps/isso.nix
+++ b/nixos/modules/services/web-apps/isso.nix
@@ -37,6 +37,8 @@ in
 
           See [Isso Server Configuration](https://posativ.org/isso/docs/configuration/server/)
           for supported values.
+          You can set secrets using the secretFile option with environment variables following
+          [the documentation](https://isso-comments.de/docs/reference/server-config/#environment-variables).
         '';
 
         type = types.submodule {
@@ -51,6 +53,16 @@ in
           }
         '';
       };
+
+      secretFile = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          A file containing secrets as environment variables that will be used in the configuration.
+          See [the documentation](https://isso-comments.de/docs/reference/server-config/#environment-variables) for details.
+        '';
+        example = "/run/secrets/isso.env";
+      };
     };
   };
 
@@ -65,6 +77,8 @@ in
         User = "isso";
         Group = "isso";
 
+        EnvironmentFile = mkIf (cfg.secretFile != null) [ cfg.secretFile ];
+
         DynamicUser = true;
 
         StateDirectory = "isso";

From 710dc3494e22b5314b5e1d3b96cbb8ea72567685 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Jul 2026 18:02:15 +0200
Subject: [PATCH 062/110] switch-to-configuration-ng: fix clippy errors

Failed to build since Rust 1.97, currently on staging.
---
 pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
index db6009945e9c..84a46d64565f 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
@@ -2001,9 +2001,9 @@ won't take effect until you reboot the system.
             // Swap entry disappeared, so turn it off.  Can't use "systemctl stop" here because
             // systemd has lots of alias units that prevent a stop from actually calling "swapoff".
             if *action == Action::DryActivate {
-                eprintln!("would stop swap device: {}", &device);
+                eprintln!("would stop swap device: {}", device);
             } else {
-                eprintln!("stopping swap device: {}", &device);
+                eprintln!("stopping swap device: {}", device);
                 let c_device = std::ffi::CString::new(device.clone())
                     .context("failed to convert device to cstring")?;
                 if unsafe { nix::libc::swapoff(c_device.as_ptr()) } != 0 {

From 506c6f092551afc2c5f9a5ff11892696e34bcf5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 10:11:42 +0000
Subject: [PATCH 063/110] wavelog: 2.5 -> 3.0.1

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

diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix
index f461449cc7fe..5f3f92f8b935 100644
--- a/pkgs/by-name/wa/wavelog/package.nix
+++ b/pkgs/by-name/wa/wavelog/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wavelog";
-  version = "2.5";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "wavelog";
     repo = "wavelog";
     tag = finalAttrs.version;
-    hash = "sha256-LsqHTMBKvXeY3dggYID9myRDUh2qEJWQe4P/SfhWMgU=";
+    hash = "sha256-RWARyBoRNHK9jd0T5u/QbL9w5TTzVeCcD4Elg/uWQNg=";
   };
 
   installPhase = ''

From a32781b63c6c814c359fe700062700a85618dacb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 10:12:00 +0000
Subject: [PATCH 064/110] xlsfonts: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/by-name/xl/xlsfonts/package.nix b/pkgs/by-name/xl/xlsfonts/package.nix
index d632b6d9e310..93e17ebe6967 100644
--- a/pkgs/by-name/xl/xlsfonts/package.nix
+++ b/pkgs/by-name/xl/xlsfonts/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xlsfonts";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/xlsfonts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-gH+QnqzmhLhm/GOz6WJynBIIIqbJbgUf9RzzULP/ts0=";
+    hash = "sha256-pqLikYAUWNklECY7F10W+YAk3DgW692955tQCfbDsGU=";
   };
 
   strictDeps = true;

From dc83a880ab439c8bf819a80cc35e5b046c15fc02 Mon Sep 17 00:00:00 2001
From: Xerydian <xerydian@gmail.com>
Date: Sat, 14 Mar 2026 12:20:49 +0100
Subject: [PATCH 065/110] nixos/zeronet: Update TOR settings

---
 nixos/modules/services/networking/zeronet.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index 9dc737bd7d0d..920885bfd4cc 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -96,13 +96,13 @@ with lib;
   config = mkIf cfg.enable {
     services.tor = mkIf cfg.tor {
       enable = true;
-      controlPort = 9051;
 
-      extraConfig = ''
-        CacheDirectoryGroupReadable 1
-        CookieAuthentication 1
-        CookieAuthFileGroupReadable 1
-      '';
+      settings = {
+        ControlPort = 9051;
+        CacheDirectoryGroupReadable = true;
+        CookieAuthentication = true;
+        CookieAuthFileGroupReadable = true;
+      };
     };
 
     systemd.services.zeronet = {

From 2d4248e0f9bc253ef9efbddaf00724467f230c01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 12:48:33 +0000
Subject: [PATCH 066/110] pyrefly: 1.2.0-dev.1 -> 1.2.0-dev.2

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

diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index 0ee8ddbfeaf9..6d8ed9796ae6 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,18 +10,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "1.2.0-dev.1";
+  version = "1.2.0-dev.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-qi2ImB2fuaDJWlJpPSlopZZmdGplEGm6+31yNOP+b8g=";
+    hash = "sha256-IQOyAYSnQ8GTIWhfNr/fMQl/TP4v3/tcf72hyHzkfjk=";
   };
 
   buildAndTestSubdir = "pyrefly";
 
-  cargoHash = "sha256-Q/xB79oR0yvXCT1bCPU82LUDrGpTUMt+uy67Si+mWL8=";
+  cargoHash = "sha256-x2gKbMopAN9FJ276KhPQouvb6Gw1z3PY4RRCdhkuhmo=";
 
   buildInputs = [ rust-jemalloc-sys ];
 

From f8b7e2fca7c74b5d58176f7333f5b2df317de7da Mon Sep 17 00:00:00 2001
From: Sarun Intaralawan <sarunint@sarunint.com>
Date: Sun, 12 Jul 2026 19:56:13 +0700
Subject: [PATCH 067/110] muse-sounds-manager: 2.1.1.912 -> 2.2.1.953

---
 pkgs/by-name/mu/muse-sounds-manager/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index f7d4af0e6e87..66c43e3c2df3 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -20,18 +20,18 @@
 
 stdenv.mkDerivation rec {
   pname = "muse-sounds-manager";
-  version = "2.1.1.912";
+  version = "2.2.1.953";
 
   # Use web.archive.org since upstream does not provide a stable (versioned) URL.
   # To see if there are new versions on the Web Archive, visit
   # http://web.archive.org/cdx/search/cdx?url=https://muse-cdn.com/Muse_Sounds_Manager_x64.tar.gz
   # then replace the date in the URL below with date when the SHA1
-  # changes (currently XF7SCWPIOJ7WVGUVFOKW4UKIQVW4NLFS) and replace
+  # changes (currently CQDUS5RIVPTNZF65NNOVKDG2BCVCXH6H) and replace
   # the version above with the version in the .deb metadata (or in the
   # settings of muse-sounds-manager).
   src = fetchurl {
-    url = "https://web.archive.org/web/20251226185300if_/https://muse-cdn.com/Muse_Sounds_Manager_x64.tar.gz";
-    hash = "sha256-fjdurAqOaiw8qUYm7oO8txHCKrrGSvvnmAxLU84IgSw=";
+    url = "https://web.archive.org/web/20260710024139if_/https://muse-cdn.com/Muse_Sounds_Manager_x64.tar.gz";
+    hash = "sha256-y7fKHh2pG8uT4p0vq20rsW8bSAp1mepkd2sW/06N3EI=";
   };
 
   nativeBuildInputs = [

From daa94dce6256a0da8e7f5cecca486a03ef7d8391 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 13:57:25 +0000
Subject: [PATCH 068/110] terraform-providers.ubiquiti-community_unifi: 0.54.0
 -> 0.55.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2bedeeeb7f0f..82550509d7c2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1409,13 +1409,13 @@
     "vendorHash": null
   },
   "ubiquiti-community_unifi": {
-    "hash": "sha256-wqR9XIuH9QzzacdOd8Z+QcfTXwjjnTQA8SbEHcLYhig=",
+    "hash": "sha256-pN/4HAQlcwr49WftYWqWRJWMuMuXFgrgC70WCn6tP3w=",
     "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
     "owner": "ubiquiti-community",
     "repo": "terraform-provider-unifi",
-    "rev": "v0.54.0",
+    "rev": "v0.55.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-XPEH1zya7e/3N/HxBPN/vZxFU5GOOXfBPTrnZEUzdpw="
+    "vendorHash": "sha256-/5VP9ljeMyvikllhfZ4kUQgMEeyRKG3lfJjbp5SWtJ0="
   },
   "ucloud_ucloud": {
     "hash": "sha256-k+NkB1q0oiasLc4+b+mbJ0TNUD67XR9ga9MwSbEXjKQ=",

From 019ca14a55f8149d0872ce5e44c561f9f92298da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 14:05:40 +0000
Subject: [PATCH 069/110] await: 2.4.0 -> 2.7.0

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

diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index ff467f90fb03..228037dc0ccc 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "await";
-  version = "2.4.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "slavaGanzin";
     repo = "await";
     tag = finalAttrs.version;
-    hash = "sha256-MpdP4OJvxjF8zbKQ1YGVrtcC8RKxDNHDA90tWvLDQbU=";
+    hash = "sha256-dtFwlGFjuaUdbggcFviLTnv2zBY6ktK8BASiz4XUeoE=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From b67e88e3a0849b363b9190793aa3f1d1ff39ceab Mon Sep 17 00:00:00 2001
From: c6rg0 <gdrozbik08@gmail.com>
Date: Sun, 12 Jul 2026 14:32:55 +0100
Subject: [PATCH 070/110] osu-lazer-bin: 2026.624.0 -> 2026.711.0

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 89b990e2b9b3..f2751bd4e951 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2026.624.0";
+  version = "2026.711.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-kL2XGJzTRC+AtHH4+byaR1df9EYyIriuxzawDtAFWZ4=";
+        hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-NOBKnsZpMYU6uBfVqYK3ZrPzZBQURw6bN5rr1iZG9nA=";
+        hash = "sha256-Crj40NkKasqc2JF1LeJwOlnCzHxsPiKG77SKTo8DS/8=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-EKmCq656djPGK5I1JqSDcTKtpbQZbO8WGWcPv+PT0q4=";
+        hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 39f6aa28a3fa46b998bc0cdcfabb1644eb950e7f Mon Sep 17 00:00:00 2001
From: c6rg0 <gdrozbik08@gmail.com>
Date: Sun, 12 Jul 2026 15:35:20 +0100
Subject: [PATCH 071/110] osu-lazer: 2026.624.0 -> 2026.711.0

---
 pkgs/by-name/os/osu-lazer/deps.json   | 12 ++++++------
 pkgs/by-name/os/osu-lazer/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 9fda74f72208..b928eda21f38 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -616,8 +616,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2026.623.0",
-    "hash": "sha256-IcCFJvj5ydy0r6mEpHgV+UK9N7cd/3CtjOCV2GT8HOY="
+    "version": "2026.629.0",
+    "hash": "sha256-fb2rmHin/5kCQ4klLvWXHZLnLg4RkrDFn024YIm13R0="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -631,8 +631,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2026.523.0",
-    "hash": "sha256-BLSFNtPU9d+Qv/sGY6d1c7rnKyJkKu66zRZGsw1oS4M="
+    "version": "2026.710.0",
+    "hash": "sha256-EvcxQx9Kq/9y5ox7fmwVSb/JUYDf3D3j/3uOgS4Kpb0="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -646,8 +646,8 @@
   },
   {
     "pname": "ppy.SDL3-CS",
-    "version": "2026.623.0",
-    "hash": "sha256-LMT2AVjP/HIC3a7PZDR4Vhlr6CCEhPu5ZF1eSYDIjeY="
+    "version": "2026.629.0",
+    "hash": "sha256-ncHf+gj36u4x4lwFoGcU6rxMnjC2AS+FYBYCKatHt3E="
   },
   {
     "pname": "ppy.Veldrid",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 7c4b5ab64a25..7efcf524c5c6 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2026.624.0";
+  version = "2026.711.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-qZPComGBdVReWQ0rVQeB9v8N2ul02AhGe8BlIzhz0+s=";
+    hash = "sha256-hdrbbPl7ClNx73bsjoN5u4bEmvl/sdcjgFnZ/uxYbOk=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From 432c1759a6568b2e24773ceff3b7c7f6bf70ddff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 16:00:02 +0000
Subject: [PATCH 072/110] python3Packages.guntamatic: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/guntamatic/default.nix b/pkgs/development/python-modules/guntamatic/default.nix
index 5dc316759a20..cfd49b969f01 100644
--- a/pkgs/development/python-modules/guntamatic/default.nix
+++ b/pkgs/development/python-modules/guntamatic/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "guntamatic";
-  version = "1.9.0";
+  version = "1.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JensTimmerman";
     repo = "guntamatic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AFqr2+N8uDpeUOvPuFZQbvln1sxWhrJEj31H2DOYX1k=";
+    hash = "sha256-OQpbBdTxbKd2A9AWJOLmoKNmPx3ZXTWqLgwTndDWMuw=";
   };
 
   build-system = [ setuptools ];

From 203070b2cd491bdf683c3fa5317a9e80b80b0066 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 17:30:20 +0000
Subject: [PATCH 073/110] plasmusic-toolbar: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index e583e9e50410..f86b3a73866b 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasmusic-toolbar";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "ccatterina";
     repo = "plasmusic-toolbar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-26kYd+LzVfscBEp5qpGKxwS9YXzZ+eEveW5GODDXqFg=";
+    hash = "sha256-OBRjHsFwwUOkx1tOgr9ZFT8EJ7wf6yz6Hv/RXlX8T0Q=";
   };
 
   installPhase = ''

From a22270679d2986df996cf56fea5c229942572723 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 17:50:24 +0000
Subject: [PATCH 074/110] terraform-providers.spotinst_spotinst: 1.237.0 ->
 1.238.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2bedeeeb7f0f..f65aef0992c1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1256,13 +1256,13 @@
     "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-rdE1+XqafMMF9+posQ4K1X1NmXdFcw/F3ivVpfYvcD8=",
+    "hash": "sha256-OX2uclduqzLPlRNHmji8X+PrEV78gdsE/W/SND4cVRA=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.237.0",
+    "rev": "v1.238.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sg4ql1YKi+2PMLuKJOmOpr3XUdsHlBmyhPFwGIQ4Dxg="
+    "vendorHash": "sha256-s6ld+xi++QWBlVmE+5BCY6+vMcn3yr/WM9NX/PlIC/M="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",

From f2493a4a77a621f42b18a0fea69f0d50e6635ab3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 17:57:00 +0000
Subject: [PATCH 075/110] terraform-providers.sumologic_sumologic: 3.2.8 ->
 3.2.9

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2bedeeeb7f0f..0e350bf9b02e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1274,13 +1274,13 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic_sumologic": {
-    "hash": "sha256-5X/3oHaW+b9U8W1DPKAJltDwGJjV4Mx1XP/JCkQtpwA=",
+    "hash": "sha256-MraUjj18ooGYfOnsEJ0oCPIFQITagNRGMeAqZqEQWU4=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.2.8",
+    "rev": "v3.2.9",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-R/+PS4cUtr8/twUXOPRiVweb5I9NNiD6mGOcAFr9IDs="
+    "vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg="
   },
   "sysdiglabs_sysdig": {
     "hash": "sha256-r14FsYrLqcZLcQlm25qOCKICTAb3dMBkphRAHiUeXrs=",

From b92228378d23e20da483d56ed6d8745bc708cf7b Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sat, 11 Jul 2026 14:54:26 +0100
Subject: [PATCH 076/110] aube: fix build

Co-Authored-By: chillcicada <chillcicada@users.noreply.github.com>
---
 pkgs/by-name/au/aube/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix
index b4c777b2ebba..acac055e65eb 100644
--- a/pkgs/by-name/au/aube/package.nix
+++ b/pkgs/by-name/au/aube/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  cacert,
   cmake,
   gitMinimal,
   versionCheckHook,
@@ -26,11 +27,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeCheckInputs = [ gitMinimal ];
 
   postInstall = ''
-    rm -f $out/bin/generate-settings-docs
+    rm -f $out/bin/generate-{error-codes,settings}-docs
   '';
 
+  checkFlags = [
+    # failed on x86_64-linux
+    "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
+  env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 

From 1e80ac708e3f6da0be52fa728487a89abe7c1999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 18:09:42 +0000
Subject: [PATCH 077/110] terraform-providers.f5networks_bigip: 1.27.0 ->
 1.28.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2bedeeeb7f0f..b8e54e4e2763 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -400,11 +400,11 @@
     "vendorHash": null
   },
   "f5networks_bigip": {
-    "hash": "sha256-tGERBmsYeoUPlTBknUOARQCs38cnAinJzFaRQDE2hHM=",
+    "hash": "sha256-CYTgJfT2RTS/affp4yZGgoUHPv5JeHfRTJ0JND7pqW4=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.27.0",
+    "rev": "v1.28.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From c4ae77b8cf54abfe585d08fc0c21fb23151d687f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:23:38 -0700
Subject: [PATCH 078/110] python3Packages.aiohomematic: 2026.7.2 -> 2026.7.6

Diff: https://github.com/SukramJ/aiohomematic/compare/2026.7.2...2026.7.6

Changelog: https://github.com/SukramJ/aiohomematic/blob/2026.7.6/changelog.md
---
 pkgs/development/python-modules/aiohomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index 567f2f7f6c74..a6f9579b4a0e 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2026.7.2";
+  version = "2026.7.6";
   pyproject = true;
 
   disabled = pythonOlder "3.14";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-P9w6re8ZRw04v6YKSYeYwjrpYpwqGSmRNWk4J+GbwpM=";
+    hash = "sha256-dshlAmjzv13Q9AijApEDNvhI3jLzDMLBs8KDtElzqJ4=";
   };
 
   build-system = [ setuptools ];

From 8a8a6b490a77514527a80845b63d64a7c80e3ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:24:05 -0700
Subject: [PATCH 079/110] python3Packages.openccu-loom-types: 0.1.52 -> 0.1.53

Diff: https://github.com/SukramJ/openccu-loom-types/compare/v0.1.52...v0.1.53

Changelog: https://github.com/SukramJ/openccu-loom-types/blob/v0.1.53/changelog.md
---
 .../development/python-modules/openccu-loom-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openccu-loom-types/default.nix b/pkgs/development/python-modules/openccu-loom-types/default.nix
index c61cccc380f5..be68cd180293 100644
--- a/pkgs/development/python-modules/openccu-loom-types/default.nix
+++ b/pkgs/development/python-modules/openccu-loom-types/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "openccu-loom-types";
-  version = "0.1.52";
+  version = "0.1.53";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
     owner = "SukramJ";
     repo = "openccu-loom-types";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cdQvGvOc8RZJ5riWHeRkY07RWu6z9kDYCVSC3+tWPPA=";
+    hash = "sha256-WoNB/xYE24qfmCSflWqgPp9FVDdCTAdOylOiOL5byMI=";
   };
 
   build-system = [ setuptools ];

From 80c285e543c54971298780eb9960d141f6ff59cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:24:27 -0700
Subject: [PATCH 080/110] python3Packages.openccu-loom-client: 2026.7.4 ->
 2026.7.6

Diff: https://github.com/SukramJ/openccu-loom-client/compare/2026.7.4...2026.7.6

Changelog: https://github.com/SukramJ/openccu-loom-client/blob/2026.7.6/changelog.md
---
 .../python-modules/openccu-loom-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openccu-loom-client/default.nix b/pkgs/development/python-modules/openccu-loom-client/default.nix
index f9b4e4c31f03..fe7e60bd734b 100644
--- a/pkgs/development/python-modules/openccu-loom-client/default.nix
+++ b/pkgs/development/python-modules/openccu-loom-client/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "openccu-loom-client";
-  version = "2026.7.4";
+  version = "2026.7.6";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     owner = "SukramJ";
     repo = "openccu-loom-client";
     tag = finalAttrs.version;
-    hash = "sha256-eI8fDslP4yVNamJtYTaMG7yw0liPAib0WmCUu+E9WUk=";
+    hash = "sha256-zeWZYYu/TdGr0OpAmiu0HMsXjf79TDy8lPNPm8x5urY=";
   };
 
   build-system = [ setuptools ];

From d585b4c95840e265a9d46c84986ebcb0bb426499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:24:36 -0700
Subject: [PATCH 081/110] home-assistant-custom-components.homematicip_local:
 2.8.2 -> 2.8.3

Diff: https://github.com/SukramJ/custom_homematic/compare/2.8.2...2.8.3

Changelog: https://github.com/SukramJ/custom_homematic/blob/2.8.3/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index f5a05af9eab6..cce0af2bcbbb 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -17,13 +17,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-KCvchOYhBYJNYbc/7HvuwrXMDoxkl15ikpJPZMC4cEc=";
+    hash = "sha256-CCs4+xHQGU4x7V9OpTvAjBP0/w+sXCoxqL0BaKVt15Y=";
   };
 
   postPatch = ''

From dbf2c2b6411809d9f21f96fb251b60641e342c54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 18:30:36 +0000
Subject: [PATCH 082/110] vrc-get: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/by-name/vr/vrc-get/package.nix b/pkgs/by-name/vr/vrc-get/package.nix
index 6cfdd0c005a5..e3403900bf75 100644
--- a/pkgs/by-name/vr/vrc-get/package.nix
+++ b/pkgs/by-name/vr/vrc-get/package.nix
@@ -10,11 +10,11 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vrc-get";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-b/rlHfm+AfrluCqoTyBqx86xVaNV3QBGollk5HyD4xk=";
+    hash = "sha256-7Remfn9U+yDvKuxLaeKAW+1Xqjz6dmm/nuxEIZwkZAg=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pkg-config
   ];
 
-  cargoHash = "sha256-TrmWZBEh2+eKqHu3hwrd2pIQggG3yFszxHQVuLHbs3M=";
+  cargoHash = "sha256-bU+TVVnbrhmkQ8L/u42Kkx0PCBufsjf2rN+GWnYg2h4=";
 
   # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling.
   # If no emulator is available, then give up on generating shell completions

From 9b2041b06ddc58783a81e54d383d342f21a25b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:31:49 -0700
Subject: [PATCH 083/110] python3Packages.aiohomematic: use finalAttrs

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

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index a6f9579b4a0e..5616fe089c26 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -17,7 +17,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aiohomematic";
   version = "2026.7.6";
   pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "aiohomematic";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-dshlAmjzv13Q9AijApEDNvhI3jLzDMLBs8KDtElzqJ4=";
   };
 
@@ -55,11 +55,11 @@ buildPythonPackage rec {
   meta = {
     description = "Module to interact with HomeMatic devices";
     homepage = "https://github.com/SukramJ/aiohomematic";
-    changelog = "https://github.com/SukramJ/aiohomematic/blob/${src.tag}/changelog.md";
+    changelog = "https://github.com/SukramJ/aiohomematic/blob/${finalAttrs.src.tag}/changelog.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       dotlambda
       fab
     ];
   };
-}
+})

From 6252b63db2800e851cedc3d3d54d6006d570a746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:32:26 -0700
Subject: [PATCH 084/110] python3Packages.aiohomematic: use __structuredAttrs

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

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index 5616fe089c26..8e98c2ff23c6 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage (finalAttrs: {
   pname = "aiohomematic";
   version = "2026.7.6";
   pyproject = true;
+  __structuredAttrs = true;
 
   disabled = pythonOlder "3.14";
 

From 08ebc6c0b25bf025a2809887e61c591aa25b59e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 11 Jul 2026 20:43:12 +0700
Subject: [PATCH 085/110] =?UTF-8?q?displaycal:=203.9.17=20=E2=86=92=203.9.?=
 =?UTF-8?q?18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/di/displaycal/package.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix
index a7422310e414..c6cc6cfec6e9 100644
--- a/pkgs/by-name/di/displaycal/package.nix
+++ b/pkgs/by-name/di/displaycal/package.nix
@@ -15,13 +15,13 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "displaycal";
-  version = "3.9.17";
+  version = "3.9.18";
   pyproject = true;
 
   src = fetchPypi {
-    pname = "DisplayCAL";
+    pname = "displaycal";
     inherit (finalAttrs) version;
-    hash = "sha256-cV8x1Hx+KQUhOOzqw/89QgoZ9+82vhwGrhG13KpE9Vw=";
+    hash = "sha256-mHUtO3vVIREzcIv6IFmPlo4nwuPPGDd9+UbIoXfvLYo=";
   };
 
   nativeBuildInputs = [
@@ -29,17 +29,30 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     gtk3
   ];
 
-  build-system = with python3.pkgs; [ setuptools ];
+  build-system = with python3.pkgs; [ setuptools_80 ];
+
+  postPatch = ''
+    # 2 conflicting copies of bin/displaycal end up from the installation
+    # process (one from pyproject.toml’s gui-scripts, one from setup.py). Keep
+    # only the setup.py version. Replace key with an invalide name to be
+    # skipped.
+    substituteInPlace pyproject.toml \
+      --replace-fail "[project.gui-scripts]" "[_project.gui-scripts]" \
+  '';
 
   dependencies = with python3.pkgs; [
     build
     certifi
+    defusedxml
     wxpython
     dbus-python
     distro
     numpy
     pillow
+    psutil
     pychromecast
+    pyglet
+    pyyaml
     send2trash
     zeroconf
   ];

From 1b844a8e744ea2be7eeb22c6124ae6825fd475dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:45:21 -0700
Subject: [PATCH 086/110] Revert "python313Packages.fs: pin to setuptools_80"

This reverts commit 6c81b30e2cd1aa5d76191ae549726cfc4cc31ae1 because
versioned attributes are not allowed in `dependencies`.
This lead to two versions of setuptools in bentoml's closure.
---
 pkgs/development/python-modules/fs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index c579ac186a6e..44715f97f82d 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -12,7 +12,7 @@
   pytestCheckHook,
   pythonAtLeast,
   pytz,
-  setuptools_80,
+  setuptools,
   six,
 }:
 
@@ -35,10 +35,10 @@ buildPythonPackage rec {
       --replace ThreadedTestFTPd FtpdThreadWrapper
   '';
 
-  build-system = [ setuptools_80 ];
+  build-system = [ setuptools ];
 
   dependencies = [
-    setuptools_80
+    setuptools
     six
     appdirs
     pytz

From c33f83b46f9c9d7a50eac5075a4b0bcc49afb8f5 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 11 Jul 2026 14:52:07 -0700
Subject: [PATCH 087/110] timbreid: replace explicit phases with nix flags

---
 pkgs/by-name/ti/timbreid/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ti/timbreid/package.nix b/pkgs/by-name/ti/timbreid/package.nix
index b9829d5c216b..827e9e407e2f 100644
--- a/pkgs/by-name/ti/timbreid/package.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -16,29 +16,28 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
   };
 
+  sourceRoot = ".";
+
   nativeBuildInputs = [ unzip ];
   buildInputs = [
     puredata
     fftwSinglePrec
   ];
 
-  unpackPhase = ''
-    mkdir source
-    cd source
-    unzip $src
-  '';
-
-  buildPhase = ''
-    make tIDLib.o all
-  '';
+  makeFlags = [
+    "tIDLib.o"
+    "all"
+  ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/
     cp -r *.pd $out/
     cp -r *.pd_linux $out/
     cp -r audio/ $out/
     cp -r data/ $out/
     cp -r doc/ $out/
+    runHook postInstall
   '';
 
   postFixup = ''

From 30f2fa0ce11e48b79815b75b7591b1f484c5ca3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 12 Jul 2026 20:59:48 +0200
Subject: [PATCH 088/110] privatebin: 2.0.4 -> 2.0.5

Diff: https://github.com/PrivateBin/PrivateBin/compare/2.0.4...2.0.5

Changelog: https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.5
---
 pkgs/by-name/pr/privatebin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix
index 58086830458d..9de52c4b9e4c 100644
--- a/pkgs/by-name/pr/privatebin/package.nix
+++ b/pkgs/by-name/pr/privatebin/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "privatebin";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "PrivateBin";
     repo = "PrivateBin";
     tag = finalAttrs.version;
-    hash = "sha256-OyTEi1D+B33e0Dqr/l/uTBcPTlC7AAqc2atnClYhyGo=";
+    hash = "sha256-om0l9psEus4+XZ+aXQ3DK5iWtQeCfCi2D6lNP+9FM6U=";
   };
 
   installPhase = ''

From 66e34083af508a84ad33f71c88491c70aee4f8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:50:54 -0700
Subject: [PATCH 089/110] python313Packages.fs: mark broken

It doesn't suffice to use setuptools_80 in `build-system` because fs
imports pkg_resources.
---
 pkgs/development/python-modules/fs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 44715f97f82d..d0dd7d12ff6a 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -88,6 +88,8 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   meta = {
+    # https://github.com/PyFilesystem/pyfilesystem2/issues/577
+    broken = lib.versionAtLeast setuptools.version "82";
     description = "Filesystem abstraction";
     homepage = "https://github.com/PyFilesystem/pyfilesystem2";
     changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md";

From 5c54aeaa1b1e88b3fc67bf04b90710dc2601bb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:02:09 -0700
Subject: [PATCH 090/110] python3Packages.fontfeatures: update dependencies

---
 .../python-modules/fontfeatures/default.nix         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix
index 450380bb166d..d67e7adcbd18 100644
--- a/pkgs/development/python-modules/fontfeatures/default.nix
+++ b/pkgs/development/python-modules/fontfeatures/default.nix
@@ -1,11 +1,9 @@
 {
   lib,
+  babelfont,
   buildPythonPackage,
   fetchPypi,
-  beziers,
   fonttools,
-  fs,
-  glyphtools,
   lxml,
   pytestCheckHook,
   youseedee,
@@ -25,12 +23,13 @@ buildPythonPackage rec {
     hash = "sha256-3PpUgaTXyFcthJrFaQqeUOvDYYFosJeXuRFnFrwp0R8=";
   };
 
-  propagatedBuildInputs = [
-    beziers
+  dependencies = [
     fonttools
-    fs
-    glyphtools
     lxml
+  ];
+
+  optional-dependencies.shaper = [
+    babelfont
     youseedee
   ];
 

From c850aa1420a7a128def76875aba2ee96611e7d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:16:31 -0700
Subject: [PATCH 091/110] python3Packages.ufolint: update dependencies

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

diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix
index 5993296e9e37..17dff4f048fd 100644
--- a/pkgs/development/python-modules/ufolint/default.nix
+++ b/pkgs/development/python-modules/ufolint/default.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
   commandlines,
   fonttools,
-  fs,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "ufolint";
   version = "1.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   # PyPI source tarballs omit tests, fetch from Github instead
   src = fetchFromGitHub {
@@ -21,11 +21,13 @@ buildPythonPackage rec {
     hash = "sha256-sv8WbnDd2LFHkwNsB9FO04OlLhemdzwjq0tC9+Fd6/M=";
   };
 
+  build-system = [ setuptools ];
+
   propagatedBuildInputs = [
     commandlines
-    fs
     fonttools
-  ];
+  ]
+  ++ fonttools.optional-dependencies.ufo;
 
   nativeBuildInputs = [ pytestCheckHook ];
 

From 0897fed1ad28b2196bebd97873b59e162d138fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:18:47 -0700
Subject: [PATCH 092/110] python3Packages.statmake: update dependencies

---
 pkgs/development/python-modules/statmake/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index 2a73d88a0eb1..f3369f12f0c5 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -5,8 +5,6 @@
   cattrs,
   fetchFromGitHub,
   fonttools,
-  fs,
-  poetry-core,
   pytestCheckHook,
   ufo2ft,
   ufolib2,
@@ -30,16 +28,12 @@ buildPythonPackage rec {
     hatchling
     hatch-vcs
   ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     cattrs
     fonttools
-    # required by fonttools[ufo]
-    fs
-  ];
+  ]
+  ++ fonttools.optional-dependencies.ufo;
 
   nativeCheckInputs = [
     pytestCheckHook

From 08acb1b09f2d5224b42c9045b43a752cc845b5cd Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@riseup.net>
Date: Mon, 13 Apr 2026 09:41:47 -0400
Subject: [PATCH 093/110] python3Packages.dataset: 1.6.2 -> 2.0.0

https://github.com/pudo/dataset/releases/tag/2.0.0

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/by-name/an/androguard/package.nix        |  9 +--------
 pkgs/by-name/di/diffoscope/package.nix        |  2 --
 pkgs/by-name/fd/fdroidserver/package.nix      | 15 ++++-----------
 pkgs/by-name/qu/quark-engine/package.nix      |  1 -
 .../python-modules/dataset/default.nix        | 19 +++++++------------
 5 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/an/androguard/package.nix b/pkgs/by-name/an/androguard/package.nix
index a9e9965f5dfd..0b44d5f84620 100644
--- a/pkgs/by-name/an/androguard/package.nix
+++ b/pkgs/by-name/an/androguard/package.nix
@@ -2,11 +2,4 @@
   python3Packages,
 }:
 
-let
-  pythonPackages = python3Packages.overrideScope (
-    self: super: {
-      sqlalchemy = self.sqlalchemy_1_4;
-    }
-  );
-in
-pythonPackages.toPythonApplication pythonPackages.androguard
+python3Packages.toPythonApplication python3Packages.androguard
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 5898aba19644..4832f52dafad 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -85,8 +85,6 @@ let
   python = python3.override {
     self = python;
     packageOverrides = final: prev: {
-      # version 2 breaks dataset and thus androguard
-      sqlalchemy = prev.sqlalchemy_1_4;
       # version 4 or newer would log the following error but tests currently don't fail because radare2 is disabled
       # ValueError: argument TNULL is not a TLSH hex string
       tlsh = prev.tlsh.overridePythonAttrs (
diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix
index b8cf0d26d0f3..dd622c371a77 100644
--- a/pkgs/by-name/fd/fdroidserver/package.nix
+++ b/pkgs/by-name/fd/fdroidserver/package.nix
@@ -7,14 +7,7 @@
   installShellFiles,
 }:
 
-let
-  pythonPackages = python3Packages.overrideScope (
-    self: super: {
-      sqlalchemy = self.sqlalchemy_1_4;
-    }
-  );
-in
-pythonPackages.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "fdroidserver";
   version = "2.4.3";
 
@@ -43,7 +36,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
   '';
 
   preConfigure = ''
-    ${pythonPackages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog
+    ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog
   '';
 
   postInstall = ''
@@ -55,12 +48,12 @@ pythonPackages.buildPythonApplication (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  build-system = with pythonPackages; [
+  build-system = with python3Packages; [
     setuptools
     babel
   ];
 
-  dependencies = with pythonPackages; [
+  dependencies = with python3Packages; [
     androguard
     biplist
     clint
diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix
index b0a38f3ca42f..7b7fef2f031f 100644
--- a/pkgs/by-name/qu/quark-engine/package.nix
+++ b/pkgs/by-name/qu/quark-engine/package.nix
@@ -11,7 +11,6 @@ let
       pytest-randomly = super.pytest-randomly.overridePythonAttrs {
         doCheck = false;
       };
-      sqlalchemy = self.sqlalchemy_1_4;
     }
   );
 in
diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix
index 5ed0fe4008e0..8cd68961990f 100644
--- a/pkgs/development/python-modules/dataset/default.nix
+++ b/pkgs/development/python-modules/dataset/default.nix
@@ -1,47 +1,42 @@
 {
   lib,
-  setuptools,
+  hatchling,
   alembic,
-  banal,
   buildPythonPackage,
   fetchFromGitHub,
   sqlalchemy,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "dataset";
-  version = "1.6.2";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pudo";
     repo = "dataset";
     tag = version;
-    hash = "sha256-hu1Qa5r3eT+xHFrCuYyJ9ZWvyoJBsisO34zvkch65Tc=";
+    hash = "sha256-A8X1Gv+b+K90LAZ5YDjeUbl3Y1fiaFwGj6urapLN3AQ=";
   };
 
   build-system = [
-    setuptools
+    hatchling
   ];
 
   dependencies = [
     alembic
-    banal
     sqlalchemy
   ];
 
-  # checks attempt to import nonexistent module 'test.test' and fail
-  doCheck = false;
-
   pythonImportsCheck = [ "dataset" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   meta = {
     description = "Toolkit for Python-based database access";
     homepage = "https://dataset.readthedocs.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ xfnw ];
-    # SQLAlchemy >= 2.0.0 is unsupported
-    # https://github.com/pudo/dataset/issues/411
-    broken = lib.versionAtLeast sqlalchemy.version "2.0.0";
   };
 }

From e3629cd4f0921bd44e5d161d00c4e70e677ae7f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 19:33:34 +0000
Subject: [PATCH 094/110] terraform-providers.hashicorp_tfe: 0.78.0 -> 0.79.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2bedeeeb7f0f..fdfb2d1f3627 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -661,11 +661,11 @@
     "vendorHash": "sha256-CwTlb0QTq0lpZK90IL6mBLoarFYFLsjiLYauGEaR1Rk="
   },
   "hashicorp_tfe": {
-    "hash": "sha256-otBeETd3wrGdpDU4MbY+qyad7ZVaoljlphBNytB36BY=",
+    "hash": "sha256-y6FZamAq/YhynWe55Syy5xA6aSPOeECkWRQbML1AjQU=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.78.0",
+    "rev": "v0.79.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-PKAFhHCaeCtV1frMyCidCcJgWTA8/7Cbdq6h3RTeqAQ="
   },

From d634535db18fdab6b85e768e3c3b7db247d6a53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:35:59 -0700
Subject: [PATCH 095/110] python3Packages.bentoml: mark insecure

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

diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 99703c943757..07dab66f838d 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -248,6 +248,14 @@ buildPythonPackage {
     description = "Build Production-Grade AI Applications";
     homepage = "https://github.com/bentoml/BentoML";
     changelog = "https://github.com/bentoml/BentoML/releases/tag/${src.tag}";
+    knownVulnerabilities = [
+      "CVE-2026-27905"
+      "CVE-2026-33744"
+      "CVE-2026-35043"
+      "CVE-2026-35044"
+      "CVE-2026-44345"
+      "CVE-2026-44346"
+    ];
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       happysalada

From 895f7deddc7515f5c094c8af312a274e3f90e570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:57:02 -0700
Subject: [PATCH 096/110] openllm: mark insecure

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

diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix
index d197e40c8dd3..321e25db6daa 100644
--- a/pkgs/by-name/op/openllm/package.nix
+++ b/pkgs/by-name/op/openllm/package.nix
@@ -64,6 +64,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Run any open-source LLMs, such as Llama 3.1, Gemma, as OpenAI compatible API endpoint in the cloud";
     homepage = "https://github.com/bentoml/OpenLLM";
     changelog = "https://github.com/bentoml/OpenLLM/releases/tag/${finalAttrs.src.tag}";
+    knownVulnerabilities = [
+      "CVE-2026-15035"
+    ];
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       happysalada

From e36b20e25e2748ccde541ddd7bcb976a4edffcd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 20:06:55 +0000
Subject: [PATCH 097/110] python3Packages.qh3: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index 972e74318f10..4773e622ff7f 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "qh3";
-  version = "1.9.2";
+  version = "1.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B1bCh4/KKXMbGb89XTiMaNqabeIdJ2hbDObzuNEj4NE=";
+    hash = "sha256-m77m+uw6tntW+YEo0+hKZx8EePNcoivBZC84X7RDu5o=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-9Bx8K9UwjEN/25+rePzm7ZNZ4nkNOCnwPjlooIA+Cuk=";
+    hash = "sha256-mQ7kRXi5dqSJ1D58rZivKVO6j3SC+9GkDZkErU21cQc=";
   };
 
   nativeBuildInputs = [

From 0d76345cd23fb2b0679a47944cb3550d67d5907c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:10:51 -0700
Subject: [PATCH 098/110] timbreid: enable parallel building

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

diff --git a/pkgs/by-name/ti/timbreid/package.nix b/pkgs/by-name/ti/timbreid/package.nix
index 827e9e407e2f..31dca749e93f 100644
--- a/pkgs/by-name/ti/timbreid/package.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     "all"
   ];
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/

From 483003dbd182901f1efc2a76b5dd092835e00a57 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 11 Jul 2026 10:24:21 +0200
Subject: [PATCH 099/110] orioledb: 17.20 -> 18.1 (orioledb-postgres)

Release Notes:
https://github.com/orioledb/postgres/releases/tag/patches18_1
https://github.com/orioledb/orioledb/releases/tag/beta16
---
 pkgs/by-name/or/orioledb/extension.nix |  8 ++++----
 pkgs/by-name/or/orioledb/package.nix   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/or/orioledb/extension.nix b/pkgs/by-name/or/orioledb/extension.nix
index c77b03cb0bb1..e9d14c107d32 100644
--- a/pkgs/by-name/or/orioledb/extension.nix
+++ b/pkgs/by-name/or/orioledb/extension.nix
@@ -10,14 +10,14 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "orioledb";
-  # SQL extension version is 1.8, official version is beta16-pre-3
-  version = "1.8-beta16-pre-3";
+  # SQL extension version is 1.8, official version is beta16
+  version = "1.8-beta16";
 
   src = fetchFromGitHub {
     owner = "orioledb";
     repo = "orioledb";
-    tag = "beta16-pre-3";
-    hash = "sha256-nBLyc9VFETRo75HfBSLmQ13a6Vcc9rlSCp06y/SnDqQ=";
+    tag = "beta16";
+    hash = "sha256-HCfNzMPt80nGeVwlstUCeMpdNZYd9KhLLHYyD/Hvuhk=";
   };
 
   buildInputs = postgresql.buildInputs ++ [
diff --git a/pkgs/by-name/or/orioledb/package.nix b/pkgs/by-name/or/orioledb/package.nix
index 85fbfee5ab66..7d29a7876385 100644
--- a/pkgs/by-name/or/orioledb/package.nix
+++ b/pkgs/by-name/or/orioledb/package.nix
@@ -1,20 +1,20 @@
 {
   fetchFromGitHub,
   lib,
-  postgresql_17,
+  postgresql_18,
 }:
 
 let
-  orioledb-postgres = postgresql_17.overrideAttrs (
+  orioledb-postgres = postgresql_18.overrideAttrs (
     finalAttrs: oldAttrs: {
       pname = "orioledb-postgres";
-      version = "17.20";
+      version = "18.1";
 
       src = fetchFromGitHub {
         owner = "orioledb";
         repo = "postgres";
-        tag = "patches17_20";
-        hash = "sha256-3dC00fFpD8fJDKed37oQvILMtA3GKBsWo1GEdUQzXzQ=";
+        tag = "patches18_1";
+        hash = "sha256-TCpmTa9R+a+rrTRSNkfhBDaVto1RtKf1R+qnepw9bV0=";
       };
 
       # Configure extracts the patch version from the git tag. This

From c11ef722638031b362942fac5b13182846785ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 13:10:54 -0700
Subject: [PATCH 100/110] python3Packages.vllm: add more known vulnerabilities

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

diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 3b5ff27ad559..8bd0a566fe8a 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -605,9 +605,21 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
       "x86_64-darwin"
     ];
     knownVulnerabilities = [
+      "CVE-2026-25960"
       "CVE-2026-27893"
+      "CVE-2026-41523"
       "CVE-2026-44222"
       "CVE-2026-44223"
+      "CVE-2026-47155"
+      "CVE-2026-48746"
+      "CVE-2026-53923"
+      "CVE-2026-54232"
+      "CVE-2026-54233"
+      "CVE-2026-54234"
+      "CVE-2026-54235"
+      "CVE-2026-54236"
+      "CVE-2026-55514"
+      "CVE-2026-55574"
     ];
   };
 })

From 895db8b608929bba887291b5e6978ee063b32d28 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Jul 2026 22:19:39 +0200
Subject: [PATCH 101/110] postgresql.withPackages: expose tests passthru

This allows running tests for example on `orioledb`, which is not only a
`postgresql` package, but wrapped with an extension.
---
 pkgs/servers/sql/postgresql/wrapper.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/wrapper.nix b/pkgs/servers/sql/postgresql/wrapper.nix
index c2a44ca46ce0..dbdfb136a2b5 100644
--- a/pkgs/servers/sql/postgresql/wrapper.nix
+++ b/pkgs/servers/sql/postgresql/wrapper.nix
@@ -64,6 +64,11 @@ buildEnv (finalAttrs: {
       };
     };
 
+    tests = lib.mapAttrs (
+      _: test:
+      if test.passthru or { } ? "override" then test.passthru.override finalAttrs.finalPackage else test
+    ) postgresql.tests;
+
     withJIT = recurse (_: installedExtensions ++ [ postgresql.jit ]);
     withoutJIT = recurse (_: lib.remove postgresql.jit installedExtensions);
 

From e2619a652d533cbffc5bd48f153e413e39f76ffc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 20:22:06 +0000
Subject: [PATCH 102/110] folia-major: 0.5.26 -> 0.5.27

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

diff --git a/pkgs/by-name/fo/folia-major/package.nix b/pkgs/by-name/fo/folia-major/package.nix
index 83ade7f9518d..bd4dc6d865d3 100644
--- a/pkgs/by-name/fo/folia-major/package.nix
+++ b/pkgs/by-name/fo/folia-major/package.nix
@@ -14,7 +14,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "folia-major";
-  version = "0.5.26";
+  version = "0.5.27";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "chthollyphile";
     repo = "folia-major";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0G7Mh34xW8kx3iP7V5u9qSqKdzqSsciVBW/g+0z7YVY=";
+    hash = "sha256-47W6nFDJlF9/voITX2nd9ZrH8gl+GNtESv1T6AXL3F4=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-ihFIXw9y2Ab+Z6CecBxFqcEGU4+sdy41hQoaknpCpb4=";
+    hash = "sha256-lLxa6fT35w+qdn08aNCi6Og/eFs72E8FfHTVM+fIvq8=";
   };
 
   nativeBuildInputs = [

From f65a47019632f1ad6e05a5b924f0ab0d2a756ffc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 22:33:38 +0000
Subject: [PATCH 103/110] python3Packages.arviz-base: ignore failing warning

---
 pkgs/development/python-modules/arviz-base/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/arviz-base/default.nix b/pkgs/development/python-modules/arviz-base/default.nix
index 99c5e909f275..814e3b911a0d 100644
--- a/pkgs/development/python-modules/arviz-base/default.nix
+++ b/pkgs/development/python-modules/arviz-base/default.nix
@@ -67,6 +67,11 @@ buildPythonPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
+  pytestFlags = [
+    # DeprecationWarning: Setting the shape on a NumPy array has been deprecated in NumPy 2.5.
+    "-Wignore::DeprecationWarning"
+  ];
+
   meta = {
     description = "Base ArviZ features and converters";
     homepage = "https://github.com/arviz-devs/arviz-base";

From 78dd83087469b88f54ed5736fd88031a48900037 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 20:42:55 +0000
Subject: [PATCH 104/110] searchix: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/by-name/se/searchix/package.nix b/pkgs/by-name/se/searchix/package.nix
index a7ea4cf31759..d8858a425861 100644
--- a/pkgs/by-name/se/searchix/package.nix
+++ b/pkgs/by-name/se/searchix/package.nix
@@ -18,13 +18,13 @@ in
 
 buildGoModule (finalAttrs: {
   pname = "searchix";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchFromCodeberg {
     owner = "alinnow";
     repo = "searchix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WhWIgx5HGynmsSKPdC4bTVnEoShpZjpG4TAuLFSmKZo=";
+    hash = "sha256-pyBl6y53Efa+4qQ92elA4r+zO7rPxha+4hnmmFTsoaE=";
   };
 
   vendorHash = "sha256-BG6v4HsXtSCmEmzdawH1YfEfDMbXNH8XGMF+jJgy+3w=";

From f6a3ebb1281b93927fb5ae1021fd7f5c036728c8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jul 2026 22:47:53 +0000
Subject: [PATCH 105/110] python3Packages.corner: 2.2.3 -> 2.3.0

Diff: https://github.com/dfm/corner.py/compare/v2.2.3...v2.3.0

Changelog: https://github.com/dfm/corner.py/releases/tag/v2.3.0
---
 .../python-modules/corner/default.nix         | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix
index 6fb5d809ddf6..fa3be6dda180 100644
--- a/pkgs/development/python-modules/corner/default.nix
+++ b/pkgs/development/python-modules/corner/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  writableTmpDirAsHomeHook,
 
   # build-system
   hatch-vcs,
@@ -13,6 +12,7 @@
 
   # optional-dependencies
   arviz,
+  arviz-base,
   ipython,
   myst-nb,
   pandoc,
@@ -23,28 +23,20 @@
 
   # tests
   pytestCheckHook,
-  corner,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "corner";
-  version = "2.2.3";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dfm";
     repo = "corner.py";
-    tag = "v${version}";
-    hash = "sha256-gK2yylteI3VLVJ0p7NB7bR7cirCo2BvFKnYIH3kfyh4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-H59IVXKPT4CLApn4kUuSuiYA9EWdOaH88Rd4YXf0VlQ=";
   };
 
-  nativeBuildInputs = [
-    # During `pythonImportsCheck`, `corner` imports `arviz` which wants to write a stamp file to the
-    # homedir. It then needs to be writable.
-    # https://github.com/arviz-devs/arviz/commit/4db612908f588d89bb5bfb6b83a08ada3d54fd02
-    writableTmpDirAsHomeHook
-  ];
-
   build-system = [
     hatch-vcs
     hatchling
@@ -53,9 +45,13 @@ buildPythonPackage rec {
   dependencies = [ matplotlib ];
 
   optional-dependencies = {
-    arviz = [ arviz ];
+    arviz = [
+      arviz
+      arviz-base
+    ];
     docs = [
       arviz
+      arviz-base
       ipython
       myst-nb
       pandoc
@@ -71,10 +67,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "corner" ];
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ corner.optional-dependencies.test;
+  nativeCheckInputs = [
+    arviz
+    pytestCheckHook
+    scipy
+  ];
 
-  # matplotlib.testing.exceptions.ImageComparisonFailure: images not close
   disabledTests = [
+    # matplotlib.testing.exceptions.ImageComparisonFailure: images not close
     "test_1d_fig_argument"
     "test_arviz"
     "test_basic"
@@ -103,6 +103,8 @@ buildPythonPackage rec {
     "test_title_quantiles_raises"
     "test_titles1"
     "test_titles2"
+    "test_titles_fmt_multi"
+    "test_titles_fmt_single"
     "test_top_ticks"
     "test_truths"
   ];
@@ -110,8 +112,8 @@ buildPythonPackage rec {
   meta = {
     description = "Make some beautiful corner plots";
     homepage = "https://github.com/dfm/corner.py";
-    changelog = "https://github.com/dfm/corner.py/releases/tag/v${version}";
+    changelog = "https://github.com/dfm/corner.py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From cc4f407d133ef4d5cc28acce791a1bba35f24cb2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:03:13 -0700
Subject: [PATCH 106/110] timbreid: specify gpl3Plus license

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

diff --git a/pkgs/by-name/ti/timbreid/package.nix b/pkgs/by-name/ti/timbreid/package.nix
index 31dca749e93f..d75c31eac9a9 100644
--- a/pkgs/by-name/ti/timbreid/package.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Collection of audio feature analysis externals for puredata";
     homepage = "http://williambrent.conflations.com/pages/research.html";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
   };

From a112bd3058db874e9fb4d5eddac8b14368a4e557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 21:19:23 +0000
Subject: [PATCH 107/110] libretro.vba-next: 0-unstable-2026-06-06 ->
 0-unstable-2026-06-29

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

diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/applications/emulators/libretro/cores/vba-next.nix
index a9a207d71dd6..c899f13b10a3 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-next.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-next.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vba-next";
-  version = "0-unstable-2026-06-06";
+  version = "0-unstable-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vba-next";
-    rev = "349b57c6442af56248433c114500a460ef9bfd8c";
-    hash = "sha256-46ps2P1a8pa9vcZ7Saz8Mh+w5e2lEWjIRAw5WQh1BjQ=";
+    rev = "91de6188c2544ecb13c7bc05e4d9c361d21a49ad";
+    hash = "sha256-gC5SAw7wHlMxvFFXOSFB5abInAme23140eAm5uyOlNg=";
   };
 
   meta = {

From 2f852c210864ef1483e4d3f813d05016d7b17b11 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sun, 12 Jul 2026 19:46:33 +0100
Subject: [PATCH 108/110] concord-tui: 2.2.13 -> 2.3.5

---
 pkgs/by-name/co/concord-tui/package.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix
index 906a3f885b5e..b6554a5202e1 100644
--- a/pkgs/by-name/co/concord-tui/package.nix
+++ b/pkgs/by-name/co/concord-tui/package.nix
@@ -7,19 +7,21 @@
   opus,
   lib,
   stdenv,
+  # TODO: Clean up on `staging`
+  lld,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "concord-tui";
-  version = "2.2.13";
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "concord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7Acffg3ExqdcqsMJyv1N74Ff1/NrA1gtw8Tpa3KM4r0=";
+    hash = "sha256-UYhwDV4tay3DqjGZNfnFNVXclAyjZKqp+gbIjXUzudE=";
   };
 
-  cargoHash = "sha256-CDU9ajRleP/Hr/9DA+8rr+uzv8V3xR9Ki1qtBHhYSpc=";
+  cargoHash = "sha256-S1ij7AukfmDosZz0TW9AVuriUFw4Eq0Pk6KxhcOr17o=";
 
   buildInputs = [
     opus
@@ -30,12 +32,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cmake
+  ]
+  # TODO: Clean up on `staging`
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    lld
   ];
 
   __darwinAllowLocalNetworking = true;
 
   __structuredAttrs = true;
 
+  # TODO: Clean up on `staging`
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}";
+  };
+
   meta = {
     description = "Feature-rich TUI client for Discord, written in Rust";
     homepage = "https://github.com/chojs23/concord";
@@ -43,6 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       Simon-Weij
       neo
+      Br1ght0ne
     ];
     mainProgram = "concord";
   };

From ee4109badce41aa56428285807361763816afd8f Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sun, 12 Jul 2026 22:54:20 +0100
Subject: [PATCH 109/110] fnox: 1.29.0 -> 1.30.0

Diff: https://github.com/jdx/fnox/compare/v1.29.0...v1.30.0

Changelog: https://github.com/jdx/fnox/releases/tag/v1.30.0
---
 pkgs/by-name/fn/fnox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fn/fnox/package.nix b/pkgs/by-name/fn/fnox/package.nix
index 35440e77bc14..06f3efe03306 100644
--- a/pkgs/by-name/fn/fnox/package.nix
+++ b/pkgs/by-name/fn/fnox/package.nix
@@ -14,16 +14,16 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
   pname = "fnox";
-  version = "1.29.0";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "fnox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sXFcvpAcHrzRbqYLIrq844TH1dHY1G23QIQoIcsCLGY=";
+    hash = "sha256-maG2+KBPBsZqRvs/Iddl7egs478s3IWOF+lJKQrjyjs=";
   };
 
-  cargoHash = "sha256-BhBWghjPC8qs5oKECmddV250YO4/hSWupOz+J9DYKog=";
+  cargoHash = "sha256-s3Cv7uAZlk67IiolLkFgcwonfYi9qUh8xXqyNPIPesM=";
 
   nativeBuildInputs = [
     perl

From ad44312900cf051fbd355ef2c198232c32434323 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 22:13:32 +0000
Subject: [PATCH 110/110] goperf: 0-unstable-2026-06-15 ->
 0-unstable-2026-07-08

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

diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix
index 8e7dee2c1b42..0898a504ae3d 100644
--- a/pkgs/by-name/go/goperf/package.nix
+++ b/pkgs/by-name/go/goperf/package.nix
@@ -9,15 +9,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "goperf";
-  version = "0-unstable-2026-06-15";
+  version = "0-unstable-2026-07-08";
 
   src = fetchgit {
     url = "https://go.googlesource.com/perf";
-    rev = "9e4b9ddef5b6a4371594ec978cb4b8088bec845d";
-    hash = "sha256-q03UUW5fJPLd6UicH+q2KEC9sx3Ph64ebzi4sxW4+rg=";
+    rev = "82a0b07e230d76fa1b3036c383d7a98172f87334";
+    hash = "sha256-TOzEoIWofdWlAfKWBS5KWxVpHsn2wx6GZDjACxFZiKI=";
   };
 
-  vendorHash = "sha256-qGQpf0T1qBcu+25VF2xnbvImj+Fs81Ru9tho/0RJwzo=";
+  vendorHash = "sha256-PBvMccuMBBGfJlETw0Xjm5Ojkgg1BS+y9Kc3vwGW5kk=";
 
   passthru.updateScript = writeShellScript "update-goperf" ''
     export UPDATE_NIX_ATTR_PATH=goperf