From 8bb81548d254a2315f89cfc234eb5bc90cc18431 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:32:06 -0800
Subject: [PATCH 001/339] jetbrains-toolbox: move icon to spec-compliant
 location

---
 pkgs/by-name/je/jetbrains-toolbox/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index e883a994d56c..6af41d46c776 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -94,7 +94,7 @@ selectKernel {
 
       extraInstallCommands = ''
         install -Dm0644 ${src}/bin/jetbrains-toolbox.desktop -t $out/share/applications
-        install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/pixmaps/jetbrains-toolbox.png
+        install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/icons/hicolor/32x32/apps/jetbrains-toolbox.png
       '';
     };
 

From ee8c55de73c69ef7d7f80ce3187d3ff49355d544 Mon Sep 17 00:00:00 2001
From: username-generic <username-generic@tuta.io>
Date: Sun, 5 Apr 2026 18:04:47 +0200
Subject: [PATCH 002/339] maintainers: add username-generic

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cdcb7f59fffc..5462c1bf7179 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28213,6 +28213,12 @@
     githubId = 17836748;
     name = "Mason Mackaman";
   };
+  username-generic = {
+    name = "username-generic";
+    email = "username-generic@tuta.io";
+    github = "username-generic";
+    githubId = 202454830;
+  };
   usertam = {
     name = "Samuel Tam";
     email = "code@usertam.dev";

From 7e29261840b0ca3e940a9a5500f12514a161821f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 07:01:10 +0000
Subject: [PATCH 003/339] lowfi: 2.0.2 -> 2.0.6

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

diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix
index 5c3d2d6076f8..9a7dc2462388 100644
--- a/pkgs/by-name/lo/lowfi/package.nix
+++ b/pkgs/by-name/lo/lowfi/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lowfi";
-  version = "2.0.2";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "talwat";
     repo = "lowfi";
     tag = finalAttrs.version;
-    hash = "sha256-RSdfZ0GrNhPcqDWutJW0VlplbpBNBCpSvw91fpl0d4E=";
+    hash = "sha256-t61R68cuAEAjyY5cR2rpTa+pSE3DDDct9G4p/aeTgsQ=";
   };
 
-  cargoHash = "sha256-OAg3ZpBmuINkc6KZJGKvYFnpv9hVbwlnOEP5ICtYh28=";
+  cargoHash = "sha256-ogoQWcS6htU515xjJW7jQYqpfHAQ48a8QaaBPvkGrXg=";
 
   buildFeatures = [ "scrape" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ];
 

From bfc1d590a84023507bfbcfa0a9476dc7eac1a7f6 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 15 May 2026 12:33:39 +0200
Subject: [PATCH 004/339] python3Packages.cartopy: add geospatial team

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

diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 2c82eae651f0..fca8fde9ec84 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -95,6 +95,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}";
     license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
+    teams = [ lib.teams.geospatial ];
     mainProgram = "feature_download";
   };
 }

From 96de2ba261e7fdf8fb5d1b9bde2ab4d991ad567c Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 15 May 2026 12:44:45 +0200
Subject: [PATCH 005/339] ifcopenshell: add geospatial team

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

diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index bcdde4021d10..151303f6bb8e 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -210,6 +210,6 @@ buildPythonPackage rec {
     description = "Open source IFC library and geometry engine";
     homepage = "https://ifcopenshell.org/";
     license = lib.licenses.lgpl3;
-    maintainers = with lib.maintainers; [ autra ];
+    teams = [ lib.teams.geospatial ];
   };
 }

From 285d04c859afbbac1cf9666adc4f9c7f36d1d7ff Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 15 May 2026 13:05:29 +0200
Subject: [PATCH 006/339] python3Packages.opensfm: add geospatial team

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

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index 2a7a13e7924c..8be40ab1731a 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -173,6 +173,7 @@ buildPythonPackage (finalAttrs: {
       lib.maintainers.pbsds
       lib.maintainers.SomeoneSerge
     ];
+    teams = [ lib.teams.geospatial ];
     license = lib.licenses.bsd2;
     changelog = "https://github.com/mapillary/OpenSfM/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Open source Structure-from-Motion pipeline from Mapillary";

From 43d722b1e032fdde6d16ded1815606956e002be7 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 15 May 2026 13:05:40 +0200
Subject: [PATCH 007/339] python3Packages.streamlit-folium: add geospatial team

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

diff --git a/pkgs/development/python-modules/streamlit-folium/default.nix b/pkgs/development/python-modules/streamlit-folium/default.nix
index 91bd46677919..6dced922d4b1 100644
--- a/pkgs/development/python-modules/streamlit-folium/default.nix
+++ b/pkgs/development/python-modules/streamlit-folium/default.nix
@@ -64,5 +64,6 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/randyzwitch/streamlit-folium/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    teams = [ lib.teams.geospatial ];
   };
 })

From 0085f4f7a8c03cac61915396708feb96f8895c7b Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Tue, 19 May 2026 13:05:43 +0200
Subject: [PATCH 008/339] sunshine: fix updater script

The script broke when invoked from the package directory: nix-update
looked for a default.nix in the cwd. Move to the nixpkgs root before
calling it.

`--generate-lockfile` and the npmDepsHash refresh are mutually exclusive
in a single nix-update pass, so the ui subpackage hash was never
updated.
Split the ui update into two passes.

Also restore the early-exit when UPDATE_NIX_OLD_VERSION matches, quote
$version, and add the shellcheck shell directive.

Assisted-by: Claude Code 4.7
---
 pkgs/by-name/su/sunshine/updater.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sunshine/updater.sh b/pkgs/by-name/su/sunshine/updater.sh
index 82e74a44c0e3..6092a8bfd582 100755
--- a/pkgs/by-name/su/sunshine/updater.sh
+++ b/pkgs/by-name/su/sunshine/updater.sh
@@ -1,13 +1,20 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p gnugrep curl jq nix-update
+# shellcheck shell=bash
 
 set -euo pipefail
 
+cd "$(dirname "${BASH_SOURCE[0]}")/../../../.."
+
 version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --location https://api.github.com/repos/LizardByte/Sunshine/releases/latest | jq --raw-output .tag_name | grep -oP "^v\K.*")
 
-if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
+if [[ "${UPDATE_NIX_OLD_VERSION:-}" == "$version" ]]; then
     echo "Already up to date!"
     exit 0
 fi
 
-nix-update sunshine --version $version --generate-lockfile --subpackage ui
+nix-update sunshine --version "$version"
+# `--generate-lockfile` only regenerates package-lock.json; it skips the npmDepsHash
+# refresh (see nix-update's dependency_hashes.py). Run a second pass to update the hash.
+nix-update sunshine --version=skip --generate-lockfile --subpackage ui
+nix-update sunshine --version=skip --subpackage ui

From f2dedc3a45dfdfa128f3a91f78198447de97326f Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <beme@anthropic.com>
Date: Tue, 19 May 2026 10:14:14 -0400
Subject: [PATCH 009/339] default-crate-overrides: add zstd-sys and fuser

zstd-sys: set ZSTD_SYS_USE_PKG_CONFIG so build.rs probes the system
libzstd via pkg-config instead of compiling the vendored C amalgamation
from scratch in every consumer.

fuser: with the default-on libfuse feature, build.rs discovers libfuse
via pkg-config and has no vendored fallback, so it fails in the sandbox
without pkg-config and fuse3 in scope.
---
 pkgs/build-support/rust/default-crate-overrides.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index c28fe180c3e2..8e43bfa98173 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -15,6 +15,7 @@
   fontconfig,
   foundationdb,
   freetype,
+  fuse3,
   gdk-pixbuf,
   glib,
   gmp,
@@ -43,6 +44,7 @@
   udev,
   webkitgtk_4_1,
   zlib,
+  zstd,
   buildPackages,
   ...
 }:
@@ -146,6 +148,11 @@
     buildInputs = [ freetype ];
   };
 
+  fuser = attrs: {
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ fuse3 ];
+  };
+
   glib-sys = attrs: {
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ glib ];
@@ -392,6 +399,12 @@
     buildInputs = [ python3 ];
   };
 
+  zstd-sys = attrs: {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ zstd ];
+  };
+
   atk-sys = attrs: {
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ atk ];

From a6fc69fe4069e804f66e01b02e382f39963bcfd2 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <beme@anthropic.com>
Date: Tue, 19 May 2026 10:16:51 -0400
Subject: [PATCH 010/339] buildRustCrate: add devDependencies parameter for
 buildTests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cargo links [dev-dependencies] only when building test or bench
targets. buildRustCrate models normal deps (`dependencies`) and
build-script deps (`buildDependencies`) but has no equivalent: callers
that set `buildTests = true` for a crate with dev-deps must compute the
dev-dep set themselves and splice it into `dependencies` via .override.

Add a `devDependencies` parameter that is appended to the linked
dependency list only when `buildTests = true`. The append happens at the
single point where `dependencies` is normalized, so it threads through
to the --extern flags, the deps directory in configurePhase, the
metadata hash, and propagated build inputs without further changes.

When `buildTests = false` the parameter is dropped, so existing lib/bin
derivations are byte-identical to before — no rebuilds for users that
don't pass it.

Includes a test case in build-rust-crate/test that fails without the
change (`can't find crate for dev_dep`).
---
 .../rust/build-rust-crate/default.nix         | 15 ++++++++++++-
 .../rust/build-rust-crate/test/default.nix    | 21 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index af1ec421da9b..e3dbde5d2f16 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -198,6 +198,13 @@ lib.makeOverridable
       # Rust build dependencies, i.e. other libraries that were built
       # with buildRustCrate and are used by a build script.
       buildDependencies,
+      # Rust dev-dependencies, i.e. other libraries that were built
+      # with buildRustCrate and are linked only when `buildTests = true`.
+      # Mirrors Cargo's `[dev-dependencies]`: ignored for the regular
+      # lib/bin build, appended to `dependencies` for the test build.
+      #
+      # Default: []
+      devDependencies,
       # Specify the "extern" name of a library if it differs from the library target.
       # See above for an extended explanation.
       #
@@ -323,6 +330,7 @@ lib.makeOverridable
       crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: { }) crateOverrides crate_);
       dependencies_ = dependencies;
       buildDependencies_ = buildDependencies;
+      devDependencies_ = devDependencies;
       processedAttrs = [
         "src"
         "propagatedBuildInputs"
@@ -334,6 +342,7 @@ lib.makeOverridable
         "libPath"
         "buildDependencies"
         "dependencies"
+        "devDependencies"
         "features"
         "crateRenames"
         "crateName"
@@ -421,7 +430,10 @@ lib.makeOverridable
           ++ (crate.buildInputs or [ ])
           ++ buildInputs_
           ++ completePropagatedBuildInputs;
-        dependencies = map lib.getLib dependencies_;
+        # Dev-dependencies are only linked when building tests, mirroring
+        # Cargo. When buildTests is false this is a no-op, so the metadata
+        # hash and store path of normal lib/bin builds are unchanged.
+        dependencies = map lib.getLib (dependencies_ ++ lib.optionals buildTests_ devDependencies_);
         buildDependencies = map lib.getLib buildDependencies_;
 
         completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies);
@@ -617,6 +629,7 @@ lib.makeOverridable
     postInstall = crate_.postInstall or "";
     dependencies = crate_.dependencies or [ ];
     buildDependencies = crate_.buildDependencies or [ ];
+    devDependencies = crate_.devDependencies or [ ];
     crateRenames = crate_.crateRenames or { };
     buildTests = crate_.buildTests or false;
   }
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 75a483a0096f..13c52a44c079 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -404,6 +404,27 @@ rec {
             "test something ... ok"
           ];
         };
+        rustLibTestsWithDevDependency =
+          let
+            devDep = mkHostCrate {
+              crateName = "dev-dep";
+              src = mkLib "src/lib.rs";
+            };
+          in
+          {
+            src = mkFile "src/lib.rs" ''
+              #[cfg(test)]
+              mod tests {
+                  #[test]
+                  fn uses_dev_dep() {
+                      assert_eq!(dev_dep::test(), 23);
+                  }
+              }
+            '';
+            devDependencies = [ devDep ];
+            buildTests = true;
+            expectedTestOutputs = [ "test tests::uses_dev_dep ... ok" ];
+          };
         rustBinTestsCombined = {
           src = symlinkJoin {
             name = "rust-bin-tests-combined";

From a53ede53dc8f3e9299c6a8db9344bfa01da7c1f3 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <beme@anthropic.com>
Date: Tue, 19 May 2026 10:14:34 -0400
Subject: [PATCH 011/339] buildRustCrate: remap crate source root to
 /<crateName>-<version>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

buildRustCrate passes `--remap-path-prefix=$NIX_BUILD_TOP=/` so the
sandbox build directory is not embedded in compiled artifacts. The
resulting source path is `/$sourceRoot/src/...` — which works out to
`/<crateName>-<version>/src/...` only because fetchCrate happens to
unpack to a directory named after the crate.

When `src` is supplied directly — `lib.fileset.toSource` (always
`source`), `lib.cleanSource ./.`, a flake's `self`, or any
`<hash>-source` store path — stdenv unpacks to `$NIX_BUILD_TOP/source/`,
so every such crate ends up with `/source/src/lib.rs`. The crate
identity is gone from panic backtraces, `file!()` expansions, debuginfo,
and llvm-cov coverage maps. Workspace builds via crate2nix that source
each member with a fileset see all members collapse to the same prefix,
making per-crate coverage and backtrace attribution impossible without a
per-crate remap override.

Add a second, more specific remap of `$NIX_BUILD_TOP/$sourceRoot` to
`/<crateName>-<version>`. rustc applies `--remap-path-prefix` flags
last-match-wins, so this prefix wins for everything under the source
root — which in a buildRustCrate build is effectively everything that
would otherwise embed a sandbox path, including `OUT_DIR` (placed at
`$sourceRoot/target/build/` by configure-crate.nix). The broader
`$NIX_BUILD_TOP=/` remap stays as a fallback for any path outside
`$sourceRoot`.

This is safe with respect to the original remap's purpose:

- Reproducibility: still maps the per-build sandbox path to a fixed,
  build-independent string. `crateName` and `version` are already
  derivation inputs, so the result is deterministic.
- Closure size: still no store paths in the embedded strings.
- fetchCrate sources: `$sourceRoot` is `<crateName>-<version>` there,
  so the new remap rewrites `/<crateName>-<version>` to itself — the
  output is byte-for-byte identical. Only custom-`src` crates change,
  and they change from a degenerate `/source/...` to the same shape
  fetchCrate crates already had.
- The remap only affects path *strings* embedded in output (DWARF
  `DW_AT_comp_dir`/`DW_AT_name`, `file!()`, `Location::file()`, LLVM
  coverage filename tables). It does not change which files are read
  or compiled.

Users who depend on the old `/source/...` prefix can restore it via
`extraRustcOpts`, which is appended after these flags and therefore
wins under last-match-wins.
---
 .../rust/build-rust-crate/build-crate.nix         | 15 +++++++++++++++
 .../rust/build-rust-crate/default.nix             |  1 +
 2 files changed, 16 insertions(+)

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index d5b7166207fa..4a337ddc2218 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -9,6 +9,7 @@
 
 {
   crateName,
+  version,
   dependencies,
   crateFeatures,
   crateRenames,
@@ -32,6 +33,20 @@ let
     (if release then "-C opt-level=3" else "-C debuginfo=2")
     "-C codegen-units=${toString codegenUnits}"
     "--remap-path-prefix=$NIX_BUILD_TOP=/"
+    # Map the unpacked source root to a stable, crate-identifying path.
+    # Sources from fetchCrate unpack to $NIX_BUILD_TOP/<crateName>-<version>,
+    # so the prefix above already yields /<crateName>-<version>/src/... and
+    # this remap is a no-op for them. Sources supplied via a custom `src`
+    # (lib.fileset.toSource, lib.cleanSource, a flake's `self`) all unpack to
+    # a fixed basename like `source`, so without this every such crate
+    # collapses to /source/src/... — losing crate identity in panic
+    # backtraces, file!() expansions, debuginfo, and coverage maps. rustc
+    # applies remaps last-match-wins, so this more-specific prefix wins
+    # for everything under the source root (including OUT_DIR, which
+    # configure-crate.nix places at $sourceRoot/target/build/); the
+    # broader $NIX_BUILD_TOP remap above remains as a fallback for any
+    # path that happens to fall outside $sourceRoot.
+    "--remap-path-prefix=$NIX_BUILD_TOP/$sourceRoot=/${crateName}-${version}"
     # When the rust-src component is present (common with rust-overlay
     # toolchains), rustc unvirtualises libstd source paths. Panic
     # locations from monomorphised generic std code then embed the
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index af1ec421da9b..799d8daec8b8 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -543,6 +543,7 @@ lib.makeOverridable
         buildPhase = buildCrate {
           inherit
             crateName
+            version
             dependencies
             crateFeatures
             crateRenames

From 735734474f74eb294aeb2e530ce36f83cec8b895 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <beme@anthropic.com>
Date: Tue, 19 May 2026 10:17:59 -0400
Subject: [PATCH 012/339] buildRustCrate: add useClippy parameter to lint with
 clippy-driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

buildRustCrate calls rustc directly, so there is no built-in equivalent
of `cargo clippy`. The capLints doc already hints at the existing
workaround — overriding the `rust` attribute with a wrapper script that
sniffs argv for build_script_build and routes everything else to
clippy-driver. That works because clippy-driver IS rustc internally
(rustc_driver plus lint passes) and produces compatible rlibs and
metadata, but the wrapper is fragile and every downstream reinvents it.

Add a `useClippy` boolean (default false) that swaps the lib/bin/test
compilation to clippy-driver while keeping plain rustc for build.rs —
the same lib-vs-build-script split as extraRustcOptsForBuildRs, since
build scripts are typically auto-generated and clippy noise there is
not actionable. The clippy-driver binary comes from a new `clippy`
parameter, auto-filled from pkgs.clippy by callPackage and overridable
alongside `rust` for toolchain bundles that ship their own.

Implemented by introducing a RUSTC_DRIVER shell variable in
build-crate.nix that lib.sh's build_lib/build_bin consume; the
build_script_build path in configure-crate.nix never sees it.

Note that the default `capLints = "allow"` cap suppresses clippy lints
along with everything else, so `useClippy` is usually paired with
`capLints = "warn"` and `-W clippy::*`/`-D warnings` flags via
extraRustcOpts. Documented in the manual.

Test fixtures cover the three load-bearing properties: a denied clippy
lint fails the build (proving clippy-driver ran), the default capLints
silences clippy lints just like rustc lints, and an rlib emitted by
clippy-driver is link-compatible with a plain-rustc dependent.
---
 doc/languages-frameworks/rust.section.md      | 31 ++++++++-
 .../rust/build-rust-crate/build-crate.nix     |  2 +
 .../rust/build-rust-crate/default.nix         | 30 ++++++++
 .../rust/build-rust-crate/lib.sh              |  4 +-
 .../rust/build-rust-crate/test/default.nix    | 69 +++++++++++++++++++
 5 files changed, 132 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index d7bb32d856af..87d916cb4a12 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -876,8 +876,7 @@ general. A number of other parameters can be overridden:
   empty, or `"forbid"` (no cap) when `lints` is set. Because `rustc`
   only honours the first `--cap-lints` it receives, this cannot be
   changed via `extraRustcOpts`; use this attribute instead. Useful
-  when overriding the `rust` attribute to point at `clippy-driver`,
-  since clippy lints are also capped by this flag:
+  with `useClippy`, since clippy lints are also capped by this flag:
 
   ```nix
   (hello { }).override { capLints = "warn"; }
@@ -903,6 +902,34 @@ general. A number of other parameters can be overridden:
   }
   ```
 
+- Whether to compile the crate with `clippy-driver` instead of `rustc`.
+  Build scripts (`build.rs`) keep plain `rustc`. The default `capLints`
+  of `"allow"` suppresses all lints including clippy's, so this is
+  usually paired with `capLints` and lint flags via `extraRustcOpts`:
+
+  ```nix
+  (hello { }).override {
+    useClippy = true;
+    capLints = "warn";
+    extraRustcOpts = [
+      "-Dwarnings"
+      "-Wclippy::all"
+    ];
+  }
+  ```
+
+  When using a Rust toolchain that bundles its own `clippy-driver`
+  (rust-overlay, Fenix), pass it via `clippy` so the sysroot matches:
+
+  ```nix
+  (hello { }).override {
+    rust = myToolchain;
+    clippy = myToolchain;
+    useClippy = true;
+    capLints = "warn";
+  }
+  ```
+
 - Phases, just like in any other derivation, can be specified using
   the following attributes: `preUnpack`, `postUnpack`, `prePatch`,
   `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index d5b7166207fa..9c2005907275 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -25,6 +25,7 @@
   buildTests,
   codegenUnits,
   capLints,
+  useClippy,
 }:
 
 let
@@ -94,6 +95,7 @@ in
   runHook preBuild
 
   # configure & source common build functions
+  RUSTC_DRIVER="${if useClippy then "clippy-driver" else "rustc"}"
   LIB_RUSTC_OPTS="${libRustcOpts}"
   BIN_RUSTC_OPTS="${binRustcOpts}"
   LIB_EXT="${stdenv.hostPlatform.extensions.library}"
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index af1ec421da9b..bf2a6af10fa9 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -12,6 +12,7 @@
   pkgsBuildBuild,
   rustc,
   cargo,
+  clippy,
   jq,
   libiconv,
   # Controls codegen parallelization for all crates.
@@ -163,6 +164,31 @@ lib.makeOverridable
       #
       # Default: pkgs.cargo
       cargo ? cargo,
+      # Whether to compile the crate's library, binary, and test targets with
+      # `clippy-driver` instead of `rustc`. Build scripts (`build.rs`) keep
+      # plain `rustc` — they are typically auto-generated and clippy findings
+      # there are not actionable.
+      #
+      # `clippy-driver` wraps `rustc_driver` with extra lint passes and emits
+      # link-compatible `.rlib`/`.rmeta`, so dependency crates built with plain
+      # `rustc` are still usable; only the crate being linted needs this flag.
+      #
+      # Note that the default `capLints` of `"allow"` suppresses ALL lints,
+      # including clippy's. Set `capLints = "warn"` (or `"forbid"`) or supply
+      # a `lints` table — otherwise `useClippy` is a silent no-op. Lint flags
+      # such as `-D warnings` or `-W clippy::pedantic` go through the regular
+      # `extraRustcOpts` (clippy-driver forwards rustc flags unchanged).
+      #
+      # Example: true
+      # Default: false
+      useClippy,
+      # The clippy package providing `clippy-driver`. Only consulted when
+      # `useClippy = true`. Override this together with `rust` when using a
+      # toolchain (rust-overlay, Fenix) that bundles its own `clippy-driver`,
+      # so the sysroot matches.
+      #
+      # Default: pkgs.clippy
+      clippy ? clippy,
       # Whether to build a release version (`true`) or a debug
       # version (`false`). Debug versions are faster to build
       # but might be much slower at runtime.
@@ -412,6 +438,7 @@ lib.makeOverridable
           cargo
           jq
         ]
+        ++ lib.optional useClippy clippy
         ++ lib.optionals stdenv.hasCC [ stdenv.cc ]
         ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ]
         ++ (crate.nativeBuildInputs or [ ])
@@ -559,6 +586,7 @@ lib.makeOverridable
             buildTests
             codegenUnits
             capLints
+            useClippy
             ;
         };
         dontStrip = !release;
@@ -594,6 +622,8 @@ lib.makeOverridable
   {
     rust = crate_.rust or rustc;
     cargo = crate_.cargo or cargo;
+    useClippy = crate_.useClippy or false;
+    clippy = crate_.clippy or clippy;
     release = crate_.release or true;
     verbose = crate_.verbose or true;
     extraRustcOpts = [ ];
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index 4d736302a0c9..28a705c7ce6a 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -10,7 +10,7 @@ build_lib() {
   lib_src=$1
   echo_build_heading $lib_src ${libName}
 
-  noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \
+  noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \
     --crate-name $CRATE_NAME \
     $lib_src \
     --out-dir target/lib \
@@ -42,7 +42,7 @@ build_bin() {
     main_file=$2
   fi
   echo_build_heading $crate_name $main_file
-  noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \
+  noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \
     --crate-name $crate_name_ \
     $main_file \
     --crate-type bin \
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 75a483a0096f..003e7cafce7b 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1042,6 +1042,75 @@ rec {
           touch $out
         '';
 
+      # `useClippy = true` plus a denied clippy lint should fail the build,
+      # proving clippy-driver (not plain rustc) compiled the crate. The
+      # `clippy::` prefix in the diagnostic is the fingerprint: rustc has no
+      # such lint group.
+      useClippyDenyFails =
+        let
+          crate = mkHostCrate {
+            crateName = "useClippyDenyFails";
+            useClippy = true;
+            lints.clippy.eq_op = "deny";
+            src = mkFile "src/lib.rs" ''
+              pub fn check() -> bool {
+                1 == 1
+              }
+            '';
+          };
+          failed = testers.testBuildFailure crate;
+        in
+        runCommand "assert-useClippyDenyFails" { inherit failed; } ''
+          grep -q 'clippy::eq.op' "$failed/testBuildFailure.log"
+          grep -q 'equal expressions' "$failed/testBuildFailure.log"
+          touch $out
+        '';
+
+      # `useClippy = true` with the default `capLints` (which resolves to
+      # `"allow"` when `lints` is empty) must still build: the cap silences
+      # clippy lints just like rustc lints. Same source as the failing test
+      # above — only the `lints` table differs.
+      useClippyDefaultCapAllows = mkHostCrate {
+        crateName = "useClippyDefaultCapAllows";
+        useClippy = true;
+        src = mkFile "src/lib.rs" ''
+          pub fn check() -> bool {
+            1 == 1
+          }
+        '';
+      };
+
+      # A library compiled by clippy-driver must produce an `.rlib` that a
+      # plain-rustc dependent can link against and run. This is the property
+      # that makes `useClippy` safe to flip per-crate.
+      useClippyRlibLinkCompat =
+        let
+          libCrate = mkHostCrate {
+            crateName = "clippylib";
+            useClippy = true;
+            src = mkFile "src/lib.rs" ''
+              pub fn test() -> i32 {
+                23
+              }
+            '';
+          };
+          binCrate = mkHostCrate {
+            crateName = "clippybin";
+            dependencies = [ libCrate ];
+            src = mkBinExtern "src/main.rs" "clippylib";
+          };
+        in
+        runCommand "run-useClippyRlibLinkCompat" { nativeBuildInputs = [ binCrate ]; } (
+          if stdenv.hostPlatform == stdenv.buildPlatform then
+            ''
+              ${binCrate}/bin/clippybin && touch $out
+            ''
+          else
+            ''
+              test -x '${binCrate}/bin/clippybin' && touch $out
+            ''
+        );
+
       rcgenTest =
         let
           pkg = rcgenCrates.rootCrate.build;

From 957bc4efe132baa75decb5440938666e13ec5fd6 Mon Sep 17 00:00:00 2001
From: username-generic <username-generic@tuta.io>
Date: Sun, 31 May 2026 19:29:26 +0200
Subject: [PATCH 013/339] flightcore: init at 3.2.2

---
 .../fl/flightcore/override-tauri.conf.json    |   8 ++
 pkgs/by-name/fl/flightcore/package.nix        | 120 ++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 pkgs/by-name/fl/flightcore/override-tauri.conf.json
 create mode 100644 pkgs/by-name/fl/flightcore/package.nix

diff --git a/pkgs/by-name/fl/flightcore/override-tauri.conf.json b/pkgs/by-name/fl/flightcore/override-tauri.conf.json
new file mode 100644
index 000000000000..9c3b2d049b86
--- /dev/null
+++ b/pkgs/by-name/fl/flightcore/override-tauri.conf.json
@@ -0,0 +1,8 @@
+{
+  "build": {
+    "beforeBuildCommand": ""
+  },
+  "bundle":{
+    "createUpdaterArtifacts": false
+  }
+}
diff --git a/pkgs/by-name/fl/flightcore/package.nix b/pkgs/by-name/fl/flightcore/package.nix
new file mode 100644
index 000000000000..51783604e22d
--- /dev/null
+++ b/pkgs/by-name/fl/flightcore/package.nix
@@ -0,0 +1,120 @@
+{
+  buildNpmPackage,
+  cargo-tauri,
+  copyDesktopItems,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  glib-networking,
+  lib,
+  makeDesktopItem,
+  nodejs,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  stdenv,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  __structuredAttrs = true;
+  pname = "flightcore";
+  version = "3.2.2";
+
+  src = fetchFromGitHub {
+    owner = "R2NorthstarTools";
+    repo = "FlightCore";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eTRtd616hWHgj3wg+jtrt/tFkaxUeKSN0d+XO1CghsE=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) pname version src;
+
+    # Hash of dependencies fetched from upstream's `package-lock.json` file.
+    hash = "sha256-+xrNKFcCatqbl79j/tSLFNTYjxXANFb3/vgWXYY2PGo=";
+  };
+
+  frontend = buildNpmPackage {
+    pname = "${finalAttrs.pname}-frontend";
+    inherit (finalAttrs) version src;
+    sourceRoot = "source/src-vue";
+
+    # Hash of dependencies fetched from upstream's `src-vue/package-lock.json`
+    # file.
+    npmDepsHash = "sha256-2PiMB9X/tp1QtTfUgVnH6caE+m2QSKTMYxPUHAUPWhQ=";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p "$out"
+      cp -a dist "$out"
+
+      runHook postInstall
+    '';
+  };
+
+  cargoHash = "sha256-weidVeEIo3IIV+Xwe1htV46fRymOo5aRzHAEKQwKbvU=";
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  # This override does the following:
+  #
+  # * Disables creating updater artifacts - the default behavior causes issues
+  #   with building the package, but since it is going to be distributed via a
+  #   software repository, it won't need to auto-update itself anyways.
+  #
+  # * Empties `beforeBuildCommand` - the upstream Tauri configuration includes
+  #   commands that automatically build the software's front-end, before
+  #   building its back-end. However, since Nixpkgs requires NPM dependencies
+  #   to be hashed, we need to build the front-end in a separate step.
+  #
+  #   This way, we end up fetching the NPM dependencies from both
+  #   `source/package.json`, and `source/src-vue/package.json`.
+  tauriBuildFlags = "-c ${./override-tauri.conf.json}";
+
+  # Copy [frontend] to where it can be picked up by Tauri.
+  preBuild = ''
+    ln -s "${finalAttrs.frontend}"/dist src-vue
+  '';
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    copyDesktopItems
+    nodejs
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    openssl
+    webkitgtk_4_1
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "FlightCore";
+      desktopName = "FlightCore";
+      exec = "flightcore";
+      icon = "flightcore";
+      comment = finalAttrs.meta.description;
+      categories = [
+        "Game"
+        "PackageManager"
+      ];
+      terminal = false;
+    })
+  ];
+
+  meta = {
+    description = "Updater and mod manager for Northstar";
+    homepage = "https://github.com/R2NorthstarTools/FlightCore";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ username-generic ];
+    mainProgram = "flightcore";
+    platforms = lib.platforms.all;
+  };
+})

From 1729f540beec604599347964410ce0cab06374c7 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 31 May 2026 15:17:12 -0400
Subject: [PATCH 014/339] buildRustCrate: prevent pulling in two rustc variants

With the addition of `remap-path-prefix` to buildRustCrate, we now
can pull in two rustc variants when cross compiling, since the rustc
that is string-interpolated for passing the remap flag is not pulled
from the proper package-set. Depending on the host platform used, this
rustc variant may not even build. In order to only pull in one variant,
and to properly mask the rustc used for building with the
remap-path-prefix flag, rustc is passed explicitly from pkgsBuildHost.
---
 .../rust/build-rust-crate/default.nix             |  2 --
 pkgs/top-level/all-packages.nix                   | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index 0903096ed281..8ba8bcdb1a35 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -155,8 +155,6 @@ crate_:
 lib.makeOverridable
   (
     # The rust compiler to use.
-    #
-    # Default: pkgs.rustc
     {
       rust ? rustc,
       # The cargo package to use for getting some metadata.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab5fbbc4ea45..81a5d2c6d34e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4401,11 +4401,20 @@ with pkgs;
       );
     in
     callPackage ../build-support/rust/build-rust-crate (
-      { }
-      // lib.optionalAttrs (stdenv.hostPlatform.libc == null) {
+      lib.optionalAttrs (stdenv.hostPlatform.libc == null) {
         stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv.
       }
-      // lib.optionalAttrs targetAlreadyIncluded { inherit (pkgsBuildBuild) rustc cargo; } # Optimization.
+      // (
+        if targetAlreadyIncluded then
+          # Optimization
+          {
+            inherit (pkgsBuildBuild) rustc cargo;
+          }
+        else
+          {
+            inherit (pkgsBuildHost) rustc cargo;
+          }
+      )
     );
   buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
 

From 91a8fdcdd68b67fcb316b2121ff723aa8902eb55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jun 2026 02:30:04 +0000
Subject: [PATCH 015/339] min-ed-launcher: 0.12.2 -> 0.13.0

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

diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix
index 4371bc758479..4d5a8583cdc1 100644
--- a/pkgs/by-name/mi/min-ed-launcher/package.nix
+++ b/pkgs/by-name/mi/min-ed-launcher/package.nix
@@ -6,13 +6,13 @@
 }:
 buildDotnetModule rec {
   pname = "min-ed-launcher";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "rfvgyhn";
     repo = "min-ed-launcher";
     tag = "v${version}";
-    hash = "sha256-jx8R/8mWuluD7ub8J3UqiP4A8k1npBgZpqRti3mhBrM=";
+    hash = "sha256-blqGq6PORBEtCLO007TR3xJ6UXX8nFSOIoFh8Dc/5B8=";
 
     leaveDotGit = true; # During build the current commit is appended to the version
   };

From 16bb18b6660b56d2b44331e846997be38486105a Mon Sep 17 00:00:00 2001
From: Yaksis <59007159+Yakkhini@users.noreply.github.com>
Date: Mon, 1 Jun 2026 18:51:58 +0800
Subject: [PATCH 016/339] nixos/clash-verge: relax `checkReversePath` in TUN
 mode

---
 nixos/modules/programs/clash-verge.nix | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix
index 0128bf6e79ed..1f9d91619516 100644
--- a/nixos/modules/programs/clash-verge.nix
+++ b/nixos/modules/programs/clash-verge.nix
@@ -21,7 +21,15 @@
       defaultText = lib.literalExpression "pkgs.clash-verge-rev";
     };
     serviceMode = lib.mkEnableOption "Service Mode";
-    tunMode = lib.mkEnableOption "Setcap for TUN Mode. DNS settings won't work on this way";
+    tunMode = lib.mkEnableOption "" // {
+      description = ''
+        Whether to set the capabilities required for TUN mode.
+
+        Without these capabilities, Clash Verge's DNS settings will not work in TUN mode.
+
+        When enabled, reverse path filtering will be set to loose instead of strict.
+      '';
+    };
     autoStart = lib.mkEnableOption "Clash Verge auto launch";
     group = lib.mkOption {
       type = lib.types.str;
@@ -59,6 +67,22 @@
         source = "${lib.getExe cfg.package}";
       };
 
+      assertions = [
+        {
+          assertion =
+            cfg.tunMode
+            ->
+              config.networking.firewall.checkReversePath != true
+              && config.networking.firewall.checkReversePath != "strict";
+          message = ''
+            {option}`programs.clash-verge.tunMode` requires {option}`networking.firewall.checkReversePath`
+            to be set to `false` or `"loose"`.
+          '';
+        }
+      ];
+
+      networking.firewall.checkReversePath = lib.mkIf cfg.tunMode (lib.mkDefault "loose");
+
       systemd.services.clash-verge = lib.mkIf cfg.serviceMode {
         enable = true;
         description = "Clash Verge Service Mode";

From 8b6cd28599b2b9add14ad7e066e65e24a0e4b824 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Mon, 1 Jun 2026 09:18:12 +0200
Subject: [PATCH 017/339] maven_4: init at 4.0.0-rc-5

Package Maven 4 as a standalone derivation that can be customized
independently of maven.

It defaults to jdk25_headless (the JDK can be overridden via that
argument), exposed through a local jdk_headless binding so future JDK
bumps are a one-line change.

maven exposes its package builder as the mkBuildMavenPackage passthru
function, which maven_4 reuses to provide its own buildMavenPackage
without duplicating build-maven-package.nix. The version tests passthru
is exposed as well. buildMaven is intentionally not exposed as it is
semi-deprecated.

The dependency FOD deletes the .meta directory during cleanup: Maven
Resolver 2.0.11+ writes machine- and time-dependent files there, which
would otherwise break the fixed-output derivation's hash.

A section about maven_4 is added to the Maven manual.

Assisted-by: Claude Code (Claude Opus 4.8)
---
 doc/languages-frameworks/maven.section.md     | 53 ++++++++++++
 doc/redirects.json                            |  3 +
 pkgs/by-name/ma/maven/build-maven-package.nix |  1 +
 pkgs/by-name/ma/maven/package.nix             | 19 +++--
 pkgs/by-name/ma/maven_4/package.nix           | 82 +++++++++++++++++++
 5 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ma/maven_4/package.nix

diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md
index daae60efc3e8..e769b38ee744 100644
--- a/doc/languages-frameworks/maven.section.md
+++ b/doc/languages-frameworks/maven.section.md
@@ -174,6 +174,59 @@ To make sure that your package does not add extra manual effort when upgrading M
 </plugin>
 ```
 
+## Maven 4 {#maven-4}
+
+Alongside the default `maven` package (the latest Maven 3 release), nixpkgs ships `maven_4`, which packages the [Maven 4](https://maven.apache.org/whatsnewinmaven4.html) release line.
+
+`maven_4` is a standalone derivation and can be used as a drop-in replacement wherever `maven` is used, for example to build a project with the latest Maven 4:
+
+```nix
+{
+  lib,
+  fetchFromGitHub,
+  jre,
+  makeWrapper,
+  maven_4,
+}:
+
+maven_4.buildMavenPackage (finalAttrs: {
+  pname = "jd-cli";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "intoolswetrust";
+    repo = "jd-cli";
+    tag = "jd-cli-${finalAttrs.version}";
+    hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
+  };
+
+  mvnHash = "";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/jd-cli
+    install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli
+
+    makeWrapper ${jre}/bin/java $out/bin/jd-cli \
+      --add-flags "-jar $out/share/jd-cli/jd-cli.jar"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Simple command line wrapper around JD Core Java Decompiler project";
+    homepage = "https://github.com/intoolswetrust/jd-cli";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ majiir ];
+  };
+})
+```
+
+`maven_4` exposes the same `buildMavenPackage` helper as `maven` (see [](#maven-buildmavenpackage)), so all of the patterns documented above apply equally. Note that the Maven dependencies resolved by Maven 4 differ from those resolved by Maven 3, so `mvnHash` must be recomputed when switching between the two.
+
 ## Manually using `mvn2nix` {#maven-mvn2nix}
 ::: {.warning}
 This way is no longer recommended; see [](#maven-buildmavenpackage) for the simpler and preferred way.
diff --git a/doc/redirects.json b/doc/redirects.json
index 51cb45eaaad8..6223a8ff6dca 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3942,6 +3942,9 @@
   "maven": [
     "index.html#maven"
   ],
+  "maven-4": [
+    "index.html#maven-4"
+  ],
   "maven-buildmavenpackage": [
     "index.html#maven-buildmavenpackage"
   ],
diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index f737507ddb73..9c83430a49be 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -112,6 +112,7 @@ let
               -o -name resolver-status.properties \
               -o -name _remote.repositories \) \
               -delete
+            rm -rf $out/.m2/.meta
 
             runHook postInstall
           '';
diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix
index a8379d4f5a97..fbdaaa80885f 100644
--- a/pkgs/by-name/ma/maven/package.nix
+++ b/pkgs/by-name/ma/maven/package.nix
@@ -47,17 +47,26 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         // {
           overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs);
         };
+
+      # Exposed so other Maven versions (e.g. maven_4) can reuse the builder
+      # without duplicating build-maven-package.nix.
+      mkBuildMavenPackage =
+        maven:
+        makeOverridableMavenPackage (
+          callPackage ./build-maven-package.nix {
+            inherit maven;
+          }
+        );
     in
     {
       buildMaven = callPackage ./build-maven.nix {
         maven = finalAttrs.finalPackage;
       };
 
-      buildMavenPackage = makeOverridableMavenPackage (
-        callPackage ./build-maven-package.nix {
-          maven = finalAttrs.finalPackage;
-        }
-      );
+      inherit mkBuildMavenPackage;
+
+      buildMavenPackage = mkBuildMavenPackage finalAttrs.finalPackage;
+
       tests = {
         version = testers.testVersion {
           package = finalAttrs.finalPackage;
diff --git a/pkgs/by-name/ma/maven_4/package.nix b/pkgs/by-name/ma/maven_4/package.nix
new file mode 100644
index 000000000000..9a9b151302f7
--- /dev/null
+++ b/pkgs/by-name/ma/maven_4/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  fetchurl,
+  jdk25_headless,
+  makeWrapper,
+  maven,
+  stdenvNoCC,
+  testers,
+}:
+let
+  # Maven 4 defaults to the latest LTS JDK. Bump this binding to change it.
+  jdk_headless = jdk25_headless;
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "maven";
+  version = "4.0.0-rc-5";
+
+  src = fetchurl {
+    url = "mirror://apache/maven/maven-4/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
+    hash = "sha256-7OalyZ09BBx25/7RgU656jogoSC8s8I1pz0sTo2xbKE=";
+  };
+
+  sourceRoot = ".";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/maven
+    cp -r apache-maven-${finalAttrs.version}/* $out/maven
+
+    makeWrapper $out/maven/bin/mvn $out/bin/mvn \
+      --set-default JAVA_HOME "${jdk_headless}"
+    makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
+      --set-default JAVA_HOME "${jdk_headless}"
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    # Reuse maven's builder so build-maven-package.nix is not duplicated.
+    buildMavenPackage = maven.mkBuildMavenPackage finalAttrs.finalPackage;
+
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = ''
+          env MAVEN_OPTS="-Dmaven.repo.local=$TMPDIR/m2" \
+            mvn --version
+        '';
+      };
+    };
+  };
+
+  meta = {
+    homepage = "https://maven.apache.org/";
+    description = "Build automation tool (used primarily for Java projects)";
+    longDescription = ''
+      Apache Maven is a software project management and comprehension
+      tool. Based on the concept of a project object model (POM), Maven can
+      manage a project's build, reporting and documentation from a central piece
+      of information.
+    '';
+    changelog = "https://maven.apache.org/docs/${finalAttrs.version}/release-notes.html";
+    sourceProvenance = with lib.sourceTypes; [
+      binaryBytecode
+      binaryNativeCode
+    ];
+    license = lib.licenses.asl20;
+    mainProgram = "mvn";
+    maintainers = with lib.maintainers; [
+      tricktron
+      britter
+    ];
+    teams = [ lib.teams.java ];
+    inherit (jdk_headless.meta) platforms;
+  };
+})

From 2f40a56b080e16aca69710f626bed167b4e0ee51 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 2 Jun 2026 19:27:10 +0300
Subject: [PATCH 018/339] compsize: add myself as maintainer

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

diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 10057405e27a..6b15eb212aa1 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     mainProgram = "compsize";
     homepage = "https://github.com/kilobyte/compsize";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ sandarukasa ];
     platforms = lib.platforms.linux;
   };
 }

From 8a0c212b74a3406368d9dc50fdd65acdfbca9b45 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 2 Jun 2026 19:28:52 +0300
Subject: [PATCH 019/339] compsize: fix build with newer btrfs-progs

---
 .../co/compsize/btrfs-progs-6-10-1.patch      | 47 +++++++++++++++++++
 pkgs/by-name/co/compsize/package.nix          | 19 ++------
 2 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch

diff --git a/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch b/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch
new file mode 100644
index 000000000000..a0b4f0b6ae1d
--- /dev/null
+++ b/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch
@@ -0,0 +1,47 @@
+From a471982c82d1917637cce81a084fcd4b02d6e33b Mon Sep 17 00:00:00 2001
+From: David Roman <droman@ifae.es>
+Date: Mon, 25 Nov 2024 14:10:16 +0100
+Subject: [PATCH] fix build with btrfs-progs >= 6.10.1
+
+https://github.com/kilobyte/compsize/pull/54
+
+---
+ compsize.c   | 2 ++
+ radix-tree.h | 4 ----
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/compsize.c b/compsize.c
+index 42ec304..0f533e5 100644
+--- a/compsize.c
++++ b/compsize.c
+@@ -5,12 +5,14 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include "kerncompat.h"
+ #include <btrfs/ioctl.h>
+ #include <btrfs/ctree.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <inttypes.h>
++#include <errno.h>
+ #include <linux/limits.h>
+ #include <getopt.h>
+ #include <signal.h>
+diff --git a/radix-tree.h b/radix-tree.h
+index bf96d83..d99ea7e 100644
+--- a/radix-tree.h
++++ b/radix-tree.h
+@@ -37,11 +37,7 @@
+ #ifndef _LINUX_RADIX_TREE_H
+ #define _LINUX_RADIX_TREE_H
+ 
+-#if BTRFS_FLAT_INCLUDES
+ #include "kerncompat.h"
+-#else
+-#include <btrfs/kerncompat.h>
+-#endif /* BTRFS_FLAT_INCLUDES */
+ 
+ #define RADIX_TREE_MAX_TAGS 2
+ 
diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 6b15eb212aa1..1f100808d18d 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -2,22 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
   btrfs-progs,
 }:
 
-let
-  # https://github.com/kilobyte/compsize/issues/52
-  btrfs-progs' = btrfs-progs.overrideAttrs (old: rec {
-    pname = "btrfs-progs";
-    version = "6.10";
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-      hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8=";
-    };
-  });
-
-in
 stdenv.mkDerivation rec {
   pname = "compsize";
   version = "1.5";
@@ -29,7 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
   };
 
-  buildInputs = [ btrfs-progs' ];
+  patches = [
+    ./btrfs-progs-6-10-1.patch
+  ];
+
+  buildInputs = [ btrfs-progs ];
 
   installFlags = [
     "PREFIX=${placeholder "out"}"

From 391d69d880514742b8612cbcd6480b5a8c3c08b5 Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Tue, 19 May 2026 13:06:05 +0200
Subject: [PATCH 020/339] sunshine: 2025.924.154138 -> 2026.516.143833

Adapt the package to upstream's packaging refactor in this release:

- Upstream now downloads a prebuilt ffmpeg from LizardByte/build-deps at
  cmake configure time. Fetch it via fetchzip and point cmake at it with
  FFMPEG_PREPARED_BINARIES. Sunshine pins build-deps via a git submodule
  at third-party/build-deps; the matching release tag is derived from
  that commit. Extend updater.sh to refresh both the tag and the
  per-architecture tarball hashes.
- The boost version pin in cmake/dependencies/Boost_Sunshine.cmake
  bumped to 1.89.0. Switch the substitution to a sed regex so future
  upstream bumps don't break the patch.
- The .desktop file now Exec's `/usr/bin/env systemctl start --u
  app-@PROJECT_FQDN@`; update the replace-fail pattern. The remaining
  @VAR@ placeholders are handled by cmake's configure_file(@ONLY) now.
- packaging/linux/sunshine.service.in was renamed to
  packaging/linux/app-dev.lizardbyte.app.Sunshine.service.in and now
  uses @SUNSHINE_SERVICE_START_COMMAND@/@SUNSHINE_SERVICE_STOP_COMMAND@
  instead of @SUNSHINE_EXECUTABLE_PATH@. Drop the postPatch subst-var-by
  lines and set SUNSHINE_EXECUTABLE_PATH via a cmake flag instead.
- cmake/packaging/linux.cmake now installs the .desktop file itself, so
  the redundant postInstall is removed.
- Add shaderc (glslc), vulkan-loader, and pipewire to inputs, all new
  configure-time requirements.
- glad's generator wants jinja2 + setuptools at configure time. Provide
  them via python3.withPackages and set GLAD_SKIP_PIP_INSTALL=ON so
  cmake doesn't try to pip-install.

Assisted-by: Claude Code 4.7
---
 pkgs/by-name/su/sunshine/package-lock.json | 1263 +++++++++++---------
 pkgs/by-name/su/sunshine/package.nix       |   82 +-
 pkgs/by-name/su/sunshine/updater.sh        |  121 +-
 3 files changed, 852 insertions(+), 614 deletions(-)

diff --git a/pkgs/by-name/su/sunshine/package-lock.json b/pkgs/by-name/su/sunshine/package-lock.json
index 8ba531828603..f8381b168b8e 100644
--- a/pkgs/by-name/su/sunshine/package-lock.json
+++ b/pkgs/by-name/su/sunshine/package-lock.json
@@ -8,70 +8,85 @@
       "name": "sunshine",
       "version": "0.0.0",
       "dependencies": {
-        "@lizardbyte/shared-web": "2025.922.181114",
-        "vue": "3.5.21",
-        "vue-i18n": "11.1.12"
+        "bootstrap": "5.3.8",
+        "date-fns": "4.1.0",
+        "lucide-vue-next": "1.0.0",
+        "marked": "18.0.3",
+        "vue": "3.5.34",
+        "vue-i18n": "11.4.2",
+        "vue3-simple-icons": "16.10.0"
       },
       "devDependencies": {
-        "@codecov/vite-plugin": "1.9.1",
-        "@vitejs/plugin-vue": "6.0.1",
-        "serve": "14.2.5",
-        "vite": "6.3.6",
+        "@codecov/vite-plugin": "2.0.1",
+        "@vitejs/plugin-vue": "6.0.7",
+        "serve": "14.2.6",
+        "vite": "6.4.2",
         "vite-plugin-ejs": "1.7.0"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-3.0.1.tgz",
+      "integrity": "sha512-a6d/Nwahm9fliVGRhdhofo40HjHQasUPusmc7vBfyky+7Z+P2A1J68zyFVaNcEclc/Se+eO595oAr5nwEIoIUA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@actions/exec": "^1.1.1",
-        "@actions/http-client": "^2.0.1"
+        "@actions/exec": "^3.0.0",
+        "@actions/http-client": "^4.0.0"
       }
     },
     "node_modules/@actions/exec": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
-      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-3.0.0.tgz",
+      "integrity": "sha512-6xH/puSoNBXb72VPlZVm7vQ+svQpFyA96qdDBvhB8eNZOE8LtPf9L4oAsfzK/crCL8YZ+19fKYVnM63Sl+Xzlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@actions/io": "^1.0.1"
+        "@actions/io": "^3.0.2"
       }
     },
     "node_modules/@actions/github": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
-      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-9.1.1.tgz",
+      "integrity": "sha512-tL5JbYOBZHc0ngEnCsaDcryUizIUIlQyIMwy1Wkx93H5HzbBJ7TbiPx2PnFjBwZW0Vh05JmfFZhecE6gglYegA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@actions/http-client": "^2.2.0",
-        "@octokit/core": "^5.0.1",
-        "@octokit/plugin-paginate-rest": "^9.2.2",
-        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
-        "@octokit/request": "^8.4.1",
-        "@octokit/request-error": "^5.1.1",
-        "undici": "^5.28.5"
+        "@actions/http-client": "^3.0.2",
+        "@octokit/core": "^7.0.6",
+        "@octokit/plugin-paginate-rest": "^14.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
+        "@octokit/request": "^10.0.7",
+        "@octokit/request-error": "^7.1.0",
+        "undici": "^6.23.0"
       }
     },
-    "node_modules/@actions/http-client": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
-      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+    "node_modules/@actions/github/node_modules/@actions/http-client": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-3.0.2.tgz",
+      "integrity": "sha512-JP38FYYpyqvUsz+Igqlc/JG6YO9PaKuvqjM3iGvaLqFnJ7TFmcLyy2IDrY0bI0qCQug8E9K+elv5ZNfw62ZJzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "tunnel": "^0.0.6",
-        "undici": "^5.25.4"
+        "undici": "^6.23.0"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-4.0.1.tgz",
+      "integrity": "sha512-+Nvd1ImaOZBSoPbsUtEhv+1z99H12xzncCkz0a3RuehINE81FZSe2QTj3uvAPTcJX/SCzUQHQ0D1GrPMbrPitg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tunnel": "^0.0.6",
+        "undici": "^6.23.0"
       }
     },
     "node_modules/@actions/io": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
-      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-3.0.2.tgz",
+      "integrity": "sha512-nRBchcMM+QK1pdjO7/idu86rbJI5YHUKCvKs0KxnSYbVe3F51UfGxuZX4Qy/fWlp6l7gWFwIkrOzN+oUK03kfw==",
       "dev": true,
       "license": "MIT"
     },
@@ -85,21 +100,21 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
-      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
+      "version": "7.29.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz",
+      "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.4"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -109,57 +124,57 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
-      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@codecov/bundler-plugin-core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@codecov/bundler-plugin-core/-/bundler-plugin-core-1.9.1.tgz",
-      "integrity": "sha512-dt3ic7gMswz4p/qdkYPVJwXlLiLsz55rBBn2I7mr0HTG8pCoLRqnANJIwo5WrqGBZgPyVSMPBqBra6VxLWfDyA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@codecov/bundler-plugin-core/-/bundler-plugin-core-2.0.1.tgz",
+      "integrity": "sha512-TkdKn/rEwZQ723M7DDUmHe5r0IJa23rUT4TAx5jXmg12wGZGAHGWWU7LKeQsYCsKdLMxK7bLaGk9M++4wSRD5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@actions/core": "^1.10.1",
-        "@actions/github": "^6.0.0",
+        "@actions/core": "^3.0.0",
+        "@actions/github": "^9.0.0",
         "chalk": "4.1.2",
         "semver": "^7.5.4",
         "unplugin": "^1.10.1",
         "zod": "^3.22.4"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@codecov/vite-plugin": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@codecov/vite-plugin/-/vite-plugin-1.9.1.tgz",
-      "integrity": "sha512-S6Yne7comVulJ1jD3T7rCfYFHPR0zUjAYoLjUDPXNJCUrdzWJdf/ak/UepE7TicqQG+yBa6eb5WusqcPgg+1AQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@codecov/vite-plugin/-/vite-plugin-2.0.1.tgz",
+      "integrity": "sha512-w7nGA9SSc0WECzn05yRrw3uN8293I620Kd9x97I0kyyxUjtWxCMmlgmAbS364gJZYvljd0A6iQyAigVV2dOX9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@codecov/bundler-plugin-core": "^1.9.1",
+        "@codecov/bundler-plugin-core": "^2.0.1",
         "unplugin": "^1.10.1"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
         "vite": "4.x || 5.x || 6.x"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
-      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
       "cpu": [
         "ppc64"
       ],
@@ -174,9 +189,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
-      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
       "cpu": [
         "arm"
       ],
@@ -191,9 +206,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
-      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
       "cpu": [
         "arm64"
       ],
@@ -208,9 +223,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
-      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
       "cpu": [
         "x64"
       ],
@@ -225,9 +240,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
-      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
       "cpu": [
         "arm64"
       ],
@@ -242,9 +257,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
-      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
       "cpu": [
         "x64"
       ],
@@ -259,9 +274,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
       "cpu": [
         "arm64"
       ],
@@ -276,9 +291,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
-      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
       "cpu": [
         "x64"
       ],
@@ -293,9 +308,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
-      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
       "cpu": [
         "arm"
       ],
@@ -310,9 +325,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
-      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
       "cpu": [
         "arm64"
       ],
@@ -327,9 +342,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
-      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
       "cpu": [
         "ia32"
       ],
@@ -344,9 +359,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
-      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
       "cpu": [
         "loong64"
       ],
@@ -361,9 +376,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
-      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
       "cpu": [
         "mips64el"
       ],
@@ -378,9 +393,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
-      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
       "cpu": [
         "ppc64"
       ],
@@ -395,9 +410,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
-      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
       "cpu": [
         "riscv64"
       ],
@@ -412,9 +427,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
-      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
       "cpu": [
         "s390x"
       ],
@@ -429,9 +444,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
-      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
       "cpu": [
         "x64"
       ],
@@ -446,9 +461,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
       "cpu": [
         "arm64"
       ],
@@ -463,9 +478,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
-      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
       "cpu": [
         "x64"
       ],
@@ -480,9 +495,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
       "cpu": [
         "arm64"
       ],
@@ -497,9 +512,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
-      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
       "cpu": [
         "x64"
       ],
@@ -514,9 +529,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
-      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
       "cpu": [
         "arm64"
       ],
@@ -531,9 +546,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
-      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
       "cpu": [
         "x64"
       ],
@@ -548,9 +563,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
-      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
       "cpu": [
         "arm64"
       ],
@@ -565,9 +580,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
-      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
       "cpu": [
         "ia32"
       ],
@@ -582,9 +597,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
-      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
       "cpu": [
         "x64"
       ],
@@ -598,33 +613,31 @@
         "node": ">=18"
       }
     },
-    "node_modules/@fastify/busboy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
-      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@fortawesome/fontawesome-free": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz",
-      "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==",
-      "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@intlify/core-base": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.12.tgz",
-      "integrity": "sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==",
+      "version": "11.4.2",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.4.2.tgz",
+      "integrity": "sha512-7fpuCcVmeLv2T9qHsARqGvh8xt+sV2fH+Q+gMHFwB/rPXzo85DpbJFKn7dBH1L5p0c2cSh2DW+2h/64EKrISmA==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/message-compiler": "11.1.12",
-        "@intlify/shared": "11.1.12"
+        "@intlify/devtools-types": "11.4.2",
+        "@intlify/message-compiler": "11.4.2",
+        "@intlify/shared": "11.4.2"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
+    "node_modules/@intlify/devtools-types": {
+      "version": "11.4.2",
+      "resolved": "https://registry.npmjs.org/@intlify/devtools-types/-/devtools-types-11.4.2.tgz",
+      "integrity": "sha512-3u8EN1kB6EMSi96KXs5k7a8y2X2g4+h3X6iwVZU47cP4n+mTuq//WMjG588BzSp/2XQ/dTXo2BLUXX+XS+PNfA==",
+      "license": "MIT",
+      "dependencies": {
+        "@intlify/core-base": "11.4.2",
+        "@intlify/shared": "11.4.2"
       },
       "engines": {
         "node": ">= 16"
@@ -634,12 +647,12 @@
       }
     },
     "node_modules/@intlify/message-compiler": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.12.tgz",
-      "integrity": "sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==",
+      "version": "11.4.2",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.4.2.tgz",
+      "integrity": "sha512-a6CDSGSMTGrg0BjD97x8TBYPf7qQMDlZipJ6UDfv/pd4OIym8TMlHu3MsH0bTNnRdAG2D6EFEykIgiQPqvtTkA==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/shared": "11.1.12",
+        "@intlify/shared": "11.4.2",
         "source-map-js": "^1.0.2"
       },
       "engines": {
@@ -650,9 +663,9 @@
       }
     },
     "node_modules/@intlify/shared": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.12.tgz",
-      "integrity": "sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==",
+      "version": "11.4.2",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.4.2.tgz",
+      "integrity": "sha512-NzpHbguRCsOHDwxmlBa9qu/imc+/QWgsYUaK6FZeNC0wK8QfAbhqrktEp/haVzxU1aikH8IX4ytD+mfFEMi/9A==",
       "license": "MIT",
       "engines": {
         "node": ">= 16"
@@ -667,189 +680,142 @@
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "license": "MIT"
     },
-    "node_modules/@lizardbyte/shared-web": {
-      "version": "2025.922.181114",
-      "resolved": "https://registry.npmjs.org/@lizardbyte/shared-web/-/shared-web-2025.922.181114.tgz",
-      "integrity": "sha512-ISJLK79h10WkZf/fz7wEkrmlEEf9tUe5RQpADdOONXIybAKP/TC2cTfPr1NSRvL4sCoHTHv1oOlMkauaEAI3kg==",
-      "license": "AGPL-3.0-only",
-      "dependencies": {
-        "@fortawesome/fontawesome-free": "7.0.1",
-        "bootstrap": "5.3.8"
-      },
-      "funding": {
-        "url": "https://app.lizardbyte.dev"
-      }
-    },
     "node_modules/@octokit/auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz",
-      "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
+      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/auth-token": "^4.0.0",
-        "@octokit/graphql": "^7.1.0",
-        "@octokit/request": "^8.4.1",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.0.0",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.3",
+        "@octokit/request": "^10.0.6",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "before-after-hook": "^4.0.0",
+        "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/endpoint": {
-      "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
-      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.3.tgz",
+      "integrity": "sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
-      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
+      "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/request": "^8.4.1",
-        "@octokit/types": "^13.0.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/request": "^10.0.6",
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
-      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-14.0.0.tgz",
+      "integrity": "sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^12.6.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
-      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-17.0.0.tgz",
+      "integrity": "sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^12.6.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/request": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
-      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.8.tgz",
+      "integrity": "sha512-SJZNwY9pur9Agf7l87ywFi14W+Hd9Jg6Ifivsd33+/bGUQIjNujdFiXII2/qSlN2ybqUHfp5xpekMEjIBTjlSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/endpoint": "^9.0.6",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/endpoint": "^11.0.3",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "json-with-bigint": "^3.5.3",
+        "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
-      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
+        "@octokit/openapi-types": "^27.0.0"
       }
     },
     "node_modules/@popperjs/core": {
@@ -864,16 +830,16 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.29",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz",
-      "integrity": "sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
+      "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.4.tgz",
-      "integrity": "sha512-BTm2qKNnWIQ5auf4deoetINJm2JzvihvGb9R6K/ETwKLql/Bb3Eg2H1FBp1gUb4YGbydMA3jcmQTR73q7J+GAA==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.3.tgz",
+      "integrity": "sha512-x35CNW/ANXG3hE/EZpRU8MXX1JDN86hBb2wMGAtltkz7pc6cxgjpy1OMMfDosOQ+2hWqIkag/fGok1Yady9nGw==",
       "cpu": [
         "arm"
       ],
@@ -885,9 +851,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.4.tgz",
-      "integrity": "sha512-P9LDQiC5vpgGFgz7GSM6dKPCiqR3XYN1WwJKA4/BUVDjHpYsf3iBEmVz62uyq20NGYbiGPR5cNHI7T1HqxNs2w==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.3.tgz",
+      "integrity": "sha512-xw3xtkDApIOGayehp2+Rz4zimfkaX65r4t47iy+ymQB2G4iJCBBfj0ogVg5jpvjpn8UWn/+q9tprxleYeNp3Hw==",
       "cpu": [
         "arm64"
       ],
@@ -899,9 +865,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.4.tgz",
-      "integrity": "sha512-QRWSW+bVccAvZF6cbNZBJwAehmvG9NwfWHwMy4GbWi/BQIA/laTIktebT2ipVjNncqE6GLPxOok5hsECgAxGZg==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.3.tgz",
+      "integrity": "sha512-vo6Y5Qfpx7/5EaamIwi0WqW2+zfiusVihKatLvtN1VFVy3D13uERk/6gZLU1UiHRL6fDXqj/ELIeVRGnvcTE1g==",
       "cpu": [
         "arm64"
       ],
@@ -913,9 +879,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.4.tgz",
-      "integrity": "sha512-hZgP05pResAkRJxL1b+7yxCnXPGsXU0fG9Yfd6dUaoGk+FhdPKCJ5L1Sumyxn8kvw8Qi5PvQ8ulenUbRjzeCTw==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.3.tgz",
+      "integrity": "sha512-D+0QGcZhBzTN82weOnsSlY7V7+RMmPuF1CkbxyMAGE8+ZHeUjyb76ZiWmBlCu//AQQONvxcqRbwZTajZKqjuOw==",
       "cpu": [
         "x64"
       ],
@@ -927,9 +893,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.4.tgz",
-      "integrity": "sha512-xmc30VshuBNUd58Xk4TKAEcRZHaXlV+tCxIXELiE9sQuK3kG8ZFgSPi57UBJt8/ogfhAF5Oz4ZSUBN77weM+mQ==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.3.tgz",
+      "integrity": "sha512-6HnvHCT7fDyj6R0Ph7A6x8dQS/S38MClRWeDLqc0MdfWkxjiu1HSDYrdPhqSILzjTIC/pnXbbJbo+ft+gy/9hQ==",
       "cpu": [
         "arm64"
       ],
@@ -941,9 +907,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.4.tgz",
-      "integrity": "sha512-WdSLpZFjOEqNZGmHflxyifolwAiZmDQzuOzIq9L27ButpCVpD7KzTRtEG1I0wMPFyiyUdOO+4t8GvrnBLQSwpw==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.3.tgz",
+      "integrity": "sha512-KHLgC3WKlUYW3ShFKnnosZDOJ0xjg9zp7au3sIm2bs/tGBeC2ipmvRh/N7JKi0t9Ue20C0dpEshi8WUubg+cnA==",
       "cpu": [
         "x64"
       ],
@@ -955,13 +921,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.4.tgz",
-      "integrity": "sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.3.tgz",
+      "integrity": "sha512-DV6fJoxEYWJOvaZIsok7KrYl0tPvga5OZ2yvKHNNYyk/2roMLqQAbGhr78EQ5YhHpnhLKJD3S1WFusAkmUuV5g==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -969,13 +938,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.4.tgz",
-      "integrity": "sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.3.tgz",
+      "integrity": "sha512-mQKoJAzvuOs6F+TZybQO4GOTSMUu7v0WdxEk24krQ/uUxXoPTtHjuaUuPmFhtBcM4K0ons8nrE3JyhTuCFtT/w==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -983,13 +955,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.4.tgz",
-      "integrity": "sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.3.tgz",
+      "integrity": "sha512-Whjj2qoiJ6+OOJMGptTYazaJvjOJm+iKHpXQM1P3LzGjt7Ff++Tp7nH4N8J/BUA7R9IHfDyx4DJIflifwnbmIA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -997,13 +972,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.4.tgz",
-      "integrity": "sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.3.tgz",
+      "integrity": "sha512-4YTNHKqGng5+yiZt3mg77nmyuCfmNfX4fPmyUapBcIk+BdwSwmCWGXOUxhXbBEkFHtoN5boLj/5NON+u5QC9tg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1011,13 +989,33 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.4.tgz",
-      "integrity": "sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.3.tgz",
+      "integrity": "sha512-SU3kNlhkpI4UqlUc2VXPGK9o886ZsSeGfMAX2ba2b8DKmMXq4AL7KUrkSWVbb7koVqx41Yczx6dx5PNargIrEA==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.3.tgz",
+      "integrity": "sha512-6lDLl5h4TXpB1mTf2rQWnAk/LcXrx9vBfu/DT5TIPhvMhRWaZ5MxkIc8u4lJAmBo6klTe1ywXIUHFjylW505sg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1025,13 +1023,33 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.4.tgz",
-      "integrity": "sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.3.tgz",
+      "integrity": "sha512-BMo8bOw8evlup/8G+cj5xWtPyp93xPdyoSN16Zy90Q2QZ0ZYRhCt6ZJSwbrRzG9HApFabjwj2p25TUPDWrhzqQ==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.3.tgz",
+      "integrity": "sha512-E0L8X1dZN1/Rph+5VPF6Xj2G7JJvMACVXtamTJIDrVI44Y3K+G8gQaMEAavbqCGTa16InptiVrX6eM6pmJ+7qA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1039,13 +1057,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.4.tgz",
-      "integrity": "sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.3.tgz",
+      "integrity": "sha512-oZJ/WHaVfHUiRAtmTAeo3DcevNsVvH8mbvodjZy7D5QKvCefO371SiKRpxoDcCxB3PTRTLayWBkvmDQKTcX/sw==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1053,13 +1074,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.4.tgz",
-      "integrity": "sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.3.tgz",
+      "integrity": "sha512-Dhbyh7j9FybM3YaTgaHmVALwA8AkUwTPccyCQ79TG9AJUsMQqgN1DDEZNr4+QUfwiWvLDumW5vdwzoeUF+TNxQ==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1067,13 +1091,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.4.tgz",
-      "integrity": "sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.3.tgz",
+      "integrity": "sha512-cJd1X5XhHHlltkaypz1UcWLA8AcoIi1aWhsvaWDskD1oz2eKCypnqvTQ8ykMNI0RSmm7NkTdSqSSD7zM0xa6Ig==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1081,13 +1108,16 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.4.tgz",
-      "integrity": "sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.3.tgz",
+      "integrity": "sha512-DAZDBHQfG2oQuhY7mc6I3/qB4LU2fQCjRvxbDwd/Jdvb9fypP4IJ4qmtu6lNjes6B531AI8cg1aKC2di97bUxA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1095,9 +1125,26 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.4.tgz",
-      "integrity": "sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.3.tgz",
+      "integrity": "sha512-cRxsE8c13mZOh3vP+wLDxpQBRrOHDIGOWyDL93Sy0Ga8y515fBcC2pjUfFwUe5T7tqvTvWbCpg1URM/AXdWIXA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.3.tgz",
+      "integrity": "sha512-QaWcIgRxqEdQdhJqW4DJctsH6HCmo5vHxY0krHSX4jMtOqfzC+dqDGuHM87bu4H8JBeibWx7jFz+h6/4C8wA5Q==",
       "cpu": [
         "x64"
       ],
@@ -1105,13 +1152,13 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "openbsd"
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.4.tgz",
-      "integrity": "sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.3.tgz",
+      "integrity": "sha512-AaXwSvUi3QIPtroAUw1t5yHGIyqKEXwH54WUocFolZhpGDruJcs8c+xPNDRn4XiQsS7MEwnYsHW2l0MBLDMkWg==",
       "cpu": [
         "arm64"
       ],
@@ -1123,9 +1170,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.4.tgz",
-      "integrity": "sha512-8GKr640PdFNXwzIE0IrkMWUNUomILLkfeHjXBi/nUvFlpZP+FA8BKGKpacjW6OUUHaNI6sUURxR2U2g78FOHWQ==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.3.tgz",
+      "integrity": "sha512-65LAKM/bAWDqKNEelHlcHvm2V+Vfb8C6INFxQXRHCvaVN1rJfwr4NvdP4FyzUaLqWfaCGaadf6UbTm8xJeYfEg==",
       "cpu": [
         "arm64"
       ],
@@ -1137,9 +1184,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.4.tgz",
-      "integrity": "sha512-AIy/jdJ7WtJ/F6EcfOb2GjR9UweO0n43jNObQMb6oGxkYTfLcnN7vYYpG+CN3lLxrQkzWnMOoNSHTW54pgbVxw==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.3.tgz",
+      "integrity": "sha512-EEM2gyhBF5MFnI6vMKdX1LAosE627RGBzIoGMdLloPZkXrUN0Ckqgr2Qi8+J3zip/8NVVro3/FjB+tjhZUgUHA==",
       "cpu": [
         "ia32"
       ],
@@ -1151,9 +1198,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.4.tgz",
-      "integrity": "sha512-UF9KfsH9yEam0UjTwAgdK0anlQ7c8/pWPU2yVjyWcF1I1thABt6WXE47cI71pGiZ8wGvxohBoLnxM04L/wj8mQ==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.3.tgz",
+      "integrity": "sha512-E5Eb5H/DpxaoXH++Qkv28RcUJboMopmdDUALBczvHMf7hNIxaDZqwY5lK12UK1BHacSmvupoEWGu+n993Z0y1A==",
       "cpu": [
         "x64"
       ],
@@ -1165,9 +1212,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.4.tgz",
-      "integrity": "sha512-bf9PtUa0u8IXDVxzRToFQKsNCRz9qLYfR/MpECxl4mRoWYjAeFjgxj1XdZr2M/GNVpT05p+LgQOHopYDlUu6/w==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.3.tgz",
+      "integrity": "sha512-hPt/bgL5cE+Qp+/TPHBqptcAgPzgj46mPcg/16zNUmbQk0j+mOEQV/+Lqu8QRtDV3Ek95Q6FeFITpuhl6OTsAA==",
       "cpu": [
         "x64"
       ],
@@ -1186,70 +1233,70 @@
       "license": "MIT"
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz",
-      "integrity": "sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==",
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.7.tgz",
+      "integrity": "sha512-km+p+XdSz9Sxm5rqUbqcSfZYaAniKxWBj1KURl+Jr7UaPvvX7BmaWMdP69I5rrFDeQGyxAG7NXdc57vz+snhWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rolldown/pluginutils": "1.0.0-beta.29"
+        "@rolldown/pluginutils": "^1.0.1"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
         "vue": "^3.2.25"
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.21.tgz",
-      "integrity": "sha512-8i+LZ0vf6ZgII5Z9XmUvrCyEzocvWT+TeR2VBUVlzIH6Tyv57E20mPZ1bCS+tbejgUgmjrEh7q/0F0bibskAmw==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.34.tgz",
+      "integrity": "sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.3",
-        "@vue/shared": "3.5.21",
-        "entities": "^4.5.0",
+        "@babel/parser": "^7.29.3",
+        "@vue/shared": "3.5.34",
+        "entities": "^7.0.1",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.21.tgz",
-      "integrity": "sha512-jNtbu/u97wiyEBJlJ9kmdw7tAr5Vy0Aj5CgQmo+6pxWNQhXZDPsRr1UWPN4v3Zf82s2H3kF51IbzZ4jMWAgPlQ==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.34.tgz",
+      "integrity": "sha512-EbF/T++k0e2MMZlJsBhzK8Sgwt0HcIPOhzn1CTB/lv6sQcyk+OWf8YeiLxZp3ro7MbbLcAfAJ6sEvjFWuNgUCw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.21",
-        "@vue/shared": "3.5.21"
+        "@vue/compiler-core": "3.5.34",
+        "@vue/shared": "3.5.34"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.21.tgz",
-      "integrity": "sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.34.tgz",
+      "integrity": "sha512-D/ihr6uZeIt6r+pVZf46RWT1fAsLFMbUP7k8G1VkiiWexriED9GrX3echHd4Abbt17zjlfiFJ8z7a3BxZOPNjg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.3",
-        "@vue/compiler-core": "3.5.21",
-        "@vue/compiler-dom": "3.5.21",
-        "@vue/compiler-ssr": "3.5.21",
-        "@vue/shared": "3.5.21",
+        "@babel/parser": "^7.29.3",
+        "@vue/compiler-core": "3.5.34",
+        "@vue/compiler-dom": "3.5.34",
+        "@vue/compiler-ssr": "3.5.34",
+        "@vue/shared": "3.5.34",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.18",
-        "postcss": "^8.5.6",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.14",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.21.tgz",
-      "integrity": "sha512-vKQ5olH5edFZdf5ZrlEgSO1j1DMA4u23TVK5XR1uMhvwnYvVdDF0nHXJUblL/GvzlShQbjhZZ2uvYmDlAbgo9w==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.34.tgz",
+      "integrity": "sha512-cDtTHKibkThKGHH1SP+WdccquNRYQDFH6rRjQCqT9G2ltFAfoR5pUftpab/z+aM5mW9HLLVQW7hfKKQe/1GBeQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.21",
-        "@vue/shared": "3.5.21"
+        "@vue/compiler-dom": "3.5.34",
+        "@vue/shared": "3.5.34"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -1259,53 +1306,53 @@
       "license": "MIT"
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.21.tgz",
-      "integrity": "sha512-3ah7sa+Cwr9iiYEERt9JfZKPw4A2UlbY8RbbnH2mGCE8NwHkhmlZt2VsH0oDA3P08X3jJd29ohBDtX+TbD9AsA==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.34.tgz",
+      "integrity": "sha512-y9XDjCEuBp+98k+UL5dbYkh57AHU4o6cxZedOPXw3bmrZZYLQsVHguGurq7hVrPCSrQtrnz1f9dssyFr+dMXfQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.21"
+        "@vue/shared": "3.5.34"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.21.tgz",
-      "integrity": "sha512-+DplQlRS4MXfIf9gfD1BOJpk5RSyGgGXD/R+cumhe8jdjUcq/qlxDawQlSI8hCKupBlvM+3eS1se5xW+SuNAwA==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.34.tgz",
+      "integrity": "sha512-mKeBYvu8tcMSLhypAHBmriUFfWXKTCF/23Z4jiCoYK3UtWepkliViNLuR90V9XOyD62mUxs9p1jsrpK3CCGIzw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.21",
-        "@vue/shared": "3.5.21"
+        "@vue/reactivity": "3.5.34",
+        "@vue/shared": "3.5.34"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.21.tgz",
-      "integrity": "sha512-3M2DZsOFwM5qI15wrMmNF5RJe1+ARijt2HM3TbzBbPSuBHOQpoidE+Pa+XEaVN+czbHf81ETRoG1ltztP2em8w==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.34.tgz",
+      "integrity": "sha512-e8kZzERmCwUnBRVsgSQlAfrfU2rGoy0FFKPBXSlfEjc/O3KfA7QP0t1/2ZylrbchjmIKB4dPTd07A6WPr0eOrg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.21",
-        "@vue/runtime-core": "3.5.21",
-        "@vue/shared": "3.5.21",
-        "csstype": "^3.1.3"
+        "@vue/reactivity": "3.5.34",
+        "@vue/runtime-core": "3.5.34",
+        "@vue/shared": "3.5.34",
+        "csstype": "^3.2.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.21.tgz",
-      "integrity": "sha512-qr8AqgD3DJPJcGvLcJKQo2tAc8OnXRcfxhOJCPF+fcfn5bBGz7VCcO7t+qETOPxpWK1mgysXvVT/j+xWaHeMWA==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.34.tgz",
+      "integrity": "sha512-nHxmJoTrKsmrkbILRhkC9gY1G3moZbJTqCzDd7DOOzG5KH9oeJ0Unqrff5f9v0pW//jES05ZkJcNtfE8JjOIew==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.21",
-        "@vue/shared": "3.5.21"
+        "@vue/compiler-ssr": "3.5.34",
+        "@vue/shared": "3.5.34"
       },
       "peerDependencies": {
-        "vue": "3.5.21"
+        "vue": "3.5.34"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.21.tgz",
-      "integrity": "sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.34.tgz",
+      "integrity": "sha512-24uqU4OIiX29ryC3MeWid/Xf2fa2EFRUVLb77nRhk+UrTVrh/XiGtFAFmJBAtBRbjwNdsPRP+jj/OL27Eg1NDA==",
       "license": "MIT"
     },
     "node_modules/@zeit/schemas": {
@@ -1316,9 +1363,9 @@
       "license": "MIT"
     },
     "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -1329,16 +1376,16 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -1472,9 +1519,9 @@
       "license": "MIT"
     },
     "node_modules/before-after-hook": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz",
+      "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==",
       "dev": true,
       "license": "Apache-2.0"
     },
@@ -1534,9 +1581,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1716,11 +1763,21 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
       "license": "MIT"
     },
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1741,13 +1798,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -1779,9 +1829,9 @@
       "license": "MIT"
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -1791,9 +1841,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
-      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1804,32 +1854,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.10",
-        "@esbuild/android-arm": "0.25.10",
-        "@esbuild/android-arm64": "0.25.10",
-        "@esbuild/android-x64": "0.25.10",
-        "@esbuild/darwin-arm64": "0.25.10",
-        "@esbuild/darwin-x64": "0.25.10",
-        "@esbuild/freebsd-arm64": "0.25.10",
-        "@esbuild/freebsd-x64": "0.25.10",
-        "@esbuild/linux-arm": "0.25.10",
-        "@esbuild/linux-arm64": "0.25.10",
-        "@esbuild/linux-ia32": "0.25.10",
-        "@esbuild/linux-loong64": "0.25.10",
-        "@esbuild/linux-mips64el": "0.25.10",
-        "@esbuild/linux-ppc64": "0.25.10",
-        "@esbuild/linux-riscv64": "0.25.10",
-        "@esbuild/linux-s390x": "0.25.10",
-        "@esbuild/linux-x64": "0.25.10",
-        "@esbuild/netbsd-arm64": "0.25.10",
-        "@esbuild/netbsd-x64": "0.25.10",
-        "@esbuild/openbsd-arm64": "0.25.10",
-        "@esbuild/openbsd-x64": "0.25.10",
-        "@esbuild/openharmony-arm64": "0.25.10",
-        "@esbuild/sunos-x64": "0.25.10",
-        "@esbuild/win32-arm64": "0.25.10",
-        "@esbuild/win32-ia32": "0.25.10",
-        "@esbuild/win32-x64": "0.25.10"
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
       }
     },
     "node_modules/estree-walker": {
@@ -1862,6 +1912,23 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
+    "node_modules/fast-content-type-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz",
+      "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1869,6 +1936,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/fast-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
+      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -1888,9 +1972,9 @@
       }
     },
     "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.6.tgz",
+      "integrity": "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1898,9 +1982,9 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1908,9 +1992,9 @@
       }
     },
     "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -2072,15 +2156,43 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json-with-bigint": {
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/json-with-bigint/-/json-with-bigint-3.5.8.tgz",
+      "integrity": "sha512-eq/4KP6K34kwa7TcFdtvnftvHCD9KvHOGGICWwMFc4dOOKF5t4iYqnfLK8otCRCRv06FXOzGGyqE8h8ElMvvdw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lucide-vue-next": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-1.0.0.tgz",
+      "integrity": "sha512-V6SPvx1IHTj/UY+FrIYWV5faISsPSb8BnWSFDxAtezWKvWc9ZZ40PDrdu1/Qb5vg4lHWr1hs1BAMGVGm6V1Xdg==",
+      "license": "ISC",
+      "peerDependencies": {
+        "vue": ">=3.0.1"
+      }
+    },
     "node_modules/magic-string": {
-      "version": "0.30.19",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz",
-      "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==",
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/marked": {
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-18.0.3.tgz",
+      "integrity": "sha512-7VT90JOkDeaRWpfjOReRGPEKn0ecdARBkDGL+tT1wZY0efPPqkUxLUSmzy/C7TIylQYJC9STISEsCHrqb/7VIA==",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2132,9 +2244,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -2162,9 +2274,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
+      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
       "funding": [
         {
           "type": "github",
@@ -2212,16 +2324,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/onetime": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -2269,9 +2371,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2282,9 +2384,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "version": "8.5.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz",
+      "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==",
       "funding": [
         {
           "type": "opencollective",
@@ -2309,16 +2411,6 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/range-parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
@@ -2380,9 +2472,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.52.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.4.tgz",
-      "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==",
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.3.tgz",
+      "integrity": "sha512-pAQK9HalE84QSm4Po3EmWIZPd3FnjkShVkiMlz1iligWYkWQ7wHYd1PF/T7QZ5TVSD6uSTon5gBVMSM4JfBV+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2396,28 +2488,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.52.4",
-        "@rollup/rollup-android-arm64": "4.52.4",
-        "@rollup/rollup-darwin-arm64": "4.52.4",
-        "@rollup/rollup-darwin-x64": "4.52.4",
-        "@rollup/rollup-freebsd-arm64": "4.52.4",
-        "@rollup/rollup-freebsd-x64": "4.52.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.52.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.52.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.52.4",
-        "@rollup/rollup-linux-arm64-musl": "4.52.4",
-        "@rollup/rollup-linux-loong64-gnu": "4.52.4",
-        "@rollup/rollup-linux-ppc64-gnu": "4.52.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.52.4",
-        "@rollup/rollup-linux-riscv64-musl": "4.52.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.52.4",
-        "@rollup/rollup-linux-x64-gnu": "4.52.4",
-        "@rollup/rollup-linux-x64-musl": "4.52.4",
-        "@rollup/rollup-openharmony-arm64": "4.52.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.52.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.52.4",
-        "@rollup/rollup-win32-x64-gnu": "4.52.4",
-        "@rollup/rollup-win32-x64-msvc": "4.52.4",
+        "@rollup/rollup-android-arm-eabi": "4.60.3",
+        "@rollup/rollup-android-arm64": "4.60.3",
+        "@rollup/rollup-darwin-arm64": "4.60.3",
+        "@rollup/rollup-darwin-x64": "4.60.3",
+        "@rollup/rollup-freebsd-arm64": "4.60.3",
+        "@rollup/rollup-freebsd-x64": "4.60.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.60.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.60.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.60.3",
+        "@rollup/rollup-linux-arm64-musl": "4.60.3",
+        "@rollup/rollup-linux-loong64-gnu": "4.60.3",
+        "@rollup/rollup-linux-loong64-musl": "4.60.3",
+        "@rollup/rollup-linux-ppc64-gnu": "4.60.3",
+        "@rollup/rollup-linux-ppc64-musl": "4.60.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.60.3",
+        "@rollup/rollup-linux-riscv64-musl": "4.60.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.60.3",
+        "@rollup/rollup-linux-x64-gnu": "4.60.3",
+        "@rollup/rollup-linux-x64-musl": "4.60.3",
+        "@rollup/rollup-openbsd-x64": "4.60.3",
+        "@rollup/rollup-openharmony-arm64": "4.60.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.60.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.60.3",
+        "@rollup/rollup-win32-x64-gnu": "4.60.3",
+        "@rollup/rollup-win32-x64-msvc": "4.60.3",
         "fsevents": "~2.3.2"
       }
     },
@@ -2443,9 +2538,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -2456,14 +2551,14 @@
       }
     },
     "node_modules/serve": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.5.tgz",
-      "integrity": "sha512-Qn/qMkzCcMFVPb60E/hQy+iRLpiU8PamOfOSYoAHmmF+fFFmpPpqa6Oci2iWYpTdOUM3VF+TINud7CfbQnsZbA==",
+      "version": "14.2.6",
+      "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.6.tgz",
+      "integrity": "sha512-QEjUSA+sD4Rotm1znR8s50YqA3kYpRGPmtd5GlFxbaL9n/FdUNbqMhxClqdditSk0LlZyA/dhud6XNRTOC9x2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@zeit/schemas": "2.36.0",
-        "ajv": "8.12.0",
+        "ajv": "8.18.0",
         "arg": "5.0.2",
         "boxen": "7.0.0",
         "chalk": "5.0.1",
@@ -2471,7 +2566,7 @@
         "clipboardy": "3.0.0",
         "compression": "1.8.1",
         "is-port-reachable": "4.0.0",
-        "serve-handler": "6.1.6",
+        "serve-handler": "6.1.7",
         "update-check": "1.5.4"
       },
       "bin": {
@@ -2482,16 +2577,16 @@
       }
     },
     "node_modules/serve-handler": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.6.tgz",
-      "integrity": "sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==",
+      "version": "6.1.7",
+      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.7.tgz",
+      "integrity": "sha512-CinAq1xWb0vR3twAv9evEU8cNWkXCb9kd5ePAHUKJBkOsUpR1wt/CvGdeca7vqumL1U5cSaeVQ6zZMxiJ3yWsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "3.0.0",
         "content-disposition": "0.5.2",
         "mime-types": "2.1.18",
-        "minimatch": "3.1.2",
+        "minimatch": "3.1.5",
         "path-is-inside": "1.0.2",
         "path-to-regexp": "3.3.0",
         "range-parser": "1.2.0"
@@ -2578,13 +2673,13 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
         "node": ">=12"
@@ -2627,14 +2722,14 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -2667,22 +2762,19 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
-      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz",
+      "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@fastify/busboy": "^2.0.0"
-      },
       "engines": {
-        "node": ">=14.0"
+        "node": ">=18.17"
       }
     },
     "node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
       "dev": true,
       "license": "ISC"
     },
@@ -2711,16 +2803,6 @@
         "registry-url": "3.1.0"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -2732,9 +2814,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
-      "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz",
+      "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2820,16 +2902,16 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.21.tgz",
-      "integrity": "sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==",
+      "version": "3.5.34",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.34.tgz",
+      "integrity": "sha512-WdLBG9gm02OgJIG9axd5Hpx0TFLdzVgfG2evFFu8Rur5O/IoGc5cMjnjh3tPL6GnRGsYvUhBSKVPYVcxRKpMCA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.21",
-        "@vue/compiler-sfc": "3.5.21",
-        "@vue/runtime-dom": "3.5.21",
-        "@vue/server-renderer": "3.5.21",
-        "@vue/shared": "3.5.21"
+        "@vue/compiler-dom": "3.5.34",
+        "@vue/compiler-sfc": "3.5.34",
+        "@vue/runtime-dom": "3.5.34",
+        "@vue/server-renderer": "3.5.34",
+        "@vue/shared": "3.5.34"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -2841,13 +2923,14 @@
       }
     },
     "node_modules/vue-i18n": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.1.12.tgz",
-      "integrity": "sha512-BnstPj3KLHLrsqbVU2UOrPmr0+Mv11bsUZG0PyCOzsawCivk8W00GMXHeVUWIDOgNaScCuZah47CZFE+Wnl8mw==",
+      "version": "11.4.2",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.4.2.tgz",
+      "integrity": "sha512-sADDeKXqAGsPX6tK3t3y2ZiMpbVWN12tG+MhTiJ06rVoh58eGtM4wFyw3uWGbVkXByVp9Ne/AP+nSSzI+J9OAQ==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/core-base": "11.1.12",
-        "@intlify/shared": "11.1.12",
+        "@intlify/core-base": "11.4.2",
+        "@intlify/devtools-types": "11.4.2",
+        "@intlify/shared": "11.4.2",
         "@vue/devtools-api": "^6.5.0"
       },
       "engines": {
@@ -2860,6 +2943,15 @@
         "vue": "^3.0.0"
       }
     },
+    "node_modules/vue3-simple-icons": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/vue3-simple-icons/-/vue3-simple-icons-16.10.0.tgz",
+      "integrity": "sha512-i5i4K3R+ZLFLsb+Gjw7jHxOQW5hhH4NcB0U2Xe1v3FKnqFJow8A5sgRglAwFtFDHLw1peDIRRRe8dCxs9yhVdQ==",
+      "license": "MIT",
+      "dependencies": {
+        "vue": "^3"
+      }
+    },
     "node_modules/webpack-virtual-modules": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
@@ -2930,13 +3022,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/zod": {
       "version": "3.25.76",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 49006ab1c7d1..1a285cb4279d 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchzip,
   autoPatchelfHook,
   autoAddDriverRunpath,
   makeWrapper,
@@ -45,9 +46,11 @@
   numactl,
   amf-headers,
   svt-av1,
+  shaderc,
   vulkan-loader,
   libappindicator,
   libnotify,
+  pipewire,
   miniupnpc,
   nlohmann_json,
   config,
@@ -56,20 +59,53 @@
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
   apple-sdk_15,
+  darwinMinVersionHook,
 }:
 let
   inherit (stdenv.hostPlatform) isDarwin isLinux;
   stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
+
+  # Upstream's cmake fetches a pre-built ffmpeg from LizardByte/build-deps at
+  # configure time. We can't do network I/O during the build, so fetch it via
+  # a fixed-output derivation and point cmake at it via FFMPEG_PREPARED_BINARIES.
+  # The tag must match the commit of the third-party/build-deps submodule pinned
+  # in the Sunshine release.
+  buildDepsTag = "v2026.516.30821";
+  ffmpegArch =
+    {
+      x86_64-linux = "Linux-x86_64";
+      aarch64-linux = "Linux-aarch64";
+      x86_64-darwin = "Darwin-x86_64";
+      aarch64-darwin = "Darwin-arm64";
+    }
+    .${stdenv.hostPlatform.system}
+      or (throw "sunshine: unsupported system ${stdenv.hostPlatform.system} for prebuilt ffmpeg");
+  ffmpegPrebuilt = fetchzip {
+    url = "https://github.com/LizardByte/build-deps/releases/download/${buildDepsTag}/${ffmpegArch}-ffmpeg.tar.gz";
+    # stripRoot defaults to true; the hash here matches what
+    # `nix-prefetch-url --unpack` produces, so the updater can refresh it
+    # with the built-in command (which also caches downloads by URL,
+    # unlike the empty-hash trick).
+    hash =
+      {
+        x86_64-linux = "sha256-VT+4qP2FaizCoIBBbBkzbYw4YOvGhuBUoZxWL0IYVZo=";
+        aarch64-linux = "sha256-X5v/GsJy8G3/LHW/8s0VAS0Vegr7JhZSqYotXL/s81o=";
+        x86_64-darwin = "sha256-rrOGahWwJikRfUn27Q4jVra2Q/MMSNitu0wS2UGKGWk=";
+        aarch64-darwin = "sha256-xkfwLJgb7uz1H7mJrQFW79w2T/T/Zv7biXlvXz5UvXc=";
+      }
+      .${stdenv.hostPlatform.system};
+  };
+
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "sunshine";
-  version = "2025.924.154138";
+  version = "2026.516.143833";
 
   src = fetchFromGitHub {
     owner = "LizardByte";
     repo = "Sunshine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QrPfZqd9pgufohUjxlTpO6V0v7B41UrXHZaESsFjZ48=";
+    hash = "sha256-3yuhOyW1Rqz4ddZ40z2ZzpAReZQFva0SL595XrnFB60=";
     fetchSubmodules = true;
   };
 
@@ -77,7 +113,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ui = buildNpmPackage {
     inherit (finalAttrs) src version;
     pname = "sunshine-ui";
-    npmDepsHash = "sha256-miRw5JGZ8L+CKnoZkCuVW+ptzFV3Dg21zuS9lqNeHro=";
+    npmDepsHash = "sha256-YnNnuAdj/S5LGNytqIsmCApIec8DTWKF6VIJ7AXUctU=";
 
     # use generated package-lock.json as upstream does not provide one
     postPatch = ''
@@ -102,8 +138,8 @@ stdenv'.mkDerivation (finalAttrs: {
   # use system boost instead of FetchContent.
   # FETCH_CONTENT_BOOST_USED prevents Simple-Web-Server from re-finding boost
   + ''
-    substituteInPlace cmake/dependencies/Boost_Sunshine.cmake \
-      --replace-fail 'set(BOOST_VERSION "1.87.0")' 'set(BOOST_VERSION "${boost.version}")'
+    sed -i -E 's/set\(BOOST_VERSION "[^"]*"\)/set(BOOST_VERSION "${boost.version}")/' \
+      cmake/dependencies/Boost_Sunshine.cmake
     echo 'set(FETCH_CONTENT_BOOST_USED TRUE)' >> cmake/dependencies/Boost_Sunshine.cmake
   ''
   # remove upstream dependency on systemd and udev
@@ -112,27 +148,31 @@ stdenv'.mkDerivation (finalAttrs: {
       --replace-fail 'find_package(Systemd)' "" \
       --replace-fail 'find_package(Udev)' ""
 
+    # The remaining @VAR@ placeholders in the .desktop file (PROJECT_NAME,
+    # PROJECT_DESCRIPTION, PROJECT_FQDN, SUNSHINE_DESKTOP_ICON,
+    # CMAKE_INSTALL_FULL_DATAROOTDIR) are substituted by cmake's
+    # configure_file(... @ONLY) during the build.
     substituteInPlace packaging/linux/dev.lizardbyte.app.Sunshine.desktop \
-      --subst-var-by PROJECT_NAME 'Sunshine' \
-      --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \
-      --subst-var-by SUNSHINE_DESKTOP_ICON 'sunshine' \
-      --subst-var-by CMAKE_INSTALL_FULL_DATAROOTDIR "$out/share" \
-      --replace-fail '/usr/bin/env systemctl start --u sunshine' 'sunshine'
+      --replace-fail '/usr/bin/env systemctl start --u app-@PROJECT_FQDN@' 'sunshine'
 
-    substituteInPlace packaging/linux/sunshine.service.in \
-      --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \
-      --subst-var-by SUNSHINE_EXECUTABLE_PATH $out/bin/sunshine \
+    substituteInPlace packaging/linux/app-dev.lizardbyte.app.Sunshine.service.in \
       --replace-fail '/bin/sleep' '${lib.getExe' coreutils "sleep"}'
   '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    python3
+    # glad's generator needs Jinja2 + setuptools at configure time;
+    # GLAD_SKIP_PIP_INSTALL=ON tells cmake not to pip-install them.
+    (python3.withPackages (ps: [
+      ps.jinja2
+      ps.setuptools
+    ]))
     makeWrapper
   ]
   ++ lib.optionals isLinux [
     wayland-scanner
+    shaderc # provides glslc, needed at configure time for shader compilation
     # Avoid fighting upstream's usage of vendored ffmpeg libraries
     autoPatchelfHook
   ]
@@ -182,6 +222,8 @@ stdenv'.mkDerivation (finalAttrs: {
     libgbm
     amf-headers
     svt-av1
+    vulkan-loader
+    pipewire
     libappindicator
     libnotify
   ]
@@ -191,6 +233,8 @@ stdenv'.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals isDarwin [
     apple-sdk_15
+    # av_audio.mm calls AudioHardwareCreateProcessTap, introduced in macOS 14.2
+    (darwinMinVersionHook "14.2")
   ];
 
   runtimeDependencies = lib.optionals isLinux [
@@ -208,6 +252,10 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "SUNSHINE_PUBLISHER_NAME" "nixpkgs")
     (lib.cmakeFeature "SUNSHINE_PUBLISHER_WEBSITE" "https://nixos.org")
     (lib.cmakeFeature "SUNSHINE_PUBLISHER_ISSUE_URL" "https://github.com/NixOS/nixpkgs/issues")
+    # avoid cmake's network download of the LizardByte/build-deps ffmpeg tarball
+    (lib.cmakeFeature "FFMPEG_PREPARED_BINARIES" "${ffmpegPrebuilt}")
+    # we provide Jinja2/setuptools via python3.withPackages; don't pip-install
+    (lib.cmakeBool "GLAD_SKIP_PIP_INSTALL" true)
   ]
   # upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead
   ++ lib.optionals isLinux [
@@ -216,6 +264,8 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d")
     (lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user")
     (lib.cmakeFeature "SYSTEMD_MODULES_LOAD_DIR" "lib/modules-load.d")
+    # used in the generated systemd unit's ExecStart= line
+    (lib.cmakeFeature "SUNSHINE_EXECUTABLE_PATH" "${placeholder "out"}/bin/sunshine")
   ]
   ++ lib.optionals (!cudaSupport) [
     (lib.cmakeBool "SUNSHINE_ENABLE_CUDA" false)
@@ -252,10 +302,6 @@ stdenv'.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  postInstall = lib.optionalString isLinux ''
-    install -Dm644 ../packaging/linux/dev.lizardbyte.app.Sunshine.desktop $out/share/applications/dev.lizardbyte.app.Sunshine.desktop
-  '';
-
   # allow Sunshine to find libvulkan
   postFixup = lib.optionalString cudaSupport ''
     wrapProgram $out/bin/sunshine \
diff --git a/pkgs/by-name/su/sunshine/updater.sh b/pkgs/by-name/su/sunshine/updater.sh
index 6092a8bfd582..e2838d2860b8 100755
--- a/pkgs/by-name/su/sunshine/updater.sh
+++ b/pkgs/by-name/su/sunshine/updater.sh
@@ -1,20 +1,127 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p gnugrep curl jq nix-update
+#! nix-shell -i bash -p gnugrep gnused coreutils curl jq nix-update nix-prefetch-git
 # shellcheck shell=bash
 
 set -euo pipefail
 
-cd "$(dirname "${BASH_SOURCE[0]}")/../../../.."
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+package_nix="$script_dir/package.nix"
+nixpkgs_root="$(cd "$script_dir/../../../.." && pwd)"
+cd "$nixpkgs_root"
 
-version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --location https://api.github.com/repos/LizardByte/Sunshine/releases/latest | jq --raw-output .tag_name | grep -oP "^v\K.*")
+log() {
+    printf '\n==> %s\n' "$*" >&2
+}
+
+api() {
+    curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --location "$@"
+}
+
+log "Querying latest Sunshine release from GitHub"
+version=$(api https://api.github.com/repos/LizardByte/Sunshine/releases/latest | jq --raw-output .tag_name | grep -oP "^v\K.*")
+log "Latest version: $version"
 
 if [[ "${UPDATE_NIX_OLD_VERSION:-}" == "$version" ]]; then
-    echo "Already up to date!"
+    log "Already up to date!"
     exit 0
 fi
 
-nix-update sunshine --version "$version"
+log "Updating sunshine version (src hash refreshed separately, see below)"
+# --no-src: nix-update can't fetch submodules, so we refresh the src hash
+# ourselves via nix-prefetch-git below.
+nix-update sunshine --version "$version" --no-src
+
+log "Prefetching sunshine src with submodules (this can take several minutes)"
+# nix-prefetch-git outputs SRI under .hash on recent versions. The submodule
+# tree NAR-hashes identically on Linux and Darwin, so one hash serves both.
+src_hash=$(nix-prefetch-git \
+    --quiet \
+    --fetch-submodules \
+    --url "https://github.com/LizardByte/Sunshine" \
+    --rev "v$version" \
+    | jq --raw-output .hash)
+
+if [[ -z "$src_hash" || "$src_hash" == "null" ]]; then
+    echo "ERROR: failed to prefetch sunshine src hash" >&2
+    exit 1
+fi
+log "src hash: $src_hash"
+
+log "Patching src hash in $package_nix"
+# The src fetchFromGitHub is the only one with fetchSubmodules; anchor on it so
+# we don't touch the ffmpeg or npmDepsHash entries. sed -z spans newlines.
+sed -i -zE "s#hash = \"sha256-[A-Za-z0-9+/=]+\"(\\s*fetchSubmodules = true;)#hash = \"$src_hash\"\\1#" "$package_nix"
+
+if ! grep -q "$src_hash" "$package_nix"; then
+    echo "ERROR: failed to write src hash into $package_nix" >&2
+    exit 1
+fi
+
+log "Regenerating sunshine.ui package-lock.json"
 # `--generate-lockfile` only regenerates package-lock.json; it skips the npmDepsHash
 # refresh (see nix-update's dependency_hashes.py). Run a second pass to update the hash.
-nix-update sunshine --version=skip --generate-lockfile --subpackage ui
-nix-update sunshine --version=skip --subpackage ui
+# `--no-src` avoids re-fetching the (already-pinned) sunshine src on each pass.
+nix-update sunshine --version=skip --no-src --generate-lockfile --subpackage ui
+
+log "Refreshing sunshine.ui npmDepsHash"
+nix-update sunshine --version=skip --no-src --subpackage ui
+
+# Update the LizardByte/build-deps tag and pinned ffmpeg tarball hashes.
+# Sunshine pins build-deps via a git submodule at third-party/build-deps; the
+# tag we need is whichever build-deps release tag points at that submodule's
+# commit.
+log "Resolving LizardByte/build-deps submodule commit and tag"
+build_deps_sha=$(api "https://api.github.com/repos/LizardByte/Sunshine/contents/third-party?ref=v$version" \
+    | jq --raw-output '.[] | select(.name=="build-deps") | .sha')
+log "build-deps submodule commit: $build_deps_sha"
+build_deps_tag=$(api "https://api.github.com/repos/LizardByte/build-deps/tags?per_page=100" \
+    | jq --raw-output --arg sha "$build_deps_sha" '.[] | select(.commit.sha==$sha) | .name' \
+    | head -n1)
+
+if [[ -z "$build_deps_tag" ]]; then
+    echo "ERROR: no LizardByte/build-deps tag points at submodule commit $build_deps_sha" >&2
+    exit 1
+fi
+log "build-deps tag: $build_deps_tag"
+
+# Compute the SRI hash of a `fetchzip` (default stripRoot=true) for a URL.
+# `nix-prefetch-url --unpack` produces the same NAR hash AND caches by URL
+# (whereas the empty-hash + fetchzip trick re-downloads every invocation).
+prefetch_unpacked_sri() {
+    local raw
+    raw=$(nix-prefetch-url --unpack --type sha256 "$1")
+    nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$raw"
+}
+
+ffmpeg_url() {
+    echo "https://github.com/LizardByte/build-deps/releases/download/$build_deps_tag/$1-ffmpeg.tar.gz"
+}
+
+# Map nix system → upstream tarball arch token. Keep this in sync with the
+# `ffmpegArch` attrset in package.nix.
+declare -A ffmpeg_arch=(
+    [x86_64-linux]=Linux-x86_64
+    [aarch64-linux]=Linux-aarch64
+    [x86_64-darwin]=Darwin-x86_64
+    [aarch64-darwin]=Darwin-arm64
+)
+
+declare -A ffmpeg_hash
+for system in "${!ffmpeg_arch[@]}"; do
+    log "Prefetching ffmpeg tarball for $system (${ffmpeg_arch[$system]})"
+    h=$(prefetch_unpacked_sri "$(ffmpeg_url "${ffmpeg_arch[$system]}")")
+    if [[ -z "$h" ]]; then
+        echo "ERROR: failed to prefetch ffmpeg tarball for $system" >&2
+        exit 1
+    fi
+    log "  $system -> $h"
+    ffmpeg_hash[$system]=$h
+done
+
+log "Patching $package_nix"
+sed_args=(-E -e "s#buildDepsTag = \"v[^\"]*\";#buildDepsTag = \"$build_deps_tag\";#")
+for system in "${!ffmpeg_hash[@]}"; do
+    sed_args+=(-e "s#$system = (lib\\.fakeHash|\"sha256-[A-Za-z0-9+/=]+\");#$system = \"${ffmpeg_hash[$system]}\";#")
+done
+sed -i "${sed_args[@]}" "$package_nix"
+log "Done."

From 17f3d5cd17c3266788bd109df10b01669454f60b Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Fri, 5 Jun 2026 19:54:59 +0000
Subject: [PATCH 021/339] gzrt: 0.8 -> 0.9.1

---
 pkgs/by-name/gz/gzrt/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gz/gzrt/package.nix b/pkgs/by-name/gz/gzrt/package.nix
index 034f340604b5..02a2a716673e 100644
--- a/pkgs/by-name/gz/gzrt/package.nix
+++ b/pkgs/by-name/gz/gzrt/package.nix
@@ -1,17 +1,19 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gzrt";
-  version = "0.8";
+  version = "0.9.1";
 
-  src = fetchurl {
-    url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${finalAttrs.version}.tar.gz";
-    sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh";
+  src = fetchFromGitHub {
+    owner = "arenn";
+    repo = "gzrt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2RzQ/xrtADplVqUeB6suU3fKhJePYM7EkuIV59JSR3Q=";
   };
 
   buildInputs = [ zlib ];
@@ -22,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/";
+    homepage = "https://github.com/arenn/gzrt";
     description = "Gzip Recovery Toolkit";
     maintainers = [ ];
     mainProgram = "gzrecover";

From be59fc82760a4bbc5a56144010372eb1dda5173a Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:17:17 +0200
Subject: [PATCH 022/339] python3Packages.azure-mgmt-domainregistration: init
 at 1.0.0b1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../azure-mgmt-domainregistration/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix b/pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix
new file mode 100644
index 000000000000..605ad5a8e97e
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-domainregistration/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  wheel,
+  azure-mgmt-core,
+  isodate,
+  typing-extensions,
+  nix-update-script,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "azure-mgmt-domainregistration";
+  version = "1.0.0b1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "azure_mgmt_domainregistration";
+    inherit (finalAttrs) version;
+    hash = "sha256-9ayRrmCqmTY8yMLtrj/IIUb5xONb9SQoz8wvN29Wvy0=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    azure-mgmt-core
+    isodate
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "azure.mgmt.domainregistration"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "This package will be released in the near future. Stay tuned";
+    homepage = "https://pypi.org/project/azure-mgmt-domainregistration";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 135ff46d3ec3..5731cb8982bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1551,6 +1551,10 @@ self: super: with self; {
 
   azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { };
 
+  azure-mgmt-domainregistration =
+    callPackage ../development/python-modules/azure-mgmt-domainregistration
+      { };
+
   azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { };
 
   azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { };

From 5d06290ba0a0cca7f0f117f0f030f4c18c331e6e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:17:55 +0200
Subject: [PATCH 023/339] azure-cli: 2.86.0 -> 2.87.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/package.nix         |  5 +++--
 pkgs/by-name/az/azure-cli/python-packages.nix | 10 ----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 01c2a4516808..17bf6dfa2a85 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.86.0";
+  version = "2.87.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     tag = "azure-cli-${version}";
-    hash = "sha256-3C39e9C3m9M0faGUgOEWo66fFGDytfGohgUYX55VN8g=";
+    hash = "sha256-08GmSGjPt+veulW6d/03bKUeyhedQ0JfsFT9VDkaQ7w=";
   };
 
   # put packages that needs to be overridden in the py package scope
@@ -192,6 +192,7 @@ py.pkgs.toPythonApplication (
         azure-mgmt-cosmosdb
         azure-mgmt-datalake-store
         azure-mgmt-datamigration
+        azure-mgmt-domainregistration
         azure-mgmt-eventgrid
         azure-mgmt-eventhub
         azure-mgmt-extendedlocation
diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix
index 01232e27aaad..ccea48c9e783 100644
--- a/pkgs/by-name/az/azure-cli/python-packages.nix
+++ b/pkgs/by-name/az/azure-cli/python-packages.nix
@@ -251,16 +251,6 @@ let
         overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip"
           "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k=";
 
-      # ModuleNotFoundError: No module named 'azure.mgmt.web.v2024_11_01'
-      azure-mgmt-web = super.azure-mgmt-web.overridePythonAttrs (attrs: rec {
-        version = "9.0.0";
-        src = fetchPypi {
-          pname = "azure_mgmt_web";
-          inherit version;
-          hash = "sha256-RFXs07SYV3CFwZBObRcTklTjWLoH/mxINaiRu697BsI=";
-        };
-      });
-
       # Attribute virtual_machines does not exist - nixpkgs has 37.x but azure-cli 2.82.0 requires ~=34.1.0
       azure-mgmt-compute = super.azure-mgmt-compute.overridePythonAttrs (attrs: rec {
         version = "34.1.0";

From e863f1b77d3dcb803e1a2da400eb68bbec350906 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:22 +0200
Subject: [PATCH 024/339] azure-cli-extensions.fileshare: init at 1.0.2

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 9b8e401f8b39..b7846fa1d8da 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -496,6 +496,13 @@
     "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=",
     "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension"
   },
+  "fileshare": {
+    "pname": "fileshare",
+    "version": "1.0.2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshare-1.0.2-py3-none-any.whl",
+    "hash": "sha256-Oxrgvsm6K2msHxNUZ5S4FUz7BPucrxHpyLdGf5ucKkA=",
+    "description": "Microsoft Azure Command-Line Tools Fileshare Extension"
+  },
   "fileshares": {
     "pname": "fileshares",
     "version": "1.0.0b1",

From d213b25fa3a89de52a7b505bff07523296dc602a Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:23 +0200
Subject: [PATCH 025/339] azure-cli-extensions.quantum: 1.0.0b13 -> 1.0.0b16

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

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

From d94d053017fdee4220120cadc0bcde266e47aaf1 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:25 +0200
Subject: [PATCH 026/339] azure-cli-extensions.oracle-database: 2.0.1 -> 2.0.3

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index a6de2cd6b252..803ca2c442fc 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -862,9 +862,9 @@
   },
   "oracle-database": {
     "pname": "oracle-database",
-    "version": "2.0.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.1-py3-none-any.whl",
-    "hash": "sha256-VlKOK9xP9e3NfPTO8jiqjdhJMkKzRpR8IWZ1hh0Z86Y=",
+    "version": "2.0.3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.3-py3-none-any.whl",
+    "hash": "sha256-Qd9WtF7opKFbotazhgJsCb6CdGO/xQ1/5De+LcIaAiY=",
     "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension"
   },
   "orbital": {

From 8d6b29a81ce5d57e695152c70335ba156b88fba1 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:26 +0200
Subject: [PATCH 027/339] azure-cli-extensions.fleet: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 803ca2c442fc..34357b4dcb0a 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -519,9 +519,9 @@
   },
   "fleet": {
     "pname": "fleet",
-    "version": "1.10.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.0-py3-none-any.whl",
-    "hash": "sha256-hgAwdLExAvKR0G9Ey81rTSa2QLxeoMnUZ7KRaCYhfM8=",
+    "version": "1.10.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.1-py3-none-any.whl",
+    "hash": "sha256-MEtlIj9z69GM/vktWbethZEr6hXyBpH310PT9A5Rtk8=",
     "description": "Microsoft Azure Command-Line Tools Fleet Extension"
   },
   "fluid-relay": {

From 5abf4a5c15d57abd7199e7f2217d560a7c34994c Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:27 +0200
Subject: [PATCH 028/339] azure-cli-extensions.dataprotection: 1.10.0 -> 1.11.1

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

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

From 40ce78a18aa49254f8f0e8d017605eee87ae9061 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:28 +0200
Subject: [PATCH 029/339] azure-cli-extensions.appservice-kube: 0.1.11 ->
 1.0.0b1

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 2fbe0b0094bc..f74293ceafd8 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -99,9 +99,9 @@
   },
   "appservice-kube": {
     "pname": "appservice-kube",
-    "version": "0.1.11",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-0.1.11-py2.py3-none-any.whl",
-    "hash": "sha256-gTI/rjFHJ8mx1QfWeWgJStemOubwqEPqKuS3jCPnuKI=",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-1.0.0b1-py2.py3-none-any.whl",
+    "hash": "sha256-85HDcR5CwGoGG2ZXOK0aPGyUoE4aXK7QMnJH2vcohac=",
     "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension"
   },
   "arcgateway": {

From c372859756181f1877d874e22b481279d811edf2 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:30 +0200
Subject: [PATCH 030/339] azure-cli-extensions.azure-changesafety: 1.0.0b1 ->
 1.0.0b2

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index f74293ceafd8..631dc6738aee 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -155,9 +155,9 @@
   },
   "azure-changesafety": {
     "pname": "azure-changesafety",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-ZR2Bm9U9C4rXrCfPVGRu65MBFjZ4iUtXS44l+ClJXsY=",
+    "version": "1.0.0b2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b2-py3-none-any.whl",
+    "hash": "sha256-HTnRKs0YDqHH1tNgrbHdMOFChY7+G6Q4duHTD3KWtPA=",
     "description": "Microsoft Azure Command-Line Tools ChangeSafety Extension"
   },
   "azure-firewall": {

From a734b579cda3e30d023d0d551aa888080ceff92f Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:31 +0200
Subject: [PATCH 031/339] azure-cli-extensions.aks-preview: 20.0.0b8 ->
 21.0.0b4

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 631dc6738aee..fe6e05fb905d 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -50,9 +50,9 @@
   },
   "aks-preview": {
     "pname": "aks-preview",
-    "version": "20.0.0b8",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b8-py2.py3-none-any.whl",
-    "hash": "sha256-ugLew461nhWWg73OZJW7g/xblclV5IfNHKm1it6j+Dc=",
+    "version": "21.0.0b4",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-21.0.0b4-py2.py3-none-any.whl",
+    "hash": "sha256-SQVpyKPmiVfN1gX7CnqhgAIoYVc8+ViPT/y0u8Km/EM=",
     "description": "Provides a preview for upcoming AKS features"
   },
   "alb": {

From 1aa7e6b7aea755d0f80be6e07aae03cf1705668a Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:32 +0200
Subject: [PATCH 032/339] azure-cli-extensions.site: 1.0.0b1 -> 1.0.0b2

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index fe6e05fb905d..aa21875699dc 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1030,9 +1030,9 @@
   },
   "site": {
     "pname": "site",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-OZ2569Gt1U+UzNHe4jsO3nTMUjipqGaCKoKbN0PDXpA=",
+    "version": "1.0.0b2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b2-py3-none-any.whl",
+    "hash": "sha256-soEnNlH5/Mvzgj++o6LvpIheUrV13ZSQfWS4hNJZaeI=",
     "description": "Microsoft Azure Command-Line Tools Site Extension"
   },
   "site-recovery": {

From 91aa08a4dfb35026a3dbde9bce450290c0939896 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:34 +0200
Subject: [PATCH 033/339] azure-cli-extensions.amg: 2.8.1 -> 3.0.0

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index aa21875699dc..87d71fa00ed0 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -71,9 +71,9 @@
   },
   "amg": {
     "pname": "amg",
-    "version": "2.8.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.8.1-py3-none-any.whl",
-    "hash": "sha256-nsp7EJIf9/hfpbbpAlNQBQ//U2oR0zWV+LqJtlyCoLM=",
+    "version": "3.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-3.0.0-py3-none-any.whl",
+    "hash": "sha256-dTenG/ZarhJyREsCBigfy3zCpQ7VmK3Z4feLU4CzFtk=",
     "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
   },
   "amlfs": {

From f226a076c98243852e35a94abdd0859f5a47322e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:35 +0200
Subject: [PATCH 034/339] azure-cli-extensions.computelimit: 1.0.0b1 -> 1.0.0

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 87d71fa00ed0..aa4e84aa0f1d 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -239,9 +239,9 @@
   },
   "computelimit": {
     "pname": "computelimit",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computelimit-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-Om6Hp12RxcajwQDUL/APXQpNjZNsJin/ad93hPfTOCg=",
+    "version": "1.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computelimit-1.0.0-py3-none-any.whl",
+    "hash": "sha256-/jvHC7wLD7BVVgFIu2souEQs/o6Uaw9qsqXnoWt632E=",
     "description": "Microsoft Azure Command-Line Tools Computelimit Extension"
   },
   "computeschedule": {

From be5ab44c632a00fa8f5b5d2730ee4173951750e3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:36 +0200
Subject: [PATCH 035/339] azure-cli-extensions.networkcloud: 5.0.0b1 -> 5.0.0b2

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

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index aa4e84aa0f1d..da2da166bd58 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -813,10 +813,10 @@
   },
   "networkcloud": {
     "pname": "networkcloud",
-    "version": "5.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b1-py3-none-any.whl",
-    "hash": "sha256-q6F3dUqkhngm6/8Xe7Aki6OUTKbCpGCwy/bIcoPpmlM=",
-    "description": "Support for Azure Operator Nexus network cloud commands based on 2026-01-01-preview API version"
+    "version": "5.0.0b2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b2-py3-none-any.whl",
+    "hash": "sha256-npgLkxwwn3FL7w4q5bpUq2Gghuy/4zsmikW7qs86Fe0=",
+    "description": "Support for Azure Operator Nexus network cloud commands based on 2026-05-01-preview API version"
   },
   "new-relic": {
     "pname": "new-relic",

From c696831a2c33558cdff18522fce2c6ff4ae0e0f2 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 6 Jun 2026 13:18:37 +0200
Subject: [PATCH 036/339] azure-cli-extensions.fileshares: remove

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 -------
 pkgs/by-name/az/azure-cli/extensions-manual.nix     | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index da2da166bd58..704233a1d483 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -503,13 +503,6 @@
     "hash": "sha256-Oxrgvsm6K2msHxNUZ5S4FUz7BPucrxHpyLdGf5ucKkA=",
     "description": "Microsoft Azure Command-Line Tools Fileshare Extension"
   },
-  "fileshares": {
-    "pname": "fileshares",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshares-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-IrJwPQaMuX9VItIEkJzK3cmANHzU50fIaWn2s32nDVk=",
-    "description": "Commands for managing Azure file shares, snapshots, and private endpoint connections"
-  },
   "firmwareanalysis": {
     "pname": "firmwareanalysis",
     "version": "2.0.1",
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 00c7f6e1c2b1..e0dca6490e74 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -389,5 +389,6 @@
   sap-hana = throw "The 'sap-hana' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8904
   spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652
   spring-cloud = throw "The 'spring-cloud' extension for azure-cli was deprecated upstream"; # Added 2025-07-01 https://github.com/Azure/azure-cli-extensions/pull/8897
-  weights-and-biases = throw "The 'weights-and-biases' was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764
+  weights-and-biases = throw "The 'weights-and-biases' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764
+  fileshares = throw "The 'fileshares' extensions for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/9910
 }

From a27f7bdd24dcbcc907062289a1daced4eb333078 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Mon, 8 Jun 2026 02:39:33 +0300
Subject: [PATCH 037/339] esbuild_netlify: remove

Netlify's esbuild fork was pinned at 0.14.39 (2022), is abandoned
upstream, and is no longer referenced by netlify-cli, which builds with
the regular npm-bundled esbuild. The package had zero remaining
consumers. Add a throw alias directing users to 'esbuild'.

Assisted-by: claude-code with claude-opus-4-8[1m]-high
---
 pkgs/by-name/es/esbuild_netlify/package.nix | 34 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/es/esbuild_netlify/package.nix

diff --git a/pkgs/by-name/es/esbuild_netlify/package.nix b/pkgs/by-name/es/esbuild_netlify/package.nix
deleted file mode 100644
index d0d18dbf5af8..000000000000
--- a/pkgs/by-name/es/esbuild_netlify/package.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  netlify-cli,
-}:
-
-buildGoModule {
-  pname = "esbuild";
-  version = "0.14.39";
-
-  src = fetchFromGitHub {
-    owner = "netlify";
-    repo = "esbuild";
-    rev = "5faa7ad54c99a953d05c06819298d2b6f8c82d80";
-    sha256 = "pYiwGjgFMclPYTW0Qml7Pr/knT1gywUAGANra5aojYM=";
-  };
-
-  vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
-
-  passthru = {
-    tests = {
-      inherit netlify-cli;
-    };
-  };
-
-  meta = {
-    description = "Fork of esbuild maintained by netlify";
-    homepage = "https://github.com/netlify/esbuild";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ roberth ];
-    mainProgram = "esbuild";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e048b8ad382d..59c4b563ded2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -705,6 +705,7 @@ mapAliases {
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
   erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01
   esbuild-config = throw "'esbuild-config' has been removed as it has been unmaintained upstream since September 2022"; # Added 2026-02-07
+  esbuild_netlify = throw "'esbuild_netlify' has been removed, as the netlify esbuild fork is abandoned upstream and no longer used by netlify-cli; use 'esbuild' instead"; # Added 2026-06-08
   etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08
   ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28
   ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31

From 6b23142a1b30a31bc8aca22ce4749d7eada1b870 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 8 Jun 2026 02:52:49 +0200
Subject: [PATCH 038/339] simulide: 1.1.0-SR1 -> 1.1.0-SR2

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

diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix
index 3dfb24aafb63..32885ea59133 100644
--- a/pkgs/by-name/si/simulide/package.nix
+++ b/pkgs/by-name/si/simulide/package.nix
@@ -29,19 +29,20 @@ let
       };
     };
     "1.1.0" = rec {
-      release = "SR1";
-      rev = "2005";
-      src = fetchbzr {
-        url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0";
-        sha256 = "sha256-YVQduUjPQF5KxMlm730FZTShHP/7JEcAMIFn+mQITrQ=";
+      release = "SR2";
+      rev = "28965e3bd6dd118598db1f5639ce1cf2e3c56e36";
+      src = fetchFromGitHub {
+        owner = "Arcachofo";
+        repo = "SimuliDE_110";
         inherit rev;
+        hash = "sha256-Ec72OE4xBlanFFzrrGu0lTY2BEVu7slc1+ZDFr8lUT8=";
       };
     };
     "1.2.0" = rec {
       release = "RC1";
       rev = "da3a925491fab9fa2a8633d18e45f8e1b576c9d2";
       src = fetchFromGitHub {
-        owner = "eeTools";
+        owner = "Arcachofo";
         repo = "SimulIDE-dev";
         hash = "sha256-6Gh0efBizDK1rUNkyU+/ysj7QwkAs3kTA1mQZYFb/pI=";
         inherit rev;

From 02651ee3ea85e8dc94b8cf216d819eff6cfc0444 Mon Sep 17 00:00:00 2001
From: IogaMaster <iogamastercode@gmail.com>
Date: Sun, 7 Jun 2026 20:56:58 -0600
Subject: [PATCH 039/339] tuxedo: 2026.5.12 -> 2026.6.2

Changelog: https://github.com/webstonehq/tuxedo/releases/tag/v2026.6.2
---
 pkgs/by-name/tu/tuxedo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tu/tuxedo/package.nix b/pkgs/by-name/tu/tuxedo/package.nix
index 717095bca829..aba3f266771b 100644
--- a/pkgs/by-name/tu/tuxedo/package.nix
+++ b/pkgs/by-name/tu/tuxedo/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tuxedo";
-  version = "2026.5.12";
+  version = "2026.6.2";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "webstonehq";
     repo = "tuxedo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s4GIHq4kjj+FiNBJJjWeXmg4f40ARUILzwsEl0CDV1o=";
+    hash = "sha256-0ulyr7AbB6KZbAAvxc/s0NJTPBYS42UCbEXYREJTWMo=";
   };
 
-  cargoHash = "sha256-rIdjrwNuY0DySdk4jc880JrFgoIuKTYEcx6XoSfllp4=";
+  cargoHash = "sha256-Sd3O/bw3/FZeas2eWAvSV3HWcDQg8Cla2hagWVYRKsc=";
 
   preCheck = ''
     export HOME="$TMPDIR/home"

From 8dd574b98ee3b15a80c9a22f84bfd31db93dc22f Mon Sep 17 00:00:00 2001
From: FlameFlag <git@ps1.sh>
Date: Mon, 8 Jun 2026 13:29:53 +0300
Subject: [PATCH 040/339] stats: fix app bundle signing

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

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index ab288d597aed..0da129d80fcb 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -2,11 +2,11 @@
   lib,
   swiftPackages,
   fetchFromGitHub,
-  darwin,
   leveldb,
   perl,
   actool,
   makeWrapper,
+  rcodesign,
   nix-update-script,
 }:
 
@@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
     swift
     perl
     actool
-    darwin.autoSignDarwinBinariesHook
     makeWrapper
+    rcodesign
   ];
 
   buildInputs = [ leveldb ];
@@ -333,6 +333,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postFixup = ''
+    # Stats is an app bundle with nested frameworks, so sign the bundle to
+    # generate sealed resources instead of signing only the Mach-O files
+    ${lib.getExe rcodesign} sign "$out/Applications/Stats.app"
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 88646e2e42c675a979384186c8268a51cd736d37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 14:53:18 +0000
Subject: [PATCH 041/339] python3Packages.cxxheaderparser: 1.7.0 -> 1.7.3

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

diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix
index 00bb14afb027..ccd4ea738153 100644
--- a/pkgs/development/python-modules/cxxheaderparser/default.nix
+++ b/pkgs/development/python-modules/cxxheaderparser/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "cxxheaderparser";
-  version = "1.7.0";
+  version = "1.7.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robotpy";
     repo = "cxxheaderparser";
     tag = version;
-    hash = "sha256-Go5oIYwB2DONPbgajQuXfgpUCiGZvgcTZuFJ5z5qC3U=";
+    hash = "sha256-1i8HbVq1dEXktKCZg/ZGX0n5J8LrZx64flMCP/c6ltI=";
   };
 
   postPatch = ''

From 3b551d2d02022076f7abfdbda2e41038d367a6b1 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Mon, 8 Jun 2026 20:38:27 +0200
Subject: [PATCH 042/339] peacock: 8.7.0 -> 8.8.1

---
 pkgs/by-name/pe/peacock/missing-hashes.json   | 64 +++++++++++++------
 pkgs/by-name/pe/peacock/package.nix           |  6 +-
 .../pe/peacock/yarn-4.14-support.patch        | 16 +----
 3 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/pe/peacock/missing-hashes.json b/pkgs/by-name/pe/peacock/missing-hashes.json
index 7bf27a804eda..b311845972cf 100644
--- a/pkgs/by-name/pe/peacock/missing-hashes.json
+++ b/pkgs/by-name/pe/peacock/missing-hashes.json
@@ -30,23 +30,49 @@
   "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2": "a65e847f6a53a74d5b91d10f8a575c43724a6b6530918ca8f71784ba763e1e0e2e2ce5f02a8709273d033a5a8b1361026adce08f69c0fcf778c3f1aae1aa9099",
   "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2": "d5af7600096b93294d5e2c8a75661979996e7d0a7eaddfa3fd45a1b41c54f2c4a21765f0852ce6ef28506309c1f19761310e345613edb2d74d5582a205e1514e",
   "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2": "10ab009b2032b638ad9c00c87b91af09e96d85991806bc73ae3bf5c956fe8172057515df4265b0d13e8b46bd5b74fff0682b5b513e3c2cf52bfac42268f6ab94",
-  "@rollup/rollup-android-arm-eabi@npm:4.35.0": "6608c59811f515fd3817c7b891d34ad042e9a3f4c0edd94fb8af839f17b1748eb5c27b7b12e2431406acd9d174abb60e8e520310d1a8add31046852651b96431",
-  "@rollup/rollup-android-arm64@npm:4.35.0": "51e6a45d4bd1048c7a6be7b4a091a9af063388f5731d455100a6e090ec6c84d44d927aa0bf8ea508a19f2f8343eaae319db06df0acfdb51eeb708d1a314ae611",
-  "@rollup/rollup-darwin-arm64@npm:4.35.0": "844a8ae0b0ab412fcc98979f0a91965a93fb60c5cce6edc7971792acf08d592fe42413eab0692ae1880dc118b669897a28c2896bfe0a9c272f1b481db662d71c",
-  "@rollup/rollup-darwin-x64@npm:4.35.0": "cbcd6d74096e9732db56444d79f4cc739ade75f4a4768e14b259829b2b2905b7e2e5c5811f6294632ae035e813b36a7ee9edf57f529449ae128ce7b4f83f6e80",
-  "@rollup/rollup-freebsd-arm64@npm:4.35.0": "0a29880358b751650db7ab294131572c3952288169d88919510ad7f1e7534cf2f46ea561c600fba27d89fff0cdabe5efb8c19cf6572d08bc0c126832d52d95d8",
-  "@rollup/rollup-freebsd-x64@npm:4.35.0": "fed915fc432c395645bbcbc9f2a88bae25c8e5ba4fb7f813e7d11c007954767ae8b78fcfc445d1c1f4f95d637745e27dcfe3acc710022d7c999c80da32f70fae",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0": "47336911b4c51a55c21a9197593acb8e7b578c9e30b4a4e446e6d4ea3aeedc4afca8d2dfa46002d076d4c456a43065eea89dcf863b80daa0b840f95717579a2f",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0": "66cb126a20e735224c1caf23531f6d8a6e0f377e5be2ea4943c3043b8d0345eafecfa7d02a763b09c057ca682d4e43fdad8d79c62b3f366d1c4dbadad9758bfd",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.35.0": "ad2cb0b631f3163709706d77d9ef111bc2bd2cefe9484b89ab00069a150df7d84ddfb3d0bec0e488363f8dcb0dacc1333533e5223ddf818af3d5da84201a1952",
-  "@rollup/rollup-linux-arm64-musl@npm:4.35.0": "c757a761365e717b2cc48b136d7ba1d0bb298ab475639dbe9393328354afde574248ee278ed66fd7715e72bd56b82f5a84e280dd5358d98736e6f6eaabad6509",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0": "44c1b076ebdea504f1bf64fe17770a1702e833fc84f1fb47a5263d03c965dbae3a18573c594fbacc1a618088dcba42f5dc004bd85c694e72317b84b8e76c0d26",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0": "24cd93ccc079d4c5af42f06b3b7ce065056ec143720ccf54002e9539934863fda88771fdd62c6dc6388e6d35f15e5e562e372eda86a1a68232b33744e75b8917",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0": "2ef06fd488795343cd8f91fb684679a08c5ecc2084e831335358e668d3ea02e121dca662cb8685f2ad16802b6c04eadb0891b1036e800eff1d4b3de258f7011c",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.35.0": "37a11392d357debd1c9d3c03540028dc4d733e91e1f11525951fb76b572cadfadac821062436bf72100e4cea83e796d1d34c9331834d56cdae9b5fb1cf676ed7",
-  "@rollup/rollup-linux-x64-gnu@npm:4.35.0": "6406cd583d15a9b6862ed8baa70b90de271663127a9729456efec31b8647d882f3ed3ea5d630cfa46b7330e5795babfa090874feb5a832b9b0964eb01fba1e79",
-  "@rollup/rollup-linux-x64-musl@npm:4.35.0": "102d679f7347ec8986eb5ceb7eaed73f1948b53f8867ae90f2e60b0efa04acc462d6d7f32ee14c73194e965fca15edcb629bb323865f3ad7953695fcd2e7aaca",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.35.0": "5344cd7bebdea17e5b8cd517e5ef590df7db23e1589d1bc1665839cb9fea82e331b69fd06859efad00544bf24a5b2af33e3f3f08e1c1a58322cddf52d5b3829a",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.35.0": "30bd40356401961443c5e2a9c2e96d086d491e7cd956de34bd073a0cbcc8f3a4c87c4e29601b8b27ef1f7d3a13f89e4a59fd6458bd7ef43565b7ac72b2ff30b0",
-  "@rollup/rollup-win32-x64-msvc@npm:4.35.0": "c684bf21414814a3f7d451be07c1716fc85bf340bcc87eb37ed3f5ea0adbef869af533392971fdc44c932de8b43b9161237cd093a47e233caf66c7be76f54a9d"
+  "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "cfed4cc07be186ab9f04956ec5faac8c7bdad7953afad8057b985c9b1703971067b61d606c9f231226d94cf61ad2f1d757c17e3f0f9a723a60960af889563950",
+  "@oxfmt/binding-android-arm64@npm:0.42.0": "442332e0c820fda900b67de5d6309f4050f7b9322ce94153477ce429f4a1bfaecf921a28c15665b643febcfefdebf3bca31eeeae52cd10cc8fd15fe67ee70bad",
+  "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ee19cb362477eb9be51852ef1add3ba121defa0b25bbb4736b1927b49786c9c74241f630ac3e5f71180f2eea1bdbc510cffd654831f4d8d815a6e69b91ab5e24",
+  "@oxfmt/binding-darwin-x64@npm:0.42.0": "798a208adcbe43ef9a3ead702a63ae91d0da868e3a34c6d21fd9cdc2933e3cd584423b96c4fa9a80a91ba50cac61f198ecaab1c1970dd1460b62706894c004be",
+  "@oxfmt/binding-freebsd-x64@npm:0.42.0": "1375f7fe8875d15ad99110d30fcf2b62f271c149b8676b7203261edc7afcd425fc6e2c1f03c688eb7792a8b407db29cc80be99508636c3ae9c5e01f7511a9019",
+  "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "ffc7b9c8368b3234fa6750cf7c97ecb48e6f7399120005cef0dc667138465a78d4542da3ef84b049496d7c7f2737a73da7bd655b25a6ac0cd581110b1c5ea97f",
+  "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "3536d4c804af4dcbdf97aeb01862a63401ab84f430af2652a8d49a6b3559b0cc13c48bb6b65a5d88bee109e8bc56eae09279b3db927506e0423b9a2c4a1a2faf",
+  "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "ab50b3dcefa2646e070344ade3c96e1f1cf6de6b82fff0d15223d5315e530536284740a67544c16d9d030235dc0e25174314d894b2f6a9870824a02d8b3dc850",
+  "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "fc6cc62590f450829b4e95d64c72fde805138dea7050c520d45cecd01fd20f47f94db0c539ce69ff0cc067ac79f852a7560369a3e39d01471294358a295215e6",
+  "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "cfe429d5056af70cfc910603e8901ec9a45afd21221900d4fef3880ac8d591f61586c49f1e2fa92c738f7c1e0b3d2178bc7c14238b0b3465360e1d66d962a671",
+  "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "943f26bc82e8964f0b49159585590805f79d6af7bde611dedfe139fe63d862ad26165d01b27df80cd3b75ba485c7b361761d3f1f1e2a58ec3d99510af8782a75",
+  "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "fc5a41699e6fba09e10628eb73c4baf71630f7a88736ec8339bdf396223d276577d1239e89c6395751680641d7c15400eacbbba175a7618cd113f656d58b65b4",
+  "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "12fd4491796031630eaf950a8fe96d652a490e07240dfcafe25ce3e2f120bf01f5472d9e1ddb9cc2862debcbc4f5a14139edbd114b9a8ba11dfcb1e50af98a04",
+  "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "831e37318b98817cc7f590bd5c4f9c4a85dd8c661611834ea97f897625a902c950aadc51133506014e7823d2b6049d70aafbec1e998e12fc7a27399b227e0974",
+  "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "6442ca0a5098ba5eff96aa846d675bed07e391caa3915cd709f489334caa807255a84abb26c2ffc9bc86f3b7be60ace90f3c8ba92ca3f22ddf31567af285cbc5",
+  "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "3146f6b340e2ee236297bec9502527ea536e27d6241f836c127e9cfce2d393d6d827737486bdc2ac28efd1a85af610326b83e7c2d28cfe01c9adec89b113a3dc",
+  "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "d8f205779c9b58cbb5a5ba8105ebce093647ab643486b6f879555908219f5343d680250a1adb84b609e4933d3fa10dfda120e62430b76c9c9e63983c546181b1",
+  "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "b8761448bc3286a71e89419416507b15c7a6a935ab39e862ef5242c654c288155e540b9a9dddef1d55fb45ec485390bdd5ff5961f70d6fcd71154f336a2403bc",
+  "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "7bdbcfb041739a6c655b8eb9acdafdb29925276c26c393da2325f0041658fc5306a9f274fbe50c18763a87c2878219db264b1c9cbc8ff5e63e77350d595a4cc8",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.10": "d4cc5896e0fb0fe10a0bb374b53824dc73ffe672693e4151a1acef3a16861f08aa10dc5c22132aaf7533028d85eb0610d90bbac73d2d7da1a7c8c9d51f58cdde",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.10": "81bb998e37f7ee6ad779a192240ee8c55c06539a2c5afc4a9a52afc4aac85340943cfa4a47d0156dcefeb57ba42d5cdfab3bd51a9ce76baa5e4b2876eee95751",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.10": "73f6a9a9c793d873fe5bd7c6602c8d3330bc6f960974c28df9e6b621503d962507b7e72d83541f4abd4af0d752998eaffbac66f07ee7b7450d5ffe0d908e0fee",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.10": "900d53dfc0f0738a261137581e155527a9e25e5a50e38f211d6155d84a16a253d5b7ba56b6692bf674d7677e33499aeb2a622e66faadb3b673151bb809b4d0f3",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.10": "9b5375d3f1140a1e69bc64e281ac31fd5f801d33cc82f9cc4ad3ae1380f974425af54b151bac92d7729f103ba72a4c3565e04f98fda4aca905e3273605a4dfe0",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.10": "eed78ec8240558ab0e68c343fc5d29a8965e41eac0dcbd63ec63645af7fd69767cb7b25fb03d27a8e3f8b51ea880294451379d3e3fd75d7a2a17545cfd2fee69",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.10": "1abf65bf031874306b1e5f6efd90eaccdf961e2341eeb285789596bfc9b870c6aca9e9fae57b1de51c1d5f27832cbc07208297e13dd516dc1f93ed26d0ca7d53",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.10": "cce773d4e27c07e28ad619cf6af148927a8e737b29070af838ab2583262a66bceae93af902db92556c9794da79b738624a0ecef79d3a07649f529742bd8360f7",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.10": "68f34d542ab61a8fb7b485a611f0eabca4f87a8c37b888d373ebe439bf1243c9571a4962ec447a285629fd49a6aca48b26832354c16cb192a2099f3e2f223015",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.10": "e7c10be739aa7b5e93818672055ee2ec6af9545057a0d9ef88aa28c7bf852ed72652bdf96be0fb9d06e17f2c0250f1823b7ec1a5bcbfd82d6ab9911bd00b446f",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.10": "a8ba6e75f7a96b5df7b9dbed53f2eb8193b31950754617906c6079c74ba7c557edcb1a32b1122acb53bd954b7aac1d574ebe887916d63ee71d6404ea812ee800",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.10": "4018ac89bd56c0ffa5e42b1e91f1b94a2c021aa967b2332c4289ca2032ed688819080527ad8876eb820f547e8e6a6b2e2ab0032ca022f208e135d54c691db3dd",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.10": "659214e120a40d4fdd2e3400f05957c75605737005f60e63aa1e6b3975f76ff8616a28621458c1b5c627c5b625aa87e1b383fb6ef3e1ce47b3bc83af97f3dc41",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.10": "4be61ac40624cdfa0b065ad40e9678f326a2d33c075b1f753386d9d1060ccade471146e476af3ae484cf1a2e58d58d87c3ab657b65c1d2d202b15fa537375145",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.10": "dca5229af78dd34b1c7fcb753c9d3b580d9ebc03ee06d41c215c0ca3ab800fcf0ecfbe6c505446eeeb81cd5897e26532d9374e60ce9ecb5c8bd8c1e5476f0801",
+  "lightningcss-android-arm64@npm:1.32.0": "119b578a5ce59674c45fe8dc269fdb2770d678571e7fd3f7eca763807d15542689d01f75f2836e1aa49b9ddd0caa7ab3a5301bb23b39418eaeba1efab3e85975",
+  "lightningcss-darwin-arm64@npm:1.32.0": "55010ae8ee7aac61da41fbc81992e11b1ca386087bb8493deb1014ea90c2deeef1b4126621722aa5b8a1aeee039ec7e3b1b9f7779d128963d6e436743f5d23aa",
+  "lightningcss-darwin-x64@npm:1.32.0": "dd74c964c85c93842576f8caaf6c31ea273545e2f39f931716fed7700668f30d7ca92516197913ded19d836f6ff1876a91cca008125f097e254c98177e67bf86",
+  "lightningcss-freebsd-x64@npm:1.32.0": "29b43c1a450171da1dece9ba2a13a6dc0866178e46fa51a8cf050fe9562eb81b45f8580a3aeaf2ac97fb2fd381d8cb88d950e701774c8d012e72a355df7ac264",
+  "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "783e6f8bba55ffd585f17229e97056c370ed834e0123d0002884b51a7fb54d6807e97076726fd0bfd949396134983e21a0aace0d4f69b916994db679a0d8a360",
+  "lightningcss-linux-arm64-gnu@npm:1.32.0": "d694a6148f86d20e23b0806e8c6366de3bfc6927925ad17d226cd86c2ff4f025b1c88ae3d214dea06b45af2aa2d356cf504b1057b2a0a7027b44bfac11dc1f4d",
+  "lightningcss-linux-arm64-musl@npm:1.32.0": "ad946ead9c3ff13b43818d94426940b50cf1ff3dacd07835b8c50f0d412f64574be3c467410786dfb3524e93bc98fb789ebb73e6de845ceb1729fceb5296fe6f",
+  "lightningcss-linux-x64-gnu@npm:1.32.0": "183d5cda546283523761f606032596d70383d6fd153cfca56ab348d551ef06394ee009fae7818b0732de10d9d0ee27db483cbc7e0d0899305a37a118504d609e",
+  "lightningcss-linux-x64-musl@npm:1.32.0": "67079567d13d5464a2556630dcbcbb8ccd0e3188d56b0a732c651930a823a708b91faa067256a15be6f289f07f1b57ca433d38ad397a9a102fbb85d0b85b5ea0",
+  "lightningcss-win32-arm64-msvc@npm:1.32.0": "6117fdfb4ef1c2d8054fb469659e406ae32adae9dc712e2e5ed3f813bf25a52f0954911e92a5d397aeeba7151bafb3370dfc50504b94e719f4018de7d3cc3687",
+  "lightningcss-win32-x64-msvc@npm:1.32.0": "f4a917eebae4f3718eaa4d3a16e268a42f117180e6bda101b380939f6738d2754dbb69bd454ee412bbc6e6290e2d8446c5f6ee3a63b144c9bd6f40a93109b7ab"
 }
diff --git a/pkgs/by-name/pe/peacock/package.nix b/pkgs/by-name/pe/peacock/package.nix
index e74931c727bd..74184e9b0ae4 100644
--- a/pkgs/by-name/pe/peacock/package.nix
+++ b/pkgs/by-name/pe/peacock/package.nix
@@ -13,13 +13,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "peacock";
-  version = "8.7.0";
+  version = "8.8.1";
 
   src = fetchFromGitHub {
     owner = "thepeacockproject";
     repo = "Peacock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kDR2ObXzo8UudjfqU/lQl6dqblFhIEgnr20EKjiWKVw=";
+    hash = "sha256-OeROaz2Uvg3nsB0R9Ojo65a+zhnw/QmYaagcBrnIdIk=";
   };
 
   patches = [
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes patches;
-    hash = "sha256-DgkmBd9/voLLxIo1R7MNknFmH62RUYrG0MeV074ZX7U=";
+    hash = "sha256-9u/w/zy4f51uPFfkzf0fDZlsj8GFXAfw7RGR9owo5n8=";
   };
 
   meta = {
diff --git a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch
index 1885f6de9f13..eb94dd5a821e 100644
--- a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch
+++ b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch
@@ -1,19 +1,8 @@
-diff --git a/.yarnrc.yml b/.yarnrc.yml
---- a/.yarnrc.yml
-+++ b/.yarnrc.yml
-@@ -14,4 +14,7 @@ plugins:
-   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-     spec: "https://mskelton.dev/yarn-outdated/v2"
- 
--yarnPath: .yarn/releases/yarn-4.7.0.cjs
-+approvedGitRepositories:
-+  - "**"
-+
-+enableScripts: true
 diff --git a/yarn.lock b/yarn.lock
+index 286ec90499..ee9a3a9fd3 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -2,6 +2,6 @@
+@@ -2,7 +2,7 @@
  # Manual changes might be lost - proceed with caution!
  
  __metadata:
@@ -21,3 +10,4 @@ diff --git a/yarn.lock b/yarn.lock
 +  version: 9
    cacheKey: 10
  
+ "@aashutoshrathi/word-wrap@npm:^1.2.3":

From 27096a58408f5a641855ed9ac759362f521be7d1 Mon Sep 17 00:00:00 2001
From: coolcuber <rpgeorg@clemson.edu>
Date: Mon, 8 Jun 2026 20:07:16 -0400
Subject: [PATCH 043/339] napari: add requests module as dependency

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

diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index 026a0cb3b56a..086b40be4b3b 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -32,6 +32,7 @@
   pydantic-settings,
   pyopengl,
   pyyaml,
+  requests,
   scikit-image,
   scipy,
   superqt,
@@ -105,6 +106,7 @@ buildPythonPackage (finalAttrs: {
     pydantic-settings
     pyopengl
     pyyaml
+    requests
     scikit-image
     scipy
     superqt

From 124317ad25cd677a767cca632976ffdcc1360e73 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 9 Jun 2026 10:53:43 +0200
Subject: [PATCH 044/339] upx: 5.1.1 -> 5.2.0

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

diff --git a/pkgs/by-name/up/upx/package.nix b/pkgs/by-name/up/upx/package.nix
index a77410b743e4..b5d602ca9f83 100644
--- a/pkgs/by-name/up/upx/package.nix
+++ b/pkgs/by-name/up/upx/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "upx";
-  version = "5.1.1";
+  version = "5.2.0";
   src = fetchFromGitHub {
     owner = "upx";
     repo = "upx";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-+ugYimeeBFAUGdBUtwasYSOZzBqQEC00N6R+GNSp9uI=";
+    hash = "sha256-6LTDz4gMak0V7KiZOeuQgm+RubKRp3zhF6T6SZzZ5Dk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4aa551078d22a95a09222776f208d4b9729a004c Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 9 Jun 2026 11:12:48 +0200
Subject: [PATCH 045/339] badger: 4.9.1 -> 4.9.2

changelog: https://github.com/dgraph-io/badger/releases/tag/v4.9.2

diff: https://github.com/dgraph-io/badger/compare/v4.9.1...v4.9.2
---
 pkgs/by-name/ba/badger/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 90643e18ae4d..51f878f4f1b1 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "badger";
-  version = "4.9.1";
+  version = "4.9.2";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BsKFi4oMNJE09PBjFmqNhbMcQcHk5uR5QssbwN2ZNCk=";
+    hash = "sha256-L6qGeOZlIl6I87t9Ohk57bA+WXT7NwMOJkiA3WaMFhM=";
   };
 
-  vendorHash = "sha256-+rXXCVH2xuULPzdM0KVPwYht+tu0qyxPjLLaBMWVIuI=";
+  vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY=";
 
   subPackages = [ "badger" ];
 

From 2a9ceb0756ee4d286204a8d947f5bca836b8ac8d Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 9 Jun 2026 11:16:58 +0200
Subject: [PATCH 046/339] badger: modernize

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

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 51f878f4f1b1..f400c178faac 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -21,9 +21,12 @@ buildGoModule (finalAttrs: {
 
   doCheck = false;
 
+  __structuredAttrs = true;
+
   meta = {
+    changelog = "https://github.com/dgraph-io/badger/releases/tag/${finalAttrs.src.tag}";
     description = "Fast key-value DB in Go";
-    homepage = "https://github.com/dgraph-io/badger";
+    homepage = "https://dgraph-io.github.io/badger";
     license = lib.licenses.asl20;
     mainProgram = "badger";
     maintainers = [ ];

From 240b60f08b40bf679390be7c10c7b72969060169 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 9 Jun 2026 11:17:16 +0200
Subject: [PATCH 047/339] badger: add hythera as maintainer

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

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index f400c178faac..0b1581bb915f 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -29,6 +29,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://dgraph-io.github.io/badger";
     license = lib.licenses.asl20;
     mainProgram = "badger";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
   };
 })

From 4bfec54d021abb611b707dd2cc1bb0f3b3bc5f07 Mon Sep 17 00:00:00 2001
From: Conor <conorboyle07@protonmail.com>
Date: Tue, 9 Jun 2026 15:43:21 +0100
Subject: [PATCH 048/339] glaze: fix build on musl

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 5bdb15fb4c67..7ab07eaa90b9 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "glaze_DISABLE_SIMD_WHEN_SUPPORTED" (!enableSIMD))
     (lib.cmakeBool "glaze_ENABLE_SSL" enableSSL)
     (lib.cmakeBool "glaze_BUILD_INTEROP" enableInterop)
+    (lib.cmakeBool "glaze_ENABLE_FUZZING" (!stdenv.hostPlatform.isMusl))
   ];
 
   meta = {

From 9c26d2966ad644ea0ad9640eff37be4b59ec846f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 11 Apr 2026 14:04:35 +0400
Subject: [PATCH 049/339] =?UTF-8?q?cudatext:=201.202.1=20=E2=86=92=201.234?=
 =?UTF-8?q?.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applications/editors/cudatext/default.nix | 11 ++---
 pkgs/applications/editors/cudatext/deps.json  | 46 +++++++++----------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index ba0cdf1ea046..a14c87ba1bd9 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -8,6 +8,7 @@
   libx11,
 
   # GTK2/3
+  harfbuzz,
   pango,
   cairo,
   glib,
@@ -42,13 +43,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cudatext";
-  version = "1.202.1";
+  version = "1.234.4.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     tag = finalAttrs.version;
-    hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4=";
+    hash = "sha256-eVdV02R1YZ3mdoucEoyp7iKhA30+QJNAqdbnOz2Xjy4=";
   };
 
   patches = [ ./proc_globdata.patch ];
@@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
   ]
   ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
+    harfbuzz
     pango
     cairo
     glib
@@ -94,10 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
       '') deps
     )
     + ''
-      # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText
-      substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \
-        --replace GTK2_IME_CODE _GTK2_IME_CODE
-
       lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \
         bgrabitmap/bgrabitmap/bgrabitmappack.lpk \
         EncConv/encconv/encconv_package.lpk \
@@ -145,5 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ sikmir ];
     platforms = lib.platforms.linux;
     mainProgram = "cudatext";
+    broken = widgetset == "gtk2"; # https://wiki.freepascal.org/CudaText#Linux_error_on_ATSynEdit_compiling
   };
 })
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 3a1e643c6f7f..f05c521228cf 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -1,57 +1,57 @@
 {
   "EncConv": {
     "owner": "Alexey-T",
-    "rev": "2023.04.16",
-    "hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc="
+    "rev": "2024.12.15",
+    "hash": "sha256-d57cOh4ucStPxOBYDt8+w1ITpCMbJW69T8mCfgJky3A="
   },
   "ATBinHex-Lazarus": {
     "owner": "Alexey-T",
-    "rev": "2023.08.12",
-    "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g="
+    "rev": "2025.09.10",
+    "hash": "sha256-opt0gy2e+cptPWhPaSjWBikVRiAVTxwtIatdvzpc7eY="
   },
   "ATFlatControls": {
     "owner": "Alexey-T",
-    "rev": "2023.10.30",
-    "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw="
+    "rev": "2026.05.06",
+    "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ="
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2023.11.23",
-    "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E="
+    "rev": "2026.05.20",
+    "hash": "sha256-r3DARtsBEXxkC9wBGuIuY6qU9GQcXPeakQsK2P8zXI0="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
-    "rev": "2023.05.31",
-    "hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo="
+    "rev": "2025.02.15",
+    "hash": "sha256-mCb2112u5cQOsGpJdgJKZnDsAQs5p5+rSINTs4BaQeQ="
   },
   "EControl": {
     "owner": "Alexey-T",
-    "rev": "2023.11.16",
-    "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg="
+    "rev": "2026.05.06",
+    "hash": "sha256-G2OSGA5MVaZC/6H0agio6cbUg1iXYEz7YszBoRwcPwI="
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2023.11.23",
-    "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE="
+    "rev": "2026.01.19",
+    "hash": "sha256-gfx+2HbssaB1frc8QQh3ua+Z4lEM2JnQtSPNZVusaTM="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",
-    "rev": "2023.06.30",
-    "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="
+    "rev": "2024.10.15",
+    "hash": "sha256-HKo4GRZ91VDRc6AKs+lJYsFvgd+5VQlFY6pkg3gXz/s="
   },
   "Emmet-Pascal": {
     "owner": "Alexey-T",
-    "rev": "2023.08.12",
-    "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg="
+    "rev": "2023.12.02",
+    "hash": "sha256-NDYhjmVGiw9UKfOQhXLdJiTaGZeTs8kr2hBujI2s+3E="
   },
   "CudaText-lexers": {
-    "owner": "Alexey-T",
-    "rev": "2021.07.09",
-    "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4="
+    "owner": "CudaText-addons",
+    "rev": "2026.04.05",
+    "hash": "sha256-LtyfXEaIDjbivuL05E00U8Myy1mQFCzl9LQjiEr4U/E="
   },
   "bgrabitmap": {
     "owner": "bgrabitmap",
-    "rev": "v11.5.6",
-    "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w="
+    "rev": "v11.6.6",
+    "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA="
   }
 }

From be11f0385ee39360039788661f7aeb6fcd817e60 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 Apr 2026 13:52:49 +0400
Subject: [PATCH 050/339] cudatext: remove gtk2

---
 pkgs/applications/editors/cudatext/default.nix | 12 +++++-------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index a14c87ba1bd9..21dad5046557 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -7,16 +7,16 @@
   fpc,
   libx11,
 
-  # GTK2/3
+  # GTK3
   harfbuzz,
   pango,
   cairo,
   glib,
   atk,
-  gtk2,
   gtk3,
   gdk-pixbuf,
   python3,
+  wrapGAppsHook3,
 
   # Qt5
   libsForQt5,
@@ -27,7 +27,6 @@
 }:
 
 assert builtins.elem widgetset [
-  "gtk2"
   "gtk3"
   "qt5"
 ];
@@ -66,21 +65,21 @@ stdenv.mkDerivation (finalAttrs: {
     lazarus
     fpc
   ]
+  ++ lib.optional (widgetset == "gtk3") wrapGAppsHook3 # required for FileChooser
   ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
   buildInputs = [
     libx11
   ]
-  ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
+  ++ lib.optionals (widgetset == "gtk3") [
     harfbuzz
     pango
     cairo
     glib
     atk
     gdk-pixbuf
+    gtk3
   ]
-  ++ lib.optional (widgetset == "gtk2") gtk2
-  ++ lib.optional (widgetset == "gtk3") gtk3
   ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;
 
   env.NIX_LDFLAGS = toString [
@@ -143,6 +142,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ sikmir ];
     platforms = lib.platforms.linux;
     mainProgram = "cudatext";
-    broken = widgetset == "gtk2"; # https://wiki.freepascal.org/CudaText#Linux_error_on_ATSynEdit_compiling
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9249274c6840..83b4f8b614e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8797,7 +8797,7 @@ with pkgs;
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };
-  cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; };
+  cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk3"; };
   cudatext = cudatext-qt;
 
   darcs = haskell.lib.compose.disableCabalFlag "library" (

From 3d59bfa4a8da0ef2de0ab472eb859fa3bad23ff1 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 Apr 2026 14:01:38 +0400
Subject: [PATCH 051/339] cudatext: migrate to by-name

---
 pkgs/by-name/cu/cudatext-gtk/package.nix                      | 3 +++
 pkgs/by-name/cu/cudatext-qt/package.nix                       | 3 +++
 pkgs/{applications/editors => by-name/cu}/cudatext/deps.json  | 0
 .../cudatext/default.nix => by-name/cu/cudatext/package.nix}  | 0
 .../editors => by-name/cu}/cudatext/proc_globdata.patch       | 0
 pkgs/{applications/editors => by-name/cu}/cudatext/update.sh  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 7 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/cu/cudatext-gtk/package.nix
 create mode 100644 pkgs/by-name/cu/cudatext-qt/package.nix
 rename pkgs/{applications/editors => by-name/cu}/cudatext/deps.json (100%)
 rename pkgs/{applications/editors/cudatext/default.nix => by-name/cu/cudatext/package.nix} (100%)
 rename pkgs/{applications/editors => by-name/cu}/cudatext/proc_globdata.patch (100%)
 rename pkgs/{applications/editors => by-name/cu}/cudatext/update.sh (91%)

diff --git a/pkgs/by-name/cu/cudatext-gtk/package.nix b/pkgs/by-name/cu/cudatext-gtk/package.nix
new file mode 100644
index 000000000000..d2afa68f07f1
--- /dev/null
+++ b/pkgs/by-name/cu/cudatext-gtk/package.nix
@@ -0,0 +1,3 @@
+{ cudatext }:
+
+cudatext.override { widgetset = "gtk3"; }
diff --git a/pkgs/by-name/cu/cudatext-qt/package.nix b/pkgs/by-name/cu/cudatext-qt/package.nix
new file mode 100644
index 000000000000..dfed1f03a38b
--- /dev/null
+++ b/pkgs/by-name/cu/cudatext-qt/package.nix
@@ -0,0 +1,3 @@
+{ cudatext }:
+
+cudatext.override { widgetset = "qt5"; }
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json
similarity index 100%
rename from pkgs/applications/editors/cudatext/deps.json
rename to pkgs/by-name/cu/cudatext/deps.json
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/by-name/cu/cudatext/package.nix
similarity index 100%
rename from pkgs/applications/editors/cudatext/default.nix
rename to pkgs/by-name/cu/cudatext/package.nix
diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/by-name/cu/cudatext/proc_globdata.patch
similarity index 100%
rename from pkgs/applications/editors/cudatext/proc_globdata.patch
rename to pkgs/by-name/cu/cudatext/proc_globdata.patch
diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/by-name/cu/cudatext/update.sh
similarity index 91%
rename from pkgs/applications/editors/cudatext/update.sh
rename to pkgs/by-name/cu/cudatext/update.sh
index 3ed1f8d56dc3..eb5eb43c46fa 100755
--- a/pkgs/applications/editors/cudatext/update.sh
+++ b/pkgs/by-name/cu/cudatext/update.sh
@@ -19,8 +19,8 @@ url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz"
 hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
 sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)
 
-sed -i "s#version = \".*\"#version = \"$version\"#" default.nix
-sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix
+sed -i "s#version = \".*\"#version = \"$version\"#" package.nix
+sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" package.nix
 
 while IFS=$'\t' read repo owner rev; do
   latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83b4f8b614e0..fe7f280b5268 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8796,10 +8796,6 @@ with pkgs;
 
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
-  cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };
-  cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk3"; };
-  cudatext = cudatext-qt;
-
   darcs = haskell.lib.compose.disableCabalFlag "library" (
     haskell.lib.compose.justStaticExecutables haskellPackages.darcs
   );

From afe9b9bc3fe9b36664683f95ef878adc65b15c3e Mon Sep 17 00:00:00 2001
From: "PAEPCKE, Michael" <git@paepcke.de>
Date: Wed, 10 Jun 2026 05:34:07 +0200
Subject: [PATCH 052/339] hackernews-tui: init at 0.13.5

Signed-off-by: PAEPCKE, Michael <git@paepcke.de>
---
 pkgs/by-name/ha/hackernews-tui/package.nix | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/ha/hackernews-tui/package.nix

diff --git a/pkgs/by-name/ha/hackernews-tui/package.nix b/pkgs/by-name/ha/hackernews-tui/package.nix
new file mode 100644
index 000000000000..2ea3d0a12463
--- /dev/null
+++ b/pkgs/by-name/ha/hackernews-tui/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hackernews-tui";
+  version = "0.13.5";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "aome510";
+    repo = "hackernews-TUI";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-p2MhVM+dbNiWlhvlSKdwXE37dKEaE2JCmT1Ari3b0WI=";
+  };
+
+  cargoHash = "sha256-KuqAyuU/LOFwvvfplHqq56Df4Dkr5PkUK1Fgeaq1REs=";
+
+  meta = {
+    description = "A Terminal UI to browse Hacker News";
+    homepage = "https://github.com/aome510/hackernews-TUI";
+    changelog = "https://github.com/aome510/hackernews-TUI/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ paepcke ];
+    mainProgram = "hackernews-tui";
+  };
+})

From e45516ba3bf2cccc2bb34fec7e4e4477a71a365b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 10 Jun 2026 07:55:22 +0200
Subject: [PATCH 053/339] rocqPackages.micromega-plugin: fix hash

---
 pkgs/development/rocq-modules/micromega-plugin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/rocq-modules/micromega-plugin/default.nix b/pkgs/development/rocq-modules/micromega-plugin/default.nix
index 5be07cf07077..cc0be5454447 100644
--- a/pkgs/development/rocq-modules/micromega-plugin/default.nix
+++ b/pkgs/development/rocq-modules/micromega-plugin/default.nix
@@ -19,7 +19,7 @@ mkRocqDerivation {
     ] null;
 
   release = {
-    "1.1.0".sha256 = "sha256-OszFXGLnm0rGAZVRCq/riQUK1DuhPyfv49GBePkQWAI=";
+    "1.1.0".hash = "sha256-CWMbGErC5bu20Yu9eskgslLkzmSof6klNlOYEkQjUjc=";
   };
   releaseRev = v: "v${v}";
 

From 0628b8f43f6c1f25e9d4fe28e884f1acd67e42e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Wed, 10 Jun 2026 11:39:31 +0200
Subject: [PATCH 054/339] asciimol: init at 1.2.5

---
 pkgs/by-name/as/asciimol/package.nix | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/as/asciimol/package.nix

diff --git a/pkgs/by-name/as/asciimol/package.nix b/pkgs/by-name/as/asciimol/package.nix
new file mode 100644
index 000000000000..a2c6077d10aa
--- /dev/null
+++ b/pkgs/by-name/as/asciimol/package.nix
@@ -0,0 +1,38 @@
+{
+  fetchPypi,
+  lib,
+  nix-update-script,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "asciimol";
+  version = "1.2.5";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-sB8hHtjfCv5jFHXEoUG7zNn3d3QKihPLbgnR+Jyz4GQ=";
+  };
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    numpy
+    ase
+    rdkit
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Curses based ASCII molecule viewer for terminals";
+    license = lib.licenses.bsd2;
+    homepage = "https://github.com/dewberryants/asciimol";
+    downloadPage = "https://pypi.org/project/asciimol/";
+    maintainers = with lib.maintainers; [ tomasrivera ];
+    mainProgram = "asciimol";
+  };
+})

From 5c2334fb9f3dfb1a9240627e6097264d8e41c2d5 Mon Sep 17 00:00:00 2001
From: Neubulae <neubulaeko@outlook.com>
Date: Wed, 10 Jun 2026 18:18:55 +0800
Subject: [PATCH 055/339] ReGreet: add missing GStreamer dependencies

Add GStreamer dependencies for animated wallpapers and video playback.
---
 pkgs/by-name/re/regreet/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/re/regreet/package.nix b/pkgs/by-name/re/regreet/package.nix
index f30f2dda932a..81aad79e092d 100644
--- a/pkgs/by-name/re/regreet/package.nix
+++ b/pkgs/by-name/re/regreet/package.nix
@@ -7,6 +7,7 @@
   accountsservice,
   dbus,
   glib,
+  gst_all_1,
   gtk4,
   pango,
   librsvg,
@@ -37,6 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
     glib
     gtk4
+    gst_all_1.gstreamer # Used for animated wallpapers or video playback
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-base
     pango
     librsvg
   ];

From 854bc198f2d3b2c047fe8bfcc42f7665c7cf2d56 Mon Sep 17 00:00:00 2001
From: Katsumi Takeuchi <contact@hibi.day>
Date: Wed, 10 Jun 2026 21:35:18 +0900
Subject: [PATCH 056/339] blesh: build from source

---
 pkgs/by-name/bl/blesh/package.nix | 76 ++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix
index 0a6cbbe79977..cb50132b7b39 100644
--- a/pkgs/by-name/bl/blesh/package.nix
+++ b/pkgs/by-name/bl/blesh/package.nix
@@ -1,36 +1,56 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
-  runtimeShell,
+  fetchFromGitHub,
   bashInteractive,
-  glibcLocales,
+  gawk,
+  runtimeShell,
+  unstableGitUpdater,
 }:
 
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "blesh";
   version = "0.4.0-devel3-unstable-2026-03-10";
 
-  src = fetchzip {
-    url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20260310%2Bb99cadb.tar.xz";
-    name = "ble-nightly-20260310+b99cadb.tar.xz";
-    sha256 = "sha256-rJnSEY7J4wfy8dnL9Bg59u0epPe0HL1J7piPbkNyes0=";
+  src = fetchFromGitHub {
+    owner = "akinomyoga";
+    repo = "ble.sh";
+    rev = "b99cadb4520a1fdec0067fdc007b39cc905ecbad";
+    fetchSubmodules = true;
+    hash = "sha256-LXDow/4yv3V0Liy12bXQ1qwO5z4u0equRO9xeJaDaWo=";
   };
 
-  dontBuild = true;
+  nativeBuildInputs = [
+    gawk
+  ];
+
+  # Fix the cache invalidation not working; see
+  # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131
+  postPatch = ''
+    substituteInPlace ble.pp \
+      --replace-fail \
+        'local ver=''${BLE_VERSINFO[0]}.''${BLE_VERSINFO[1]}' \
+        'local ver=$BLE_VERSION'
+  '';
+
+  # ble.sh embeds the commit id, normally read from .git, which fetchFromGitHub omits.
+  makeFlags = [
+    "PREFIX=$(out)"
+    "BLE_GIT_COMMIT_ID=${builtins.substring 0 7 finalAttrs.src.rev}"
+    "BLE_GIT_BRANCH=master"
+  ];
 
   doCheck = true;
-  nativeCheckInputs = [
-    bashInteractive
-    glibcLocales
-  ];
-  preCheck = "export LC_ALL=en_US.UTF-8";
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/share/blesh/lib"
+  # auto-detection runs `make -n check` without makeFlags, which fails without BLE_GIT_COMMIT_ID
+  checkTarget = "check";
+  nativeCheckInputs = [ bashInteractive ];
+  preCheck = ''
+    export HOME=$TMPDIR
+    # upstream skips its flaky sleep-timing tests under GitHub CI
+    export CI=true GITHUB_ACTION=nix
+  '';
 
+  postInstall = ''
     cat <<EOF >"$out/share/blesh/lib/_package.sh"
     _ble_base_package_type=nix
 
@@ -40,12 +60,6 @@ stdenvNoCC.mkDerivation {
     }
     EOF
 
-    cp -rv $src/* $out/share/blesh
-
-    runHook postInstall
-  '';
-
-  postInstall = ''
     mkdir -p "$out/bin"
     cat <<EOF >"$out/bin/blesh-share"
     #!${runtimeShell}
@@ -54,8 +68,18 @@ stdenvNoCC.mkDerivation {
     echo "$out/share/blesh"
     EOF
     chmod +x "$out/bin/blesh-share"
+
+    rm -rf "$out/share/blesh/cache.d" "$out/share/blesh/run"
   '';
 
+  # tagFormat skips the "nightly"/"spike-*" tags; the newest tag is too far
+  # behind HEAD for shallow deepening, so clone fully.
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+    tagFormat = "v*";
+    shallowClone = false;
+  };
+
   meta = {
     homepage = "https://github.com/akinomyoga/ble.sh";
     description = "Bash Line Editor -- a full-featured line editor written in pure Bash";
@@ -67,4 +91,4 @@ stdenvNoCC.mkDerivation {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 51c2ff341a00095efd1cf7b315529a345937ff39 Mon Sep 17 00:00:00 2001
From: Katsumi Takeuchi <contact@hibi.day>
Date: Wed, 10 Jun 2026 21:41:50 +0900
Subject: [PATCH 057/339] blesh: 0.4.0-devel3-unstable-2026-03-10 ->
 0.4.0-devel3-unstable-2026-05-28

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

diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix
index cb50132b7b39..2c73550db045 100644
--- a/pkgs/by-name/bl/blesh/package.nix
+++ b/pkgs/by-name/bl/blesh/package.nix
@@ -10,14 +10,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "blesh";
-  version = "0.4.0-devel3-unstable-2026-03-10";
+  version = "0.4.0-devel3-unstable-2026-05-28";
 
   src = fetchFromGitHub {
     owner = "akinomyoga";
     repo = "ble.sh";
-    rev = "b99cadb4520a1fdec0067fdc007b39cc905ecbad";
+    rev = "f38850cb0add16f110341a517ff7c849adb43e57";
     fetchSubmodules = true;
-    hash = "sha256-LXDow/4yv3V0Liy12bXQ1qwO5z4u0equRO9xeJaDaWo=";
+    hash = "sha256-EtOCZvUkzstXaT7N9qe+oT7+7ExlREsobzY+ylNy/7Y=";
   };
 
   nativeBuildInputs = [

From d72bb5916afe9ed91570654f9480e5be655dd2a5 Mon Sep 17 00:00:00 2001
From: Linus Emmerich <emmerichlinus@gmail.com>
Date: Wed, 10 Jun 2026 18:55:18 +0200
Subject: [PATCH 058/339] gnomeExtensions.forge: 49.3 -> 50.1

Make Forge compatible with the current GNOME Shell 50.1 by updating it
to upstream
---
 pkgs/desktops/gnome/extensions/forge/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/forge/default.nix b/pkgs/desktops/gnome/extensions/forge/default.nix
index eeb41376e369..c146fd868c5c 100644
--- a/pkgs/desktops/gnome/extensions/forge/default.nix
+++ b/pkgs/desktops/gnome/extensions/forge/default.nix
@@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "gnome-shell-extension-forge";
-  version = "49.3-development";
+  version = "50.1-development";
 
   src = fetchFromGitHub {
     owner = "forge-ext";
     repo = "forge";
-    rev = "a2fabeb5102d3b96661cde0e332c288bea21a1a5";
-    hash = "sha256-nk2olkhNX7dIKO9xYR1yWaaKHjxtMv7mPvmUf2sCDD8=";
+    rev = "0319a7125db1088556b159a69bbec77e111afca7";
+    hash = "sha256-IyjHjL1RqxZZZgMnRlmavnae3OqZvRT6aSwKouQRopc=";
   };
 
   nativeBuildInputs = [ glib ];

From e54493d246b14b135036ba336f7195085daef9ef Mon Sep 17 00:00:00 2001
From: Johannes Arnold <jarnold@b1-systems.de>
Date: Wed, 10 Jun 2026 21:03:06 +0200
Subject: [PATCH 059/339] matrix-tuwunel: 1.7.0 -> 1.7.1

---
 pkgs/by-name/ma/matrix-tuwunel/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix
index 2ac745b9c1f2..a7e994ee4dd7 100644
--- a/pkgs/by-name/ma/matrix-tuwunel/package.nix
+++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix
@@ -11,7 +11,6 @@
   nix-update-script,
   testers,
   matrix-tuwunel,
-  enableBlurhashing ? true,
   # upstream tuwunel enables jemalloc by default, so we follow suit
   enableJemalloc ? true,
   rust-jemalloc-sys,
@@ -89,16 +88,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-tuwunel";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "matrix-construct";
     repo = "tuwunel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ=";
+    hash = "sha256-KbcijWL4PwEUycE9pxdJjnBP0pxK6ywuf7wpuy2eA60=";
   };
 
-  cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY=";
+  cargoHash = "sha256-RsZWk+cm9JJ6+8xsWXNyN2QcHSMFOD3CikNm84DhXWU=";
 
   nativeBuildInputs = [
     pkg-config
@@ -127,7 +126,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   # See https://github.com/matrix-construct/tuwunel/blob/main/src/main/Cargo.toml
   # for available features.
-  # We enable all default features except jemalloc, blurhashing, and io_uring, which
+  # We enable all default features except jemalloc and io_uring, which
   # we guard behind our own (default-enabled) flags.
   buildFeatures = [
     "brotli_compression"
@@ -140,7 +139,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "url_preview"
     "zstd_compression"
   ]
-  ++ lib.optional enableBlurhashing "blurhashing"
   ++ lib.optional enableJemalloc [
     "jemalloc"
     "jemalloc_conf"

From 90abebf7fad9638a1a056806136738cef11fef4d Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Thu, 11 Jun 2026 08:44:39 +0200
Subject: [PATCH 060/339] appium-inspector: let update script automatically
 update electron version

---
 pkgs/by-name/ap/appium-inspector/package.nix | 28 +++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix
index 16cc3002081a..78c4c291c096 100644
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@@ -7,6 +7,10 @@
   makeDesktopItem,
   makeWrapper,
   nix-update-script,
+  _experimental-update-script-combinators,
+  writeShellApplication,
+  nix,
+  jq,
 }:
 
 let
@@ -14,7 +18,7 @@ let
   version = "2026.2.1";
 in
 
-buildNpmPackage {
+buildNpmPackage (finalAttrs: {
   pname = "appium-inspector";
   inherit version;
 
@@ -75,7 +79,25 @@ buildNpmPackage {
     })
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (nix-update-script { })
+    (lib.getExe (writeShellApplication {
+      name = "${finalAttrs.pname}-electron-updater";
+      runtimeInputs = [
+        nix
+        jq
+      ];
+      runtimeEnv = {
+        PNAME = finalAttrs.pname;
+        PKG_FILE = toString ./package.nix;
+      };
+      text = ''
+        new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
+        new_electron_major="$(jq -r '.devDependencies.electron | split(".")[0] | tonumber' "$new_src/package.json")"
+        sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
+      '';
+    }))
+  ];
 
   meta = {
     description = "GUI inspector for the appium UI automation tool";
@@ -86,4 +108,4 @@ buildNpmPackage {
     maintainers = with lib.maintainers; [ marie ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 6fc09275e2e0e7c0206496dad8d6620f39421e3f Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Thu, 11 Jun 2026 08:57:56 +0200
Subject: [PATCH 061/339] appium-inspector: 2026.2.1 -> 2026.5.1

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

diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix
index 78c4c291c096..13616599a684 100644
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNpmPackage,
   copyDesktopItems,
-  electron_40,
+  electron_41,
   fetchFromGitHub,
   makeDesktopItem,
   makeWrapper,
@@ -14,8 +14,8 @@
 }:
 
 let
-  electron = electron_40;
-  version = "2026.2.1";
+  electron = electron_41;
+  version = "2026.5.1";
 in
 
 buildNpmPackage (finalAttrs: {
@@ -26,10 +26,10 @@ buildNpmPackage (finalAttrs: {
     owner = "appium";
     repo = "appium-inspector";
     tag = "v${version}";
-    hash = "sha256-89u8MifBPh5AwaMFp+aGSzsiwp75Skca/t6OyDSzrGo=";
+    hash = "sha256-SJlTTVTZ/zGIK7Nf35cZ62tdhevXC95MsbiQJCLiVtk=";
   };
 
-  npmDepsHash = "sha256-mwNn7TllWCtr4sif9Wc3FDtK2Icu72/iI+IllhBswHQ=";
+  npmDepsHash = "sha256-2rjgKS1mIrjOg+YXuMaqKyEQt0utLA4DGxOs0oI4BaQ=";
   npmFlags = [ "--ignore-scripts" ];
 
   nativeBuildInputs = [

From 16f300c7506df3cc30931e572484051f988d24b3 Mon Sep 17 00:00:00 2001
From: Haonan Chen <chn@chn.moe>
Date: Thu, 11 Jun 2026 15:26:21 +0800
Subject: [PATCH 062/339] cp2k: fix rocm support

---
 pkgs/by-name/si/sirius/package.nix |  2 +-
 pkgs/by-name/um/umpire/package.nix | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index 7106069f47db..3d38dd8b071b 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSIRIUS_CREATE_PYTHON_MODULE=ON"
   ];
 
-  doCheck = true;
+  doCheck = !umpire.passthru.rocmSupport;
 
   # Can not run parallel checks generally as it requires exactly multiples of 4 MPI ranks
   # Even cpu_serial tests had to be disabled as they require scalapack routines in the sandbox
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index e46c3e002de2..bb36d87cc71c 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -6,6 +6,8 @@
   config,
   cudaSupport ? config.cudaSupport,
   cudaPackages ? null,
+  rocmSupport ? config.rocmSupport,
+  rocmPackages,
 }:
 
 assert cudaSupport -> cudaPackages != null;
@@ -27,6 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
+  ]
+  ++ lib.optionals rocmSupport [
+    rocmPackages.clr
   ];
 
   buildInputs = lib.optionals cudaSupport (
@@ -37,11 +42,17 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
-  cmakeFlags = lib.optionals cudaSupport [
-    "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
-    "-DENABLE_CUDA=ON"
-    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
-  ];
+  cmakeFlags =
+    lib.optionals cudaSupport [
+      "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
+      "-DENABLE_CUDA=ON"
+      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+    ]
+    ++ lib.optionals rocmSupport [
+      "-DENABLE_HIP=ON"
+    ];
+
+  passthru = { inherit rocmSupport; };
 
   meta = {
     description = "Application-focused API for memory management on NUMA & GPU architectures";

From 03f4820c62802998527881846d5d850c93858932 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 29 Apr 2026 16:44:21 +0200
Subject: [PATCH 063/339] rebuilderd: 0.25.0 -> 0.27.0

https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0
https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0
---
 doc/release-notes/rl-2611.section.md   |  2 ++
 pkgs/by-name/re/rebuilderd/package.nix | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 20aa808653cd..8187ed786ec0 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -43,6 +43,8 @@
   [pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the manual
   for details.
 
+- `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0)
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index bd2880e22895..61642d6fc678 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -7,6 +7,7 @@
   installShellFiles,
   scdoc,
   bzip2,
+  cacert,
   openssl,
   sqlite,
   xz,
@@ -20,13 +21,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebuilderd";
-  version = "0.25.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "rebuilderd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BuL9s3ewZ1NvR9GG51TVrAncB0PR78Wuw8by+loSP8Q=";
+    hash = "sha256-f+WfmkV0P4VfaOXxX3t5t9g/uJYCh2A587HEq9OK5QU=";
   };
 
   postPatch = ''
@@ -40,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/bin/echo' 'echo'
   '';
 
-  cargoHash = "sha256-4M5uWgksYsV8PGe0zn9ADv06q3Ga/GVoQ8HjS7GCnwo=";
+  cargoHash = "sha256-se5u7+SF3fW5WqdUA3qmztUw5oPa0YXbgOp9GIVOQu0=";
 
   nativeBuildInputs = [
     pkg-config
@@ -80,6 +81,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       done
     '';
 
+  preCheck = ''
+    export SSL_CERT_FILE=${cacert.out}/etc/ssl/certs/ca-bundle.crt
+  '';
+
+  __darwinAllowLocalNetworking = true;
+
   checkFlags = [
     # Failing tests
     "--skip=decompress::tests::decompress_bzip2_compression"

From 0f74ce6cef178c67c6a8aaf33d6bc7ed94721805 Mon Sep 17 00:00:00 2001
From: DESPsyched <priyanshu.tripathi@deshaw.com>
Date: Wed, 10 Sep 2025 02:36:48 -0400
Subject: [PATCH 064/339] python3Packages.kafka-python: re-init at 2.3.2

---
 .../python-modules/kafka-python/default.nix   | 84 +++++++++++++++++++
 pkgs/top-level/python-aliases.nix             |  1 -
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/kafka-python/default.nix

diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
new file mode 100644
index 000000000000..05a90a9f6624
--- /dev/null
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -0,0 +1,84 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pythonAtLeast,
+
+  # build system
+  setuptools,
+
+  # optional dependencies
+  crc32c,
+  lz4,
+  pyperf,
+  python-snappy,
+  zstandard,
+
+  # test dependencies
+  pytestCheckHook,
+  pytest-mock,
+  pytest-timeout,
+  xxhash,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "kafka-python";
+  version = "2.3.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  disabled = pythonAtLeast "3.14";
+
+  src = fetchFromGitHub {
+    owner = "dpkp";
+    repo = "kafka-python";
+    tag = finalAttrs.version;
+    hash = "sha256-FC5ntcRy2iF2sqYVxWg11EcGA5ncpuUuQHOkBG0paog=";
+  };
+
+  build-system = [ setuptools ];
+
+  optional-dependencies = {
+    benchmarks = [ pyperf ];
+    crc32c = [ crc32c ];
+    lz4 = [ lz4 ];
+    snappy = [ python-snappy ];
+    zstd = [ zstandard ];
+  };
+
+  pythonImportsCheck = [
+    "kafka"
+    "kafka.admin"
+    "kafka.benchmarks"
+    "kafka.cli"
+    "kafka.consumer"
+    "kafka.coordinator"
+    "kafka.metrics"
+    "kafka.partitioner"
+    "kafka.producer"
+    "kafka.protocol"
+    "kafka.record"
+    "kafka.sasl"
+    "kafka.serializer"
+    "kafka.vendor"
+  ];
+
+  nativeCheckInputs = [
+    pytest-mock
+    pytest-timeout
+    pytestCheckHook
+    xxhash
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
+
+  meta = {
+    changelog = "https://github.com/dpkp/kafka-python/blob/${finalAttrs.src.tag}/CHANGES.md";
+    description = "Pure Python client for Apache Kafka";
+    homepage = "https://github.com/dpkp/kafka-python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
+  };
+})
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a7d277f88617..0c96df507180 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -298,7 +298,6 @@ mapAliases {
   jupyter_core = throw "'jupyter_core' has been renamed to/replaced by 'jupyter-core'"; # Converted to throw 2025-10-29
   jupyter_server = throw "'jupyter_server' has been renamed to/replaced by 'jupyter-server'"; # Converted to throw 2025-10-29
   jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
-  kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
   Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
   keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
   keepkey_agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59128805b25d..5079ef7a101e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8342,6 +8342,8 @@ self: super: with self; {
 
   kaa-metadata = callPackage ../development/python-modules/kaa-metadata { };
 
+  kafka-python = callPackage ../development/python-modules/kafka-python { };
+
   kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { };
 
   kaggle = callPackage ../development/python-modules/kaggle { };

From 156b8dbaac8ca57b5d42d435993407fbc260441f Mon Sep 17 00:00:00 2001
From: DESPsyched <priyanshu.tripathi@deshaw.com>
Date: Fri, 12 Jun 2026 03:38:10 -0400
Subject: [PATCH 065/339] python3Packages.pytest-kafka: depend on kafka-python

---
 .../python-modules/pytest-kafka/default.nix            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-kafka/default.nix b/pkgs/development/python-modules/pytest-kafka/default.nix
index 1da9b7d6b6dd..af77b53c8186 100644
--- a/pkgs/development/python-modules/pytest-kafka/default.nix
+++ b/pkgs/development/python-modules/pytest-kafka/default.nix
@@ -1,9 +1,13 @@
 {
-  lib,
   buildPythonPackage,
   fetchFromGitLab,
+  lib,
+
+  # build system
   setuptools,
-  kafka-python-ng,
+
+  # dependencies
+  kafka-python,
   port-for,
   pytest,
 }:
@@ -23,7 +27,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    kafka-python-ng
+    kafka-python
     port-for
     pytest
   ];

From 2742edbf36f7554d8d50ee8b24aeb197cbee92ca Mon Sep 17 00:00:00 2001
From: Matthieu Barthel <matthieu@imatt.ch>
Date: Fri, 12 Jun 2026 10:35:47 +0200
Subject: [PATCH 066/339] clipqr: 1.3.0 -> 1.4.0

---
 pkgs/by-name/cl/clipqr/package.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix
index f40970a80523..a2334473e669 100644
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@@ -4,31 +4,37 @@
   fetchFromGitLab,
   lib,
   libGL,
+  libdecor,
+  libgbm,
   libx11,
   libxcursor,
   libxext,
   libxi,
   libxinerama,
+  libxkbcommon,
   libxrandr,
   libxxf86vm,
   makeDesktopItem,
-  libgbm,
+  makeWrapper,
   pkg-config,
-  stdenv,
+  wayland,
+  wl-clipboard,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "clipqr";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitLab {
     owner = "imatt-foss";
     repo = "clipqr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M=";
+    hash = "sha256-DC6zc1Qe/z7ihuvdawb8bj5MefYGgt7HAV5dWTjeHZc=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-MrXMbavff6CEKVbL+Mx8hICYB9sZQcvAhnu2X4sVvVw=";
+
+  tags = [ "wayland" ];
 
   ldflags = [
     "-s"
@@ -37,23 +43,30 @@ buildGoModule (finalAttrs: {
 
   buildInputs = [
     libGL
+    libgbm
     libx11
     libxcursor
     libxext
     libxi
     libxinerama
+    libxkbcommon
     libxrandr
     libxxf86vm
-    libgbm
+    wayland
   ];
 
   nativeBuildInputs = [
     copyDesktopItems
+    makeWrapper
     pkg-config
   ];
 
   postInstall = ''
     install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg
+
+    wrapProgram $out/bin/clipqr \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdecor ]} \
+      --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]}
   '';
 
   desktopItems = [
@@ -73,7 +86,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ MatthieuBarthel ];
     homepage = "https://gitlab.com/imatt-foss/clipqr";
-    broken = stdenv.hostPlatform.isDarwin;
+    platforms = lib.platforms.linux;
     mainProgram = "clipqr";
   };
 })

From 408759f3731cdfff9be5b52c68b37d7f1299194f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 12 Jun 2026 11:18:13 +0000
Subject: [PATCH 067/339] pnpm_11: 11.5.3 -> 11.6.0

---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index b8fdc30fd0f6..bf61aef988c7 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -26,8 +26,8 @@ let
       hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4=";
     };
     "11" = {
-      version = "11.5.3";
-      hash = "sha256-I41jmkdxIni7cui22ywpesHM2A3XZC98kztzrr3ntR8=";
+      version = "11.6.0";
+      hash = "sha256-oBYpSdGrGeEuizzZ8PWe8C1750oouAbPf0n7f0wH5c4=";
     };
   };
 

From 1264e5d45027a6f1e1a87a689c8dca95e0908485 Mon Sep 17 00:00:00 2001
From: Colin King <colin@hakuj.in>
Date: Fri, 12 Jun 2026 07:45:13 -0500
Subject: [PATCH 068/339] shen-sbcl: 41 -> 41.1

Like it says on the tin. Now supports installing concurrency, THORN, and
Logic Lab libraries into the default image.
---
 pkgs/by-name/sh/shen-sbcl/package.nix | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix
index 605d5f17fe8f..35eaafd5ccc6 100644
--- a/pkgs/by-name/sh/shen-sbcl/package.nix
+++ b/pkgs/by-name/sh/shen-sbcl/package.nix
@@ -4,16 +4,20 @@
   fetchzip,
   sbcl,
   installStandardLibrary ? true,
+  installConcurrency ? true,
+  installThorn ? true,
+  installLogicLab ? true,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "shen-sbcl";
-  version = "41";
+  version = "41.1";
 
   src = fetchzip {
     url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip";
-    hash = "sha256-uWGMET1zjGbI/+yM1zeMfhVYBgrGawafAEBBGXANXGE=";
+    hash = "sha256-v/hlP23yfpkpFEDCTKYoxeMJbfR2qVF9LFUkqsFwo6g=";
   };
 
+  sourceRoot = "${finalAttrs.src.name}/S41";
   nativeBuildInputs = [ sbcl ];
   dontStrip = true; # necessary to prevent runtime errors with sbcl
 
@@ -38,11 +42,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     substituteInPlace Primitives/globals.lsp \
       --replace-fail '"2.0.0"' '(LISP-IMPLEMENTATION-VERSION)'
 
-    # remove interactive prompt during image creation
-    substituteInPlace install.lsp \
-      --replace-fail '(Y-OR-N-P "Load Shen Standard Library? ")' '${
-        if installStandardLibrary then "T" else "NIL"
-      }'
+    # remove interactive prompts during image creation
+    # shen/tk requires further configuration and isn't supported by default
+    substituteInPlace Lib/install.shen \
+      --replace-fail '(y-or-n? "install standard library?")' '${
+        if installStandardLibrary then "true" else "false"
+      }' \
+      --replace-fail '(y-or-n? "install concurrency? (required for Shen/tk)")' '${
+        if installConcurrency then "true" else "false"
+      }' \
+      --replace-fail '(y-or-n? "install Shen/tk + IDE?")' 'false' \
+      --replace-fail '(y-or-n? "install THORN?")' '${if installThorn then "true" else "false"}' \
+      --replace-fail '(y-or-n? "install Logic Lab?")' '${if installLogicLab then "true" else "false"}'
   '';
 
   meta = {

From 178bbe85ef6baa482641372d8b69abfd4b6cb390 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jun 2026 13:25:29 +0000
Subject: [PATCH 069/339] pv: 1.10.5 -> 1.11.0

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

diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index 9bfb87160eef..621925dcb881 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.10.5";
+  version = "1.11.0";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    hash = "sha256-qyG0+GYigGRragLhufCWeQkY+JyVK74NBv73XTtS+xU=";
+    hash = "sha256-/ALJ/CuCsgqSzI2Y+ES+Y/IqvZh1Go5KvIdeHYA2Yus=";
   };
 
   meta = {

From ac7b44060886518eb315c655b786fd4369504444 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 12 Jun 2026 22:36:31 +0100
Subject: [PATCH 070/339] diffoscope: 318 -> 319

Changes: https://diffoscope.org/news/diffoscope-319-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 20e30df4e5ea..4f91c440e5c9 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -108,12 +108,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 = "318";
+  version = "319";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-rvZxd0mFDzmMFg2QYihkfizYGwiK1QQB9flyYn1uESM=";
+    hash = "sha256-oIEC3ssdp0p2cE0VunTv6oo5CFuMQyftr4e5kqWmfP4=";
   };
 
   outputs = [

From 379db2909f337f99ebce9c707d44ce9a7bfea58d Mon Sep 17 00:00:00 2001
From: Zhaith Izaliel <zhaith.izaliel@ethereal-edelweiss.cloud>
Date: Sat, 13 Jun 2026 02:53:46 +0200
Subject: [PATCH 071/339] iio-niri: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix
index d3d81b23e81a..46f7f26c112d 100644
--- a/pkgs/by-name/ii/iio-niri/package.nix
+++ b/pkgs/by-name/ii/iio-niri/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "iio-niri";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Zhaith-Izaliel";
     repo = "iio-niri";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EwilbkL1cMH8l63Cm5eikVKc+YndsYsaYJxhCNJgz6M=";
+    hash = "sha256-2DWNq6qZmC4hNjgu1W6LBHkcDOSwRT0/8MnbJjyPHQM=";
   };
 
   cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo=";

From 69234dcce0dc3ae9c851a45d110e16f83196250d Mon Sep 17 00:00:00 2001
From: Sergey Makarov <12733495+SeTSeR@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:45:43 +0300
Subject: [PATCH 072/339] far2l: 2.7.0 -> 2.8.0

Signed-off-by: Sergey Makarov <12733495+SeTSeR@users.noreply.github.com>
---
 pkgs/by-name/fa/far2l/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index ea771b7d03cd..0288a3dfaa7c 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -44,13 +44,13 @@
 
 stdenv.mkDerivation rec {
   pname = "far2l";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     tag = "v_${version}";
-    hash = "sha256-pqyAZtVeE3awejx1/glJgAQN6fjAe4YHJX/fLHlF1+Y=";
+    hash = "sha256-LP+agJrYxjH6vLAg6cJTU4/9jYGF9iaZzxA7hozDKNY=";
   };
 
   nativeBuildInputs = [

From 3716f2e81194c721ab1b07a90ba34b485e95fccc Mon Sep 17 00:00:00 2001
From: Edgar Pireyn <edgar@pireyn.be>
Date: Mon, 6 Apr 2026 18:19:55 +0200
Subject: [PATCH 073/339] nixos/frp: add 'extraConfig' option

This feature allows for unparsable settings (by nix) to be used, such as Go templates. It is needed to configure port ranges (https://github.com/fatedier/frp?tab=readme-ov-file#port-range-mapping).
---
 nixos/modules/services/networking/frp.nix | 33 +++++++++++++++++++-
 nixos/tests/frp.nix                       | 37 ++++++++++++++++++++---
 2 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix
index f43a102d741d..0cb5b00fd350 100644
--- a/nixos/modules/services/networking/frp.nix
+++ b/nixos/modules/services/networking/frp.nix
@@ -76,6 +76,26 @@ in
                   ];
                 };
               };
+
+              extraConfig = lib.mkOption {
+                type = lib.types.lines;
+                default = "";
+                description = ''
+                  Extra frp TOML configuration included at the end of the generated configuration file.
+                  Especially useful for [port range mapping].
+
+                  [port range mapping]: https://github.com/fatedier/frp#port-range-mapping
+                '';
+                example = ''
+                  {{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }}
+                  [[proxies]]
+                  name = "tcp-{{ $v.First }}"
+                  type = "tcp"
+                  localPort = {{ $v.First }}
+                  remotePort = {{ $v.Second }}
+                  {{- end }}
+                '';
+              };
             };
           }
         );
@@ -94,7 +114,18 @@ in
       instance: options:
       let
         serviceName = "frp" + lib.optionalString (instance != "") ("-" + instance);
-        configFile = settingsFormat.generate "${serviceName}.toml" options.settings;
+        baseConfigFile = settingsFormat.generate "${serviceName}-base.toml" options.settings;
+        configFile =
+          if options.extraConfig == "" then
+            baseConfigFile
+          else
+            pkgs.writeText "${serviceName}.toml" ''
+              # Nixos Module settings
+              ${builtins.readFile baseConfigFile}
+
+              # Nixos Module extraConfig
+              ${options.extraConfig}
+            '';
         isClient = (options.role == "client");
         isServer = (options.role == "server");
         serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ];
diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix
index 48c4e2bc842c..1d71767f33d5 100644
--- a/nixos/tests/frp.nix
+++ b/nixos/tests/frp.nix
@@ -9,6 +9,7 @@ let
     name = "secrets";
     text = "token=${token}";
   };
+  portRange = 6003;
 in
 {
   name = "frp";
@@ -56,14 +57,25 @@ in
       services.httpd = {
         enable = true;
         adminAddr = "admin@example.com";
-        virtualHosts."test-appication" =
+        virtualHosts =
           let
             testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
           in
           {
-            documentRoot = "${testdir}/web";
-            locations."/" = {
-              index = "index.php index.html";
+            "test-appication" = {
+              documentRoot = "${testdir}/web";
+              locations."/" = {
+                index = "index.php index.html";
+              };
+            };
+            "test-range" = {
+              documentRoot = "${testdir}/web";
+              listen = [
+                { port = portRange; }
+              ];
+              locations."/" = {
+                index = "index.php index.html";
+              };
             };
           };
         phpPackage = pkgs.php84;
@@ -87,6 +99,15 @@ in
             }
           ];
         };
+        extraConfig = ''
+          {{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }}
+          [[proxies]]
+          name = "tcp-{{ $v.First }}"
+          type = "tcp"
+          localPort = {{ $v.First }}
+          remotePort = {{ $v.Second }}
+          {{- end }}
+        '';
       };
     };
   };
@@ -96,9 +117,17 @@ in
     frps.wait_for_unit("frp-server.service")
     frps.wait_for_open_port(80)
     frpc.wait_for_unit("frp-client.service")
+
+    # Test config written in Nix
     response = frpc.succeed("curl -fvvv -s http://127.0.0.1/")
     assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
     response = frpc.succeed("curl -fvvv -s http://10.0.0.1/")
     assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
+
+    # Test `extraConfig` option with port range
+    response = frpc.succeed("curl -fvvv -s http://127.0.0.1:${toString portRange}/")
+    assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
+    response = frpc.succeed("curl -fvvv -s http://10.0.0.1:${toString portRange}/")
+    assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
   '';
 }

From abe79b11e6f360cf3c4ce5c0bae05ab793e14839 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Jun 2026 21:09:39 +0000
Subject: [PATCH 074/339] lilypond-unstable: 2.27.0 -> 2.27.1

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

diff --git a/pkgs/by-name/li/lilypond-unstable/package.nix b/pkgs/by-name/li/lilypond-unstable/package.nix
index d9900c23348a..2767cf9cf866 100644
--- a/pkgs/by-name/li/lilypond-unstable/package.nix
+++ b/pkgs/by-name/li/lilypond-unstable/package.nix
@@ -7,11 +7,11 @@
 
 lilypond.overrideAttrs (
   finalAttrs: prevAttrs: {
-    version = "2.27.0";
+    version = "2.27.1";
 
     src = fetchzip {
       url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
-      hash = "sha256-uZKpHmuYFkmj1kI+D09rPNLov83EO1QdXyUSSscBRPE=";
+      hash = "sha256-SqnBem2dj7w6oRfxk+h5Ahq+NEPDdX7I/NRKZQnK1kU=";
     };
 
     patches = [ ];

From 693faedb738c66c6e3ab610097f47cadf47543a4 Mon Sep 17 00:00:00 2001
From: Edgar Pireyn <edgar@pireyn.be>
Date: Sat, 13 Jun 2026 22:52:16 +0200
Subject: [PATCH 075/339] nixos/frp: add self to maintainers

---
 nixos/modules/services/networking/frp.nix | 5 ++++-
 nixos/tests/frp.nix                       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix
index 0cb5b00fd350..fa636bbe06fc 100644
--- a/nixos/modules/services/networking/frp.nix
+++ b/nixos/modules/services/networking/frp.nix
@@ -175,5 +175,8 @@ in
     ) enabledInstances;
   };
 
-  meta.maintainers = with lib.maintainers; [ zaldnoay ];
+  meta.maintainers = with lib.maintainers; [
+    zaldnoay
+    epireyn
+  ];
 }
diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix
index 1d71767f33d5..00982a6e05bf 100644
--- a/nixos/tests/frp.nix
+++ b/nixos/tests/frp.nix
@@ -13,7 +13,10 @@ let
 in
 {
   name = "frp";
-  meta.maintainers = with lib.maintainers; [ zaldnoay ];
+  meta.maintainers = with lib.maintainers; [
+    zaldnoay
+    epireyn
+  ];
   nodes = {
     frps = {
       networking = {

From 516749bbd430fce8129875fe8774595815f5fc03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Jun 2026 21:46:50 +0000
Subject: [PATCH 076/339] bitrise: 2.40.4 -> 2.40.5

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

diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 1cef5d7995b2..81e9b035babc 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "bitrise";
-  version = "2.40.4";
+  version = "2.40.5";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8Ec6It0haw2PC0HZPxbu2H+J0ltJ3vzsBaWytDiJzx4=";
+    hash = "sha256-wuvtkbQ3QmYc/ZO/QDpq1DDoLUE3Hcq5H7oWpCdZVVg=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

From 0524c4ec4bfa7e1e0873d5b6afacf6693857661d Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sat, 13 Jun 2026 23:43:53 +0000
Subject: [PATCH 077/339] gatus: 5.35.0 -> 5.36.0

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

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index df40c24b23c7..dca8d87a73bf 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gatus";
-  version = "5.35.0";
+  version = "5.36.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-I1HjeJ4/yLLgcoIEOQCv3WQDNrpIAFhzDvVpz24T7gU=";
+    hash = "sha256-YduXhHra6w7zo1f+brCjiusH7xCSdAzo5uF6aN5uv/A=";
   };
 
-  vendorHash = "sha256-PBy/0My0TdlolpagDSdt7r2dPPLJOVHEsU1xaV8RFjg=";
+  vendorHash = "sha256-RbFNtojZthf7bKMhGStH/jOkeIR6EHpw2vvAMLEFtKI=";
 
   subPackages = [ "." ];
 

From 4f5042c837f8379b29ec8ec06ee9047da22b821c Mon Sep 17 00:00:00 2001
From: Ian Mitchell <mitchell.ian.2001@gmail.com>
Date: Tue, 9 Jun 2026 11:20:56 -0400
Subject: [PATCH 078/339] supercollider: re-enable QtWebEngine

Qt WebEngine is a major component of the SuperCollider language,
especially because it powers the user documentation system, which
contains all of the helpfiles for the user's local system that may not
be in the online SuperCollider documentation browser (see
<https://docs.supercollider.online/Browse.html>). WebEngine has
potential security vulnerabilities (see below)---which was why WebEngine
was removed in PR #480196---however, the documentation browser in SC is
not used for anything other than browsing local documentation, which
minimizes the potential harms from WebEngine.

Potential security problems with Qt6 WebEngine can be found at the
following:
  * https://doc.qt.io/qt-6//qtwebengine-security.html
  * (for FreeBSD) https://www.vuxml.org/freebsd/pkg-qt6-webengine.html

Security-conscious users may wish to not use QtWebEngine, and so there
is an included option to disable it with the `useQtWebEngine` option.
---
 pkgs/development/interpreters/supercollider/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 078b6782a3d0..6b73cdf7f5f3 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -16,6 +16,7 @@
   libxt,
   readline,
   useSCEL ? false,
+  useQtWebEngine ? true,
   emacs,
   gitUpdater,
   supercollider-with-plugins,
@@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
     qt6.qtbase
     qt6.qtwebsockets
     qt6.qtwayland
+    qt6.qtwebengine
     readline
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
@@ -74,7 +76,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DSC_WII=OFF"
     "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
-    (lib.cmakeBool "SC_USE_QTWEBENGINE" false)
+    (lib.cmakeBool "SC_USE_QTWEBENGINE" useQtWebEngine)
   ];
 
   passthru = {

From cfa8792facbc716f48aaac385a242a4fa878236f Mon Sep 17 00:00:00 2001
From: Ian Mitchell <mitchell.ian.2001@gmail.com>
Date: Sat, 13 Jun 2026 00:34:21 -0400
Subject: [PATCH 079/339] supercolliderPlugins: fix FFTW3F-INCLUDE-DIR build
 error

sc3-plugins requires the `fftw3F` (or `fftw3Float`) package, due to its
UGens utilizing the library. Without including `fftw3Float` in the
`buildInput` variable, sc3-plugins will not compile.
---
 .../interpreters/supercollider/plugins/sc3-plugins.nix          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
index a3203e87bc06..f13f8feb1c17 100644
--- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
+++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
@@ -6,6 +6,7 @@
   cmake,
   supercollider,
   fftw,
+  fftwFloat,
   gitUpdater,
 }:
 
@@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     supercollider
     fftw
+    fftwFloat # builds without this will return an error message about no FFTW3F-INCLUDE-DIR
   ];
 
   cmakeFlags = [

From 1e68037f555f4f7c1dbe5f5bb36bc0ee9e3da451 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Jun 2026 04:36:09 +0000
Subject: [PATCH 080/339] worktrunk: 0.56.0 -> 0.58.0

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

diff --git a/pkgs/by-name/wo/worktrunk/package.nix b/pkgs/by-name/wo/worktrunk/package.nix
index 1ba94bcf30db..ffd9ddfba56c 100644
--- a/pkgs/by-name/wo/worktrunk/package.nix
+++ b/pkgs/by-name/wo/worktrunk/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "worktrunk";
-  version = "0.56.0";
+  version = "0.58.0";
 
   src = fetchFromGitHub {
     owner = "max-sixty";
     repo = "worktrunk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6Soz41fyieWczJBNiv50UGUVMsvVej/1pMX3iPnvXg8=";
+    hash = "sha256-yjya7J35wXZoT2CCZhH2Qhgu6vjFzH3pHinMCiyMhe4=";
   };
 
-  cargoHash = "sha256-NKjbn8RVtHWv/DqcQ/HqvvhKr9jAyisElD0OYyYbVAg=";
+  cargoHash = "sha256-IrYjEjorYEnIhEPskAqqr9O4yf1GXJFh/TDhSWZiBZk=";
 
   cargoBuildFlags = [ "--package=worktrunk" ];
 

From a2d77db044a5b03d0d3982efbc1aebb04cc2eb52 Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@lelgenio.com>
Date: Tue, 9 Jun 2026 19:53:17 -0300
Subject: [PATCH 081/339] lessc: 4.6.3 -> 4.6.6

---
 pkgs/by-name/le/lessc/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix
index 494657523c3d..85f1be5795e5 100644
--- a/pkgs/by-name/le/lessc/package.nix
+++ b/pkgs/by-name/le/lessc/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   nodejs,
-  pnpm_9,
+  pnpm_11,
   pnpmConfigHook,
   callPackage,
   testers,
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lessc";
-  version = "4.6.3";
+  version = "4.6.6";
 
   src = fetchFromGitHub {
     owner = "less";
     repo = "less.js";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ=";
+    hash = "sha256-onTaVj69LYeYnywYXSC0I3ewF4rT0LAlRI61NEroLvc=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -32,16 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k=";
+    pnpm = pnpm_11;
+    fetcherVersion = 4;
+    hash = "sha256-tlms2b0aodWkI+btdmCnwSDgsURekaBdiI8IZ/iMVnI=";
   };
 
   strictDeps = true;
 
   nativeBuildInputs = [
     pnpmConfigHook
-    pnpm_9
+    pnpm_11
     nodejs
   ];
 

From 2dc5868ed98ba5ddac598ad57f5a1f3f0e60b38f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Jun 2026 06:18:01 +0000
Subject: [PATCH 082/339] python3Packages.cryptodatahub: 1.1.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix
index a07509e65f98..f1b83ac239f4 100644
--- a/pkgs/development/python-modules/cryptodatahub/default.nix
+++ b/pkgs/development/python-modules/cryptodatahub/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cryptodatahub";
-  version = "1.1.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "coroner";
     repo = "cryptodatahub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tz2VbWS5/sGjRsOKR7eWpWAJVNv1QMSjkepI7fVZq6w=";
+    hash = "sha256-Zu8E3k6jHFK+IIHWOalmdv/mPGhT7JjgjFkGiLxA4iI=";
   };
 
   build-system = [

From 018056a938bc229b6c4069bc7ac3be513fba7be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theobori@disroot.org>
Date: Sun, 14 Jun 2026 15:46:11 +0200
Subject: [PATCH 083/339] nile: 1.1.2 -> 1.2.0

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

diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix
index d7c22df3f02f..60773293c88a 100644
--- a/pkgs/by-name/ni/nile/package.nix
+++ b/pkgs/by-name/ni/nile/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nile";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "imLinguin";
     repo = "nile";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
+    hash = "sha256-tzf3sqD7P32AXzZu/WDauOSsEe/xhCh6x4KGQ1YnJqw=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From aed0ba8d706ee3c367b5898af16362e15ab0fb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theobori@disroot.org>
Date: Sun, 14 Jun 2026 15:48:14 +0200
Subject: [PATCH 084/339] nile: add theobori as maintainer

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

diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix
index 60773293c88a..8afc79a11894 100644
--- a/pkgs/by-name/ni/nile/package.nix
+++ b/pkgs/by-name/ni/nile/package.nix
@@ -50,6 +50,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     changelog = "https://github.com/imLinguin/nile/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     mainProgram = "nile";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ theobori ];
   };
 })

From 6eb837c54d707affba369d69e002fb6a5d9b6368 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 14 Jun 2026 18:03:57 +0300
Subject: [PATCH 085/339] pizauth: use a global enableSystemd package flag

Makes overlays easier for systems such as [sixos][1] or [finix][2].

[1]: https://codeberg.org/amjoseph/sixos
[2]: https://github.com/finix-community/finix
---
 pkgs/by-name/pi/pizauth/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 1d0a5f9bb3cf..065dc042987a 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   stdenv,
   nix-update-script,
+  enableSystemd ? stdenv.hostPlatform.isLinux,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-pxzPcieUXE3VOyGNDaeDHUQPayRDZXpW57VWMejlZ4k=";
 
-  buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [
+  buildFeatures = lib.optionals enableSystemd [
     "systemd"
   ];
 
@@ -29,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   postInstall = ''
-    make PREFIX=$out install ${lib.optionalString stdenv.hostPlatform.isLinux "install-systemd"}
+    make PREFIX=$out install ${lib.optionalString enableSystemd "install-systemd"}
   '';
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=pizauth-(.*)" ]; };

From 583024221d3a8e5f0648c0e834328b2836d2aed0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 14 Jun 2026 18:14:51 +0300
Subject: [PATCH 086/339] pizauth: fix systemd feature

Although we had `systemd` included in `buildFeatures`, it didn't reach
`$out/bin/pizauth`, because upstream's Makefile used
`target/release/pizauth` as a Makefile target that `cargo build
--release` (with or without `--features=systemd`) solves.
---
 pkgs/by-name/pi/pizauth/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 065dc042987a..a23a84d38ffb 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -27,6 +27,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   preConfigure = ''
     substituteInPlace lib/systemd/user/pizauth.service \
       --replace-fail /usr/bin/ ''${!outputBin}/bin/
+    # Upstream's Makefile uses target/release/pizauth as a Makefile target that
+    # the `install` target depends upon. Nixpkgs' cargoBuildHook defaults to
+    # using the explicit `--target @rustcTargetSpec@` flag, so that the
+    # executable always ends up in
+    # `target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release`. To make the
+    # Makefile not run cargo build again, we use this substitution.
+    substituteInPlace Makefile \
+      --replace-fail target/release target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release
   '';
 
   postInstall = ''

From 6c82a20bbc25aff4efb81cfa192e58ae9b5502e6 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Fri, 12 Jun 2026 01:03:59 +0200
Subject: [PATCH 087/339] silver-searcher-ng: init at 2.2.0

This partially reverts commit 6d2532593145aa9a1f8191ee9f9b8e9784852d69.
---
 .../silver-searcher-ng/bash-completion.patch  |  5 ++
 .../by-name/si/silver-searcher-ng/package.nix | 55 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  2 +-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/si/silver-searcher-ng/bash-completion.patch
 create mode 100644 pkgs/by-name/si/silver-searcher-ng/package.nix

diff --git a/pkgs/by-name/si/silver-searcher-ng/bash-completion.patch b/pkgs/by-name/si/silver-searcher-ng/bash-completion.patch
new file mode 100644
index 000000000000..30e8c72389b7
--- /dev/null
+++ b/pkgs/by-name/si/silver-searcher-ng/bash-completion.patch
@@ -0,0 +1,5 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9 +9 @@
+-bashcompdir = $(pkgdatadir)/completions
++bashcompdir = $(datadir)/bash-completion/completions
diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix
new file mode 100644
index 000000000000..20da881e8d2e
--- /dev/null
+++ b/pkgs/by-name/si/silver-searcher-ng/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  pcre,
+  zlib,
+  xz,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "silver-searcher-ng";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "silver-searcher";
+    repo = "silver-searcher-ng";
+    rev = finalAttrs.version;
+    sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
+  };
+
+  patches = [ ./bash-completion.patch ];
+
+  env = {
+    # Workaround build failure on -fno-common toolchains like upstream
+    # gcc-10. Otherwise build fails as:
+    #   ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
+    #     `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
+    # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
+    NIX_CFLAGS_COMPILE = "-fcommon";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    NIX_LDFLAGS = "-lgcc_s";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+  buildInputs = [
+    pcre
+    zlib
+    xz
+  ];
+
+  meta = {
+    homepage = "https://github.com/silver-searcher/silver-searcher-ng";
+    description = "Code-searching tool similar to ack, but faster";
+    maintainers = with lib.maintainers; [ timschumi ];
+    mainProgram = "ag";
+    platforms = lib.platforms.all;
+    license = lib.licenses.asl20;
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 860584e73a64..464abee85119 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1974,7 +1974,7 @@ mapAliases {
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   signal-desktop-bin = throw "'signal-desktop-bin' has been replaced by 'signal-desktop' which is built from source"; # Added 2026-03-02
   signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27
-  silver-searcher = throw "'silver-searcher' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library";
+  silver-searcher = throw "'silver-searcher' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library. Consider using 'silver-searcher-ng', which is a fork with support for PCRE2.";
   simpleBluez = warnAlias "'simpleBluez' has been renamed to 'simplebluez'" simplebluez; # Added 2026-02-18
   simpleDBus = warnAlias "'simpleDBus' has been renamed to 'simpledbus'" simpledbus; # Added 2026-02-12
   simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17

From 67919be717e87cfea39f4d3010a9f05c3a3de0bb Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Fri, 12 Jun 2026 01:06:38 +0200
Subject: [PATCH 088/339] silver-searcher-ng: 2.2.0 -> 3.0.0

---
 pkgs/by-name/si/silver-searcher-ng/package.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix
index 20da881e8d2e..33885543ab23 100644
--- a/pkgs/by-name/si/silver-searcher-ng/package.nix
+++ b/pkgs/by-name/si/silver-searcher-ng/package.nix
@@ -4,33 +4,25 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  pcre,
+  pcre2,
   zlib,
   xz,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "silver-searcher-ng";
-  version = "2.2.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "silver-searcher";
     repo = "silver-searcher-ng";
     rev = finalAttrs.version;
-    sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
+    hash = "sha256-IiVFbS9XGmqcGN4NRXFC07cV6bGKDs9C2y5XxJKdvFk=";
   };
 
   patches = [ ./bash-completion.patch ];
 
-  env = {
-    # Workaround build failure on -fno-common toolchains like upstream
-    # gcc-10. Otherwise build fails as:
-    #   ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
-    #     `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
-    # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
-    NIX_CFLAGS_COMPILE = "-fcommon";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
     NIX_LDFLAGS = "-lgcc_s";
   };
 
@@ -39,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    pcre
+    pcre2
     zlib
     xz
   ];

From b4cf3a59449aa3f0fde388c73fe57fac2af21b6b Mon Sep 17 00:00:00 2001
From: Dan Xin <davinci42.cn@gmail.com>
Date: Sun, 14 Jun 2026 14:10:16 +0800
Subject: [PATCH 089/339] pijul: 1.0.0-beta.11 -> 1.0.0-beta.14

Signed-off-by: Dan Xin <davinci42.cn@gmail.com>
---
 .../fix-rand-0.9-sanakirja-imports.patch      | 19 -------------------
 pkgs/by-name/pi/pijul/package.nix             | 11 ++++++-----
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch

diff --git a/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch b/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch
deleted file mode 100644
index 17f34d5d3f43..000000000000
--- a/pkgs/by-name/pi/pijul/fix-rand-0.9-sanakirja-imports.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/commands/git.rs
-+++ b/src/commands/git.rs
-@@ -1,6 +1,7 @@
- use anyhow::bail;
- use clap::{Parser, ValueHint};
- use libpijul::pristine::*;
-+use ::sanakirja::RootPageMut as _;
- use libpijul::*;
- use log::{debug, error, info, trace};
- use std::collections::{BTreeMap, BTreeSet, HashSet};
-@@ -564,7 +565,7 @@
-                                     tmp_path.pop();
-                                     use rand::Rng;
-                                     let s: String = rand::thread_rng()
--                                        .sample_iter(&rand::distributions::Alphanumeric)
-+                                        .sample_iter(&rand::distr::Alphanumeric)
-                                         .take(30)
-                                         .map(|x| x as char)
-                                         .collect();
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index 7252cb7eec97..6cec25019d44 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -14,18 +14,19 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
+  __structuredAttrs = true;
+
   pname = "pijul";
-  version = "1.0.0-beta.11";
+  version = "1.0.0-beta.14";
 
   src = fetchCrate {
     inherit (finalAttrs) version pname;
-    hash = "sha256-+rMMqo2LBYlCFQJv8WFCSEJgDUbMi8DnVDKXIWm3tIk=";
+    hash = "sha256-Ex8fCIcif2lmZ3ytLARwgGzEeq6GB2NDvwd96niDKbQ=";
   };
 
-  cargoHash = "sha256-IhArTiReUdj49bA+XseQpOiszK801xX5LdLj8vXD8rs=";
-
-  patches = [ ./fix-rand-0.9-sanakirja-imports.patch ];
+  cargoHash = "sha256-yPzDzfD+QdhAXdyvzDV1z9HDe1mwF9cRCsliejr8H88=";
 
+  # Tests require a TTY, which the Nix sandbox does not provide.
   doCheck = false;
   nativeBuildInputs = [
     installShellFiles

From b2aade9cfd92fb4750e41f7d3f573407eab38cf1 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Fri, 12 Jun 2026 01:08:26 +0200
Subject: [PATCH 090/339] silver-searcher-ng: run upstream tests

---
 pkgs/by-name/si/silver-searcher-ng/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix
index 33885543ab23..ba71da4ed9a8 100644
--- a/pkgs/by-name/si/silver-searcher-ng/package.nix
+++ b/pkgs/by-name/si/silver-searcher-ng/package.nix
@@ -3,8 +3,10 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  git,
   pkg-config,
   pcre2,
+  python3Packages,
   zlib,
   xz,
 }:
@@ -30,12 +32,26 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     pkg-config
   ];
+
   buildInputs = [
     pcre2
     zlib
     xz
   ];
 
+  doCheck = true;
+  nativeCheckInputs = [
+    python3Packages.cram
+    git
+  ];
+  checkPhase = ''
+    runHook preCheck
+
+    make test
+
+    runHook postCheck
+  '';
+
   meta = {
     homepage = "https://github.com/silver-searcher/silver-searcher-ng";
     description = "Code-searching tool similar to ack, but faster";

From 8e079e0225f26cedfeaf53f6cd52e67f9b87ab4f Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sun, 14 Jun 2026 20:13:24 +0200
Subject: [PATCH 091/339] silver-searcher-ng: enable recommended packaging
 attributes

---
 pkgs/by-name/si/silver-searcher-ng/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/si/silver-searcher-ng/package.nix b/pkgs/by-name/si/silver-searcher-ng/package.nix
index ba71da4ed9a8..e0f76f7aad0a 100644
--- a/pkgs/by-name/si/silver-searcher-ng/package.nix
+++ b/pkgs/by-name/si/silver-searcher-ng/package.nix
@@ -52,6 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   meta = {
     homepage = "https://github.com/silver-searcher/silver-searcher-ng";
     description = "Code-searching tool similar to ack, but faster";

From 887c92037cff38470e37b0de92c3a691fd2b6261 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Jun 2026 18:29:26 +0000
Subject: [PATCH 092/339] drawterm: 0-unstable-2026-05-26 ->
 0-unstable-2026-06-06

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

diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index 58e89e83ca24..9c11d57015bf 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2026-05-26";
+  version = "0-unstable-2026-06-06";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "0385fd3dc0343c4c882096c60558b01f61260736";
-    hash = "sha256-OiGliIVMUpFaNkMn15qaYdBsU429Q0RUw68lqTOu880=";
+    rev = "3fdee4c284c98c84a85b2c9101aab7bbebf3dfbf";
+    hash = "sha256-GUc69wONBOtVKjIJu+zgsUdUADWXUJlh3Fl7W0Ub99k=";
   };
 
   enableParallelBuilding = true;

From 926eb0377cebef785b399409bc8e401f4d1bfe5c Mon Sep 17 00:00:00 2001
From: Henrique Oliveira <github@m0streng0.eu>
Date: Sun, 14 Jun 2026 20:41:28 +0200
Subject: [PATCH 093/339] ostui: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/by-name/os/ostui/package.nix b/pkgs/by-name/os/ostui/package.nix
index 47eac25c8244..a1b51c13c2c5 100644
--- a/pkgs/by-name/os/ostui/package.nix
+++ b/pkgs/by-name/os/ostui/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "ostui";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromSourcehut {
     owner = "~ser";
     repo = "ostui";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kg0sMLH7rZ+RmOi8lnjIya4l9W/HIU9bP2Eyj1+vWSQ=";
+    hash = "sha256-Zm7j4s+GLILLnH+CjF8JsJB4APYeWV7TyCUkKLW2SGQ=";
   };
 
   vendorHash = "sha256-yhoTwouYlv2VkCWmvwvvpbQmrFwzwpraf0EV2Tegq94=";

From c0f363a710c7af956841f71da1b9a4da01c0b0f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Jun 2026 18:53:29 +0000
Subject: [PATCH 094/339] lomiri.lomiri-terminal-app: 2.0.5 -> 2.0.6

---
 .../lomiri/applications/lomiri-terminal-app/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
index cd47cbec28cd..0735d5d6cff3 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-terminal-app";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-terminal-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-STL8Km5NVSW3wEjC96sT4Q9z/lTSYKFQ6ku6M+CKM78=";
+    hash = "sha256-F7E8YKNC1wAMYnE2Ct30ZMKbzN/wHIPWv+AAVw86Hm4=";
   };
 
   postPatch = ''

From da1c954bd509f920b07d4737892392efe78afd9b Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 14 Jun 2026 14:44:19 -0700
Subject: [PATCH 095/339] samim-fonts: use installFonts

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

diff --git a/pkgs/by-name/sa/samim-fonts/package.nix b/pkgs/by-name/sa/samim-fonts/package.nix
index d495c7331785..10f2cc2e5d1f 100644
--- a/pkgs/by-name/sa/samim-fonts/package.nix
+++ b/pkgs/by-name/sa/samim-fonts/package.nix
@@ -2,26 +2,26 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "samim-fonts";
   version = "4.0.5";
 
+  outputs = [
+    "out"
+    "webfont"
+  ];
+
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "samim-font";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \;
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     homepage = "https://github.com/rastikerdar/samim-font";
@@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.all;
     maintainers = [ ];
   };
-}
+})

From 41093672a0d9082b341beb792bb59c95ecf657f4 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 14 Jun 2026 14:45:33 -0700
Subject: [PATCH 096/339] samim-fonts: add pancaek to maintainers

---
 pkgs/by-name/sa/samim-fonts/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sa/samim-fonts/package.nix b/pkgs/by-name/sa/samim-fonts/package.nix
index 10f2cc2e5d1f..9a3f007c1aca 100644
--- a/pkgs/by-name/sa/samim-fonts/package.nix
+++ b/pkgs/by-name/sa/samim-fonts/package.nix
@@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
   };
 })

From 16a9a6dc0dff6b8fbabde7caa7455bf22f36860c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 00:26:06 +0000
Subject: [PATCH 097/339] waffle: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix
index 4ca8a12233fe..c8948023ae74 100644
--- a/pkgs/by-name/wa/waffle/package.nix
+++ b/pkgs/by-name/wa/waffle/package.nix
@@ -25,14 +25,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waffle";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "Mesa";
     repo = "waffle";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U=";
+    sha256 = "sha256-1yAg8ws4GIs/IHGVbfUKTXkD9JVRtjuH0REFIfDqXtc=";
   };
 
   buildInputs = [

From b08d3e27c44f58ae7f4a08fd7cf6563866a55398 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 19 Jan 2026 00:36:12 +0000
Subject: [PATCH 098/339] pkgsStrict: init

enabling top-level access to this config supports the effort to enable
`strictDeps` by default:
<https://github.com/NixOS/nixpkgs/issues/178468>

PRs to support musl, static, and cross compiled builds benefit from
simple instructions the reviewer can observe improvements, e.g.:

- "fixes build for `pkgsMusl.hello`"
- "fixes `nix-build -A pkgsStatic.hello`"
- "fixes `pkgsCross.aarch64-multiplatform.hello`"

now strictDeps-related changes can benefit from this same idiom:

- "fixes build for `pkgsStrict.hello`"
---
 pkgs/top-level/variants.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index 28b7ae323956..dd817788b5a9 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -173,4 +173,10 @@ self: super: {
     ]
     ++ overlays;
   };
+
+  pkgsStrict = nixpkgsFun {
+    config = super.config // {
+      strictDepsByDefault = true;
+    };
+  };
 }

From 946ec48ea11b539034d491045632cc6f834efec7 Mon Sep 17 00:00:00 2001
From: Katsumi Takeuchi <contact@hibi.day>
Date: Mon, 15 Jun 2026 10:08:34 +0900
Subject: [PATCH 099/339] blesh: move source fixes to patch files

---
 .../bl/blesh/fix-cache-invalidation.patch       | 11 +++++++++++
 pkgs/by-name/bl/blesh/package.nix               | 17 +++++++++--------
 .../bl/blesh/skip-readonly-runtime-dir.patch    | 10 ++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/bl/blesh/fix-cache-invalidation.patch
 create mode 100644 pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch

diff --git a/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch b/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch
new file mode 100644
index 000000000000..1fa4803f3156
--- /dev/null
+++ b/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch
@@ -0,0 +1,11 @@
+--- a/ble.pp
++++ b/ble.pp
+@@ -2063,7 +2063,7 @@
+     return 1
+   fi
+ 
+-  local ver=${BLE_VERSINFO[0]}.${BLE_VERSINFO[1]}
++  local ver=$BLE_VERSION
+   ble/base/.create-user-directory _ble_base_cache "$cache_dir/blesh/$ver"
+ }
+ function ble/base/initialize-cache-directory {
diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix
index 2c73550db045..ba69473aef0d 100644
--- a/pkgs/by-name/bl/blesh/package.nix
+++ b/pkgs/by-name/bl/blesh/package.nix
@@ -24,14 +24,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     gawk
   ];
 
-  # Fix the cache invalidation not working; see
-  # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131
-  postPatch = ''
-    substituteInPlace ble.pp \
-      --replace-fail \
-        'local ver=''${BLE_VERSINFO[0]}.''${BLE_VERSINFO[1]}' \
-        'local ver=$BLE_VERSION'
-  '';
+  patches = [
+    # Fix the cache invalidation not working; see
+    # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131
+    ./fix-cache-invalidation.patch
+    # ble.sh reaches a runtime-dir fallback under the install base when the
+    # others are unusable (always on WSL); see
+    # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4686973408
+    ./skip-readonly-runtime-dir.patch
+  ];
 
   # ble.sh embeds the commit id, normally read from .git, which fetchFromGitHub omits.
   makeFlags = [
diff --git a/pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch b/pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch
new file mode 100644
index 000000000000..e03f56fc2646
--- /dev/null
+++ b/pkgs/by-name/bl/blesh/skip-readonly-runtime-dir.patch
@@ -0,0 +1,10 @@
+--- a/ble.pp
++++ b/ble.pp
+@@ -1934,6 +1934,7 @@
+ function ble/base/initialize-runtime-directory/.base {
+   local tmp_dir=$_ble_base/run
+   if [[ ! -d $tmp_dir ]]; then
++    [[ -w $_ble_base ]] || return 1
+     ble/bin/mkdir -p "$tmp_dir" || return 1
+     ble/bin/chmod a+rwxt "$tmp_dir" || return 1
+   fi

From 4a0c8882aa3f8fc76e8a63761ded7bfe1f214132 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 01:29:08 +0000
Subject: [PATCH 100/339] tinty: 0.32.2 -> 0.33.0

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

diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index 597100daeb2a..17a04dadb18e 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "0.32.2";
+  version = "0.33.0";
 in
 rustPlatform.buildRustPackage {
   pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "tinted-theming";
     repo = "tinty";
     tag = "v${version}";
-    hash = "sha256-+13iS99bwvIZDy96x1fgOtDyvbu59ieY4nUZk91mK4s=";
+    hash = "sha256-pQ7Aw95evZc8buPLkluUhxs113El2SFFNTltpunPbow=";
   };
 
-  cargoHash = "sha256-gShC4+uzdJVi3KuLc6ImJRvEWvIY4vgKcYT8Aykm0Xc=";
+  cargoHash = "sha256-pJH8ROgwfHZfJQWQI7u+mzqVX6I369/cF3QUM2+D7Y4=";
 
   # Pretty much all tests require internet access
   doCheck = false;

From 5f361c1f340f03a7045ec889477f6b53c7400e5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 04:29:18 +0000
Subject: [PATCH 101/339] codebuff: 1.0.680 -> 1.0.681

---
 pkgs/by-name/co/codebuff/package-lock.json | 8 ++++----
 pkgs/by-name/co/codebuff/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 1de7560f441a..5cf1e70b7750 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.680"
+        "codebuff": "^1.0.681"
       }
     },
     "node_modules/@isaacs/fs-minipass": {
@@ -30,9 +30,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.680",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.680.tgz",
-      "integrity": "sha512-+HrrSchE7wsAQNcq5yJfL4YygOf+ng3T9S3yF+FZFVfnT29KVXSoar5mdRmzsVFNGjHZKc9I+kqt0dEO01G9Ow==",
+      "version": "1.0.681",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.681.tgz",
+      "integrity": "sha512-xRj1kKCvXA522IiomLVV0EyORdsjjS4T/shLVeoTrdM9MNZRqrCcm/b9bsiTIzwlYz4oQFgBfmWeHapKKPjh7A==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index d29736373447..e8543c35f756 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "codebuff";
-  version = "1.0.680";
+  version = "1.0.681";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz";
-    hash = "sha256-glsZk5q+Qd2NbMk/jIXklCHf9MSSqkMN67d7k1fuzlk=";
+    hash = "sha256-tkQ8MOkQk4vaS9PFqlFBV6unEgysXcwHrKGgxfe60fM=";
   };
 
   strictDeps = true;
 
-  npmDepsHash = "sha256-+HZN4oal+Bn7uKfWrWd/eDRvuAPvRKlGO4ThFamNZCI=";
+  npmDepsHash = "sha256-KB0QCfpGP32O5dU+/2dOEmX87iclJrZudIkTNp9ZxSw=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 4d8211ff1d4239a9a59a6547ba3db4c005710759 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 14 Jun 2026 21:54:54 -0700
Subject: [PATCH 102/339] llvmPackages_git: 23.0.0-unstable-2026-06-07 ->
 23.0.0-unstable-2026-06-14

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index ac4a5ef58288..42b0dabf6e1b 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
     "22.1.7".officialRelease.sha256 = "sha256-AmozlrL8AAlfr+F7OrJqr3ecd/KhBx5Bngj3SopPdyY=";
     "23.0.0-git".gitRelease = {
-      rev = "47ef7495ad781b742a0c4435ca72590d297ba8bf";
-      rev-version = "23.0.0-unstable-2026-06-07";
-      sha256 = "sha256-5x3wvNti/OCmdam0tUmkiiq/ONn23m4mcTh491hWLVA=";
+      rev = "625facd4375f6bfa5de501d0559bd262062e2dc3";
+      rev-version = "23.0.0-unstable-2026-06-14";
+      sha256 = "sha256-myNSe9+nBTd28BnEmq+Ysp0kiY6KtOJSmbnGjQgGxRI=";
     };
   }
   // llvmVersions;

From a1437743ad033be195d83f92fd8ca29d3c92c535 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 15 Jun 2026 07:16:09 +0000
Subject: [PATCH 103/339] ec2-metadata-mock: 1.12.0 -> 1.13.0

---
 pkgs/by-name/ec/ec2-metadata-mock/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ec/ec2-metadata-mock/package.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
index 9b278f4ec48d..e95085dbe2ab 100644
--- a/pkgs/by-name/ec/ec2-metadata-mock/package.nix
+++ b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
@@ -6,20 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "ec2-metadata-mock";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ec2-metadata-mock";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y=";
+    hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8=";
   };
 
-  vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c=";
+  vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU=";
 
-  postInstall = ''
-    mv $out/bin/{cmd,ec2-metadata-mock}
-  '';
+  subPackages = [ "cmd/ec2-metadata-mock" ];
 
   meta = {
     description = "Amazon EC2 Metadata Mock";

From 2a4d3c1729fa2d060a61423385fbdf80c51331f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 09:01:38 +0000
Subject: [PATCH 104/339] pb: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/pb/pb/package.nix b/pkgs/by-name/pb/pb/package.nix
index db8e599965c8..b9f5823cd6ee 100644
--- a/pkgs/by-name/pb/pb/package.nix
+++ b/pkgs/by-name/pb/pb/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pb";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "parseablehq";
     repo = "pb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OXxLHi7v/xJZVvxHZvJ0eH4MYrlLFxDAMT9CVG2mWTM=";
+    hash = "sha256-q389FVNVxIoDr65imIg5gjn8/CnKl437a04ojm9uyrA=";
   };
 
-  vendorHash = "sha256-N6m0qvj65Ls3yQmVGw0AklsO1zs1KHdi/Y6FZRghnCs=";
+  vendorHash = "sha256-hEVoz8EgC2hAkiC0LNZ+h/Hy7toVxWvv2gchymfpMK8=";
 
   ldflags = [
     "-s"

From 7b0fbcf6abdd6c1d0882643b28cc7bfc7de65a68 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 15 Jun 2026 11:20:13 +0200
Subject: [PATCH 105/339] aubio: add darwin platform

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

diff --git a/pkgs/by-name/au/aubio/package.nix b/pkgs/by-name/au/aubio/package.nix
index 26dc445bacd2..362eec53198e 100644
--- a/pkgs/by-name/au/aubio/package.nix
+++ b/pkgs/by-name/au/aubio/package.nix
@@ -27,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     wafHook
   ];
   buildInputs = [
-    alsa-lib
     fftw
     libjack2
     libsamplerate
     libsndfile
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
   ];
 
   strictDeps = true;
@@ -51,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       fpletz
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From 2cf217562a91633258162564c18e1bfd4fe0ed48 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 15 Jun 2026 13:04:37 +0200
Subject: [PATCH 106/339] libwebsockets: Fix darwin dylib install names

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

diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index f0e50b0f6132..18767b409aa1 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -65,7 +65,15 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \
       "set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \
       "set(LIBWEBSOCKETS_LIBRARIES websockets)"
-  '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Fix doubled store path in macOS install_name
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        'SET(CMAKE_INSTALL_NAME_DIR "''${CMAKE_INSTALL_PREFIX}/''${LWS_INSTALL_LIB_DIR}")' \
+        'SET(CMAKE_INSTALL_NAME_DIR "''${LWS_INSTALL_LIB_DIR}")'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic "";
 
   postInstall = ''
     # Fix path that will be incorrect on move to "dev" output.

From bae382ff3bb99601d35a8a4e2877c6f5286b9b95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 12:25:48 +0000
Subject: [PATCH 107/339] python3Packages.openimageio: 3.1.14.0 -> 3.1.14.1

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

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index 570d5c6619e9..a5dd93938fa3 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.1.14.0";
+  version = "3.1.14.1";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sA4NzGdT+K9uQM+h8Ew1EvjO8TGMGyyLS5KYYMJAToE=";
+    hash = "sha256-gAW9pUK0oPGoeNRBCS7i444PQ3b6f9Pa0UJwhSJV9ss=";
   };
 
   outputs = [

From 1a23f7552ffb8f486ae73535efb487de6177e0bf Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 20:40:06 +0700
Subject: [PATCH 108/339] python3Packages.wiffi: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix
index 1a600ed76375..ff2d6025069d 100644
--- a/pkgs/development/python-modules/wiffi/default.nix
+++ b/pkgs/development/python-modules/wiffi/default.nix
@@ -3,12 +3,13 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "wiffi";
   version = "1.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mampfes";
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-pnbzJxq8K947Yg54LysPPho6IRKf0cc+szTETgyzFao=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # Project has no tests
   doCheck = false;

From e4c56a27798f111ec98ec789b036a7a9852cae6b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 20:41:19 +0700
Subject: [PATCH 109/339] python3Packages.wiffi: modernize

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

diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix
index ff2d6025069d..929f2ec335f7 100644
--- a/pkgs/development/python-modules/wiffi/default.nix
+++ b/pkgs/development/python-modules/wiffi/default.nix
@@ -6,15 +6,17 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "wiffi";
   version = "1.1.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "mampfes";
     repo = "python-wiffi";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-pnbzJxq8K947Yg54LysPPho6IRKf0cc+szTETgyzFao=";
   };
 
@@ -30,8 +32,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python module to interface with STALL WIFFI devices";
     homepage = "https://github.com/mampfes/python-wiffi";
-    changelog = "https://github.com/mampfes/python-wiffi/blob/${version}/HISTORY.md";
+    changelog = "https://github.com/mampfes/python-wiffi/blob/${finalAttrs.version}/HISTORY.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 1eba6059e52c93e85161e5741dfdd9a83535350b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 08:48:06 -0500
Subject: [PATCH 110/339] =?UTF-8?q?yaziPlugins.mediainfo:=200-unstable-202?=
 =?UTF-8?q?6-06-03=20=E2=86=92=200-unstable-2026-06-06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compare: https://github.com/boydaihungst/mediainfo.yazi/compare/ef8105a52b2f2bc59aeef38e02b2c69418131352...a6d30a1c85faabe9bab215b83efb3c646b4c2924
---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 45f9c9350898..03d86c88dd55 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "0-unstable-2026-06-03";
+  version = "0-unstable-2026-06-06";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "ef8105a52b2f2bc59aeef38e02b2c69418131352";
-    hash = "sha256-1qHCeLn6bPdOs3Z176367t6/m9sothyqHe+rqkKqgiI=";
+    rev = "a6d30a1c85faabe9bab215b83efb3c646b4c2924";
+    hash = "sha256-s2/6ljln64oVbKVFTGbRdxB8x9ASCo7FKDvC65eyDWM=";
   };
 
   meta = {

From b7759b11f1bff67b9801d222d5013e47450d24ed Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 08:49:21 -0500
Subject: [PATCH 111/339] =?UTF-8?q?yaziPlugins.starship:=200-unstable-2026?=
 =?UTF-8?q?-03-22=20=E2=86=92=200-unstable-2026-06-14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compare: https://github.com/Rolv-Apneseth/starship.yazi/compare/a83710153ab5625a64ef98d55e6ddad480a3756f...159eaba5b5052bf78ff6cfbfe4e527b946818c82
---
 pkgs/by-name/ya/yazi/plugins/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
index 7f9f40d8a45e..36348ba2902b 100644
--- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "starship.yazi";
-  version = "0-unstable-2026-03-22";
+  version = "0-unstable-2026-06-14";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "starship.yazi";
-    rev = "a83710153ab5625a64ef98d55e6ddad480a3756f";
-    hash = "sha256-CPRVJVunBLwFLCoj+XfoIIwrrwHxqoElbskCXZgFraw=";
+    rev = "159eaba5b5052bf78ff6cfbfe4e527b946818c82";
+    hash = "sha256-I21to4cxlszRpsb58cvsmwX7VglQBSJC0rrsFIltzC8=";
   };
 
   meta = {

From 3587874e51753c90bc50ace422d0486233ef59a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 14:10:14 +0000
Subject: [PATCH 112/339] signalbackup-tools: 20260603-1 -> 20260615

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

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 11366c865466..aafc51dbd2a3 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "signalbackup-tools";
-  version = "20260603-1";
+  version = "20260615";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = finalAttrs.version;
-    hash = "sha256-Y4RxuDVb9nkAMzTmasznCNsO31jxpDDd2eG9l04bGDg=";
+    hash = "sha256-T/LMv2HbdGo8OViAz2/QFiBXSLqDpkXH5XMvA6H7I70=";
   };
 
   nativeBuildInputs = [

From 652521ca8e427171e7c96a3a1f0993d34a6f4952 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:25:27 +0700
Subject: [PATCH 113/339] python3Packages.xstatic: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
index cbf3b968d58b..f50958bee5bc 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -2,12 +2,13 @@
   buildPythonPackage,
   lib,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "xstatic";
   version = "1.0.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "XStatic";
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg=";
   };
 
+  build-system = [ setuptools ];
+
   # no tests implemented
   doCheck = false;
 

From a7e6577b2aaa1381654a351a0fc50751704e4a7d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:27:23 +0700
Subject: [PATCH 114/339] python3Packages.xstatic: modernize

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

diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
index f50958bee5bc..3b4071a971be 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -5,14 +5,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "xstatic";
   version = "1.0.3";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     pname = "XStatic";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg=";
   };
 
@@ -21,10 +23,12 @@ buildPythonPackage rec {
   # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "xstatic" ];
+
   meta = {
     homepage = "https://bitbucket.org/thomaswaldmann/xstatic";
     description = "Base packaged static files for python";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ makefu ];
   };
-}
+})

From c42f6ec3b8f86f6b0faec5255eedaeb53f11fb1f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:28:49 +0700
Subject: [PATCH 115/339] python3Packages.xstatic: unbreak meta.homepage

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

diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
index 3b4071a971be..9b50ad332bf0 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
   pythonImportsCheck = [ "xstatic" ];
 
   meta = {
-    homepage = "https://bitbucket.org/thomaswaldmann/xstatic";
+    homepage = "https://github.com/xstatic-py/xstatic";
     description = "Base packaged static files for python";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ makefu ];

From 4a3079eda3efa38d80f83c9e459b8d3923ee4219 Mon Sep 17 00:00:00 2001
From: Sam Pointon <sampointon@gmail.com>
Date: Mon, 15 Jun 2026 14:31:00 +0100
Subject: [PATCH 116/339] systems: set rust.platform.env as rustc does

rustc allows code to perform compile-time tests against target_env [0],
which is a function of the target triple. There isn't provision in
Nixpkgs for learning target_env, however. That doesn't affect rustc's
evaluation of cfg guards in Rust code - rustc knows perfectly well what
target_env is - but it _does_ affect the env vars passed to a build
script set by buildRustCrate, which is presently hard-coded to gnu, and
also affects any Nix code looking to branch on target_env.

Being able to access target_env is very relevant to, for example, WASI
as (using Rust terminology) wasm32-wasip1 and wasm32-wasip2 differ only
by target_env, with identical target_arch and target_os values. Properly
reflecting target_env may also fix some random musl issues if you're a
bit lucky.

This commit adds a new attr, rust.platform.env, which reflects the
target_env that rustc will set for the target, and wires it up in
buildRustCrate. In isolation, this change mostly only affects build
scripts checking target_env, but crate2nix will greatly benefit from
being able to accurately resolve the dep graph (which can also vary
depending on target_env).

The target triple -> target_env function resists Kolmogorov compression:
it's irregular and, though there are some patterns, there are lots of
special cases. So, I have done the stupidest possible thing and scraped
out all of the targets with non-empty target_env values and dumped that
into an attrset. This attrset will progressively get out of date as
rustc adds new platforms, but updating it should be simple enough - I've
included the generation script as a comment.

There are some other configuration options not being reflected in Nix. I
have left those alone, but, in the future, maybe this can be extended to
just dumping all of them into an attrset and then reflecting them in
rust.platform. It might even make sense to convert the existing code
producing rust.platform to just looking up from an attrset and to 'do
what rustc does'.

I would have liked to have added a test targetting a platform with a
non-empty non-GNU target_env, but all of the yaks were quite hairy.

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

[0]: https://doc.rust-lang.org/reference/conditional-compilation.html#r-cfg.target_env
---
 lib/systems/default.nix                       |  11 ++
 lib/systems/rustc-target-env.nix              | 160 ++++++++++++++++++
 .../rust/build-rust-crate/configure-crate.nix |   2 +-
 .../rust/build-rust-crate/test/default.nix    |  60 +++++++
 4 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 lib/systems/rustc-target-env.nix

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 53c095711aef..72fe1f549cf3 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -23,6 +23,7 @@ let
   platforms = import ./platforms.nix { inherit lib; };
   examples = import ./examples.nix { inherit lib; };
   architectures = import ./architectures.nix { inherit lib; };
+  rustc-target-env = import ./rustc-target-env.nix;
 
   /**
     Elaborated systems contain functions, which means that they don't satisfy
@@ -449,6 +450,16 @@ let
                 else
                   final.parsed.cpu.name;
 
+              # https://doc.rust-lang.org/reference/conditional-compilation.html#target_env
+              # Accomodate system definitions written before Nixpkgs learned about target_env.
+              env =
+                if rust ? platform.env then
+                  rust.platform.env
+                else if rustc-target-env ? ${final.rust.rustcTargetSpec} then
+                  rustc-target-env.${final.rust.rustcTargetSpec}
+                else
+                  "";
+
               # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
               os =
                 if rust ? platform then
diff --git a/lib/systems/rustc-target-env.nix b/lib/systems/rustc-target-env.nix
new file mode 100644
index 000000000000..a0bb0b66dc9c
--- /dev/null
+++ b/lib/systems/rustc-target-env.nix
@@ -0,0 +1,160 @@
+# As of rustc 1.96.0. Empty `target_env` values are omitted.
+#
+# Generation script:
+# #!/bin/bash
+# rustc --print target-list | while read -r target ; do
+#     env=$(rustc --print cfg --target "$target" | grep '^target_env=' | sed 's/# ^target_env="//;s/"$//')
+#     [[ -z "$env" ]] && continue
+#     printf '  %s = "%s";\n' "$target" "$env"
+# done
+{
+  aarch64-apple-ios-macabi = "macabi";
+  aarch64-apple-ios-sim = "sim";
+  aarch64-apple-tvos-sim = "sim";
+  aarch64-apple-visionos-sim = "sim";
+  aarch64-apple-watchos-sim = "sim";
+  aarch64-pc-windows-gnullvm = "gnu";
+  aarch64-pc-windows-msvc = "msvc";
+  aarch64-unknown-linux-gnu = "gnu";
+  aarch64-unknown-linux-gnu_ilp32 = "gnu";
+  aarch64-unknown-linux-musl = "musl";
+  aarch64-unknown-linux-ohos = "ohos";
+  aarch64-unknown-managarm-mlibc = "mlibc";
+  aarch64-unknown-nto-qnx700 = "nto70";
+  aarch64-unknown-nto-qnx710 = "nto71";
+  aarch64-unknown-nto-qnx710_iosock = "nto71_iosock";
+  aarch64-unknown-nto-qnx800 = "nto80";
+  aarch64-unknown-redox = "relibc";
+  aarch64-uwp-windows-msvc = "msvc";
+  aarch64-wrs-vxworks = "gnu";
+  aarch64_be-unknown-linux-gnu = "gnu";
+  aarch64_be-unknown-linux-gnu_ilp32 = "gnu";
+  aarch64_be-unknown-linux-musl = "musl";
+  arm-unknown-linux-gnueabi = "gnu";
+  arm-unknown-linux-gnueabihf = "gnu";
+  arm-unknown-linux-musleabi = "musl";
+  arm-unknown-linux-musleabihf = "musl";
+  arm64ec-pc-windows-msvc = "msvc";
+  armeb-unknown-linux-gnueabi = "gnu";
+  armv4t-unknown-linux-gnueabi = "gnu";
+  armv5te-unknown-linux-gnueabi = "gnu";
+  armv5te-unknown-linux-musleabi = "musl";
+  armv5te-unknown-linux-uclibceabi = "uclibc";
+  armv6k-nintendo-3ds = "newlib";
+  armv7-rtems-eabihf = "newlib";
+  armv7-sony-vita-newlibeabihf = "newlib";
+  armv7-unknown-linux-gnueabi = "gnu";
+  armv7-unknown-linux-gnueabihf = "gnu";
+  armv7-unknown-linux-musleabi = "musl";
+  armv7-unknown-linux-musleabihf = "musl";
+  armv7-unknown-linux-ohos = "ohos";
+  armv7-unknown-linux-uclibceabi = "uclibc";
+  armv7-unknown-linux-uclibceabihf = "uclibc";
+  armv7-wrs-vxworks-eabihf = "gnu";
+  armv7a-vex-v5 = "v5";
+  csky-unknown-linux-gnuabiv2 = "gnu";
+  csky-unknown-linux-gnuabiv2hf = "gnu";
+  hexagon-unknown-linux-musl = "musl";
+  i386-apple-ios = "sim";
+  i586-unknown-linux-gnu = "gnu";
+  i586-unknown-linux-musl = "musl";
+  i586-unknown-redox = "relibc";
+  i686-pc-nto-qnx700 = "nto70";
+  i686-pc-windows-gnu = "gnu";
+  i686-pc-windows-gnullvm = "gnu";
+  i686-pc-windows-msvc = "msvc";
+  i686-unknown-hurd-gnu = "gnu";
+  i686-unknown-linux-gnu = "gnu";
+  i686-unknown-linux-musl = "musl";
+  i686-uwp-windows-gnu = "gnu";
+  i686-uwp-windows-msvc = "msvc";
+  i686-win7-windows-gnu = "gnu";
+  i686-win7-windows-msvc = "msvc";
+  i686-wrs-vxworks = "gnu";
+  loongarch64-unknown-linux-gnu = "gnu";
+  loongarch64-unknown-linux-musl = "musl";
+  loongarch64-unknown-linux-ohos = "ohos";
+  m68k-unknown-linux-gnu = "gnu";
+  mips-unknown-linux-gnu = "gnu";
+  mips-unknown-linux-musl = "musl";
+  mips-unknown-linux-uclibc = "uclibc";
+  mips64-openwrt-linux-musl = "musl";
+  mips64-unknown-linux-gnuabi64 = "gnu";
+  mips64-unknown-linux-muslabi64 = "musl";
+  mips64el-unknown-linux-gnuabi64 = "gnu";
+  mips64el-unknown-linux-muslabi64 = "musl";
+  mipsel-unknown-linux-gnu = "gnu";
+  mipsel-unknown-linux-musl = "musl";
+  mipsel-unknown-linux-uclibc = "uclibc";
+  mipsisa32r6-unknown-linux-gnu = "gnu";
+  mipsisa32r6el-unknown-linux-gnu = "gnu";
+  mipsisa64r6-unknown-linux-gnuabi64 = "gnu";
+  mipsisa64r6el-unknown-linux-gnuabi64 = "gnu";
+  powerpc-unknown-linux-gnu = "gnu";
+  powerpc-unknown-linux-gnuspe = "gnu";
+  powerpc-unknown-linux-musl = "musl";
+  powerpc-unknown-linux-muslspe = "musl";
+  powerpc-wrs-vxworks = "gnu";
+  powerpc-wrs-vxworks-spe = "gnu";
+  powerpc64-unknown-linux-gnu = "gnu";
+  powerpc64-unknown-linux-musl = "musl";
+  powerpc64-wrs-vxworks = "gnu";
+  powerpc64le-unknown-linux-gnu = "gnu";
+  powerpc64le-unknown-linux-musl = "musl";
+  riscv32-wrs-vxworks = "gnu";
+  riscv32gc-unknown-linux-gnu = "gnu";
+  riscv32gc-unknown-linux-musl = "musl";
+  riscv32imac-esp-espidf = "newlib";
+  riscv32imafc-esp-espidf = "newlib";
+  riscv32imc-esp-espidf = "newlib";
+  riscv64-wrs-vxworks = "gnu";
+  riscv64a23-unknown-linux-gnu = "gnu";
+  riscv64gc-unknown-linux-gnu = "gnu";
+  riscv64gc-unknown-linux-musl = "musl";
+  riscv64gc-unknown-managarm-mlibc = "mlibc";
+  riscv64gc-unknown-redox = "relibc";
+  s390x-unknown-linux-gnu = "gnu";
+  s390x-unknown-linux-musl = "musl";
+  sparc-unknown-linux-gnu = "gnu";
+  sparc64-unknown-linux-gnu = "gnu";
+  thumbv7a-pc-windows-msvc = "msvc";
+  thumbv7a-uwp-windows-msvc = "msvc";
+  thumbv7neon-unknown-linux-gnueabihf = "gnu";
+  thumbv7neon-unknown-linux-musleabihf = "musl";
+  wasm32-wali-linux-musl = "musl";
+  wasm32-wasip1 = "p1";
+  wasm32-wasip1-threads = "p1";
+  wasm32-wasip2 = "p2";
+  wasm32-wasip3 = "p3";
+  x86_64-apple-ios = "sim";
+  x86_64-apple-ios-macabi = "macabi";
+  x86_64-apple-tvos = "sim";
+  x86_64-apple-watchos-sim = "sim";
+  x86_64-fortanix-unknown-sgx = "sgx";
+  x86_64-pc-nto-qnx710 = "nto71";
+  x86_64-pc-nto-qnx710_iosock = "nto71_iosock";
+  x86_64-pc-nto-qnx800 = "nto80";
+  x86_64-pc-windows-gnu = "gnu";
+  x86_64-pc-windows-gnullvm = "gnu";
+  x86_64-pc-windows-msvc = "msvc";
+  x86_64-unikraft-linux-musl = "musl";
+  x86_64-unknown-hurd-gnu = "gnu";
+  x86_64-unknown-l4re-uclibc = "uclibc";
+  x86_64-unknown-linux-gnu = "gnu";
+  x86_64-unknown-linux-gnuasan = "gnu";
+  x86_64-unknown-linux-gnumsan = "gnu";
+  x86_64-unknown-linux-gnutsan = "gnu";
+  x86_64-unknown-linux-gnux32 = "gnu";
+  x86_64-unknown-linux-musl = "musl";
+  x86_64-unknown-linux-ohos = "ohos";
+  x86_64-unknown-managarm-mlibc = "mlibc";
+  x86_64-unknown-redox = "relibc";
+  x86_64-uwp-windows-gnu = "gnu";
+  x86_64-uwp-windows-msvc = "msvc";
+  x86_64-win7-windows-gnu = "gnu";
+  x86_64-win7-windows-msvc = "msvc";
+  x86_64-wrs-vxworks = "gnu";
+  xtensa-esp32-espidf = "newlib";
+  xtensa-esp32s2-espidf = "newlib";
+  xtensa-esp32s3-espidf = "newlib";
+}
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 060ce25df8db..6d7b530454d9 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -148,7 +148,7 @@ in
   export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os}
   export CARGO_CFG_TARGET_FAMILY="unix"
   export CARGO_CFG_UNIX=1
-  export CARGO_CFG_TARGET_ENV="gnu"
+  export CARGO_CFG_TARGET_ENV=${stdenv.hostPlatform.rust.platform.env}
   export CARGO_CFG_TARGET_ENDIAN=${
     if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"
   }
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 7e05e49072ab..b0f9dd4190f8 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1008,6 +1008,66 @@ rec {
         ];
       };
 
+      crateWasm32TargetEnv = assertOutputs {
+        name = "gnu64-crate-target-env";
+        mkCrate = mkCrate pkgsCross.wasm32-unknown-none.buildRustCrate;
+        crateArgs = {
+          crateName = "wasm32-crate-target-env";
+          crateBin = [ { name = "wasm32-crate-target-env"; } ];
+          src = symlinkJoin {
+            name = "wasm32-crate-target-env-sources";
+            paths = [
+              (mkFile "build.rs" ''
+                fn main() {
+                  assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("".to_string()));
+                }
+              '')
+              (mkFile "src/main.rs" ''
+                use std::env;
+                #[cfg(target_env = "")]
+                fn main() {
+                  let name: String = env::args().nth(0).unwrap();
+                  println!("executed {}", name);
+                }
+              '')
+            ];
+          };
+        };
+        expectedFiles = [
+          "./bin/wasm32-crate-target-env.wasm"
+        ];
+      };
+
+      crateGnu64TargetEnv = assertOutputs {
+        name = "gnu64-crate-target-env";
+        mkCrate = mkCrate pkgsCross.gnu64.buildRustCrate;
+        crateArgs = {
+          crateName = "gnu64-crate-target-env";
+          crateBin = [ { name = "gnu64-crate-target-env"; } ];
+          src = symlinkJoin {
+            name = "gnu64-crate-target-env-sources";
+            paths = [
+              (mkFile "build.rs" ''
+                fn main() {
+                  assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("gnu".to_string()));
+                }
+              '')
+              (mkFile "src/main.rs" ''
+                use std::env;
+                #[cfg(target_env = "gnu")]
+                fn main() {
+                  let name: String = env::args().nth(0).unwrap();
+                  println!("executed {}", name);
+                }
+              '')
+            ];
+          };
+        };
+        expectedFiles = [
+          "./bin/gnu64-crate-target-env"
+        ];
+      };
+
       brotliTest =
         let
           pkg = brotliCrates.brotli_2_5_0 { };

From f347c80e99d0870f8c5225410f10ec1e849240ad Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 22:22:40 +0700
Subject: [PATCH 117/339] python3Packages.volvooncall: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index ac459dd7aaa1..eb87829a3382 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -7,6 +7,7 @@
   docopt,
   fetchFromGitHub,
   fetchpatch,
+  setuptools,
   geopy,
   mock,
   pytest-asyncio_0,
@@ -16,7 +17,7 @@
 buildPythonPackage rec {
   pname = "volvooncall";
   version = "0.10.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "molobrakos";
@@ -34,7 +35,9 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   optional-dependencies = {
     console = [

From 3c87485efdac5778710383c5fa9d36bf45f94544 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 22:24:11 +0700
Subject: [PATCH 118/339] python3Packages.volvooncall: modernize

---
 .../python-modules/volvooncall/default.nix           | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index eb87829a3382..ccb531b46691 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -14,15 +14,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "volvooncall";
   version = "0.10.4";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "molobrakos";
     repo = "volvooncall";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xr3g93rt3jvxVZrZY7cFh5eBP3k0arsejsgvx8p5EV4=";
   };
 
@@ -56,16 +58,16 @@ buildPythonPackage rec {
     pytest-asyncio_0
     pytestCheckHook
   ]
-  ++ optional-dependencies.mqtt;
+  ++ finalAttrs.passthru.optional-dependencies.mqtt;
 
   pythonImportsCheck = [ "volvooncall" ];
 
   meta = {
     description = "Retrieve information from the Volvo On Call web service";
     homepage = "https://github.com/molobrakos/volvooncall";
-    changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}";
+    changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.unlicense;
     mainProgram = "voc";
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From 8c0d1c7322d9d6700377e385390720c455d47099 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 22:48:49 +0700
Subject: [PATCH 119/339] python3Packages.wasabi: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index 57f498e3c13d..3476c4c76e77 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 
   # tests
   ipykernel,
@@ -13,13 +14,15 @@
 buildPythonPackage rec {
   pname = "wasabi";
   version = "1.1.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-S7MAjwA4CdsMPii02vIJBuqHGiu0P5kUGX1UD08uCHg=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     ipykernel
     nbconvert

From 9fcfac5c0acac80ced628cf39c2c16c441bf3fdd Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 22:49:54 +0700
Subject: [PATCH 120/339] python3Packages.wasabi: modernize

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

diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index 3476c4c76e77..a4c6d00c91fb 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -11,13 +11,15 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "wasabi";
   version = "1.1.3";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-S7MAjwA4CdsMPii02vIJBuqHGiu0P5kUGX1UD08uCHg=";
   };
 
@@ -37,8 +39,8 @@ buildPythonPackage rec {
   meta = {
     description = "Lightweight console printing and formatting toolkit";
     homepage = "https://github.com/ines/wasabi";
-    changelog = "https://github.com/ines/wasabi/releases/tag/v${version}";
+    changelog = "https://github.com/ines/wasabi/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From f60b2dc9bf350b1b4edd723606d574c8b5e17b2a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 22:50:55 +0700
Subject: [PATCH 121/339] python3Packages.wasabi: fix meta URLs (ines ->
 explosion)

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

diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index a4c6d00c91fb..286cdf7a1ecd 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -38,8 +38,8 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     description = "Lightweight console printing and formatting toolkit";
-    homepage = "https://github.com/ines/wasabi";
-    changelog = "https://github.com/ines/wasabi/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/explosion/wasabi";
+    changelog = "https://github.com/explosion/wasabi/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };

From 5986fcd20fa8cdc00a6df3eb5fdfae66b4c3fee2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 15:54:45 +0000
Subject: [PATCH 122/339] mochi: 1.21.14 -> 1.21.16

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

diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix
index 8eb6000d6abd..0f41fbeb5f90 100644
--- a/pkgs/by-name/mo/mochi/package.nix
+++ b/pkgs/by-name/mo/mochi/package.nix
@@ -12,14 +12,14 @@
 
 let
   pname = "mochi";
-  version = "1.21.14";
+  version = "1.21.16";
 
   linux = appimageTools.wrapType2 rec {
     inherit pname version meta;
 
     src = fetchurl {
       url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage";
-      hash = "sha256-+iMT8xofQB2m1V4rNZHR6loRfxNGgcptD3FPlFXC5Mw=";
+      hash = "sha256-LWwv/+2/djc2bdqhnJiG5etXg+MFaEZbpttewVBZdeg=";
     };
 
     appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -44,9 +44,9 @@ let
       url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg";
       hash =
         if stdenv.hostPlatform.isAarch64 then
-          "sha256-/ML5jWTBVLzitZDaBoU6sVJ0iNmq0jjMIV33yLnX1io="
+          "sha256-dtdQZYGrukT/UgfNdsnGxOYmpuebJCDHXW8cAGN2GZE="
         else
-          "sha256-vldyC/VkHf+BofpKvOxzCTM8F77k2aX9CxFP+frKvKc=";
+          "sha256-FdNFpuIOMgRzniB9Aze3GUpNY27h++StTdwqfF1k07I=";
     };
 
     sourceRoot = ".";

From f40fc1dd1c9c1d7d25f281fcfeea26996a3ca073 Mon Sep 17 00:00:00 2001
From: nix-julia <nix-julia2@proton.me>
Date: Mon, 15 Jun 2026 16:09:40 +0330
Subject: [PATCH 123/339] vazir-fonts: rename to vazirmatn and use installFonts
 hook

---
 .../va/{vazir-fonts => vazirmatn}/package.nix | 27 +++++++++++--------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 17 insertions(+), 11 deletions(-)
 rename pkgs/by-name/va/{vazir-fonts => vazirmatn}/package.nix (56%)

diff --git a/pkgs/by-name/va/vazir-fonts/package.nix b/pkgs/by-name/va/vazirmatn/package.nix
similarity index 56%
rename from pkgs/by-name/va/vazir-fonts/package.nix
rename to pkgs/by-name/va/vazirmatn/package.nix
index a5b32ddb5dd0..cc8e45175041 100644
--- a/pkgs/by-name/va/vazir-fonts/package.nix
+++ b/pkgs/by-name/va/vazirmatn/package.nix
@@ -2,34 +2,39 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation rec {
-  pname = "vazir-fonts";
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "vazirmatn";
   version = "33.003";
 
   src = fetchFromGitHub {
     owner = "rastikerdar";
-    repo = "vazir-font";
-    rev = "v${version}";
+    repo = "vazirmatn";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-C1UtfrRFzz0uv/hj8e7huXe4sNd5h7ozVhirWEAyXGg=";
   };
-
+  __structuredAttrs = true;
+  strictDeps = true;
   dontBuild = true;
 
+  outputs = [
+    "out"
+    "webfont"
+  ];
+  nativeBuildInputs = [ installFonts ];
+
   installPhase = ''
     runHook preInstall
-
-    find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
-
     runHook postInstall
   '';
 
   meta = {
-    homepage = "https://github.com/rastikerdar/vazir-font";
-    description = "Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
+    homepage = "https://github.com/rastikerdar/vazirmatn";
+    description = "Persian (Farsi) Font - قلم (فونت) فارسی وزیرمتن";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 244fbb2fdfa1..726877e4610a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2235,6 +2235,7 @@ mapAliases {
   varnish77 = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01
   varnish77Packages = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01
   vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
+  vazir-fonts = throw "'vazir-fonts' has been renamed to 'vazirmatn'"; # Added 2026-06-15
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vboot_reference = vboot-utils; # Added 2025-11-01
   vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20

From 414f453f3350fd05d45b6e3a928d732e674b6353 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 23:18:38 +0700
Subject: [PATCH 124/339] python3Packages.webthing: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix
index 24712666a4d8..0c011a1906d3 100644
--- a/pkgs/development/python-modules/webthing/default.nix
+++ b/pkgs/development/python-modules/webthing/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   ifaddr,
   jsonschema,
   pyee,
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "webthing";
   version = "0.15.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "WebThingsIO";
@@ -21,7 +22,9 @@ buildPythonPackage rec {
     hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     ifaddr
     jsonschema
     pyee

From fe42f0be9f9776aa2a72a4a7c557ab79b8979fa3 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 23:20:27 +0700
Subject: [PATCH 125/339] python3Packages.webthing: modernize

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

diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix
index 0c011a1906d3..1fad7df705ec 100644
--- a/pkgs/development/python-modules/webthing/default.nix
+++ b/pkgs/development/python-modules/webthing/default.nix
@@ -10,15 +10,17 @@
   zeroconf,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "webthing";
   version = "0.15.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "WebThingsIO";
     repo = "webthing-python";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg=";
   };
 
@@ -43,4 +45,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mpl20 ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 40b38170c34dff312b965a01e9717368789e5c26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 16:57:29 +0000
Subject: [PATCH 126/339] iroh-dns-server: 0.98.2 -> 1.0.0

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

diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix
index df44ce53c60b..d0dc19d8b749 100644
--- a/pkgs/tools/networking/iroh/default.nix
+++ b/pkgs/tools/networking/iroh/default.nix
@@ -12,16 +12,16 @@ let
     }:
     rustPlatform.buildRustPackage rec {
       pname = name;
-      version = "0.98.2";
+      version = "1.0.0";
 
       src = fetchFromGitHub {
         owner = "n0-computer";
         repo = "iroh";
         rev = "v${version}";
-        hash = "sha256-oYKl0dJLJtn2HDxu0ajlhzEWL741h4yN8ZVEQq2dwRk=";
+        hash = "sha256-L5y2/u5Sxh0tnl1NJS5dcRVLHDExHMiF12p0gRY2fzM=";
       };
 
-      cargoHash = "sha256-hO7bJt4RnqE8PLvemISqN7fqIjDbVPHZrW5AQlGJeqw=";
+      cargoHash = "sha256-R6b1BfKlgFCcPSif0qMHCj/gZ6v2beawbF4P3knkROw=";
 
       buildFeatures = cargoFeatures;
       cargoBuildFlags = [

From 36977f32c32fea458c8f65755055a46305a0be0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 16:57:35 +0000
Subject: [PATCH 127/339] iroh-relay: 0.98.2 -> 1.0.0

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

diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix
index df44ce53c60b..d0dc19d8b749 100644
--- a/pkgs/tools/networking/iroh/default.nix
+++ b/pkgs/tools/networking/iroh/default.nix
@@ -12,16 +12,16 @@ let
     }:
     rustPlatform.buildRustPackage rec {
       pname = name;
-      version = "0.98.2";
+      version = "1.0.0";
 
       src = fetchFromGitHub {
         owner = "n0-computer";
         repo = "iroh";
         rev = "v${version}";
-        hash = "sha256-oYKl0dJLJtn2HDxu0ajlhzEWL741h4yN8ZVEQq2dwRk=";
+        hash = "sha256-L5y2/u5Sxh0tnl1NJS5dcRVLHDExHMiF12p0gRY2fzM=";
       };
 
-      cargoHash = "sha256-hO7bJt4RnqE8PLvemISqN7fqIjDbVPHZrW5AQlGJeqw=";
+      cargoHash = "sha256-R6b1BfKlgFCcPSif0qMHCj/gZ6v2beawbF4P3knkROw=";
 
       buildFeatures = cargoFeatures;
       cargoBuildFlags = [

From 069e192d02b2df8d2c9830cc1646bf7b3a03f9ea Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 15 Jun 2026 20:58:48 +0300
Subject: [PATCH 128/339] lasuite-meet: 1.17.0 -> 1.21.0

---
 pkgs/by-name/la/lasuite-meet/addon-outlook.nix | 2 +-
 pkgs/by-name/la/lasuite-meet/frontend.nix      | 2 +-
 pkgs/by-name/la/lasuite-meet/mail.nix          | 2 +-
 pkgs/by-name/la/lasuite-meet/package.nix       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix
index f578f0635d9a..3dfb7faf8ec7 100644
--- a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix
+++ b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix
@@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) version src sourceRoot;
-    hash = "sha256-ReYXXYFzqZl0HWAgLdlw25ZamZJ06Aez8g1Tv/Nt3cE=";
+    hash = "sha256-1CoY0A4KMdn76SbgfRULn+O4yZhJgwNdk/bZ9Fk2rwY=";
   };
   npmBuildScript = "build";
 
diff --git a/pkgs/by-name/la/lasuite-meet/frontend.nix b/pkgs/by-name/la/lasuite-meet/frontend.nix
index 620641681dbe..a6ff5debfd6e 100644
--- a/pkgs/by-name/la/lasuite-meet/frontend.nix
+++ b/pkgs/by-name/la/lasuite-meet/frontend.nix
@@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) version src sourceRoot;
-    hash = "sha256-Dd0wqssmLBfHkOHI5aactLnCPG4JxPLhNC+eo//QRXM=";
+    hash = "sha256-YnHjuwDp293KVNTYTd4KcZqMamZNeccOdpSGgJ9a3G8=";
   };
   npmBuildScript = "build";
 
diff --git a/pkgs/by-name/la/lasuite-meet/mail.nix b/pkgs/by-name/la/lasuite-meet/mail.nix
index 542433488845..128b5f6e8dee 100644
--- a/pkgs/by-name/la/lasuite-meet/mail.nix
+++ b/pkgs/by-name/la/lasuite-meet/mail.nix
@@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
     pname = "${finalAttrs.pname}-npm-deps";
     inherit version src;
     inherit (finalAttrs) sourceRoot;
-    hash = "sha256-dvOmSQjtw7Qv3H+flOcXDaIxQzf9YBmsQo7jmSTA7tI=";
+    hash = "sha256-yq88kbrKn9HMwvxcWNXm7zonAqTs8T2i7iQAsD0TtnU=";
   };
   npmBuildScript = "build";
 
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index aef6663aaed2..ee61defe5c5e 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -6,13 +6,13 @@
   python3,
 }:
 let
-  version = "1.17.0";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-hmkJwFYTBTbYsroegaRp/dcaNmeyPQ0Rbh/D1PGbh04=";
+    hash = "sha256-pUCSdnTBj/qwc0cya3P96r89r2K1GNSGg4DeIhxUKwI=";
   };
 
   meta = {
@@ -46,7 +46,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build"
+      --replace-fail "uv_build>=0.11.16,<0.12.0" "uv_build"
   '';
 
   build-system = with python.pkgs; [ uv-build ];

From c67573daa23b2377e9ea8e370e6d231b54e12794 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 15 Jun 2026 11:18:13 -0700
Subject: [PATCH 129/339] abc-verifier: update license to be more precise

---
 pkgs/by-name/ab/abc-verifier/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ab/abc-verifier/package.nix b/pkgs/by-name/ab/abc-verifier/package.nix
index d88b202e3419..f992190b36b0 100644
--- a/pkgs/by-name/ab/abc-verifier/package.nix
+++ b/pkgs/by-name/ab/abc-verifier/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool for sequential logic synthesis and formal verification";
     homepage = "https://people.eecs.berkeley.edu/~alanmi/abc";
-    license = lib.licenses.mit;
+    license = lib.licenses.mit-modern;
     maintainers = with lib.maintainers; [
       thoughtpolice
       Luflosi

From fb7d30da81b06518f38784c0ac8abf6435cc84fb Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 15 Jun 2026 10:34:22 -0400
Subject: [PATCH 130/339] elixir/erlang: deprecated top-level attributes

These top-level attributes are duplicative, and more likely to cause footguns
for users. Let's deprecate them and direct people to use the package sets.
---
 pkgs/by-name/cl/cl/package.nix                |  4 ++--
 .../er/erlang-language-platform/package.nix   |  4 ++--
 pkgs/by-name/gl/gleam/package.nix             |  4 ++--
 pkgs/by-name/me/mercury/package.nix           |  6 ++---
 pkgs/by-name/pl/plausible/package.nix         |  3 +--
 pkgs/by-name/ra/rabbitmq-server/package.nix   |  3 +--
 pkgs/by-name/ts/tsung/package.nix             |  4 ++--
 pkgs/by-name/wi/wings/package.nix             |  6 ++---
 pkgs/by-name/ya/yaws/package.nix              |  4 ++--
 pkgs/servers/http/couchdb/3.nix               |  4 ++--
 pkgs/top-level/aliases.nix                    |  9 +++++++
 pkgs/top-level/all-packages.nix               | 24 ++-----------------
 12 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/cl/cl/package.nix b/pkgs/by-name/cl/cl/package.nix
index 33f19af1798b..0ed69f19ed7e 100644
--- a/pkgs/by-name/cl/cl/package.nix
+++ b/pkgs/by-name/cl/cl/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   rebar3,
-  erlang,
+  beamPackages,
   opencl-headers,
   ocl-icd,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    erlang
+    beamPackages.erlang
     rebar3
     opencl-headers
     ocl-icd
diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix
index cdb1d13e0ba1..6288fddca42a 100644
--- a/pkgs/by-name/er/erlang-language-platform/package.nix
+++ b/pkgs/by-name/er/erlang-language-platform/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchurl,
   autoPatchelfHook,
-  erlang,
+  beamPackages,
 }:
 let
   # erlang-language-platform supports multiple OTP versions.
@@ -15,7 +15,7 @@ let
       "elp-macos-${arch}-apple-darwin"
     else
       "elp-linux-${arch}-unknown-linux-gnu";
-  otp_version = "otp-${lib.versions.major erlang.version}";
+  otp_version = "otp-${lib.versions.major beamPackages.erlang.version}";
   release_major = "${platform}-${otp_version}";
 
   hashes = builtins.fromJSON (builtins.readFile ./hashes.json);
diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index 928c7f2613e3..ec64c958c1c5 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   git,
   pkg-config,
-  erlang,
+  beamPackages,
   nodejs,
   bun,
   deno,
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    erlang
+    beamPackages.erlang
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/me/mercury/package.nix b/pkgs/by-name/me/mercury/package.nix
index 10a1d8b570c0..45326948f2ba 100644
--- a/pkgs/by-name/me/mercury/package.nix
+++ b/pkgs/by-name/me/mercury/package.nix
@@ -7,7 +7,7 @@
   bison,
   texinfo,
   openjdk8_headless,
-  erlang,
+  beamPackages,
   makeWrapper,
   readline,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     bison
     texinfo
     openjdk8_headless
-    erlang
+    beamPackages.erlang
     readline
   ];
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/$e \
         --prefix PATH ":" "${gcc}/bin" \
         --prefix PATH ":" "${openjdk8_headless}/bin" \
-        --prefix PATH ":" "${erlang}/bin"
+        --prefix PATH ":" "${beamPackages.erlang}/bin"
     done
   '';
 
diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix
index 3afdb2a5040c..9dbcce981432 100644
--- a/pkgs/by-name/pl/plausible/package.nix
+++ b/pkgs/by-name/pl/plausible/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   beam27Packages,
-  elixir_1_18,
   buildNpmPackage,
   rustPlatform,
   fetchFromGitHub,
@@ -130,7 +129,7 @@ let
           $out/lazy_html/_build/c/third_party/lexbor/${lexborCommit}
       '';
 
-  beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });
+  beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; });
 
 in
 beamPackages.mixRelease rec {
diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix
index 31fe4e99d498..8873c897a339 100644
--- a/pkgs/by-name/ra/rabbitmq-server/package.nix
+++ b/pkgs/by-name/ra/rabbitmq-server/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   beam27Packages,
-  elixir_1_18,
   stdenv,
   fetchurl,
   python3,
@@ -41,7 +40,7 @@ let
     ]
   );
 
-  beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });
+  beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; });
 in
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/ts/tsung/package.nix b/pkgs/by-name/ts/tsung/package.nix
index 66a7ee410d41..bb9c3d065563 100644
--- a/pkgs/by-name/ts/tsung/package.nix
+++ b/pkgs/by-name/ts/tsung/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  erlang,
+  beamPackages,
   python3,
   python3Packages,
   perlPackages,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    erlang
+    beamPackages.erlang
     gnuplot
     perlPackages.perl
     perlPackages.TemplateToolkit
diff --git a/pkgs/by-name/wi/wings/package.nix b/pkgs/by-name/wi/wings/package.nix
index 5f80dc7a6e64..90e6630a65f8 100644
--- a/pkgs/by-name/wi/wings/package.nix
+++ b/pkgs/by-name/wi/wings/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  erlang,
+  beamPackages,
   cl,
   libGL,
   libGLU,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ git ];
   buildInputs = [
-    erlang
+    beamPackages.erlang
     cl
     libGL
     libGLU
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     fi
     cat << EOF > $out/bin/wings
     #!${runtimeShell}
-    ${erlang}/bin/erl \
+    ${beamPackages.erlang}/bin/erl \
       -pa $out/lib/wings-${finalAttrs.version}/ebin -run wings_start start_halt "$@"
     EOF
     chmod +x $out/bin/wings
diff --git a/pkgs/by-name/ya/yaws/package.nix b/pkgs/by-name/ya/yaws/package.nix
index f0fd09dbaa56..433daf076be9 100644
--- a/pkgs/by-name/ya/yaws/package.nix
+++ b/pkgs/by-name/ya/yaws/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  erlang,
+  beamPackages,
   pam,
   perl,
   autoreconfHook,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [
-    erlang
+    beamPackages.erlang
     pam
     perl
   ];
diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix
index a83ce7727d5b..04bb048b4995 100644
--- a/pkgs/servers/http/couchdb/3.nix
+++ b/pkgs/servers/http/couchdb/3.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  erlang,
+  beamMinimalPackages,
   icu,
   openssl,
   python3,
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    erlang
+    beamMinimalPackages.erlang
   ];
 
   buildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 85054366042e..36de6c2ba903 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -687,8 +687,12 @@ mapAliases {
   electron_37 = throw "electron_37 has been removed in favor of newer versions"; # Added 2026-03-20
   electron_37-bin = throw "electron_37-bin has been removed in favor of newer versions"; # Added 2026-03-20
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
+  elixir = warnAlias "'elixir' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir' instead." beamPackages.elixir; # added 2026-06-15
   elixir_1_15 = throw "'elixir_1_15' has been removed, due to the removal of erlang_26 as EOL"; # added 2026-04-01
   elixir_1_16 = throw "'elixir_1_16' has been removed, due to the removal of erlang_26 as EOL"; # added 2026-04-01
+  elixir_1_17 = warnAlias "'elixir_1_17' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir_1_17' instead." beamPackages.elixir_1_17; # added 2026-06-15
+  elixir_1_18 = warnAlias "'elixir_1_18' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir_1_18' instead." beamPackages.elixir_1_18; # added 2026-06-15
+  elixir_1_19 = warnAlias "'elixir_1_19' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.elixir_1_19' instead." beamPackages.elixir_1_19; # added 2026-06-15
   elixir_ls = throw "'elixir_ls' has been renamed to/replaced by 'elixir-ls'"; # Converted to throw 2025-10-27
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
@@ -708,8 +712,11 @@ mapAliases {
   epick = throw "'epick' has been removed as it has been unmaintained upstream since November 2022"; # Added 2026-02-07
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
+  erlang = warnAlias "'erlang' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.erlang' instead." beamPackages.erlang; # added 2026-06-15
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
   erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01
+  erlang_27 = warnAlias "'erlang_27' is deprecated in favor of using the beamPackages sets. Use 'beam27Packages.erlang' instead." beam27Packages.erlang; # added 2026-06-15
+  erlang_28 = warnAlias "'erlang_28' is deprecated in favor of using the beamPackages sets. Use 'beam28Packages.erlang' instead." beam28Packages.erlang; # added 2026-06-15
   esbuild-config = throw "'esbuild-config' has been removed as it has been unmaintained upstream since September 2022"; # Added 2026-02-07
   etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08
   ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28
@@ -717,6 +724,7 @@ mapAliases {
   eureka-ideas = throw "'eureka-ideas' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07
   evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25
   eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
+  ex_doc = warnAlias "'ex_doc' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.ex_doc' instead." beamPackages.ex_doc; # added 2026-06-15
   f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18
   fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   fancontrol-gui = throw "'fancontrol-gui' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01
@@ -1126,6 +1134,7 @@ mapAliases {
   ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
   lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
   lexical = throw "'lexical' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24
+  lfe = warnAlias "'lfe' is deprecated in favor of using the beamPackages sets. Use 'beam27Packages.lfe' instead." beam27Packages.lfe; # added 2026-06-15
   lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
   libAppleWM = libapplewm; # Added 2026-02-04
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cb689540262..b3c659db643e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4617,26 +4617,8 @@ with pkgs;
     wxSupport = false;
   };
 
-  inherit (beam.interpreters)
-    erlang
-    erlang_28
-    erlang_27
-    ;
-
-  inherit (beam.packages.erlang_28.beamPackages)
-    elixir_1_19
-    ;
-
-  inherit (beam.packages.erlang_27.beamPackages)
-    elixir
-    elixir_1_18
-    elixir_1_17
+  inherit (beamPackages)
     elixir-ls
-    ex_doc
-    lfe
-    ;
-
-  inherit (beam.packages.erlang)
     erlfmt
     elvis-erlang
     rebar
@@ -7554,9 +7536,7 @@ with pkgs;
 
   clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
 
-  couchdb3 = callPackage ../servers/http/couchdb/3.nix {
-    erlang = beamMinimalPackages.erlang;
-  };
+  couchdb3 = callPackage ../servers/http/couchdb/3.nix { };
 
   dict = callPackage ../servers/dict {
     flex = flex_2_5_35;

From 34e8e9fce77cdf90f54e6025ce17e0699999bce8 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 2 Jun 2026 19:47:20 +0300
Subject: [PATCH 131/339] compsize: 1.5 -> 1.5-unstable-2023-12-24

Includes a few minor fixes and one significant to big-endian platforms
---
 pkgs/by-name/co/compsize/package.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 1f100808d18d..a3689b475144 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -5,15 +5,15 @@
   btrfs-progs,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "compsize";
-  version = "1.5";
+  version = "1.5-unstable-2023-12-24";
 
   src = fetchFromGitHub {
     owner = "kilobyte";
     repo = "compsize";
-    rev = "v${version}";
-    sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
+    rev = "d79eacf77abe3b799387bb8a4e07a18f1f1031e8";
+    sha256 = "sha256-pwHFllwTznhgZAGtGsULoLLBZlCllGt1eBmUKoJ/2wk=";
   };
 
   patches = [
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
     "PREFIX=${placeholder "out"}"
   ];
 
-  preInstall = ''
-    mkdir -p $out/share/man/man8
-  '';
-
   meta = {
     description = "Find compression type/ratio on a file or set of files in the Btrfs filesystem";
     mainProgram = "compsize";

From 0f05671f5e3671e1c4c76521137ce856a73f256b Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 5 Jun 2026 06:16:40 +0300
Subject: [PATCH 132/339] compsize: add `man` output

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

diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index a3689b475144..408ad2f37e1c 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation {
     ./btrfs-progs-6-10-1.patch
   ];
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   buildInputs = [ btrfs-progs ];
 
   installFlags = [

From 67936cc4f7415aca1d8dba832f08f3eac55c4920 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 15 Jun 2026 04:39:19 +0300
Subject: [PATCH 133/339] compsize: `__structuredAttrs`, `strictDeps`,
 `enableParallelBuilding`

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

diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 408ad2f37e1c..13d736337294 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation {
     ./btrfs-progs-6-10-1.patch
   ];
 
+  __structuredAttrs = true;
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   outputs = [
     "out"
     "man"

From 00c4abb1b1cc05737ef7f7420c3e66eaea99cd3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 19:08:01 +0000
Subject: [PATCH 134/339] c2patool: 0.26.62 -> 0.26.67

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

diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index c6c188658b82..875b10425d84 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "c2patool";
-  version = "0.26.62";
+  version = "0.26.67";
 
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2pa-rs";
     tag = "c2patool-v${finalAttrs.version}";
-    hash = "sha256-OcZQ8z/hQh5oqXf6JTZ7qN4OSQAyewaBKHwID38aWmc=";
+    hash = "sha256-18gGrIleSpSwHohX+Qn6Zj6kPIzNri53tHIBlED5/LY=";
   };
 
-  cargoHash = "sha256-x5QH1iysCdez5V4OQE2xqVXFBpxDygqCrs3MiXNTfTw=";
+  cargoHash = "sha256-YZKQmekJ0RxtyrLkCeiAry+m7j2jhxm0lsQ+Xi29nEw=";
 
   # use the non-vendored openssl
   env.OPENSSL_NO_VENDOR = 1;

From 3c72082c96087f21089257bba20895e01276c725 Mon Sep 17 00:00:00 2001
From: daskladas <xvzrsm@tutanota.de>
Date: Mon, 15 Jun 2026 21:39:12 +0200
Subject: [PATCH 135/339] angle-grinder: 0.19.4 -> 0.19.6

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

diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix
index c73c81853f80..09bd209626a7 100644
--- a/pkgs/by-name/an/angle-grinder/package.nix
+++ b/pkgs/by-name/an/angle-grinder/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "angle-grinder";
-  version = "0.19.4";
+  version = "0.19.6";
 
   src = fetchFromGitHub {
     owner = "rcoh";
     repo = "angle-grinder";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c=";
+    sha256 = "sha256-CkDDX9U3e57fbKA9hwdy1AZ/ZDNpIFe6uvemmc6DcKA=";
   };
 
-  cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU=";
+  cargoHash = "sha256-w1+wdvl4wmxOynsg7SmL5lSASd4Cl4OkMJoIBUmuKGY=";
 
   passthru = {
     updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

From 62d203b03d229f4ee1d01edbbcfbdc155628f9e0 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 15 Jun 2026 19:55:13 +0000
Subject: [PATCH 136/339] legitify: unbreak build

---
 pkgs/by-name/le/legitify/package.nix | 32 ++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix
index 6147fc470318..a87f3ebb535c 100644
--- a/pkgs/by-name/le/legitify/package.nix
+++ b/pkgs/by-name/le/legitify/package.nix
@@ -4,23 +4,42 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "legitify";
   version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "Legit-Labs";
     repo = "legitify";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc=";
   };
 
-  vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU=";
+  vendorHash = "sha256-XPfqQFGJ5yZJVFzHq4zzTXzwuxsAPJvTrZBK+gZWRKE=";
+
+  overrideModAttrs = oldAttrs: {
+    postPatch = (oldAttrs.postPatch or "") + ''
+      export GOCACHE=$TMPDIR/go-cache
+      export GOPATH=$TMPDIR/go
+      go mod edit -replace golang.org/x/tools=golang.org/x/tools@v0.30.0
+      go mod tidy
+    '';
+    postBuild = (oldAttrs.postBuild or "") + ''
+      cp go.mod go.sum vendor/
+    '';
+  };
+
+  preBuild = ''
+    if [ -d vendor ]; then
+      chmod -R u+w vendor
+      cp vendor/go.mod vendor/go.sum .
+    fi
+  '';
 
   ldflags = [
     "-w"
     "-s"
-    "-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}"
+    "-X=github.com/Legit-Labs/legitify/internal/version.Version=${finalAttrs.version}"
   ];
 
   preCheck = ''
@@ -30,10 +49,9 @@ buildGoModule rec {
   meta = {
     description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
     homepage = "https://github.com/Legit-Labs/legitify";
-    changelog = "https://github.com/Legit-Labs/legitify/releases/tag/${src.tag}";
+    changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "legitify";
-    broken = true;
   };
-}
+})

From 31073b23b0f92a9b090752bcb190766a117c8936 Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2026 20:40:55 +0000
Subject: [PATCH 137/339] maintainers/github-teams.json: Automated sync

---
 maintainers/github-teams.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index 9a9fc155a52c..1eaf3ca4cd13 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -128,7 +128,6 @@
       "Pandapip1": 45835846,
       "a-kenji": 65275785,
       "drakon64": 6444703,
-      "michaelBelsanti": 62124625,
       "thefossguy": 44400303
     },
     "name": "COSMIC"
@@ -847,6 +846,18 @@
     },
     "name": "Radicle"
   },
+  "redis": {
+    "description": "Maintain Redis, related packages, module, and tests.",
+    "id": 17932473,
+    "maintainers": {
+      "Hythera": 87016780,
+      "MiniHarinn": 52773156,
+      "debtquity": 225436867,
+      "kybe236": 118068228
+    },
+    "members": {},
+    "name": "Redis"
+  },
   "reproducible": {
     "description": "Team that is interested in reproducible builds",
     "id": 7625643,

From 9a35a7efd0e6223e201f591efd15795af9d702f8 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 15 Jun 2026 03:37:23 +0300
Subject: [PATCH 138/339] pkgsChecked, pkgsParallel, pkgsStructured: init

---
 pkgs/test/top-level/default.nix | 14 ++++++++++++++
 pkgs/top-level/variants.nix     | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/pkgs/test/top-level/default.nix b/pkgs/test/top-level/default.nix
index 3946b363b764..7d21549c9107 100644
--- a/pkgs/test/top-level/default.nix
+++ b/pkgs/test/top-level/default.nix
@@ -82,4 +82,18 @@ lib.recurseIntoAttrs {
     assert cross.makeWrapper ? __spliced;
     assert appended.makeWrapper ? __spliced;
     pkgs.emptyFile;
+
+  massRebuildVariantComposition =
+    let
+      variants = [
+        "pkgsChecked"
+        "pkgsParallel"
+        "pkgsStrict"
+        "pkgsStructured"
+      ];
+      all = lib.getAttrFromPath variants pkgs;
+      all-reversed = lib.getAttrFromPath (lib.reverseList variants) pkgs;
+    in
+    assert pkgs.config.allowVariants -> (all.hello == all-reversed.hello);
+    pkgs.emptyFile;
 }
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index dd817788b5a9..fb6a38029c96 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -174,9 +174,24 @@ self: super: {
     ++ overlays;
   };
 
+  pkgsChecked = nixpkgsFun {
+    config = super.config // {
+      doCheckByDefault = true;
+    };
+  };
+  pkgsParallel = nixpkgsFun {
+    config = super.config // {
+      enableParallelBuildingByDefault = true;
+    };
+  };
   pkgsStrict = nixpkgsFun {
     config = super.config // {
       strictDepsByDefault = true;
     };
   };
+  pkgsStructured = nixpkgsFun {
+    config = super.config // {
+      structuredAttrsByDefault = true;
+    };
+  };
 }

From 47e7247f8b4845cdd2dedfcc009f420cc722a93b Mon Sep 17 00:00:00 2001
From: Mira Chacku Purakal <git@chpu.eu>
Date: Mon, 15 Jun 2026 23:19:25 +0200
Subject: [PATCH 139/339] osmium: fix update script

---
 pkgs/by-name/os/osmium/package.nix | 16 +---------------
 pkgs/by-name/os/osmium/update.sh   |  5 +++++
 2 files changed, 6 insertions(+), 15 deletions(-)
 create mode 100755 pkgs/by-name/os/osmium/update.sh

diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
index b8f515f72ec5..fd86341e66ac 100644
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -25,9 +25,6 @@
   libnotify,
   libpulseaudio,
   writeShellApplication,
-  curl,
-  yq,
-  common-updater-scripts,
 }:
 
 stdenv.mkDerivation rec {
@@ -108,18 +105,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = lib.getExe (writeShellApplication {
-      name = "update-osmium";
-      runtimeInputs = [
-        curl
-        yq
-        common-updater-scripts
-      ];
-      text = ''
-        version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq .version)"
-        update-source-version osmium "$version"
-      '';
-    });
+    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/os/osmium/update.sh b/pkgs/by-name/os/osmium/update.sh
new file mode 100755
index 000000000000..cc6387968829
--- /dev/null
+++ b/pkgs/by-name/os/osmium/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl yq common-updater-scripts
+
+version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq -r .version)"
+update-source-version osmium "$version"

From e9fc6a6096fd414d64e86349b4911dec543737ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 21:20:12 +0000
Subject: [PATCH 140/339] 
 vscode-extensions.divyanshuagrawal.competitive-programming-helper:
 2026.6.1780508121 -> 2026.6.1780853884

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 1f6b8f072645..7ced00d18d2c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1375,8 +1375,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2026.6.1780508121";
-          hash = "sha256-4kb7Nk+gctECMQM/cko+q1Bta1EKPXPEqyCQLBMkbEo=";
+          version = "2026.6.1780853884";
+          hash = "sha256-4nxH5qW3u3/9Vqf+QFs7l5BDusE5wcxxHiJFcPq/2EE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";

From 2b7563a10688d2b533d9eb467e39cbed19ebcdef Mon Sep 17 00:00:00 2001
From: Mira Chacku Purakal <git@chpu.eu>
Date: Mon, 15 Jun 2026 23:22:31 +0200
Subject: [PATCH 141/339] osmium: 0.0.26-alpha -> 0.0.29-alpha

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

diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
index fd86341e66ac..97114e38aee1 100644
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osmium";
-  version = "0.0.26-alpha";
+  version = "0.0.29-alpha";
 
   src = fetchurl {
     url = "https://updater.osmium.chat/Osmium-${version}-x64.tar.gz";
-    hash = "sha256-6hsXZ9ykM7x4RNqixolK3/C9K0OBjMuUNIWYjjj8uCs=";
+    hash = "sha256-UbYnT/9bkMCii4rkAlkUBQcHc6DyAkOa8rQl+9e3NZU=";
   };
 
   nativeBuildInputs = [

From 1b09198aab53ea7c87d51091ab2fa5f8b0e00a70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 21:30:17 +0000
Subject: [PATCH 142/339] matlab-language-server: 1.3.11 -> 1.3.12

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

diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix
index d65b973762e7..ff77f8ba723f 100644
--- a/pkgs/by-name/ma/matlab-language-server/package.nix
+++ b/pkgs/by-name/ma/matlab-language-server/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "matlab-language-server";
-  version = "1.3.11";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "mathworks";
     repo = "matlab-language-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UY+rYWfLHSc+1wDZsRfttX9asFOmV4i42/vxdqLQSuw=";
+    hash = "sha256-+0aVg5SesV8zOndRLTpz3WwLW32GxLLVlMcWj46vVIM=";
   };
 
-  npmDepsHash = "sha256-r4GE9uQwjyPWUitaxXLejH4Ej8SWw+slGlYIo0OX3HM=";
+  npmDepsHash = "sha256-SQtUgX3yNXwUxZxPvNdYAtLBAu++2DiAx301X0LnAQo=";
 
   npmBuildScript = "package";
 

From e8edee782352f6740a51bcb4f2adb0d2c297d5c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 21:30:30 +0000
Subject: [PATCH 143/339] mcaselector: 2.7 -> 2.8

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

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

From 4884e7d1e369020e17fb19e0a64944699eeeb7a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 21:43:51 +0000
Subject: [PATCH 144/339] python3Packages.hyponcloud: 0.9.4 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/hyponcloud/default.nix b/pkgs/development/python-modules/hyponcloud/default.nix
index 444c589e3f57..0fd1cc09dfa9 100644
--- a/pkgs/development/python-modules/hyponcloud/default.nix
+++ b/pkgs/development/python-modules/hyponcloud/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hyponcloud";
-  version = "0.9.4";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jcisio";
     repo = "hyponcloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eehYzPv527zfWAL1vyb6R6iRZW7sYcaOzJBetCHL8jE=";
+    hash = "sha256-Mn+OZHpDSMgA3mUi1s2t+HTlsnsN9eFfzdNNddDz6OA=";
   };
 
   build-system = [

From d6caed0ac68c1366601342568a6edc8fd5cddfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 15 Jun 2026 15:12:16 -0700
Subject: [PATCH 145/339] weblate: make pythonRelaxDeps more robust

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

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 892d9a778806..7d7514eedcf1 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -111,7 +111,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       ];
     in
     lib.concatMap (
-      p: if p == null || lib.elem p.pname coreDeps then [ ] else [ p.pname ]
+      p: if !p ? "pname" || lib.elem p.pname coreDeps then [ ] else [ p.pname ]
     ) finalAttrs.passthru.dependencies;
 
   dependencies =

From 663a13de1a125b35d3d8538e2f078f93157c1644 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 22:13:35 +0000
Subject: [PATCH 146/339] redumper: 722 -> 724

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

diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix
index 2e7df105a3cd..82b9027435f6 100644
--- a/pkgs/by-name/re/redumper/package.nix
+++ b/pkgs/by-name/re/redumper/package.nix
@@ -13,13 +13,13 @@
 # redumper is using C++ modules, this requires latest C++20 compiler and build tools
 llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: {
   pname = "redumper";
-  version = "722";
+  version = "724";
 
   src = fetchFromGitHub {
     owner = "superg";
     repo = "redumper";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-6UphK1Dq7szUMNqVuFNDK6/5AraOHDGeTXa5bzZo3PI=";
+    hash = "sha256-EOQEEQKxdAGGZr72/lfJv1KOz7bQglzxwpwblrTPtls=";
   };
 
   patches = [

From bfe8eafc9cbb5f03533358193162478475a727c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 22:15:53 +0000
Subject: [PATCH 147/339] gaugePlugins.js: 5.0.5 -> 5.0.6

---
 pkgs/by-name/ga/gauge/plugins/js/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gauge/plugins/js/default.nix b/pkgs/by-name/ga/gauge/plugins/js/default.nix
index 7af057045b3e..d65139b31323 100644
--- a/pkgs/by-name/ga/gauge/plugins/js/default.nix
+++ b/pkgs/by-name/ga/gauge/plugins/js/default.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "gauge-plugin-js";
-  version = "5.0.5";
+  version = "5.0.6";
 
   src = fetchFromGitHub {
     owner = "getgauge";
     repo = "gauge-js";
     rev = "v${version}";
-    hash = "sha256-qWnBx6bvut/bSvFC8WPAetyAsF16Wz99Pq0tGg+YpZw=";
+    hash = "sha256-/hfsBoZ37A4W3uejmOnl6nZv0oCedkQFMNidqWb9DN8=";
     fetchSubmodules = true;
   };
 
-  npmDepsHash = "sha256-HD1JsAewyzoUPKFwtpGGwjHWmYUpLSN3Spb5FW+3d10=";
+  npmDepsHash = "sha256-2kZDpRUegHqZOEc49h3+RRAbKroW7v63bXjzDAu/bCc=";
   npmBuildScript = "package";
 
   buildInputs = [ nodejs ];

From b393a9f05ebbcc58fcb61ca7fd7addeeab350230 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 15 Jun 2026 04:19:54 +0300
Subject: [PATCH 148/339] ieda: `enableParallelBuilding` & `__structuredAttrs`

---
 pkgs/by-name/ie/ieda/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index e39620b0e801..81d65eaf289f 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -81,12 +81,10 @@ stdenv.mkDerivation {
     (lib.cmakeBool "CMD_BUILD" true)
     (lib.cmakeBool "SANITIZER" false)
     (lib.cmakeBool "BUILD_STATIC_LIB" false)
+    (lib.cmakeOptionType "filepath" "CMAKE_RUNTIME_OUTPUT_DIRECTORY" "${placeholder "out"}/bin")
+    (lib.cmakeOptionType "filepath" "CMAKE_LIBRARY_OUTPUT_DIRECTORY" "${placeholder "out"}/lib")
   ];
 
-  preConfigure = ''
-    cmakeFlags+=" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:FILEPATH=$out/bin -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:FILEPATH=$out/lib"
-  '';
-
   buildInputs = [
     rustpkgs.iir-rust
     rustpkgs.sdf_parse
@@ -130,7 +128,8 @@ stdenv.mkDerivation {
 
   doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038
 
-  enableParallelBuild = true;
+  enableParallelBuilding = true;
+  __structuredAttrs = true;
 
   passthru.updateScript = ./update.sh;
 

From e23c7045750018e4fdb8dcd6af37ed9f0aa6605f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 15 Jun 2026 21:58:43 +0000
Subject: [PATCH 149/339] python3Packages.stable-baselines3: 2.8.0 -> 2.9.0

Diff: https://github.com/DLR-RM/stable-baselines3/compare/v2.8.0...v2.9.0

Changelog: https://github.com/DLR-RM/stable-baselines3/releases/tag/v2.9.0
---
 .../python-modules/stable-baselines3/default.nix       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix
index efa234413391..d4e72d1ee173 100644
--- a/pkgs/development/python-modules/stable-baselines3/default.nix
+++ b/pkgs/development/python-modules/stable-baselines3/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -22,7 +23,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "stable-baselines3";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -30,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     owner = "DLR-RM";
     repo = "stable-baselines3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eMtkcPvTtdy0gqedCD8NxlC85rDEB9Dam5fIKujEWp4=";
+    hash = "sha256-vKbILFjQuD2gAkl3J3RA/vEo5UYqWttJ99kZdlEsqkY=";
   };
 
   build-system = [ setuptools ];
@@ -77,6 +78,11 @@ buildPythonPackage (finalAttrs: {
     # Tests that attempt to access the filesystem
     "test_make_atari_env"
     "test_vec_env_monitor_kwargs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_report_figure_to_tensorboard"
+    "test_unsupported_figure_format"
   ];
 
   meta = {

From e1080ada14f55c1bd555dd63f6c60c09514e5c67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 22:26:49 +0000
Subject: [PATCH 150/339] meilisearch: 1.45.2 -> 1.47.0

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

diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 9a1bbe6f1be8..7f3dce98d76e 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "meilisearch";
-  version = "1.45.2";
+  version = "1.47.0";
 
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hEMOyvFtbrOkN0I9F20NxdCLg+gYKDghZqXQ4T74Gsc=";
+    hash = "sha256-LEO8D4OgTjYdBMyOM8RG298+gj2iWN1TVUhYWvOCkns=";
   };
 
   cargoBuildFlags = [ "--package=meilisearch" ];
 
-  cargoHash = "sha256-R7q3TkmHBhKzfX+pVfh27UHBNtmMVwx0pjbqX+FCsWI=";
+  cargoHash = "sha256-frYHEeJOmPNAd/tt762qRBbSrXZ3/ZDjc8wZynuEDL4=";
 
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;

From c0452d2836e047710465dec47996a7210bc5806f Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com>
Date: Thu, 3 Jul 2025 08:24:36 +0000
Subject: [PATCH 151/339] zcool-qingke-huangyou: init at 1.000

Co-authored-by: Acid Bong <acidbong@tilde.club>
---
 .../zc/zcool-qingke-huangyou/package.nix      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/zc/zcool-qingke-huangyou/package.nix

diff --git a/pkgs/by-name/zc/zcool-qingke-huangyou/package.nix b/pkgs/by-name/zc/zcool-qingke-huangyou/package.nix
new file mode 100644
index 000000000000..54f2bb03e63f
--- /dev/null
+++ b/pkgs/by-name/zc/zcool-qingke-huangyou/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  installFonts,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "zcool-qingke-huangyou";
+  version = "1.000";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "zcool-qingke-huangyou";
+    rev = "c9dac424b0a9f47d3b113cff4a4922f632d82c94";
+    hash = "sha256-xIIDP8gCtwNtY6AReeuLZSbnDXczS5ycObP3EKxk+hU=";
+  };
+
+  nativeBuildInputs = [ installFonts ];
+
+  meta = {
+    description = "Futuristic stiff geometric font";
+    homepage = "https://fonts.google.com/specimen/ZCOOL+QingKe+HuangYou";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ gigahawk ];
+  };
+})

From 3efefab24fad46feb3edcebfbb5cebae25ee39be Mon Sep 17 00:00:00 2001
From: yvnth <yvnth@users.noreply.github.com>
Date: Tue, 16 Jun 2026 04:11:43 +0530
Subject: [PATCH 152/339] maintainers: add yvnth

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 630ade480827..a7b732e4b09f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -30725,6 +30725,12 @@
     githubId = 65394961;
     name = "Yves Straten";
   };
+  yvnth = {
+    email = "yashupress@gmail.com";
+    github = "yvnth";
+    githubId = 201552597;
+    name = "Yashwanth Prasannakumar";
+  };
   yzx9 = {
     email = "yuan.zx@outlook.com";
     github = "yzx9";

From 9011f88fe4d89ae0466c147e3f9c8f27245eb256 Mon Sep 17 00:00:00 2001
From: yvnth <yvnth@users.noreply.github.com>
Date: Tue, 16 Jun 2026 04:11:44 +0530
Subject: [PATCH 153/339] tombi: add yvnth as maintainer

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

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 822be4dda1d9..b83b2178fbf9 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -55,6 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       faukah
       psibi
+      yvnth
     ];
     mainProgram = "tombi";
   };

From b1ea0117c692b200c05ba3ef633d3f3516f76813 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 00:42:02 +0200
Subject: [PATCH 154/339] sharefinder: init at 1.4.0

Active network shares enumeration tool

https://github.com/vflame6/sharefinder
---
 pkgs/by-name/sh/sharefinder/package.nix | 43 +++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/sh/sharefinder/package.nix

diff --git a/pkgs/by-name/sh/sharefinder/package.nix b/pkgs/by-name/sh/sharefinder/package.nix
new file mode 100644
index 000000000000..a8246a941093
--- /dev/null
+++ b/pkgs/by-name/sh/sharefinder/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sharefinder";
+  version = "1.4.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "vflame6";
+    repo = "sharefinder";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-82hQPz05Xzvq5ggUht3GFaJ+3yEjES94mfZjQd5a+rA=";
+  };
+
+  vendorHash = "sha256-ABPq6WKYIjyCX5K8iU++6dszUW7s9Ld1Queb2hGdGzs=";
+
+  ldflags = [
+    "-s"
+    "-X=github.com/vflame6/sharefinder/cmd.VERSION=${finalAttrs.version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Active network shares enumeration tool";
+    homepage = "https://github.com/vflame6/sharefinder";
+    changelog = "https://github.com/vflame6/sharefinder/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "sharefinder";
+  };
+})

From 486069670130e10aeabdd3b3b5c96336853a2ea0 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 11 Jun 2026 12:40:32 +0200
Subject: [PATCH 155/339] github-act-runner: init at 0.13.0

---
 pkgs/by-name/gi/github-act-runner/package.nix | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/gi/github-act-runner/package.nix

diff --git a/pkgs/by-name/gi/github-act-runner/package.nix b/pkgs/by-name/gi/github-act-runner/package.nix
new file mode 100644
index 000000000000..d1c1a04cc61c
--- /dev/null
+++ b/pkgs/by-name/gi/github-act-runner/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  nodejs_24,
+  gitMinimal,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "github-act-runner";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "ChristopherHX";
+    repo = "github-act-runner";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Bcpaw3tVCkpxMmjxKTxu1H3amlawbIS0UdH0+qWEv18=";
+  };
+
+  vendorHash = "sha256-JS+8A6/JiIctCFzZQl1GqfSGv5yZT64++0BgYC8sulE=";
+
+  ldflags = [
+    "-s"
+    "-X main.version=v${finalAttrs.version}"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/github-act-runner \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          nodejs_24
+          gitMinimal
+        ]
+      }
+  '';
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Reverse-engineered self-hosted GitHub Actions runner (Go)";
+    homepage = "https://github.com/ChristopherHX/github-act-runner";
+    changelog = "https://github.com/ChristopherHX/github-act-runner/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ liberodark ];
+    platforms = lib.platforms.linux;
+    mainProgram = "github-act-runner";
+  };
+})

From def71860b28ab804d787a6bcd53b8cfa98c2b7c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:07:24 +0000
Subject: [PATCH 156/339] cargo-deny: 0.19.8 -> 0.19.9

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

diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 556eda676e08..62ef4627cef4 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deny";
-  version = "0.19.8";
+  version = "0.19.9";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
     tag = finalAttrs.version;
-    hash = "sha256-pcF/SYtlydu09ZXQ5/1Wm2gwttFBulEt27SCEY1+kNU=";
+    hash = "sha256-b3p4UxMDUNMKusgGDji3A0myfAfYU+o4DFnhM4mrWao=";
   };
 
-  cargoHash = "sha256-I2BHVcpULObHtsqBxzTvEPevZa/CkhlC/gj0ldofDwA=";
+  cargoHash = "sha256-+FWEA2T8CASg3MmTb7WpN4MO8lwiLZtsVDuWMddkUgA=";
 
   nativeBuildInputs = [
     pkg-config

From 4eda937b813f587a87461559a81d0d15da800c04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:12:39 +0000
Subject: [PATCH 157/339] azurehound: 2.12.1 -> 2.12.2

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

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index ab84c1aefac3..b1dd9f8fb4c4 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "azurehound";
-  version = "2.12.1";
+  version = "2.12.2";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qJ7mzG1G9ck4xM9dB9rcpojGCAbUoZ8bKZwuZV5bhjA=";
+    hash = "sha256-w8PmSt+QvU0HELkgdYLfIUgK3R5vCYzlPbMyrHztiPw=";
   };
 
   vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY=";

From 142b5fe53d1e34ceed7b6b8f33743e195e4403d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:14:15 +0000
Subject: [PATCH 158/339] art: 1.26.5 -> 1.26.6

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

diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index b2daeeac12d2..1ddfd45d7f69 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "art";
-  version = "1.26.5";
+  version = "1.26.6";
 
   src = fetchFromGitHub {
     owner = "artpixls";
     repo = "ART";
     tag = finalAttrs.version;
-    hash = "sha256-kNe+1jwMJ8RVm4dBUg6/ik3TJRZVuGbZt5Wtx8qVbvk=";
+    hash = "sha256-m5KQUY7loLKH7X2cDw5n7biH1GJTVONTbguILdjNWrI=";
   };
 
   # Fix the build with CMake 4.

From f47a088a80b2afce40794ac10d447a941f159d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 15 Jun 2026 16:01:00 -0700
Subject: [PATCH 159/339] python3Packages.mail-parser: 4.1.4 -> 4.4.0

Diff: https://github.com/SpamScope/mail-parser/compare/4.1.4...4.4.0
---
 .../python-modules/mail-parser/default.nix    | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
index c56abff52667..4a9958b594dd 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -2,58 +2,56 @@
   lib,
   buildPythonPackage,
   python,
-  glibcLocales,
+  extract-msg,
   fetchFromGitHub,
+  hatchling,
   pytest-cov-stub,
+  pytest-mock,
   pytestCheckHook,
-  setuptools,
-  six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mail-parser";
-  version = "4.1.4";
+  version = "4.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SpamScope";
     repo = "mail-parser";
-    tag = version;
-    hash = "sha256-wwLUD/k26utugK/Yx9eXYEdSOvrk0Cy6RkXGDnzZ+fE=";
+    tag = finalAttrs.version;
+    hash = "sha256-fuL2cWQSkYQKhG/UVNOp4ch4MrZINizvsPCQUzb3Z9c=";
   };
 
-  env.LC_ALL = "en_US.utf-8";
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [ glibcLocales ];
-
-  build-system = [ setuptools ];
-
-  pythonRemoveDeps = [ "ipaddress" ];
-
-  dependencies = [
-    six
-  ];
+  optional-dependencies = {
+    outlook = [ extract-msg ];
+  };
 
   pythonImportsCheck = [ "mailparser" ];
 
   nativeCheckInputs = [
     pytest-cov-stub
+    pytest-mock
     pytestCheckHook
-  ];
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
-  # Taken from .travis.yml
+  # Taken from .github/workflows/main.yml
   postCheck = ''
     ${python.interpreter} -m mailparser -v
     ${python.interpreter} -m mailparser -h
     ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j
+    ${python.interpreter} -m mailparser -f tests/mails/mail_outlook_1 -j
     cat tests/mails/mail_malformed_3 | ${python.interpreter} -m mailparser -k -j
   '';
 
   meta = {
+    changelog = "https://github.com/SpamScope/mail-parser/releases/tag/${finalAttrs.src.tag}";
     description = "Mail parser for python 2 and 3";
-    mainProgram = "mailparser";
+    mainProgram = "mail-parser";
     homepage = "https://github.com/SpamScope/mail-parser";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ psyanticy ];
   };
-}
+})

From 3b0b0e4ac34a6f48bf4ce1de888e47216c4789c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 15 Jun 2026 16:05:42 -0700
Subject: [PATCH 160/339] python3Packages.mailsuite: 1.11.2 -> 2.2.2

Diff: https://github.com/seanthegeek/mailsuite/compare/1.11.2...2.2.2

Changelog: https://github.com/seanthegeek/mailsuite/blob/2.2.2/CHANGELOG.md
---
 .../python-modules/mailsuite/default.nix      | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix
index c402453f7e42..71203068559e 100644
--- a/pkgs/development/python-modules/mailsuite/default.nix
+++ b/pkgs/development/python-modules/mailsuite/default.nix
@@ -1,24 +1,35 @@
 {
   lib,
+  azure-identity,
+  authres,
   buildPythonPackage,
+  cryptography,
+  dkimpy,
   dnspython,
   expiringdict,
-  fetchPypi,
+  fetchFromGitHub,
+  google-api-python-client,
+  google-auth,
+  google-auth-oauthlib,
   hatchling,
   html2text,
   imapclient,
   mail-parser,
+  msgraph-sdk,
   publicsuffix2,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mailsuite";
-  version = "1.11.2";
+  version = "2.2.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ilcOH27lVKhh/xFO/dkWZkwtx6wPYrKTWR3n1xqoUdk=";
+  src = fetchFromGitHub {
+    owner = "seanthegeek";
+    repo = "mailsuite";
+    tag = finalAttrs.version;
+    hash = "sha256-qQ+AaelLQED0mWCAItx/3d7o9QVUnhUVxvdCfnNRqzQ=";
   };
 
   pythonRelaxDeps = [ "mail-parser" ];
@@ -26,6 +37,9 @@ buildPythonPackage rec {
   build-system = [ hatchling ];
 
   dependencies = [
+    authres
+    cryptography
+    dkimpy
     dnspython
     expiringdict
     html2text
@@ -34,16 +48,30 @@ buildPythonPackage rec {
     publicsuffix2
   ];
 
+  optional-dependencies = {
+    all = lib.concatAttrValues (lib.removeAttrs finalAttrs.passthru.optional-dependencies [ "all" ]);
+    gmail = [
+      google-api-python-client
+      google-auth
+      google-auth-oauthlib
+    ];
+    msgraph = [
+      azure-identity
+      msgraph-sdk
+    ];
+  };
+
   pythonImportsCheck = [ "mailsuite" ];
 
-  # Module has no tests
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = {
     description = "Python package to simplify receiving, parsing, and sending email";
     homepage = "https://seanthegeek.github.io/mailsuite/";
-    changelog = "https://github.com/seanthegeek/mailsuite/blob/master/CHANGELOG.md";
+    changelog = "https://github.com/seanthegeek/mailsuite/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ talyz ];
   };
-}
+})

From 6c62c3fd126c3d1ee195202f948ec75217061453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 15 Jun 2026 16:16:17 -0700
Subject: [PATCH 161/339] python3Packages.parsedmarc: 9.6.0 -> 10.1.1

Diff: https://github.com/domainaware/parsedmarc/compare/9.6.0...10.1.1

Changelog: https://github.com/domainaware/parsedmarc/blob/10.1.1/CHANGELOG.md
---
 pkgs/by-name/pa/parsedmarc/package.nix        | 41 +------------------
 .../python-modules/parsedmarc/default.nix     | 41 ++++++++-----------
 2 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix
index f6b38bf7d3c3..0f28ef5ec02b 100644
--- a/pkgs/by-name/pa/parsedmarc/package.nix
+++ b/pkgs/by-name/pa/parsedmarc/package.nix
@@ -1,44 +1,7 @@
 {
-  python3,
+  python3Packages,
   fetchFromGitHub,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # https://github.com/domainaware/parsedmarc/issues/464
-      msgraph-core = super.msgraph-core.overridePythonAttrs (old: rec {
-        version = "0.2.2";
-
-        src = fetchFromGitHub {
-          owner = "microsoftgraph";
-          repo = "msgraph-sdk-python-core";
-          rev = "v${version}";
-          hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA=";
-        };
-
-        nativeBuildInputs = with self; [
-          flit-core
-        ];
-
-        propagatedBuildInputs = with self; [
-          requests
-        ];
-
-        nativeCheckInputs = with self; [
-          pytestCheckHook
-          responses
-        ];
-
-        disabledTestPaths = [
-          "tests/integration"
-        ];
-
-        pythonImportsCheck = [ "msgraph.core" ];
-      });
-    };
-  };
-in
-with python.pkgs;
+with python3Packages;
 toPythonApplication parsedmarc
diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index 32d457b1596f..4d6b37a7baa6 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -16,17 +16,10 @@
   elasticsearch-dsl,
   elasticsearch,
   expiringdict,
-  geoip2,
-  google-api-core,
-  google-api-python-client,
-  google-auth-httplib2,
-  google-auth-oauthlib,
-  google-auth,
-  imapclient,
-  kafka-python-ng,
+  kafka-python,
   lxml,
   mailsuite,
-  msgraph-core,
+  maxminddb,
   nixosTests,
   opensearch-py,
   publicsuffixlist,
@@ -38,7 +31,7 @@
   xmltodict,
 
   # test
-  unittestCheckHook,
+  pytestCheckHook,
 }:
 
 let
@@ -49,14 +42,14 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "9.6.0";
+  version = "10.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "domainaware";
     repo = "parsedmarc";
     tag = version;
-    hash = "sha256-ez7QMFsSvJzxhfCPA4G6oGQhqAzcgKBTJMiMogIJvNg=";
+    hash = "sha256-dFwlcbR8NNKrDBoKPDX9M82tTK5aCbeP3KMF/BctgMc=";
   };
 
   postPatch = ''
@@ -82,17 +75,10 @@ buildPythonPackage rec {
     elasticsearch
     elasticsearch-dsl
     expiringdict
-    geoip2
-    google-api-core
-    google-api-python-client
-    google-auth
-    google-auth-httplib2
-    google-auth-oauthlib
-    imapclient
-    kafka-python-ng
+    kafka-python
     lxml
     mailsuite
-    msgraph-core
+    maxminddb
     opensearch-py
     publicsuffixlist
     pygelf
@@ -101,10 +87,17 @@ buildPythonPackage rec {
     tqdm
     urllib3
     xmltodict
-  ];
+  ]
+  ++ mailsuite.optional-dependencies.gmail
+  ++ mailsuite.optional-dependencies.msgraph;
 
   nativeCheckInputs = [
-    unittestCheckHook
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # contacts DNS servers at 1.1.1.1 and 8.8.8.8
+    "test_general_dns_settings_with_defaults"
   ];
 
   pythonImportsCheck = [ "parsedmarc" ];
@@ -121,7 +114,5 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ talyz ];
     mainProgram = "parsedmarc";
-    # https://github.com/domainaware/parsedmarc/issues/464
-    broken = lib.versionAtLeast msgraph-core.version "1.0.0";
   };
 }

From bd9ef96a2c2df29ad26d1136f216d1bfbe1e53b1 Mon Sep 17 00:00:00 2001
From: 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net>
Date: Tue, 16 Jun 2026 02:32:21 +0300
Subject: [PATCH 162/339] anilibria-winmaclinux: 2.2.35 -> 2.2.36

---
 ...patch => 0001-disable-version-check.patch} |  0
 .../0001-fix-installation-paths.patch         | 24 -------
 .../an/anilibria-winmaclinux/package.nix      | 68 +++++++++----------
 3 files changed, 31 insertions(+), 61 deletions(-)
 rename pkgs/by-name/an/anilibria-winmaclinux/{0002-disable-version-check.patch => 0001-disable-version-check.patch} (100%)
 delete mode 100644 pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch

diff --git a/pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch
similarity index 100%
rename from pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch
rename to pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch
diff --git a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch
deleted file mode 100644
index 14f9799e46bd..000000000000
--- a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/AniLibria.pro b/AniLibria.pro
-index 3eb7213..ea571ff 100644
---- a/AniLibria.pro
-+++ b/AniLibria.pro
-@@ -271,17 +271,8 @@ QML_IMPORT_PATH =
- # Additional import path used to resolve QML modules just for Qt Quick Designer
- QML_DESIGNER_IMPORT_PATH =
- 
--# Default rules for deployment.
--!flatpak{
--    qnx: target.path = /tmp/$${TARGET}/bin
--    else: unix:!android: target.path = /opt/$${TARGET}/bin
--}else{
--    target.path = $$PREFIX/bin
--}
--!isEmpty(target.path) {
--    unix: INSTALLS += target desktop $${UNIX_ICONS}
--    else:macx: INSTALLS += target
--}
-+target.path = $$PREFIX/bin
-+INSTALLS += target $${UNIX_ICONS}
- 
- flatpak {
-     metadata.path = $$PREFIX/share/metainfo
diff --git a/pkgs/by-name/an/anilibria-winmaclinux/package.nix b/pkgs/by-name/an/anilibria-winmaclinux/package.nix
index 86d515120c9c..c3a52822ac43 100644
--- a/pkgs/by-name/an/anilibria-winmaclinux/package.nix
+++ b/pkgs/by-name/an/anilibria-winmaclinux/package.nix
@@ -2,47 +2,40 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libsForQt5,
+  fetchpatch,
+  cmake,
+  qt6Packages,
+  ninja,
   pkg-config,
   gst_all_1,
   makeDesktopItem,
   copyDesktopItems,
-
-  withVLC ? true,
-  libvlc,
-  withMPV ? true,
   mpv-unwrapped,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "anilibria-winmaclinux";
-  version = "2.2.35";
+  version = "2.2.36";
 
   src = fetchFromGitHub {
     owner = "anilibria";
     repo = "anilibria-winmaclinux";
     tag = finalAttrs.version;
-    hash = "sha256-3tiCfL6j2yhhL16mG1LYD41G6nbomwmqZOwgm4bEHTs=";
+    hash = "sha256-2fwpLHEH1jlxl7r7QiVTHZniBO5k0GWaloNBynZJlTw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  qmakeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ]
-  ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ]
-  ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ];
-
   patches = [
-    ./0001-fix-installation-paths.patch
-    ./0002-disable-version-check.patch
+    ./0001-disable-version-check.patch
+    (fetchpatch {
+      name = "0002-fixed-qt6-folder-modal.patch";
+      url = "https://github.com/anilibria/anilibria-winmaclinux/commit/adb4f7e5447d733fc3042f4bff25224ed726f3e6.patch";
+      hash = "sha256-6/oXAObmXS+GKjjLNneMIj2gtKNvz6zHshWDYPv4agY=";
+      stripLen = 1;
+    })
   ];
 
-  preConfigure = ''
-    substituteInPlace AniLibria.pro \
-      --replace "\$\$PREFIX" '${placeholder "out"}'
-  '';
-
   qtWrapperArgs = [
     "--prefix GST_PLUGIN_PATH : ${
       (
@@ -59,17 +52,18 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    libsForQt5.qmake
+    cmake
     pkg-config
-    libsForQt5.wrapQtAppsHook
+    ninja
+    qt6Packages.wrapQtAppsHook
     copyDesktopItems
   ];
 
   buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qtwebsockets
-    libsForQt5.qtmultimedia
+    qt6Packages.qtbase
+    qt6Packages.qtwebsockets
+    qt6Packages.qtmultimedia
+    mpv-unwrapped.dev
   ]
   ++ (with gst_all_1; [
     gst-plugins-bad
@@ -77,34 +71,34 @@ stdenv.mkDerivation (finalAttrs: {
     gst-plugins-base
     gst-libav
     gstreamer
-  ])
-  ++ lib.optionals withVLC [ libvlc ]
-  ++ lib.optionals withMPV [ mpv-unwrapped.dev ];
+  ]);
 
   desktopItems = [
     (makeDesktopItem {
-      name = "AniLibria";
-      desktopName = "AniLibria";
-      icon = "anilibria";
+      name = "AniLiberty";
+      desktopName = "AniLiberty";
+      icon = "aniliberty";
       comment = finalAttrs.meta.description;
-      genericName = "AniLibria desktop client";
+      genericName = "AniLiberty (ex AniLibria) desktop client";
       categories = [
         "Qt"
+        "Audio"
+        "Video"
         "AudioVideo"
         "Player"
       ];
       keywords = [ "anime" ];
-      exec = "AniLibria";
+      exec = finalAttrs.meta.mainProgram;
       terminal = false;
     })
   ];
 
   meta = {
     homepage = "https://github.com/anilibria/anilibria-winmaclinux";
-    description = "AniLibria cross platform desktop client";
+    description = "AniLiberty (ex AniLibria) cross platform desktop client, an anime theater for any computer you own";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
-    inherit (libsForQt5.qtbase.meta) platforms;
-    mainProgram = "AniLibria";
+    inherit (qt6Packages.qtbase.meta) platforms;
+    mainProgram = "AniLiberty";
   };
 })

From 6564771d0f05818b39e03679edc028da48a4ad79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:34:58 +0000
Subject: [PATCH 163/339] kubectl: 1.36.1 -> 1.36.2

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

diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix
index dc0735675aed..475d6e921049 100644
--- a/pkgs/by-name/ku/kubernetes/package.nix
+++ b/pkgs/by-name/ku/kubernetes/package.nix
@@ -23,13 +23,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes";
-  version = "1.36.1";
+  version = "1.36.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QG2zFaFtGXoWIlyp3hVBRU+OHre/6vWcvijUe1DdjIo=";
+    hash = "sha256-vE+2iBoJvkRhJDAHMCrJLIJKD53YWRBN6fBUP4589OU=";
   };
 
   vendorHash = null;

From 258f97415d07511f42f528208fcee49dbfd884ae Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 15 Jun 2026 19:37:11 -0400
Subject: [PATCH 164/339] various: move some hooks to pkgs/by-name

---
 ci/OWNERS                                     |  2 -
 .../ad/addBinToPathHook}/add-bin-to-path.sh   |  0
 pkgs/by-name/ad/addBinToPathHook/package.nix  |  9 ++
 pkgs/by-name/au/auto-patchelf/package.nix     |  5 +-
 .../au/autoPatchelfHook}/auto-patchelf.sh     |  0
 pkgs/by-name/au/autoPatchelfHook/package.nix  | 21 +++++
 .../au/autoreconfHook}/autoreconf.sh          |  0
 pkgs/by-name/au/autoreconfHook/package.nix    | 18 ++++
 .../setup-hooks => by-name/di/dieHook}/die.sh |  0
 pkgs/by-name/di/dieHook/package.nix           |  9 ++
 .../fix-darwin-dylib-names.sh                 |  0
 .../fi/fixDarwinDylibNames/package.nix        | 14 +++
 .../go/gogUnpackHook}/gog-unpack.sh           |  0
 pkgs/by-name/go/gogUnpackHook/package.nix     | 15 ++++
 pkgs/by-name/se/setJavaClassPath/package.nix  |  9 ++
 .../setJavaClassPath}/set-java-classpath.sh   |  0
 .../by-name/sh/shortenPerlShebang/package.nix | 11 +++
 .../shorten-perl-shebang.sh                   |  0
 .../st/stripJavaArchivesHook/package.nix      | 11 +++
 .../strip-java-archives.sh                    |  0
 pkgs/top-level/all-packages.nix               | 86 -------------------
 21 files changed, 121 insertions(+), 89 deletions(-)
 rename pkgs/{build-support/setup-hooks => by-name/ad/addBinToPathHook}/add-bin-to-path.sh (100%)
 create mode 100644 pkgs/by-name/ad/addBinToPathHook/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/au/autoPatchelfHook}/auto-patchelf.sh (100%)
 create mode 100644 pkgs/by-name/au/autoPatchelfHook/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/au/autoreconfHook}/autoreconf.sh (100%)
 create mode 100644 pkgs/by-name/au/autoreconfHook/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/di/dieHook}/die.sh (100%)
 create mode 100644 pkgs/by-name/di/dieHook/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/fi/fixDarwinDylibNames}/fix-darwin-dylib-names.sh (100%)
 create mode 100644 pkgs/by-name/fi/fixDarwinDylibNames/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/go/gogUnpackHook}/gog-unpack.sh (100%)
 create mode 100644 pkgs/by-name/go/gogUnpackHook/package.nix
 create mode 100644 pkgs/by-name/se/setJavaClassPath/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/se/setJavaClassPath}/set-java-classpath.sh (100%)
 create mode 100644 pkgs/by-name/sh/shortenPerlShebang/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/sh/shortenPerlShebang}/shorten-perl-shebang.sh (100%)
 create mode 100644 pkgs/by-name/st/stripJavaArchivesHook/package.nix
 rename pkgs/{build-support/setup-hooks => by-name/st/stripJavaArchivesHook}/strip-java-archives.sh (100%)

diff --git a/ci/OWNERS b/ci/OWNERS
index e08961b38210..43ef6f666651 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -74,8 +74,6 @@
 /pkgs/build-support/bintools-wrapper             @Ericson2314
 /pkgs/build-support/setup-hooks                  @Ericson2314
 /pkgs/build-support/setup-hooks/arrayUtilities   @ConnorBaker
-/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
-/pkgs/by-name/au/auto-patchelf                   @layus
 
 ## Format generators/serializers
 /pkgs/pkgs-lib                                   @Stunkymonkey @h7x4
diff --git a/pkgs/build-support/setup-hooks/add-bin-to-path.sh b/pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/add-bin-to-path.sh
rename to pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh
diff --git a/pkgs/by-name/ad/addBinToPathHook/package.nix b/pkgs/by-name/ad/addBinToPathHook/package.nix
new file mode 100644
index 000000000000..e8a208611c52
--- /dev/null
+++ b/pkgs/by-name/ad/addBinToPathHook/package.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "add-bin-to-path-hook";
+  meta.license = lib.licenses.mit;
+} ./add-bin-to-path.sh
diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix
index adff3a5e40c0..7823a55c72e5 100644
--- a/pkgs/by-name/au/auto-patchelf/package.nix
+++ b/pkgs/by-name/au/auto-patchelf/package.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation {
     mainProgram = "auto-patchelf";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ Scrumplex ];
+    maintainers = with lib.maintainers; [
+      Scrumplex
+      layus
+    ];
   };
 }
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/auto-patchelf.sh
rename to pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh
diff --git a/pkgs/by-name/au/autoPatchelfHook/package.nix b/pkgs/by-name/au/autoPatchelfHook/package.nix
new file mode 100644
index 000000000000..c537f113afcf
--- /dev/null
+++ b/pkgs/by-name/au/autoPatchelfHook/package.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  makeSetupHook,
+  auto-patchelf,
+  bintools,
+  stdenv,
+}:
+
+makeSetupHook {
+  name = "auto-patchelf-hook";
+  propagatedBuildInputs = [
+    auto-patchelf
+    bintools
+  ];
+  substitutions = {
+    hostPlatform = stdenv.hostPlatform.config;
+  };
+  meta = {
+    maintainers = with lib.maintainers; [ layus ];
+  };
+} ./auto-patchelf.sh
diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/by-name/au/autoreconfHook/autoreconf.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/autoreconf.sh
rename to pkgs/by-name/au/autoreconfHook/autoreconf.sh
diff --git a/pkgs/by-name/au/autoreconfHook/package.nix b/pkgs/by-name/au/autoreconfHook/package.nix
new file mode 100644
index 000000000000..b3f1eefbb247
--- /dev/null
+++ b/pkgs/by-name/au/autoreconfHook/package.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  makeSetupHook,
+  autoconf,
+  automake,
+  gettext,
+  libtool,
+}:
+makeSetupHook {
+  name = "autoreconf-hook";
+  propagatedBuildInputs = [
+    autoconf
+    automake
+    gettext
+    libtool
+  ];
+  meta.license = lib.licenses.mit;
+} ./autoreconf.sh
diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/by-name/di/dieHook/die.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/die.sh
rename to pkgs/by-name/di/dieHook/die.sh
diff --git a/pkgs/by-name/di/dieHook/package.nix b/pkgs/by-name/di/dieHook/package.nix
new file mode 100644
index 000000000000..e5bb76370426
--- /dev/null
+++ b/pkgs/by-name/di/dieHook/package.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "die-hook";
+  meta.license = lib.licenses.mit;
+} ./die.sh
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
rename to pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh
diff --git a/pkgs/by-name/fi/fixDarwinDylibNames/package.nix b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix
new file mode 100644
index 000000000000..3caba19ec6da
--- /dev/null
+++ b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  targetPackages,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "fix-darwin-dylib-names-hook";
+  substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; };
+  meta = {
+    platforms = lib.platforms.darwin;
+    license = lib.licenses.mit;
+  };
+} ./fix-darwin-dylib-names.sh
diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/by-name/go/gogUnpackHook/gog-unpack.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/gog-unpack.sh
rename to pkgs/by-name/go/gogUnpackHook/gog-unpack.sh
diff --git a/pkgs/by-name/go/gogUnpackHook/package.nix b/pkgs/by-name/go/gogUnpackHook/package.nix
new file mode 100644
index 000000000000..d47a750ad961
--- /dev/null
+++ b/pkgs/by-name/go/gogUnpackHook/package.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  makeSetupHook,
+  innoextract,
+  file-rename,
+}:
+
+makeSetupHook {
+  name = "gog-unpack-hook";
+  propagatedBuildInputs = [
+    innoextract
+    file-rename
+  ];
+  meta.license = lib.licenses.mit;
+} ./gog-unpack.sh
diff --git a/pkgs/by-name/se/setJavaClassPath/package.nix b/pkgs/by-name/se/setJavaClassPath/package.nix
new file mode 100644
index 000000000000..f02a40c4f225
--- /dev/null
+++ b/pkgs/by-name/se/setJavaClassPath/package.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "set-java-classpath-hook";
+  meta.license = lib.licenses.mit;
+} ./set-java-classpath.sh
diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/set-java-classpath.sh
rename to pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh
diff --git a/pkgs/by-name/sh/shortenPerlShebang/package.nix b/pkgs/by-name/sh/shortenPerlShebang/package.nix
new file mode 100644
index 000000000000..7b8037a44709
--- /dev/null
+++ b/pkgs/by-name/sh/shortenPerlShebang/package.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  makeSetupHook,
+  dieHook,
+}:
+
+makeSetupHook {
+  name = "shorten-perl-shebang-hook";
+  propagatedBuildInputs = [ dieHook ];
+  meta.license = lib.licenses.mit;
+} ./shorten-perl-shebang.sh
diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
rename to pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh
diff --git a/pkgs/by-name/st/stripJavaArchivesHook/package.nix b/pkgs/by-name/st/stripJavaArchivesHook/package.nix
new file mode 100644
index 000000000000..699fd78e73bd
--- /dev/null
+++ b/pkgs/by-name/st/stripJavaArchivesHook/package.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  makeSetupHook,
+  strip-nondeterminism,
+}:
+
+makeSetupHook {
+  name = "strip-java-archives-hook";
+  propagatedBuildInputs = [ strip-nondeterminism ];
+  meta.license = lib.licenses.mit;
+} ./strip-java-archives.sh
diff --git a/pkgs/build-support/setup-hooks/strip-java-archives.sh b/pkgs/by-name/st/stripJavaArchivesHook/strip-java-archives.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/strip-java-archives.sh
rename to pkgs/by-name/st/stripJavaArchivesHook/strip-java-archives.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc448d0e2a6e..439e0435a6cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -243,14 +243,6 @@ with pkgs;
     in
     recurseIntoAttrs arrayUtilitiesPackages;
 
-  addBinToPathHook = callPackage (
-    { makeSetupHook }:
-    makeSetupHook {
-      name = "add-bin-to-path-hook";
-      meta.license = lib.licenses.mit;
-    } ../build-support/setup-hooks/add-bin-to-path.sh
-  ) { };
-
   aider-chat-with-playwright = aider-chat.withOptional { withPlaywright = true; };
 
   aider-chat-with-browser = aider-chat.withOptional { withBrowser = true; };
@@ -261,51 +253,14 @@ with pkgs;
 
   aider-chat-full = aider-chat.withOptional { withAll = true; };
 
-  autoreconfHook = callPackage (
-    {
-      makeSetupHook,
-      autoconf,
-      automake,
-      gettext,
-      libtool,
-    }:
-    makeSetupHook {
-      name = "autoreconf-hook";
-      propagatedBuildInputs = [
-        autoconf
-        automake
-        gettext
-        libtool
-      ];
-      meta.license = lib.licenses.mit;
-    } ../build-support/setup-hooks/autoreconf.sh
-  ) { };
-
   autoreconfHook269 = autoreconfHook.override {
     autoconf = autoconf269;
   };
 
-  autoPatchelfHook = makeSetupHook {
-    name = "auto-patchelf-hook";
-    propagatedBuildInputs = [
-      auto-patchelf
-      bintools
-    ];
-    substitutions = {
-      hostPlatform = stdenv.hostPlatform.config;
-    };
-  } ../build-support/setup-hooks/auto-patchelf.sh;
-
   appimageTools = callPackage ../build-support/appimage { };
 
   appimageupdate-qt = appimageupdate.override { withQtUI = true; };
 
-  stripJavaArchivesHook = makeSetupHook {
-    name = "strip-java-archives-hook";
-    propagatedBuildInputs = [ strip-nondeterminism ];
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/strip-java-archives.sh;
-
   ensureNewerSourcesHook =
     { year }:
     makeSetupHook
@@ -352,15 +307,6 @@ with pkgs;
     meta.license = lib.licenses.mit;
   } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh;
 
-  gogUnpackHook = makeSetupHook {
-    name = "gog-unpack-hook";
-    propagatedBuildInputs = [
-      innoextract
-      file-rename
-    ];
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/gog-unpack.sh;
-
   buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
 
   buildFHSEnv = buildFHSEnvBubblewrap;
@@ -434,11 +380,6 @@ with pkgs;
 
   diffPlugins = (callPackage ../build-support/plugins.nix { }).diffPlugins;
 
-  dieHook = makeSetupHook {
-    name = "die-hook";
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/die.sh;
-
   devShellTools = callPackage ../build-support/dev-shell-tools { };
 
   dockerTools = callPackage ../build-support/docker {
@@ -855,12 +796,6 @@ with pkgs;
 
   setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
 
-  shortenPerlShebang = makeSetupHook {
-    name = "shorten-perl-shebang-hook";
-    propagatedBuildInputs = [ dieHook ];
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/shorten-perl-shebang.sh;
-
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
   srcOnly = callPackage ../build-support/src-only { };
@@ -913,27 +848,6 @@ with pkgs;
 
   inherit (lib.systems) platforms;
 
-  setJavaClassPath = makeSetupHook {
-    name = "set-java-classpath-hook";
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/set-java-classpath.sh;
-
-  fixDarwinDylibNames = callPackage (
-    {
-      lib,
-      targetPackages,
-      makeSetupHook,
-    }:
-    makeSetupHook {
-      name = "fix-darwin-dylib-names-hook";
-      substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; };
-      meta = {
-        platforms = lib.platforms.darwin;
-        license = lib.licenses.mit;
-      };
-    } ../build-support/setup-hooks/fix-darwin-dylib-names.sh
-  ) { };
-
   writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { };
 
   desktopToDarwinBundle = makeSetupHook {

From 1dc640aa8ea8282882b8678254fc9d2606028e54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:40:46 +0000
Subject: [PATCH 165/339] anda: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/an/anda/package.nix b/pkgs/by-name/an/anda/package.nix
index 949f0b0ba872..b494810cee55 100644
--- a/pkgs/by-name/an/anda/package.nix
+++ b/pkgs/by-name/an/anda/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "anda";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "FyraLabs";
     repo = "anda";
     tag = finalAttrs.version;
-    hash = "sha256-bnjTXLxFDc/blyu2Ns8EV5ZCh97RLJpQsGtavxP9W+4=";
+    hash = "sha256-4KiqIBWQfI8IagSoa39+bh0bVdhbuwTmxPdNkRlNEdA=";
   };
 
-  cargoHash = "sha256-GWPl91Y2DDrFMvsUAZBYburNpPgl2O/ZLeYy0ivclOA=";
+  cargoHash = "sha256-EWPahdExDi0TFVVMPljTb+j8iUtoqYOqU8LI621gj30=";
 
   __structuredAttrs = true;
 

From 7179ad701dbc7715ccf6d4af972cd9381974bcd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:45:02 +0000
Subject: [PATCH 166/339] python3Packages.smg-grpc-proto: 0.4.8 -> 0.4.10

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

diff --git a/pkgs/development/python-modules/smg-grpc-proto/default.nix b/pkgs/development/python-modules/smg-grpc-proto/default.nix
index 5f25a0871d70..e4b35d5210df 100644
--- a/pkgs/development/python-modules/smg-grpc-proto/default.nix
+++ b/pkgs/development/python-modules/smg-grpc-proto/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "smg-grpc-proto";
-  version = "0.4.8";
+  version = "0.4.10";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
     format = "setuptools";
     pname = "smg_grpc_proto";
     inherit (finalAttrs) version;
-    hash = "sha256-BK2sEbhHsa5/+yej9SB5A06SHB+9oCuuMmwENHJPyHY=";
+    hash = "sha256-VBVhjSUuWitD0du9LB6uMFdgBw3SRzUwgUCu0Gp0hr4=";
   };
 
   build-system = [

From 182e44d968ca9e39dcc6dd6ce260278cdac77b6e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 Jun 2026 01:27:29 +0200
Subject: [PATCH 167/339] wyoming-faster-whisper: 3.1.0 -> 3.2.0

https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v3.2.0
---
 .../home-automation/wyoming/faster-whisper.nix      | 13 +++++++++++++
 pkgs/by-name/wy/wyoming-faster-whisper/package.nix  | 11 +++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix
index 834cd7c6b774..c0851d190ec8 100644
--- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix
+++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix
@@ -39,6 +39,17 @@ in
             options = {
               enable = mkEnableOption "Wyoming faster-whisper server";
 
+              task = mkOption {
+                type = enum [
+                  "transcribe"
+                  "translate"
+                ];
+                default = "transcribe";
+                description = ''
+                  Whisper task to perform.
+                '';
+              };
+
               zeroconf = {
                 enable = mkEnableOption "zeroconf discovery" // {
                   default = true;
@@ -349,6 +360,8 @@ in
                 options.uri
                 "--device"
                 options.device
+                "--whisper-task"
+                options.task
                 "--stt-library"
                 options.sttLibrary
                 "--model"
diff --git a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix
index 65ddaad79125..8821f9552356 100644
--- a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix
+++ b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "wyoming-faster-whisper";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-faster-whisper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p1FCyj/D7ndKJD1/V5YzhT0xlkg61DSx2m3DCELmPO8=";
+    hash = "sha256-4tgBsraFd7IUHw6p/59FHzuUISOaALxBU7H8V0yQl0E=";
   };
 
   build-system = with python3Packages; [
@@ -25,11 +25,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "wyoming"
   ];
 
-  pythonRemoveDeps = [
-    # https://github.com/rhasspy/wyoming-faster-whisper/pull/81
-    "requests"
-  ];
-
   dependencies = with python3Packages; [
     faster-whisper
     wyoming
@@ -58,7 +53,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "wyoming_faster_whisper"
   ];
 
-  # no tests
+  # tests require models from huggingface
   doCheck = false;
 
   meta = {

From 74ea8346d84e006337538b62c0f5e0e355221824 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2026 23:49:41 +0000
Subject: [PATCH 168/339] python3Packages.netbox-dns: 1.5.9 -> 1.5.10

---
 pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix
index e3eb95a6e56f..8a86085099b2 100644
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix
@@ -7,7 +7,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "netbox-plugin-dns";
-  version = "1.5.9";
+  version = "1.5.10";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: {
     owner = "peteeckel";
     repo = "netbox-plugin-dns";
     tag = finalAttrs.version;
-    hash = "sha256-yWOoYQm5XQs8j2DWs1UAaT9LwI61TKHjfOdjRn6UtJA=";
+    hash = "sha256-wxTW/qiwp+1CXUeCDJnllEW2oCTjlFVUot7JfWPooaw=";
   };
 
   build-system = [ setuptools ];

From e9fd13d9588532fcc9b74a0d32702df7470acea3 Mon Sep 17 00:00:00 2001
From: Gareth Pye <gareth@cerberos.id.au>
Date: Mon, 15 Jun 2026 12:45:36 +1000
Subject: [PATCH 169/339] chhoto-url: Enable git LFS for pulling the images

Upstream switched to using LFS for storing the images (favicon, etc): https://github.com/SinTan1729/chhoto-url/commit/fcbb3e13e503163075061553430453d5e16e758a
---
 pkgs/by-name/ch/chhoto-url/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 7f3a2ec9ba89..e40b1fb1ca42 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -14,7 +14,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-B6bMuy/EEveYtQtGBO5CNeEUlPK8eQ412k+SwlRPm2M=";
+    hash = "sha256-n8fCQeY0gIyZuACKWa8Fk9TQ680PpVS2MHMFy7UgDwk=";
+    fetchLFS = true;
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";

From a997fe11409089f4e9db39b5b223046ce963b92c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 00:39:40 +0000
Subject: [PATCH 170/339] inventree: 1.3.3 -> 1.3.5

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

diff --git a/pkgs/by-name/in/inventree/package.nix b/pkgs/by-name/in/inventree/package.nix
index b40201deee1e..fc63844cbdf9 100644
--- a/pkgs/by-name/in/inventree/package.nix
+++ b/pkgs/by-name/in/inventree/package.nix
@@ -14,12 +14,12 @@
 }:
 let
 
-  version = "1.3.3";
+  version = "1.3.5";
   src = fetchFromGitHub {
     owner = "inventree";
     repo = "inventree";
     tag = "${version}";
-    hash = "sha256-Xh3YcVz5OLQ596uWUEac87CKi62xgr63dYiYb6U6qXQ=";
+    hash = "sha256-SxJc09zy7aKW+PVl4My3jzwsktkbsvNnyXMTMs/NzUA=";
     postCheckout = ''
       git -C $out rev-parse HEAD > $out/commit_hash.txt
       git -C $out show -s --format=%cd --date=short HEAD > $out/commit_date.txt

From 3e397c5775dcf26c4ac86e01e79c5ff0535dd9cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 01:15:42 +0000
Subject: [PATCH 171/339] terraform-providers.launchdarkly_launchdarkly: 2.29.0
 -> 2.30.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 3f42d79daa0b..60e73e9bf1b2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -842,11 +842,11 @@
     "vendorHash": "sha256-PIltVJ3o3ROFi1ensrJyFYEsCm6nEFXHkkTPU3ho+gU="
   },
   "launchdarkly_launchdarkly": {
-    "hash": "sha256-DCc+qQdVVDdFiHaDv6jc4MUuWPemk3XEeBEKAbTUi7M=",
+    "hash": "sha256-PgAK0BUTSyW4CXssQkENohnhtd2O5GPuFVvSDcHWjQ8=",
     "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
     "owner": "launchdarkly",
     "repo": "terraform-provider-launchdarkly",
-    "rev": "v2.29.0",
+    "rev": "v2.30.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM="
   },

From eb573783ad8c78085ddf4a4b075d3675e77f091e Mon Sep 17 00:00:00 2001
From: Sapi <144389458+tree-sapii@users.noreply.github.com>
Date: Fri, 12 Jun 2026 22:24:15 -0400
Subject: [PATCH 172/339] tailwindcss-language-server: 0.14.28 -> 0.14.29

---
 .../tailwindcss-language-server/package.nix   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
index 0a4b336074c2..0f31a49b3ec1 100644
--- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix
+++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
@@ -3,20 +3,20 @@
   stdenv,
   fetchFromGitHub,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tailwindcss-language-server";
-  version = "0.14.28";
+  version = "0.14.29";
 
   src = fetchFromGitHub {
     owner = "tailwindlabs";
     repo = "tailwindcss-intellisense";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jds6Wq4rcR4wXonZ1v9JITiEc4gflT0sTc3KUSBCMFc=";
+    hash = "sha256-o5NyU52j3ZyuKWT4lL5U78qz4TBbXerylTl2fdvwqlk=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -25,15 +25,21 @@ stdenv.mkDerivation (finalAttrs: {
       version
       src
       pnpmWorkspaces
+      patchPhase
       ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-3pHEmYMgQuHFFMyGeFzo9BWRFt6yvWzFFMJEdRhwS2w=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-excPYLP+81ftU/LwBeO/lmj4Nbefb4dNvpvudg/sx+w=";
   };
 
+  patchPhase = ''
+    substituteInPlace ./packages/tailwindcss-language-server/package.json \
+      --replace '"@tailwindcss/oxide": "^4.1.15",' '"@tailwindcss/oxide": "^4.1.14",'
+  '';
+
   nativeBuildInputs = [
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
   ];
 
   buildInputs = [

From ebc03826a3cd26d646cb9fb66b5dceba09df6edd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 01:57:22 +0000
Subject: [PATCH 173/339] clickhouse-lts: 26.3.12.3-lts -> 26.3.13.31-lts

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

diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix
index d039c92c54f7..d265a7c5abc6 100644
--- a/pkgs/by-name/cl/clickhouse/lts.nix
+++ b/pkgs/by-name/cl/clickhouse/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "26.3.12.3-lts";
-  rev = "d23c7536b980c34b39c850b08ef23c509f06aaaa";
-  hash = "sha256-xM+dqOSNa4rMaCGgz86UCdF3szwXgYr5vH1Ov7y4X08=";
+  version = "26.3.13.31-lts";
+  rev = "27ae4e9fe0e3f97f012b3be293caf42a60d08747";
+  hash = "sha256-NTts2SiaQ+B+iPCAPLF4fLQmZ9/0Gp2FFu/E0aXfCMc=";
   lts = true;
 }

From 420039c8c9d6a17bf8b0e9696c2e7c14e23aaf38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 02:21:23 +0000
Subject: [PATCH 174/339] prow: 0-unstable-2026-06-03 -> 0-unstable-2026-06-15

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

diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix
index 755c375fe641..ddc780c80ae3 100644
--- a/pkgs/by-name/pr/prow/package.nix
+++ b/pkgs/by-name/pr/prow/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "prow";
-  version = "0-unstable-2026-06-03";
-  rev = "539ecaca1ce9f8aeeefbfd016be10d5c02876f6c";
+  version = "0-unstable-2026-06-15";
+  rev = "351e8cfd58915657bd36a50e7e86bbe972bc0739";
 
   src = fetchFromGitHub {
     inherit rev;
 
     owner = "kubernetes-sigs";
     repo = "prow";
-    hash = "sha256-6ySI5Nyv+Twd37w4S7Vxl2To9jjpEyxIH/giQmAY4oo=";
+    hash = "sha256-TvEAgi2uj1B513o2YWuONiCmCzQvA9S7XPL7MF1VZK4=";
   };
 
   vendorHash = "sha256-PmvEW80vYTHfcgMOf1AwF9Xb3U9Uj85IJzBpRDxJzhM=";

From b30144ea4a1e5af8fdbdd35242b81ee58ba452d8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 16 Jun 2026 04:35:11 +0200
Subject: [PATCH 175/339] {palemoon-bin,palemoon-gtk2-bin}: 34.3.0 -> 34.3.0.1

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

diff --git a/pkgs/by-name/pa/palemoon-bin/package.nix b/pkgs/by-name/pa/palemoon-bin/package.nix
index c43324e7d19a..fbb903774a53 100644
--- a/pkgs/by-name/pa/palemoon-bin/package.nix
+++ b/pkgs/by-name/pa/palemoon-bin/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "34.3.0";
+  version = "34.3.0.1";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -171,11 +171,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-yoZqZJLxgDIxIeyrn6VW6c6iKpU84ZDsJbCz3yf4gdU=";
+          hash = "sha256-U9OwgiQMVOayt5Krlina2s33wS55HuLN255tkVyQxoY=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-QhrW1ZD1ouPvWJLvnIEMHgTViGNBshFlT6Ax0l0xGv8=";
+          hash = "sha256-Yzr2ovHKFFNIem1PXTaajlxVKXB5frZQ/kfOL+jsmtE=";
         };
       };
 

From cbb15ea618af7711514b0d31c34c248f8f2a695e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 03:26:47 +0000
Subject: [PATCH 176/339] python3Packages.microsoft-kiota-serialization-json:
 1.10.2 -> 1.10.3

---
 .../microsoft-kiota-serialization-json/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
index ca3edef149bd..d0b08a6286d5 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "microsoft-kiota-serialization-json";
-  version = "1.10.2";
+  version = "1.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-json-v${finalAttrs.version}";
-    hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I=";
+    hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/serialization/json/";

From b63f17f386203c04444d3044c40c27aa952d789d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 03:31:49 +0000
Subject: [PATCH 177/339] terraform-providers.lxc_incus: 1.1.0 -> 1.1.1

---
 .../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 3f42d79daa0b..fc9c0ee7c8de 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -878,13 +878,13 @@
     "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8="
   },
   "lxc_incus": {
-    "hash": "sha256-m3xUqIUvowu+SZ7TxXYKjOv0Th/Pah0MXVAdaaSPeCo=",
+    "hash": "sha256-Jabbg13UetT4B+kGNP2DDEXFALR8apqjPB5xWkHF5UA=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v1.1.0",
+    "rev": "v1.1.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-vTJXA7vHVE/m68gr1nHInGs/2T/4OzwS6T3BAAJ+ATo="
+    "vendorHash": "sha256-nRkttehaieVOcTBJ3rIU/JHtv/q4fU18z8MUo3xtE28="
   },
   "marcofranssen_dexidp": {
     "hash": "sha256-Aby3FNEA6LgsGM/N10LNu9sCv3f2N8WIrmWoqEqTa8E=",

From 2188a9d0285554440566a9cb47883228f5323b5b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 16 Jun 2026 11:29:50 +0800
Subject: [PATCH 178/339] luau: 0.720 -> 0.725

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

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

From 6c7f838c712edda68005ee82aeae9e8fb041ca2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 03:35:42 +0000
Subject: [PATCH 179/339] python3Packages.atproto: 0.0.67 -> 0.0.68

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

diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix
index eccdd83788ec..6692891b1546 100644
--- a/pkgs/development/python-modules/atproto/default.nix
+++ b/pkgs/development/python-modules/atproto/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "atproto";
-  version = "0.0.67";
+  version = "0.0.68";
   pyproject = true;
 
   # use GitHub, pypi does not include tests
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "MarshalX";
     repo = "atproto";
     tag = "v${version}";
-    hash = "sha256-r/+4DvTjMdu5v0tgbs9YgO3/EOJJqE81rEFrVMzq+x4=";
+    hash = "sha256-z5/CLC2pxp2cFNZQsnQT96g8y2CFjNmiEatu8yEmYHw=";
   };
 
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From 03d85ef09e519ae3b75b6603c2ee1195e462a784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 03:38:25 +0000
Subject: [PATCH 180/339] libretro.fceumm: 0-unstable-2026-05-06 ->
 0-unstable-2026-06-15

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

diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index 3abd97a160f1..af55857f56dc 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2026-05-06";
+  version = "0-unstable-2026-06-15";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "3a84a6fd0ba20dd4877c06b1d58741172148395f";
-    hash = "sha256-4+kEoN0+SWl284n7tIR76aysf0GlLdxELDXfpEK6mi8=";
+    rev = "c0c52ad0eb36cdbfc66e9bdb72efc83103e85e22";
+    hash = "sha256-e81kpVUTz3l9wqCwN9Zf4LrnskPRW7Ewy78/1BApZlg=";
   };
 
   meta = {

From efac900ca7c422ed85600d6b4aea685dfdb00fbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 03:52:09 +0000
Subject: [PATCH 181/339] just-lsp: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix
index 0d928cc1c41e..eb9ea1b0f1b1 100644
--- a/pkgs/by-name/ju/just-lsp/package.nix
+++ b/pkgs/by-name/ju/just-lsp/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "just-lsp";
-  version = "0.4.5";
+  version = "0.4.6";
 
   __structuredAttrs = true;
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "terror";
     repo = "just-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-Ly+9JXZNCQ3uFt2r6Cte88Hzr6VxpKFHYx29SdngfuE=";
+    hash = "sha256-x58iZ1TSwMZSPQsxlXeMgBxBMezCLJkbGFMWE4gV2PE=";
   };
 
-  cargoHash = "sha256-nsTC4ks81F0E8OqOaRXYlzi/RTg+ywpiCsTwKFGwCt0=";
+  cargoHash = "sha256-XSXzCTbacnxuK9rjuRhnNu9uglK+H1Ixfm00A+6O5MM=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 2b5d250b841c2c10070e5be614ce08e2188198f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 04:22:13 +0000
Subject: [PATCH 182/339] linuxPackages.amneziawg: 1.0.20260329-2 ->
 1.0.20260611

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

diff --git a/pkgs/os-specific/linux/amneziawg/default.nix b/pkgs/os-specific/linux/amneziawg/default.nix
index e291e91d77d5..9a0dc5751153 100644
--- a/pkgs/os-specific/linux/amneziawg/default.nix
+++ b/pkgs/os-specific/linux/amneziawg/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amneziawg";
-  version = "1.0.20260329-2";
+  version = "1.0.20260611";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-linux-kernel-module";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BlWnncTzVKDpCVvtLp8L+bABs81YH/Ce+9JGCoCm1LI=";
+    hash = "sha256-eMApc7VHWB1GL8YWdAS7HyEgkV/nkLjwBMOP+gtuHOE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From 71c0a6ab798e634e78135128501ae60fbb038315 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 04:22:48 +0000
Subject: [PATCH 183/339] python3Packages.nmcli: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/nmcli/default.nix b/pkgs/development/python-modules/nmcli/default.nix
index 2f16ca8d6947..fa427355ed68 100644
--- a/pkgs/development/python-modules/nmcli/default.nix
+++ b/pkgs/development/python-modules/nmcli/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "nmcli";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ushiboy";
     repo = "nmcli";
     tag = "v${version}";
-    hash = "sha256-OQwvSg8IzBsZJgAAjoKvHyXBE/gSyhcvFLuEidqstzI=";
+    hash = "sha256-x3P+bayBG8SKnMxacIE9UQSE6GFqCX47Z4xtrFJOoRg=";
   };
 
   build-system = [

From 44bd912379d63e12515eff9391cf9d3420afbb9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 04:40:20 +0000
Subject: [PATCH 184/339] cudaPackages.cutlass: 4.5.1 -> 4.5.2

---
 pkgs/development/cuda-modules/packages/cutlass.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix
index 8f3c492a20c3..1866bba22a03 100644
--- a/pkgs/development/cuda-modules/packages/cutlass.nix
+++ b/pkgs/development/cuda-modules/packages/cutlass.nix
@@ -46,13 +46,13 @@ backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
   name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "cutlass";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rW//OyY9fZjxavT5QYjLvc5oOpQhrXiDGwM2NTFuehY=";
+    hash = "sha256-5SMEfoqB2QXRfH5wBwTKKjez0x2zhR8T8EA0bqPMqwM=";
   };
 
   # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a

From 9318361ec3293610e3639c76e018e50c3ed07ef8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 05:13:59 +0000
Subject: [PATCH 185/339] python3Packages.jupyterhub: 5.4.6 -> 5.5.0

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

diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 2c2cc5f927f5..005420dfa09a 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -51,7 +51,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jupyterhub";
-  version = "5.4.6";
+  version = "5.5.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -59,7 +59,7 @@ buildPythonPackage (finalAttrs: {
     owner = "jupyterhub";
     repo = "jupyterhub";
     tag = finalAttrs.version;
-    hash = "sha256-ndL5pE332VDlCk16XYUDaXhsg/J8ndGtgDhKct+y26c=";
+    hash = "sha256-BDU0RP6NRRnSZelRadhvSm2mfsuewyMwpcRlDBPDC0E=";
   };
 
   npmDeps = fetchNpmDeps {

From 13a377738beb89a6efd698bfab85b5cc537cd601 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:03:55 +0000
Subject: [PATCH 186/339] tgeraser: 1.6.0 -> 1.6.2

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

diff --git a/pkgs/by-name/tg/tgeraser/package.nix b/pkgs/by-name/tg/tgeraser/package.nix
index a16e3597813e..2cb85c8f5262 100644
--- a/pkgs/by-name/tg/tgeraser/package.nix
+++ b/pkgs/by-name/tg/tgeraser/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tgeraser";
-  version = "1.6.0";
+  version = "1.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "en9inerd";
     repo = "tgeraser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8RcOfA7rGgVjkOrsBpCf9RsJ93xtS65hIUe1vPDpPNI=";
+    hash = "sha256-oX4bLbTFnWzuPLqygGDMAT7ObUMDS1nD1fGFqCa9SJQ=";
   };
 
   build-system = [ python3Packages.setuptools ];

From bffcba3931e07ae04ad373b604a501ca02b7366e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:08:54 +0000
Subject: [PATCH 187/339] terraform-providers.aiven_aiven: 4.57.0 -> 4.58.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 3f42d79daa0b..88782f0f1efe 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-Yevs7mUu5Mr9JBbPE8CIKufYCLKealbBXrNL+mRH2Yw=",
+    "hash": "sha256-LfchOoquLq6YwRqwWv+q4V2+0wRE1zehWddlwf3GItI=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.57.0",
+    "rev": "v4.58.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-ndIxcO14+NAKmRs9wVEE/HhBx9Wj4AwiMv+nus6BDK4="
+    "vendorHash": "sha256-0ttD+LdZaIKiVMRsck4o0ibKHpAGfYMSSOanUKq89Js="
   },
   "akamai_akamai": {
     "hash": "sha256-M6Btq8wX1lsEs1HUaaTwGspnvS2IyE0L2ITe+ogDTlc=",

From 067bec3626d88bcde44afa9d9f75d0d9050b0a87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:09:43 +0000
Subject: [PATCH 188/339] terraform-providers.hashicorp_google-beta: 7.35.0 ->
 7.36.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 3f42d79daa0b..f2339b9a87ce 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -589,13 +589,13 @@
     "vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-WsZY4O5kUoOkDcP2iKmkLo85XaBM2oQxaB/7ibJMDwA=",
+    "hash": "sha256-eqbMR7U6hBZ6eue7QTPeA1YeRBxk/XerbmZ+FP4oHQM=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.35.0",
+    "rev": "v7.36.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-CjrVDZpRlnPA1MnWEZdFyO3YzgaHqTsiw+kKOW+//2g="
+    "vendorHash": "sha256-JAxI/E8GlUZd3RlhsrIhGm4+G18/obms+czJORYCENY="
   },
   "hashicorp_helm": {
     "hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=",

From 58b384f3d8aaace114f87b7ed4e20e182d6fe141 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 15 Jun 2026 17:52:28 -0600
Subject: [PATCH 189/339] maintainers: update ryand56

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 630ade480827..fd09e562c491 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24257,6 +24257,7 @@
   };
   ryand56 = {
     email = "git@ryand.ca";
+    matrix = "@ryan:ryand.ca";
     github = "ryand56";
     githubId = 22267679;
     name = "Ryan Omasta";

From cc01a06290339c73c643e092784d76051759fcdc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:23:58 +0000
Subject: [PATCH 190/339] rucio: 39.4.2 -> 40.3.0

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

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
index 8385c8a03ce8..5d6ca8cd696e 100644
--- a/pkgs/development/python-modules/rucio/default.nix
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -40,13 +40,13 @@
 }:
 
 let
-  version = "39.4.2";
+  version = "40.3.0";
 
   src = fetchFromGitHub {
     owner = "rucio";
     repo = "rucio";
     tag = version;
-    hash = "sha256-xLOSdpkBjku3AehH6n9+hT1HM5QCwr1Sh7KEQRHr7jg=";
+    hash = "sha256-HJE4isk+1eOyfIzjVKg888CxW/JuKFGtTbjZNEfodt4=";
   };
 in
 buildPythonPackage {

From 526b6b177011d040f11053132d96aaefb2fbe16e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:28:13 +0000
Subject: [PATCH 191/339] plasmavantage: 0.30 -> 0.31

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

diff --git a/pkgs/by-name/pl/plasmavantage/package.nix b/pkgs/by-name/pl/plasmavantage/package.nix
index dfc6c10b34c3..aaf2a023991d 100644
--- a/pkgs/by-name/pl/plasmavantage/package.nix
+++ b/pkgs/by-name/pl/plasmavantage/package.nix
@@ -6,12 +6,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasmavantage";
-  version = "0.30";
+  version = "0.31";
   src = fetchFromGitLab {
     owner = "Scias";
     repo = "plasmavantage";
     tag = finalAttrs.version;
-    hash = "sha256-++WewCzTWGrMTXhBQQ339W/bDgKO040xeBNhozljsko=";
+    hash = "sha256-SUsPb7NblnTpcju1d1km5877IPnaykiKd1bHJ/D6wyw=";
   };
 
   strictDeps = true;

From 7e005b0fc00476866e2ed388ddcbed4329748ffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:31:18 +0000
Subject: [PATCH 192/339] cameradar: 6.1.1 -> 6.2.0

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

diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index 12d7eada0d08..6709ee32572c 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cameradar";
-  version = "6.1.1";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = "cameradar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wJiHCJHG8S+iGFd9jFyavyxAtJ5FGlbvfFcGQfwpi9Y=";
+    hash = "sha256-NgzTZpRrFLoFNn3xiR5ysORTO9Yj2kn2aPSwSa441t0=";
   };
 
-  vendorHash = "sha256-1jqGRwgbfcOq6fE3h9RJSeLRlFkd4w4L/2RwscA0zZ0=";
+  vendorHash = "sha256-NljQGN/B/+gdMGmE1pI2rJPfZNY3xBHYLf+xPxzuh3w=";
 
   nativeBuildInputs = [ pkg-config ];
 

From e5a0a9fa9a27bed3fc2159ff78bcbb84e699d41d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:31:48 +0000
Subject: [PATCH 193/339] python3Packages.geoarrow-rust-core: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix
index e1967b606158..32161008b20e 100644
--- a/pkgs/development/python-modules/geoarrow-rust/default.nix
+++ b/pkgs/development/python-modules/geoarrow-rust/default.nix
@@ -22,20 +22,20 @@
   shapely,
 }:
 let
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "geoarrow";
     repo = "geoarrow-rs";
     tag = "py-v${version}";
-    hash = "sha256-qQGGG8aGwFR7ApLaQAE0iQSElpSBeRTtbq4+1xbTC/o=";
+    hash = "sha256-5RWhOw31yRzkBE27LeES7z3G7OgRHQZP3aYacBuPUDM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src version;
     pname = "geoarrow-rust-vendor";
     cargoRoot = "python";
-    hash = "sha256-UjLqynlt5Rkx10hlnaY76wDRhJwhNvHmkhpj04Y8/ek=";
+    hash = "sha256-HbtNzcFkqDS8RpxW6MBfOhhzy5MsaKguKkhDN5xGckY=";
   };
 
   commonMeta = {

From 54645c4980121d8f8b5f56338b531ea1a4935d2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 06:36:38 +0000
Subject: [PATCH 194/339] python3Packages.spotipyfree: 1.9.5 -> 1.9.12

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

diff --git a/pkgs/development/python-modules/spotipyfree/default.nix b/pkgs/development/python-modules/spotipyfree/default.nix
index 962ab48a0e67..7713d203429b 100644
--- a/pkgs/development/python-modules/spotipyfree/default.nix
+++ b/pkgs/development/python-modules/spotipyfree/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "spotipyfree";
-  version = "1.9.5";
+  version = "1.9.12";
   pyproject = true;
 
   # no tags on GitHub
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-1QvcyQcQsLXsEzk6fbNw9lga4KCcoPpxJGorJoacHto=";
+    hash = "sha256-66SITvhrKd1dJucd626Qy9jW9qZYgH/PWYyto3F4Big=";
   };
 
   build-system = [ setuptools ];

From b8fe809fdf16ee8104ed7932d4ed205ec7cbb387 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 16 Jun 2026 00:31:12 -0600
Subject: [PATCH 195/339] python3Packages.hetzner: switch to pyproject

---
 .../python-modules/hetzner/default.nix            | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix
index 592804449801..aee75ab0c4bc 100644
--- a/pkgs/development/python-modules/hetzner/default.nix
+++ b/pkgs/development/python-modules/hetzner/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "hetzner";
   version = "0.8.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    repo = "hetzner";
     owner = "aszlig";
-    rev = "v${version}";
-    sha256 = "0nhm7j2y4rgmrl0c1rklg982qllp7fky34dchqwd4czbsdnv9j7a";
+    repo = "hetzner";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6si0bdPrM9I4hqyR4ac7l1IsUHp05sAAzfVl4oU8FVo=";
   };
 
+  build-system = [ setuptools ];
+
   meta = {
     homepage = "https://github.com/RedMoonStudios/hetzner";
     description = "High-level Python API for accessing the Hetzner robot";
@@ -23,4 +26,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ aszlig ];
   };
-}
+})

From d3f3a582bb017a6bdd254c7b7db934f02dcffa6d Mon Sep 17 00:00:00 2001
From: Thomas Bemme <thomas.bemme@gmail.com>
Date: Mon, 15 Jun 2026 21:49:57 +0200
Subject: [PATCH 196/339] maintainers: add thbemme

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 59fe70cb9843..b409c33c983d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27407,6 +27407,13 @@
     github = "thattemperature";
     githubId = 125476238;
   };
+  thbemme = {
+    name = "Thomas Bemme";
+    email = "thomas.bemme@gmail.com";
+    matrix = "@riza:chaos.jetzt";
+    github = "thbemme";
+    githubId = 14074615;
+  };
   thblt = {
     name = "Thibault Polge";
     email = "thibault@thb.lt";

From c09e94506136a59310b0c85466d6d171b52626b1 Mon Sep 17 00:00:00 2001
From: Thomas Bemme <thomas.bemme@gmail.com>
Date: Tue, 16 Jun 2026 08:58:04 +0200
Subject: [PATCH 197/339] librewolf-unwrapped: add thbemme to maintainers

---
 pkgs/by-name/li/librewolf-unwrapped/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix
index d279ee6ccf2c..eb158cf7c598 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix
@@ -32,6 +32,7 @@ in
       dwrege
       fpletz
       hythera
+      thbemme
     ];
     platforms = lib.platforms.unix;
     broken = stdenv.buildPlatform.is32bit;

From ebdef1a337de8ecffe42ca558021dd33aa941982 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 16 Jun 2026 09:01:10 +0200
Subject: [PATCH 198/339] python3Packages.cryptoparser: 1.1.0 -> 1.2.1

Changelog: https://gitlab.com/coroner/cryptoparser/-/blob/v1.2.1/CHANGELOG.md
---
 pkgs/development/python-modules/cryptoparser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix
index 6c814655ae8f..232c5ada513f 100644
--- a/pkgs/development/python-modules/cryptoparser/default.nix
+++ b/pkgs/development/python-modules/cryptoparser/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cryptoparser";
-  version = "1.1.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "coroner";
     repo = "cryptoparser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zd305BFM3G8LMQqDwtbwRPy6ooNXJ61UzWBwVewh0F4=";
+    hash = "sha256-thhpXfLH5yB3pMUKFrMUJ8+8IGchF813ApKUrN+UuZA=";
   };
 
   patches = [

From 783f6a6cb5c79cb60caef96082eca8f6726d5abf Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 16 Jun 2026 09:01:40 +0200
Subject: [PATCH 199/339] python3Packages.cryptolyzer: 1.1.0 -> 1.2.1

Changelog: https://gitlab.com/coroner/cryptolyzer/-/blob/v1.2.1/CHANGELOG.md
---
 pkgs/development/python-modules/cryptolyzer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix
index e8cc54e9632d..3acb13a63ce1 100644
--- a/pkgs/development/python-modules/cryptolyzer/default.nix
+++ b/pkgs/development/python-modules/cryptolyzer/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cryptolyzer";
-  version = "1.1.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "coroner";
     repo = "cryptolyzer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z9RuboCWHEqw4aFfQTjWly/UP9Yed0R+VdMLVXxdBmc=";
+    hash = "sha256-v+himg/DOBlIRiWBIGkxiahT3JGp384Ed4cUCIq6TOw=";
   };
 
   patches = [

From c2d9735104a5fa7035f533563f9a8e9f44e5031e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 16 Jun 2026 07:03:09 +0000
Subject: [PATCH 200/339] nixl: 1.2.0 -> 1.3.0

Diff: https://github.com/ai-dynamo/nixl/compare/v1.2.0...v1.3.0

Changelog: https://github.com/ai-dynamo/nixl/releases/tag/v1.3.0
---
 pkgs/by-name/ni/nixl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixl/package.nix b/pkgs/by-name/ni/nixl/package.nix
index 44c8fac0e236..9d23e3be2808 100644
--- a/pkgs/by-name/ni/nixl/package.nix
+++ b/pkgs/by-name/ni/nixl/package.nix
@@ -36,7 +36,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "nixl";
-  version = "1.2.0";
+  version = "1.3.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -45,7 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ai-dynamo";
     repo = "nixl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-viyoFc8g0B8kXW2umd7vdAAu+XMk0CJwQEGw+ll3AJ4=";
+    hash = "sha256-rEeR7UnpIill/QLNZAbjPhtggJn/fO9SNEcPwqKgTGc=";
   };
 
   postPatch =

From b3bfa5c605e298ab0724dda11a29064cb6010153 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:07:38 +0000
Subject: [PATCH 201/339] pure-prompt: 1.28.0 -> 1.28.1

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

diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix
index 9f39772e2cc2..cfad1310e22a 100644
--- a/pkgs/by-name/pu/pure-prompt/package.nix
+++ b/pkgs/by-name/pu/pure-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pure-prompt";
-  version = "1.28.0";
+  version = "1.28.1";
 
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-4And0+06KbIsFDTNupi42yR8fa1BjHoZVi9btdYPkTg=";
+    sha256 = "sha256-UQ0hP3qJd4Qxiw1LXPdb9d0Dc4OSD3HJpgYzaCfujno=";
   };
 
   strictDeps = true;

From ff403638a3246f2b5a0a3bcf12931e425b839ab6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:19:18 +0000
Subject: [PATCH 202/339] melonds: 1.1-unstable-2026-05-27 ->
 1.1-unstable-2026-06-07

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

diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix
index d5bef23c640a..4403f9ff44eb 100644
--- a/pkgs/by-name/me/melonds/package.nix
+++ b/pkgs/by-name/me/melonds/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonds";
-  version = "1.1-unstable-2026-05-27";
+  version = "1.1-unstable-2026-06-07";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "c69c1ceb1176a03782f13bb8ae54883a44cb2d5d";
-    hash = "sha256-d/9tlGAo66v0C2/erdoDyLXqoxqaTExztlxbFE4V7d8=";
+    rev = "10a173b5536fc75cd93f8a3868349dad963542ef";
+    hash = "sha256-YsVCU40BZgYoxyuscbD0Ab613eUIgYlXJkm0KJQg+yY=";
   };
 
   nativeBuildInputs = [

From 3da2efb265ef4ee113e5f4d50ecfdfec3863053a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:22:48 +0000
Subject: [PATCH 203/339] python3Packages.pylutron-caseta: 0.28.0 -> 0.29.0

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

diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index 2736f2587fd3..34fd2777f6ba 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylutron-caseta";
-  version = "0.28.0";
+  version = "0.29.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gurumitts";
     repo = "pylutron-caseta";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0HH+tEZoMTmvD3z67nJWauQfxoQ/IK1Bxlu1XbWGqI4=";
+    hash = "sha256-YGdx/WQLM7Dglo4FSEr+QJDKTf7Dyn8V3qSFWNlEu00=";
   };
 
   build-system = [ hatchling ];

From 936e310bdc5082dad52672478711b7fd301db8fa Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Tue, 16 Jun 2026 15:24:04 +0800
Subject: [PATCH 204/339] nezha: fix build on darwin

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

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index 88070b405075..eefd6b8f17ff 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -101,6 +101,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/nezhahq/nezha/service/singleton.Version=${finalAttrs.version}"
   ];
 
+  __darwinAllowLocalNetworking = true; # TestOptionalAuth_PATWithoutScopeIsDenied
   checkFlags = "-skip=^TestSplitDomainSOA$";
 
   postInstall = ''

From 04f926b78b498c38202a1a0868d358ef59ceebd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:31:00 +0000
Subject: [PATCH 205/339] gore: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/by-name/go/gore/package.nix b/pkgs/by-name/go/gore/package.nix
index a15a0c10bfa6..1e50bec96416 100644
--- a/pkgs/by-name/go/gore/package.nix
+++ b/pkgs/by-name/go/gore/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gore";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "motemen";
     repo = "gore";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-EPySMj+mQxTJbGheAtzKvQq23DLljPR6COrmytu1x/Q=";
+    sha256 = "sha256-niMYoYkDaZsv6ntUIfB0B4VheiG6rMouZGUSjHnm51w=";
   };
 
-  vendorHash = "sha256-W9hMxANySY31X2USbs4o5HssxQfK/ihJ+vCQ/PTyTDc=";
+  vendorHash = "sha256-oS5LJfLFrmHEwayoD+HygfamZpmerIL1i4QtoRL4Om4=";
 
   doCheck = false;
 

From afc84f9983bc93fb3e2d4fbca555a51ea1d64bc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:37:17 +0000
Subject: [PATCH 206/339] libretro.genesis-plus-gx: 0-unstable-2026-06-05 ->
 0-unstable-2026-06-12

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index 04d25dced59e..ad5a4b148996 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-06-05";
+  version = "0-unstable-2026-06-12";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "f2b40ca6c97b2ff7f70d3c00d7ace84200bb31eb";
-    hash = "sha256-mvPRDQpRFClcQS26ARf7Mp2eEhf8AbvDG9DdTGHOrlI=";
+    rev = "d046ec708d443ec7d9d38f757fa8e01099dd5c5a";
+    hash = "sha256-Q3eqYnoGAUcQOSt33lcQHHDqc7aLGcxaf+gcRUC4FGs=";
   };
 
   meta = {

From b3b897b4956ef4056f248e26b1e9054b9a73ddd2 Mon Sep 17 00:00:00 2001
From: Artur Manuel <amadaluzia@disroot.org>
Date: Mon, 15 Jun 2026 15:53:27 +0000
Subject: [PATCH 207/339] rmg: 0.8.9 -> 0.9.0

---
 pkgs/by-name/rm/rmg/package.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix
index 8f5707c82b09..8192570ab4f8 100644
--- a/pkgs/by-name/rm/rmg/package.nix
+++ b/pkgs/by-name/rm/rmg/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   gitUpdater,
   boost,
   cmake,
@@ -31,29 +30,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rmg";
-  version = "0.8.9";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "Rosalie241";
     repo = "RMG";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L8fA2D1BQWhJiygHmbOmINBFk27X2Vd7zHCGnElM9EE=";
+    hash = "sha256-7ULpuecg8n5AEpWEYIln2SQV6CsGKMyO9ZHT71bDcIg=";
   };
 
-  # Fixes include errors from including minizip libraries
-  patches = [
-    (fetchpatch2 {
-      name = "0000-fix-minizip-include-archive";
-      url = "https://github.com/Rosalie241/RMG/commit/7e4e402f277803d3a998e96ea04064063bd1551a.patch";
-      hash = "sha256-uyEYv2r7J2nou9AHkezEX0LS/mOnIa6lbQqhxHY9ibo=";
-    })
-    (fetchpatch2 {
-      name = "0001-fix-minizip-include-mupen64plus-core";
-      url = "https://github.com/Rosalie241/RMG/commit/8ee3410680c247dcfee806562073626a0b7bf46b.patch";
-      hash = "sha256-29zg90ScPNizWq3BzNuM6yfCwmMXRYFfbjOg3YpCrGI=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     nasm

From 5d55e94980c92734046cf3840e90cc747aea686b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:51:41 +0000
Subject: [PATCH 208/339] samrewritten: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix
index aa52a1cff34e..4129393a225d 100644
--- a/pkgs/by-name/sa/samrewritten/package.nix
+++ b/pkgs/by-name/sa/samrewritten/package.nix
@@ -15,16 +15,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "samrewritten";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "PaulCombal";
     repo = "SamRewritten";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p24V0rUnCPanci8KqxGhWA793HVcqO8VSHzabSAOR0A=";
+    hash = "sha256-zfjAdInF/Sy9FRALlwGtEvp2K9xCReqpbMvVNPho+Ic=";
   };
 
-  cargoHash = "sha256-beHc4EETX6cyRFEHaiCghvaRZ6uYQOfllygdkiMg+OA=";
+  cargoHash = "sha256-DWt98XoLBShfhfFu1mI7f5Ke/jDIjtllWSpYPS1Sygc=";
 
   # Tests require network access and a running Steam client. Skipping.
   doCheck = false;

From 3075ecefd28789cfc27b75b23be13bd2716e8fc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 07:57:14 +0000
Subject: [PATCH 209/339] check-jsonschema: 0.37.2 -> 0.37.3

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

diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix
index bf59e76541e0..72e671a1a11a 100644
--- a/pkgs/by-name/ch/check-jsonschema/package.nix
+++ b/pkgs/by-name/ch/check-jsonschema/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "check-jsonschema";
-  version = "0.37.2";
+  version = "0.37.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     tag = finalAttrs.version;
-    hash = "sha256-Uflc92J8oSl633FD+DDIDGXvrFCfwpyxTqoNHLcHEpE=";
+    hash = "sha256-9s0AitPH9PAuQ7FH009ppBbH5Z2aNjhinAungoXX3OQ=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 0eee16e9cc2ab4a3d91878bad8aa61bdd8b4fd70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 08:08:05 +0000
Subject: [PATCH 210/339] terraform-providers.ubiquiti-community_unifi: 0.42.0
 -> 0.49.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 3f42d79daa0b..c68720918a88 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-STJXSLtAN1HR46p/Vs3E0ZB/DQ1NW5HTPK50k9kk3EY=",
+    "hash": "sha256-S2/7ESs7YaTmRn7luJgENk1eZXe/tnIYaNuprnUObv0=",
     "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
     "owner": "ubiquiti-community",
     "repo": "terraform-provider-unifi",
-    "rev": "v0.42.0",
+    "rev": "v0.49.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-1leizEFn+5VFy3LOAFAogtDT4pyuaG5in0hMat1sORg="
+    "vendorHash": "sha256-ciATeythUzo+DqLA4g1Vpq4Agc9KjKatpmpXOOOjxA8="
   },
   "ucloud_ucloud": {
     "hash": "sha256-k+NkB1q0oiasLc4+b+mbJ0TNUD67XR9ga9MwSbEXjKQ=",

From 76b183a00ed62d03175f6ace47ee8fd8ddaf2f61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 08:40:50 +0000
Subject: [PATCH 211/339] grafanaPlugins.grafana-exploretraces-app: 2.0.3 ->
 2.0.4

---
 .../grafana/plugins/grafana-exploretraces-app/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
index 770104c28b62..60ecc076f2ee 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-exploretraces-app";
-  version = "2.0.3";
-  zipHash = "sha256-tV0XINCucQZeDirXHBJovA+V2MQ1f0gx3Jo9VsPNqSc=";
+  version = "2.0.4";
+  zipHash = "sha256-pNmHq7kRlpucwd2taNaPa/m3+yBPUJwBLFoWpxe8eVQ=";
   meta = {
     description = "Opinionated traces app";
     license = lib.licenses.agpl3Only;

From 5b932f07cf97e731583e540dc2b0c03bc356202d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 08:47:29 +0000
Subject: [PATCH 212/339] qbittorrent-nox: 5.2.1 -> 5.2.2

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

diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index 7d21ed81972b..671e1d0e3d2b 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.2.1";
+  version = "5.2.2";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qBittorrent";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-xC0XCVbshs4rtfLoJKKp0+IeSN2SRg7J5G504TcXFPI=";
+    hash = "sha256-5lGv1ajuDE/DTqUbnVeRRBcXntrzn6bs72mZbQMf7Fc=";
   };
 
   nativeBuildInputs = [

From 8aa505b42ed755a779ecbc57a85bc23cdec22885 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 08:53:15 +0000
Subject: [PATCH 213/339] skills: 1.5.10 -> 1.5.11

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

diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix
index 1bf0ee506d32..86c8e7ca336c 100644
--- a/pkgs/by-name/sk/skills/package.nix
+++ b/pkgs/by-name/sk/skills/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "skills";
-  version = "1.5.10";
+  version = "1.5.11";
 
   src = fetchFromGitHub {
     owner = "vercel-labs";
     repo = "skills";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nISOazYZ9I786Nn4TKmFXyK6WiTPdULdAG0aeRUVXvA=";
+    hash = "sha256-IAbkeN1ZP8z5xTaZafRLMhAlhXBDw+fkfTvjZBoGeqw=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From 8fddae52a8f54f29594a2e68127f81d27d9b3c21 Mon Sep 17 00:00:00 2001
From: airone01 <airone01@proton.me>
Date: Tue, 16 Jun 2026 10:28:28 +0200
Subject: [PATCH 214/339] mullvad-vpn: 2026.2 -> 2026.3

Diff: https://github.com/mullvad/mullvadvpn-app/compare/2026.2...2026.3

Changelog: https://github.com/mullvad/mullvadvpn-app/blob/2026.3/CHANGELOG.md
---
 pkgs/by-name/mu/mullvad-vpn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix
index 60e664cdb4b5..c7115f9bfb27 100644
--- a/pkgs/by-name/mu/mullvad-vpn/package.nix
+++ b/pkgs/by-name/mu/mullvad-vpn/package.nix
@@ -90,14 +90,14 @@ let
   };
 
   hash = selectSystem {
-    x86_64-linux = "sha256-ewJ/XxqwVLF3/MsiN+AZ+jQodMr+JmPtpbcdXe6HNPo=";
-    aarch64-linux = "sha256-hpuLpDA3PMrlOkF172f0PZY+cGe2gBkRTWCwwwYJwQo=";
+    x86_64-linux = "sha256-OMbuc66AhwaIVgkiooUlttDazGLC5BCTiGPXA46TGso=";
+    aarch64-linux = "sha256-pEzb21CSPn/ZflzZGTSJI5Hz3Q+ERFILg8q7V89AN1Q=";
   };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mullvad-vpn";
-  version = "2026.2";
+  version = "2026.3";
 
   __structuredAttrs = true;
   strictDeps = true;

From 77c2f0dbfc5081149b895b821fcb70bd9fd9c493 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 09:13:04 +0000
Subject: [PATCH 215/339] zapret2: 1.0 -> 1.0.1

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

diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix
index 74dc0ae29657..b9a945235b5d 100644
--- a/pkgs/by-name/za/zapret2/package.nix
+++ b/pkgs/by-name/za/zapret2/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret2";
-  version = "1.0";
+  version = "1.0.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "bol-van";
     repo = "zapret2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OCXsM1vIb/xtuwNCD4gbrlOV3F8jvARwOi1SCWhoOAY=";
+    hash = "sha256-hV9MVkDVkGGGdHCUGRscm9rIKORDEi+xWtfITQE22mw=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"

From 3a1473f76f12e911d8d1b34b8aa52176462c6d25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 09:15:24 +0000
Subject: [PATCH 216/339] yamlscript: 0.2.12 -> 0.2.20

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

diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix
index 36c286df2dcd..5792b1f0e712 100644
--- a/pkgs/by-name/ya/yamlscript/package.nix
+++ b/pkgs/by-name/ya/yamlscript/package.nix
@@ -6,11 +6,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "yamlscript";
-  version = "0.2.12";
+  version = "0.2.20";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-/+vvOvZFVzGNC5838vX2CnLD5V2gEWWTXzEfz0AoSb8=";
+    hash = "sha256-RzMIzwq7L5H40DkVJaIyoa6yK36DphfwW24x0Bbe+Xk=";
   };
 
   extraNativeImageBuildArgs = [

From 2c38756fc126401e5ae40b32c482325c40a366b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 09:22:14 +0000
Subject: [PATCH 217/339] tusd: 2.9.2 -> 2.10.0

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

diff --git a/pkgs/by-name/tu/tusd/package.nix b/pkgs/by-name/tu/tusd/package.nix
index f85925edcc68..1bf4bce2b6df 100644
--- a/pkgs/by-name/tu/tusd/package.nix
+++ b/pkgs/by-name/tu/tusd/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tusd";
-  version = "2.9.2";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "tus";
     repo = "tusd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bHC1pUx/GW3IWtGqsGOOBMWTRM65oCKg9gTL5L8GT+0=";
+    hash = "sha256-rG86IibKEjJ4/JNEBpU9APIrS57b4XL/9/HQIRWb5PM=";
   };
 
-  vendorHash = "sha256-sNWB/qiF/DhRpF0Z+m1NQ3ydUWAr9NdsSaRx0BT8C98=";
+  vendorHash = "sha256-5Sh4u+tW9TPJUNQiBWmG1fQUYVtO+plT4ZZ49iQeXSU=";
 
   ldflags = [
     "-X github.com/tus/tusd/v2/cmd/tusd/cli.VersionName=v${finalAttrs.version}"

From fcd31344c3da2cbd921c5852e3c935a5facf5429 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 16 Jun 2026 17:26:39 +0800
Subject: [PATCH 218/339] python3Packages.smg-grpc-servicer: 0.5.3 -> 0.5.5

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

diff --git a/pkgs/development/python-modules/smg-grpc-servicer/default.nix b/pkgs/development/python-modules/smg-grpc-servicer/default.nix
index 701466ef7a54..c367990e4103 100644
--- a/pkgs/development/python-modules/smg-grpc-servicer/default.nix
+++ b/pkgs/development/python-modules/smg-grpc-servicer/default.nix
@@ -14,7 +14,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "smg-grpc-servicer";
-  version = "0.5.3";
+  version = "0.5.5";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: {
     format = "setuptools";
     pname = "smg_grpc_servicer";
     inherit (finalAttrs) version;
-    hash = "sha256-/stjZWK+5XSTmD9iIRWq+dqthd5kRhty6F7Ffvbfr74=";
+    hash = "sha256-g3SCR/WjoSpxoq1a+Elvf9z+kAvb8nGgayMRMR/q4d8=";
   };
 
   build-system = [

From 24b0dbfb95f10573cf915a7deaf042c0016bacb8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 11:39:42 +0200
Subject: [PATCH 219/339] python3Packages.tencentcloud-sdk-python: 3.1.115 ->
 3.1.116

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.115...3.1.116

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.116/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 2f16eb0d726b..e8535389af88 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.115";
+  version = "3.1.116";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-nGbh+gO1E9cxKh9uWdG7H5KqXcULwehbfHCtpxOHt3M=";
+    hash = "sha256-56WyEdYo0TWZYyYKIaenZDJiXRPFZKuIrpXvjMIgRMU=";
   };
 
   build-system = [ setuptools ];

From bf837eb4f1e111b2af289895f531eee319ffe32b Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Tue, 16 Jun 2026 11:40:03 +0200
Subject: [PATCH 220/339] fluux-messenger: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix
index 6f588a2378ef..7d34624a1e49 100644
--- a/pkgs/by-name/fl/fluux-messenger/package.nix
+++ b/pkgs/by-name/fl/fluux-messenger/package.nix
@@ -18,7 +18,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fluux-messenger";
-  version = "0.16.0";
+  version = "0.16.1";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -26,16 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "processone";
     repo = "fluux-messenger";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-P4bRyge5EGdlZBdX+gIWh48itkCLQ+EjKLHt4xv6qnY=";
+    hash = "sha256-os6zEB1E3D4WSRfru/UCDY0mgZxy0Zu/YcjhMbXt47g=";
   };
 
   cargoRoot = "apps/fluux/src-tauri";
-  cargoHash = "sha256-YIX/F9LMuHFGJ89NIsFLUjjrR7XBoJF78OsyXiSjEqU=";
+  cargoHash = "sha256-V6iDPPBpdJQV5PA/isRy+Gz6NdwUUEj3mf9PM/nX10s=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-rzkFrvLb/0c+pg2SIUnhyTHK2MGL2ugRI9XuHtdm8XE=";
+    hash = "sha256-iMkb7QZZrKjzmTzvWGbw8reF1nX4Avd1XKzyybz3q00=";
   };
 
   nativeBuildInputs = [

From a15f623ba41513e5cb61714dc83ebee01124c5e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 11:40:20 +0200
Subject: [PATCH 221/339] python3Packages.iamdata: 0.1.202606151 ->
 0.1.202606161

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202606151...v0.1.202606161

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202606161
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 7c94104281fb..8a23a3014bff 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202606151";
+  version = "0.1.202606161";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mlh2kTJ/u6jdtR8+etx+zbaFC1P5kE7x+1JAiSPR4bk=";
+    hash = "sha256-B5xXUgF709FCmiLD8t0nNhDhCIid1IDW1cTgJ6UR7c0=";
   };
 
   __darwinAllowLocalNetworking = true;

From 0dd538a9cc521c02f401eda69b8613540be0e6f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 11:54:23 +0200
Subject: [PATCH 222/339] cnspec: 13.21.1 -> 13.22.1

Diff: https://github.com/mondoohq/cnspec/compare/v13.21.1...v13.22.1

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v13.22.1
---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index ebf8ef72e0b4..e6c8eca66eac 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "cnspec";
-  version = "13.21.1";
+  version = "13.22.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uc2W1OWvnzXqEpDtkXd2b8ieCHxOIQ0QAvayDyah7pc=";
+    hash = "sha256-GyaK9aupJ8ki7UlKnkKEtv1jZnbZbzSaFRDDIBBXsYI=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-RGuV0gZgCxmIVb2neb/Yn/Tvo4hZDAK5vUVEl8FxYBI=";
+  vendorHash = "sha256-jeJmizGXrEwtbDzoQZyNfu+GtvAkPHt7qIQthai/i1Y=";
 
   subPackages = [ "apps/cnspec" ];
 

From 2138663709e3623265f4cc395ef0d205d6cd672c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 11:55:43 +0200
Subject: [PATCH 223/339] azurehound: 2.12.1 -> 2.12.2

Diff: https://github.com/SpecterOps/AzureHound/compare/v2.12.1...v2.12.2

Changelog: https://github.com/SpecterOps/AzureHound/releases/tag/v2.12.2
---
 pkgs/by-name/az/azurehound/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index ab84c1aefac3..b1dd9f8fb4c4 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "azurehound";
-  version = "2.12.1";
+  version = "2.12.2";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qJ7mzG1G9ck4xM9dB9rcpojGCAbUoZ8bKZwuZV5bhjA=";
+    hash = "sha256-w8PmSt+QvU0HELkgdYLfIUgK3R5vCYzlPbMyrHztiPw=";
   };
 
   vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY=";

From 09ddbaf6f8797c20847c681b333eeec0e60b9d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 8 May 2026 14:50:14 +0200
Subject: [PATCH 224/339] e57inspector.tests: Add VLM screenshot analysis for
 automatic test checking

On an AMD Ryzen 9 5950X I got:

    VLM inference took 29.9s

Smaller LLMs are faster, but the current (Gemma4 E2B Q4)
is more reliable in its outputs and can correctly describe
what's on screen.

Allowing more than `--threads 1` makes it much faster,
but at the potential cost of nondeterministic
output of `llama-cli`.

The VLM screenshot analysis running in CI makes it slower,
but spending < 1 minute single-core seems worth it
given that it quite robustly removes the need for a human
to check if the GUI renders correctly.

Potential future improvement:
A bit benefit would be content-addressing of the screenshot:
Most nixpkgs update would likely not change the screenshot
pixels at all, reproducing it bit-identically.
In that case, there's no need to re-run the VLM at all.
Doing the VLM analysis in a separate derivation that takes
the screenshot as only input would make it ossible
to cache these results, while still being less maintenance
than having a "golden" screenshot that needs to be updated
by a human when screenshots actually change.
---
 nixos/tests/all-tests.nix                |   2 +-
 nixos/tests/e57inspector.nix             |  71 ++++++++------
 nixos/tests/vlm-screenshot-question.nix  | 118 +++++++++++++++++++++++
 pkgs/by-name/e5/e57inspector/package.nix |   4 +-
 4 files changed, 163 insertions(+), 32 deletions(-)
 create mode 100644 nixos/tests/vlm-screenshot-question.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5b17b838e343..d5e9eefc83dd 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -495,7 +495,7 @@ in
   drupal = runTest ./drupal.nix;
   dublin-traceroute = runTest ./dublin-traceroute.nix;
   dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix;
-  e57inspector = runTest ./e57inspector.nix;
+  e57inspector = import ./e57inspector.nix { inherit pkgs runTest; };
   early-mount-options = runTest ./early-mount-options.nix;
   earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix;
   easytier = runTest ./easytier.nix;
diff --git a/nixos/tests/e57inspector.nix b/nixos/tests/e57inspector.nix
index d421b69f2101..91c4bb90e996 100644
--- a/nixos/tests/e57inspector.nix
+++ b/nixos/tests/e57inspector.nix
@@ -1,38 +1,53 @@
-{ pkgs, ... }:
-{
-  name = "e57inspector";
-  meta.maintainers = with pkgs.lib.maintainers; [
-    nh2
-    chpatrick
-  ];
+{ pkgs, runTest }:
+let
+  testFile = pkgs.fetchurl {
+    url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57";
+    hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM=";
+  };
 
-  nodes.machine =
-    { ... }:
-    {
-      imports = [
-        ./common/x11.nix
-      ];
+  vmTest = runTest {
+    name = "e57inspector-vm";
+    meta.maintainers = with pkgs.lib.maintainers; [
+      nh2
+      chpatrick
+    ];
 
-      services.xserver.enable = true;
-      environment.systemPackages = [
-        pkgs.e57inspector
-        pkgs.xdotool
-      ];
-    };
+    nodes.machine =
+      { ... }:
+      {
+        imports = [
+          ./common/x11.nix
+        ];
 
-  testScript =
-    let
-      testFile = pkgs.fetchurl {
-        url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57";
-        hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM=";
+        services.xserver.enable = true;
+        environment.systemPackages = [
+          pkgs.e57inspector
+        ];
       };
-    in
-    ''
+    enableOCR = true;
+
+    testScript = ''
       start_all()
       machine.wait_for_x()
 
       machine.execute("e57inspector ${testFile} >&2 &")
-      machine.wait_until_succeeds("xdotool search --pid $(pidof .e57inspector-wrapped)")
-      machine.screenshot("screen")
+      machine.wait_for_text("File")  # menu visible
+
+      machine.screenshot("screen.png")
     '';
+  };
+in
+{
+  vm = vmTest;
+
+  screenshot-analysis = pkgs.callPackage ./vlm-screenshot-question.nix {
+    name = "e57inspector-screenshot-analysis";
+    screenshot = "${vmTest}/screen.png";
+    question = ''
+      Look at this screenshot of a desktop application.
+      Answer: Does the application show that a file was loaded into it successfully?
+      For this, only scans matter, as there are no images in the file.
+      The inspector on the left should show child elements below 'Data 3D'.
+    '';
+  };
 }
diff --git a/nixos/tests/vlm-screenshot-question.nix b/nixos/tests/vlm-screenshot-question.nix
new file mode 100644
index 000000000000..9009f4a21d84
--- /dev/null
+++ b/nixos/tests/vlm-screenshot-question.nix
@@ -0,0 +1,118 @@
+# Reusable VLM screenshot analysis derivation.
+#
+# Similar to `wait_for_text()` in NixOS VM tests.
+#
+# Runs a VLM (Vision Language Model) on a screenshot and asserts that the
+# model's answer to a yes/no question ends with "YES".
+#
+# This is useful to automatically test software that is otherwise
+# hard to test, e.g. "does this 3D program render the bunny correctly?".
+# It is especially useful to judge screenshots made in NixOS VM tests.
+{
+  lib,
+  writers,
+  fetchurl,
+  llama-cpp,
+  runCommand,
+  # VLM defaults, chosen to pick a model smart enough to be useful
+  # for screenshot analysis, but small enough to not consume too much RAM
+  # or be too slow for CI.
+  model ? (
+    fetchurl {
+      url = "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/90f9618340396838ee7ff5b0ba2da27da62953d3/gemma-4-E2B-it-Q4_0.gguf";
+      hash = "sha256-nEwdSKRi9/iDsomErE9C02bJxXNDTqtoVT4POL9+tQw=";
+    }
+  ),
+  mmproj ? (
+    fetchurl {
+      url = "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/90f9618340396838ee7ff5b0ba2da27da62953d3/mmproj-F16.gguf";
+      hash = "sha256-FAvo14SXQfiMUHV9UpuENz7o4nBSzCI2hVtTf0qCFfo=";
+    }
+  ),
+  # User-provided arguments:
+  name,
+  screenshot,
+  question,
+}:
+let
+
+  analysisScript =
+    writers.writePython3 "${name}-script" { flakeIgnore = [ "E501" ]; } # allow long lines
+      ''
+        import os
+        import re
+        import subprocess
+        import time
+
+        out = os.environ["out"]
+        screenshot = "${screenshot}"
+        # Using JSON here even permits preserving multi-line ASCII art questions and so on.
+        question = ${builtins.toJSON question}
+
+        # Build the full prompt with output markers for reliable extraction.
+        prompt = (
+            "Start your output with [output-start]."
+            f" {question}"
+            " Explain what you see, and your judgment."
+            " Then answer that question with exactly YES or NO, followed by [output-end]."
+        )
+
+        vlm_start = time.time()
+        result = subprocess.run(
+            [
+                "${lib.getExe llama-cpp}",
+                "--single-turn", "--no-display-prompt", "--log-verbosity", "0", "--jinja",
+                "--simple-io",  # disables the spinner whose backspace chars would corrupt captured output
+                "--reasoning", "off", "--temp", "0",
+                "--threads", "1",  # for determinism
+                "--n-gpu-layers", "0",  # force CPU-only (results on GPUs might be different and nondeterministic, see https://github.com/ggml-org/llama.cpp/pull/16016#issuecomment-3293505238)
+                "--model", "${model}",
+                "--mmproj", "${mmproj}",
+                "--image", screenshot,
+                "-p", prompt,
+            ],
+            capture_output=True,
+            text=True,
+            # `OMP_NUM_THREADS=1` prevents OpenMP from spawning extra threads in the BLAS backend
+            # (OpenBLAS), which causes nondeterminism with `--image`; without `--image`, `--threads 1`
+            # alone is already deterministic (BLAS is not used for short text prompts).
+            # Relevant code: https://github.com/ggml-org/llama.cpp/blob/80afa33aadcc4f71212b17e5e52904491c76b63e/ggml/src/ggml-blas/ggml-blas.cpp#L30-L148
+            # PR to fix it in OpenBLAS: https://github.com/OpenMathLib/OpenBLAS/pull/5808
+            env={**os.environ, "OMP_NUM_THREADS": "1"},
+        )
+        vlm_elapsed = time.time() - vlm_start
+        output = result.stdout
+        print(f"VLM inference took {vlm_elapsed:.1f}s")
+        print(f"VLM raw output: {repr(output)}")
+        if result.returncode != 0:
+            print(f"VLM stderr: {result.stderr}")
+        assert result.returncode == 0, f"llama-cli failed with exit code {result.returncode}"
+
+        print()
+
+        # Post-process: extract the answer between `[output-start]` and `[output-end]` markers.
+        # This is needed because llama-cli prints UI noise (banner,
+        # spinner, stats) to stdout alongside the model's response.
+        # TODO: Replace with `--quiet` once https://github.com/ggml-org/llama.cpp/pull/22848 is merged;
+        #       then also remove the markers from the prompt and the extraction below.
+        matches = re.findall(r"\[output-start\](.*?)\[output-end\]", output, re.DOTALL)
+        assert matches, (
+            f"VLM output did not contain [output-start]...[output-end] markers."
+            f" Raw output: {repr(output)}"
+        )
+        answer = matches[-1].strip()  # use last match (first may be prompt echo)
+        print("VLM answer:")
+        print(answer)
+        assert answer.upper().endswith("YES"), (
+            f"VLM did not confirm expected answer. Answer: {answer}"
+        )
+
+        os.makedirs(out, exist_ok=True)
+        with open(os.path.join(out, "vlm-answer.txt"), "w") as f:
+            f.write(answer + "\n")
+        os.symlink(screenshot, os.path.join(out, "screen.png"))
+      '';
+in
+runCommand name { } ''
+  ${analysisScript}
+''
diff --git a/pkgs/by-name/e5/e57inspector/package.nix b/pkgs/by-name/e5/e57inspector/package.nix
index 895ced7a183c..3b9305bc3af6 100644
--- a/pkgs/by-name/e5/e57inspector/package.nix
+++ b/pkgs/by-name/e5/e57inspector/package.nix
@@ -62,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = {
-    e57inspector = nixosTests.e57inspector;
-  };
+  passthru.tests = nixosTests.e57inspector;
 
   meta = {
     description = "Cross-platform E57 file viewer to list and view stored point clouds, images and metadata";

From 3f8f339a7be547aaf142e053e5beff6b33a7950d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 16 May 2026 22:43:28 +0200
Subject: [PATCH 225/339] cloudcompare.tests: Add VLM screenshot analysis

---
 nixos/tests/all-tests.nix                |  1 +
 nixos/tests/cloudcompare.nix             | 55 ++++++++++++++++++++++++
 pkgs/by-name/cl/cloudcompare/package.nix |  3 ++
 3 files changed, 59 insertions(+)
 create mode 100644 nixos/tests/cloudcompare.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d5e9eefc83dd..48566863b223 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -364,6 +364,7 @@ in
   };
   cloud-init = runTest ./cloud-init.nix;
   cloud-init-hostname = runTest ./cloud-init-hostname.nix;
+  cloudcompare = import ./cloudcompare.nix { inherit pkgs runTest; };
   cloudlog = runTest ./cloudlog.nix;
   cntr = import ./cntr.nix {
     inherit (pkgs) lib;
diff --git a/nixos/tests/cloudcompare.nix b/nixos/tests/cloudcompare.nix
new file mode 100644
index 000000000000..0e9b72da3a41
--- /dev/null
+++ b/nixos/tests/cloudcompare.nix
@@ -0,0 +1,55 @@
+{ pkgs, runTest }:
+let
+  testFile = pkgs.fetchurl {
+    url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57";
+    hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM=";
+  };
+
+  vmTest = runTest {
+    name = "cloudcompare-vm";
+    meta.maintainers = with pkgs.lib.maintainers; [
+      nh2
+    ];
+
+    enableOCR = true;
+
+    nodes.machine =
+      { ... }:
+      {
+        imports = [
+          ./common/x11.nix
+        ];
+
+        services.xserver.enable = true;
+        environment.systemPackages = [
+          pkgs.cloudcompare
+        ];
+      };
+
+    testScript = ''
+      start_all()
+      machine.wait_for_x()
+
+      machine.execute("CloudCompare ${testFile} >&2 &")
+      machine.wait_for_window("CloudCompare")
+
+      # Wait for the file to be loaded; CloudCompare shows "loaded successfully" in its log panel at the bottom.
+      machine.wait_for_text("loaded successfully")
+
+      machine.screenshot("screen.png")
+    '';
+  };
+in
+{
+  vm = vmTest;
+
+  screenshot-analysis = pkgs.callPackage ./vlm-screenshot-question.nix {
+    name = "cloudcompare-screenshot-analysis";
+    screenshot = "${vmTest}/screen.png";
+    question = ''
+      Look at this screenshot of a desktop application.
+      Answer: Does the application show a 3D point cloud viewer (CloudCompare) that has successfully loaded and is displaying a coloured point cloud?
+      Evidence of success: a 3D viewport with coloured points is visible AND there are no error dialogs or error messages.
+    '';
+  };
+}
diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix
index a736269cf28a..28b69ee1ecee 100644
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -16,6 +16,7 @@
   mpfr,
   pcl,
   libsForQt5,
+  nixosTests,
   onetbb,
   xercesc,
   wrapGAppsHook3,
@@ -162,6 +163,8 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  passthru.tests = nixosTests.cloudcompare;
+
   meta = {
     description = "3D point cloud and mesh processing software";
     homepage = "https://cloudcompare.org";

From 86ee3faa49fc954542d39aa46dbd67f6e3011c30 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 12:00:37 +0200
Subject: [PATCH 226/339] python3Packages.claude-agent-sdk: 0.2.101 -> 0.2.102

Diff: https://github.com/anthropics/claude-agent-sdk-python/compare/v0.2.101...v0.2.102

Changelog: https://github.com/anthropics/claude-agent-sdk-python/blob/v0.2.102/CHANGELOG.md
---
 pkgs/development/python-modules/claude-agent-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index c24b84006289..555dba7fc0fa 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.2.101";
+  version = "0.2.102";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ZEXjZZSdw+IOPB4DSSJwVfCEAjgIIs9vholJSeRXoY=";
+    hash = "sha256-Vh+NS/NGzZICfWiw3MSRSeU/PlusyJTFHwPHTaRwO4M=";
   };
 
   build-system = [ hatchling ];

From 69607f2ba4b33bcb3c1d2c7a5c9ac8179232e3b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 12:01:39 +0200
Subject: [PATCH 227/339] python3Packages.awsiotsdk: 1.29.0 -> 1.30.0

Diff: https://github.com/aws/aws-iot-device-sdk-python-v2/compare/v1.29.0...v1.30.0

Changelog: https://github.com/aws/aws-iot-device-sdk-python-v2/releases/tag/v1.30.0
---
 pkgs/development/python-modules/awsiotsdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix
index bc368b92c344..3df76ff2c706 100644
--- a/pkgs/development/python-modules/awsiotsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotsdk/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "awsiotsdk";
-  version = "1.29.0";
+  version = "1.30.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-iot-device-sdk-python-v2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YSBtViejJFlu3r38Kx1sn+TNkfq0+Zy/KfoBlJdj5Gg=";
+    hash = "sha256-e6bQso8+zIQzw9YSjWPR7Ij6q4nXm/jl6ruHtjA9Mr8=";
   };
 
   postPatch = ''

From 6c0eab00fa8ff36e560ee6cf69f6f166193494af Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 12:03:45 +0200
Subject: [PATCH 228/339] python3Packages.cyclonedx-python-lib: 11.9.0 ->
 11.10.0

Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/v11.9.0...v11.10.0

Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v11.10.0
---
 .../python-modules/cyclonedx-python-lib/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index bd4d1b2d08a9..ee5346bc44ec 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyclonedx-python-lib";
-  version = "11.9.0";
+  version = "11.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1Ukq1467cjfrZFewIdFPRWyh73Zf2qmSoZgn4o48h2c=";
+    hash = "sha256-8iZWIiLLMWJsLbl3ayPTcLYbpxT9ccCpgxIRd7d3Bkk=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];

From 184d1b4c0f6e5e05e079a8a6cca67879a317ea2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Tue, 16 Jun 2026 11:19:02 +0100
Subject: [PATCH 229/339] nixos/uwsm: set restartIfChanged = false on session
 units

---
 nixos/modules/programs/wayland/uwsm.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix
index 2ed6a643f39a..838ac2ef01de 100644
--- a/nixos/modules/programs/wayland/uwsm.nix
+++ b/nixos/modules/programs/wayland/uwsm.nix
@@ -37,6 +37,11 @@ let
         ;
     }
   ) cfg.waylandCompositors;
+
+  sessionServices = [
+    "wayland-wm@"
+    "wayland-session-bindpid@"
+  ];
 in
 {
   options.programs.uwsm = {
@@ -136,6 +141,17 @@ in
 
         # UWSM recommends dbus broker for better compatibility
         services.dbus.implementation = "broker";
+
+        # Restarting these kills the graphical session, same treatment as the
+        # display-manager modules.
+        systemd.user.services = lib.genAttrs sessionServices (_: {
+          restartIfChanged = false;
+          # Defining the units here generates drop-ins; without this they
+          # would carry the NixOS default Environment="PATH=coreutils:…",
+          # clobbering the PATH that uwsm imported into the user manager
+          # and breaking spawn actions that rely on it.
+          enableDefaultPath = false;
+        });
       }
 
       (lib.mkIf (cfg.waylandCompositors != { }) {

From 44cd038ef1cc77ac5a7fbd5cd8c49368b4dc0575 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 10:31:59 +0000
Subject: [PATCH 230/339] python3Packages.cyvest: 5.4.1 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/cyvest/default.nix b/pkgs/development/python-modules/cyvest/default.nix
index 148ee24377fc..4ec9fb1f298e 100644
--- a/pkgs/development/python-modules/cyvest/default.nix
+++ b/pkgs/development/python-modules/cyvest/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyvest";
-  version = "5.4.1";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PakitoSec";
     repo = "cyvest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FEi/0pWUHFE1ZwDtKt6u2MPFAUeiOqA8LYfoqDu3vzI=";
+    hash = "sha256-QJirMx/cr9QSCS3wSEDHSGjmBe9XWAtjBEh1ZiRWUGU=";
   };
 
   postPatch = ''

From 10af96ef760fbbec794d667a4c908ba6aef893d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:03:10 +0000
Subject: [PATCH 231/339] material-symbols: 4.0.0-unstable-2026-06-05 ->
 4.0.0-unstable-2026-06-12

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

diff --git a/pkgs/by-name/ma/material-symbols/package.nix b/pkgs/by-name/ma/material-symbols/package.nix
index 9fec0f1f675e..e6cf43b8c55a 100644
--- a/pkgs/by-name/ma/material-symbols/package.nix
+++ b/pkgs/by-name/ma/material-symbols/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation {
   pname = "material-symbols";
-  version = "4.0.0-unstable-2026-06-05";
+  version = "4.0.0-unstable-2026-06-12";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "material-design-icons";
-    rev = "27aa4d49e4fabcb2a7f3acc86d205d33b159fad3";
-    hash = "sha256-l8uXZZZ0rtQIYiEua8xmpuacLiR8hVjclAyc9dUI8z8=";
+    rev = "5d5d1fdd5476f3df3749e9fb872e32021ec7a750";
+    hash = "sha256-e0bxJpehssgnxigSgPt9qxMrKRZcvlVDyLu5DY6MkTA=";
     sparseCheckout = [ "variablefont" ];
   };
 

From 1dac239e54eb3449fe89c85d22e647c64f9b3e7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:04:13 +0000
Subject: [PATCH 232/339] mtail: 3.3.0 -> 3.3.2

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

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 262b534718f5..2de15aec8add 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "mtail";
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zJ30T9+Jy1RqUERlkHbY3w2Beuefwd/otwPXnS4oFrU=";
+    hash = "sha256-Cn6Ssj5ik0G/MORbx+YwY7ekheXim64zUx7oKH5JXD0=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-AXMqLwFcRoFRKrGH8srsH1GjeI25XgjgqrcOpQY3ZbY=";
+  vendorHash = "sha256-v00wX7uz3z/ldwppQd9aJLN/bnhoN/wweY3nbO/fu2I=";
 
   nativeBuildInputs = [
     gotools # goyacc

From 77a1e765537d1ec41ba91335bea87d6c037c1ef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:05:43 +0000
Subject: [PATCH 233/339] ananicy-rules-cachyos: 0-unstable-2026-06-03 ->
 0-unstable-2026-06-15

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

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index b3d263bd6fc8..9f082fd2af32 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2026-06-03";
+  version = "0-unstable-2026-06-15";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "422e807d3376dc9d07e7acfa82b62b5d62275486";
-    hash = "sha256-wDlAbb9O0I7WXsvQ+xLBPRt+haKJjvCJR56TGRC9auA=";
+    rev = "70bc1a2c935518461e4e8d53d7c454489e26565d";
+    hash = "sha256-KJnZRXyl/iagknbFGh06dEtedMzJKZ+uDiXuP2OpMZE=";
   };
 
   dontConfigure = true;

From a64730c2a017c5ccd211ff10170ffe238736cbdc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:22:13 +0000
Subject: [PATCH 234/339] n8n: 2.23.4 -> 2.25.7

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index f7027b35b302..0e91e2fd604c 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -26,20 +26,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "2.23.4";
+  version = "2.25.7";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-0LROPZKLKEKHBgV0kWAfataZB2nMzdsmq1WImCA6bgA=";
+    hash = "sha256-V8CqEzCw4DcLPCao4HRXrJXFeID2+Ef8fNW1xd1b8Vs=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-oqnLywIOhAZr7nmeGvq6k0brcGjHRhR3pVvBQK3Fg0k=";
+    hash = "sha256-JS4OY6CmihsbJRyPszSlNUEViFKfLm2vu+G2upIoLW8=";
   };
 
   nativeBuildInputs = [

From 3c2465d4ee315f3bb52c9a9c6a8ea127a18176b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:24:19 +0000
Subject: [PATCH 235/339] python3Packages.adjusttext: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix
index dd45d9ebbb08..7e67a9344451 100644
--- a/pkgs/development/python-modules/adjusttext/default.nix
+++ b/pkgs/development/python-modules/adjusttext/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "adjusttext";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Phlya";
     repo = "adjusttext";
     tag = "v${version}";
-    hash = "sha256-WMWT2os3ADQOc1ogoCFKBEWnb6/CxgtiWmY45bYomks=";
+    hash = "sha256-MzVyY5GKy41kaGnV234OHmokrUarrV3HCq5GnrdjibM=";
   };
 
   build-system = [

From 1de59e443d65aa1de4921da608accced378828b7 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 16 Jun 2026 13:26:24 +0200
Subject: [PATCH 236/339] simulide: use correct license above 1.1.0

---
 pkgs/by-name/si/simulide/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix
index 32885ea59133..6064a90e2e41 100644
--- a/pkgs/by-name/si/simulide/package.nix
+++ b/pkgs/by-name/si/simulide/package.nix
@@ -168,7 +168,8 @@ stdenv.mkDerivation {
       It supports PIC, AVR, Arduino and other MCUs and MPUs.
     '';
     homepage = "https://simulide.com/";
-    license = lib.licenses.gpl3Only;
+    license =
+      if lib.versionAtLeast versionNum "1.1.0" then lib.licenses.agpl3Only else lib.licenses.gpl3Only;
     mainProgram = "simulide";
     maintainers = with lib.maintainers; [
       carloscraveiro

From 5fca4986204d6b46e4d213c69d0260620bc43402 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:36:03 +0000
Subject: [PATCH 237/339] netboxPlugins.netbox-custom-objects: 0.5.1 -> 0.5.2

---
 .../ne/netbox_4_5/plugins/netbox-custom-objects/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix
index 6cff03d9b841..4a7d67384c07 100644
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "netbox-custom-objects";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
     owner = "netboxlabs";
     repo = "netbox-custom-objects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8PEqt6TpoQ8ncyZPesRos0BQHF3cKIzgoFr56v8UTTY=";
+    hash = "sha256-bFPcv7eEUFfLB7XfxOnJR+pBSXUVKsAupcid2dxjtho=";
   };
 
   build-system = [ setuptools ];

From f507a43c8ea880cd64e9c8e620731f9828dcfa7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 11:55:11 +0000
Subject: [PATCH 238/339] python3Packages.cohere: 7.0.3 -> 7.0.4

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

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index 9b9f77523e7e..b288342f6d75 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "7.0.3";
+  version = "7.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-MEw1H17Cy5ItCek72HSPLDYBmRpTzFEDg9SZE1iMWFE=";
+    hash = "sha256-iFqzWuWOKbJcvmGFEI0jt0fkBlZHlzmzZXZO7tIn638=";
   };
 
   build-system = [ poetry-core ];

From fd3b782a5534275b8b788272aaced96d67cec5d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 12:01:25 +0000
Subject: [PATCH 239/339] terraform-providers.spotinst_spotinst: 1.236.1 ->
 1.237.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 3f42d79daa0b..c3cbc217af23 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-cZ2gKgXLM/0msBvtlWn16TdM1kwd2wRUyV7bvVEd+SE=",
+    "hash": "sha256-rdE1+XqafMMF9+posQ4K1X1NmXdFcw/F3ivVpfYvcD8=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.236.1",
+    "rev": "v1.237.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Gb07NAvZowWIUokmjLq2IOvg4El2hGwJ6J2J9hBj+eg="
+    "vendorHash": "sha256-sg4ql1YKi+2PMLuKJOmOpr3XUdsHlBmyhPFwGIQ4Dxg="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",

From e3cae8abb333d6024619d7ae6de57f6f41100491 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 12:09:30 +0000
Subject: [PATCH 240/339] ctx7: 0.4.4 -> 0.5.2

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

diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix
index 2d1ae96149eb..aaa477fc26d0 100644
--- a/pkgs/by-name/ct/ctx7/package.nix
+++ b/pkgs/by-name/ct/ctx7/package.nix
@@ -16,7 +16,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ctx7";
-  version = "0.4.4";
+  version = "0.5.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "upstash";
     repo = "context7";
     tag = "${finalAttrs.pname}@${finalAttrs.version}";
-    hash = "sha256-3Hk3YEXIR6SAEtCeDeaU1fU/CyvxuObZSNbgqrzeJ/o=";
+    hash = "sha256-CAOFt/oKjeFOIesJCTQsAq0miXssEJKNMLcd6Eb9HZs=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-ugUN1U0OR8dPTq4PADJaq6ElngSlw6PlmYDUFoW+2F4=";
+    hash = "sha256-C+4QgpSJa5sDZr/0ltxHeaPX7IJTgG957dK/iA5sFXs=";
   };
 
   buildPhase = ''

From 65ccb6f831a38059ff8df891a983959d9f3df2b5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 8 Jun 2026 23:12:43 +0300
Subject: [PATCH 241/339] kdePackages: Plasma 6.6.5 -> 6.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 𝑷𝒉𝒊𝒍𝒐𝒄𝒂𝒍𝒚𝒔𝒕 <regime_skylark.0y@icloud.com>
Co-authored-by: adisbladis <adisbladis@gmail.com>
---
 maintainers/scripts/kde/collect-logs.nu       |   4 +-
 maintainers/scripts/kde/generate-sources.py   |   1 +
 .../services/desktop-managers/plasma6.nix     |   3 +
 pkgs/kde/default.nix                          |   1 +
 pkgs/kde/generated/licenses.json              |  33 +-
 pkgs/kde/generated/projects.json              |  46 +-
 pkgs/kde/generated/sources/plasma.json        | 448 +++++++++---------
 pkgs/kde/misc/cxx-rust-cssparser/default.nix  |  55 +++
 pkgs/kde/plasma/default.nix                   |   2 +
 pkgs/kde/plasma/kdeplasma-addons/default.nix  |  32 +-
 .../plasma/kinfocenter/0001-tool-paths.patch  |  75 +--
 pkgs/kde/plasma/krdp/default.nix              |   3 +
 pkgs/kde/plasma/kscreen/default.nix           |   8 +-
 ...er-CAP_SYS_NICE-from-the-ambient-set.patch |  40 --
 ...lugins-qpa-allow-using-nixos-wrapper.patch |  21 +-
 pkgs/kde/plasma/kwin/default.nix              |   2 -
 pkgs/kde/plasma/plasma-bigscreen/default.nix  |  39 ++
 pkgs/kde/plasma/plasma-desktop/default.nix    |   5 -
 .../plasma/plasma-desktop/hwclock-path.patch  |  24 -
 pkgs/kde/plasma/plasma-desktop/tzdir.patch    |  18 -
 pkgs/kde/plasma/plasma-keyboard/default.nix   |   4 +
 .../plasma-login-manager/config-mtime.patch   |  14 -
 .../plasma/plasma-login-manager/default.nix   |   1 -
 .../plasma-login-manager/kwin-path.patch      |   5 +-
 pkgs/kde/plasma/plasma-nm/default.nix         |   2 +
 .../plasma/plasma-vault/hardcode-paths.patch  |  20 +-
 pkgs/kde/plasma/plasma-workspace/default.nix  |   2 +
 .../plasma-workspace/dependency-paths.patch   |  24 +-
 pkgs/kde/plasma/powerdevil/default.nix        |   4 -
 .../plasma/powerdevil/rb-batterymonitor.patch |  10 -
 pkgs/kde/plasma/print-manager/default.nix     |   6 +-
 pkgs/kde/plasma/spectacle/default.nix         |  10 -
 pkgs/kde/plasma/union/default.nix             |  11 +
 33 files changed, 539 insertions(+), 434 deletions(-)
 create mode 100644 pkgs/kde/misc/cxx-rust-cssparser/default.nix
 delete mode 100644 pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
 create mode 100644 pkgs/kde/plasma/plasma-bigscreen/default.nix
 delete mode 100644 pkgs/kde/plasma/plasma-desktop/hwclock-path.patch
 delete mode 100644 pkgs/kde/plasma/plasma-desktop/tzdir.patch
 delete mode 100644 pkgs/kde/plasma/plasma-login-manager/config-mtime.patch
 delete mode 100644 pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch
 create mode 100644 pkgs/kde/plasma/union/default.nix

diff --git a/maintainers/scripts/kde/collect-logs.nu b/maintainers/scripts/kde/collect-logs.nu
index 1d07fa9d2caf..656a97a0ce38 100755
--- a/maintainers/scripts/kde/collect-logs.nu
+++ b/maintainers/scripts/kde/collect-logs.nu
@@ -6,6 +6,8 @@ mkdir logs
 nix-env -qaP -f . -A kdePackages --json --out-path | from json | values | par-each { |it|
     echo $"Processing ($it.pname)..."
     if "outputs" in $it {
-        nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log"
+        try {
+            nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log"
+        }
     }
 }
diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py
index 2966e7ef9675..11a24f7c47ed 100755
--- a/maintainers/scripts/kde/generate-sources.py
+++ b/maintainers/scripts/kde/generate-sources.py
@@ -37,6 +37,7 @@ PROJECTS_WITH_RUST = {
     "akonadi-search",
     "angelfish",
     "kdepim-addons",
+    "kdeplasma-addons",
 }
 
 def to_sri(hash):
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 0785f4f809d1..0813b1b6b84c 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -172,6 +172,9 @@ in
           # touch keyboard
           plasma-keyboard
           qtvirtualkeyboard # used by plasma-keyboard KCM
+
+          # experimental(?) Union theme
+          union
         ]
         ++ lib.optional config.networking.networkmanager.enable qrca
         ++ lib.optionals config.hardware.sensor.iio.enable [
diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 58cdeab2dfc8..e97e6d866a7d 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -69,6 +69,7 @@ let
         selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
         alpaka = self.callPackage ./misc/alpaka { };
+        cxx-rust-cssparser = self.callPackage ./misc/cxx-rust-cssparser { };
         glaxnimate = self.callPackage ./misc/glaxnimate { };
         kdiagram = self.callPackage ./misc/kdiagram { };
         kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { };
diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index c0fe90c9efe5..f7210a6880d8 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -236,6 +236,7 @@
     "LicenseRef-SJFonts"
   ],
   "bluedevil": [
+    "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -278,6 +279,7 @@
   "breeze-grub": [
     "BSD-2-Clause",
     "CC-BY-SA-4.0",
+    "CC0-1.0",
     "Font-exception-2.0",
     "GPL-2.0-or-later",
     "GPL-3.0-only",
@@ -2674,6 +2676,19 @@
     "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
+  "plasma-bigscreen": [
+    "CC-BY-SA-4.0",
+    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
+  ],
   "plasma-browser-integration": [
     "BSD-2-Clause",
     "CC0-1.0",
@@ -2897,6 +2912,7 @@
   ],
   "plasma-welcome": [
     "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2911,6 +2927,7 @@
     "GPL-2.0-or-later",
     "GPL-3.0-only",
     "GPL-3.0-or-later",
+    "ISC",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
@@ -2964,20 +2981,19 @@
     "GPL-2.0-only",
     "GPL-2.0-or-later",
     "GPL-3.0-only",
-    "GPL-3.0-or-later",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL",
-    "MIT"
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "poxml": [
     "CC0-1.0"
   ],
   "print-manager": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
@@ -3204,6 +3220,17 @@
     "LicenseRef-KDE-Accepted-GPL",
     "MIT"
   ],
+  "union": [
+    "BSD-2-Clause",
+    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-3.0-only",
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
+  ],
   "wacomtablet": [],
   "xdg-desktop-portal-kde": [
     "BSD-2-Clause",
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 2c7c29ac958c..f873a3b645f8 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -83,6 +83,12 @@
     "project_path": "pim/akonadi-contacts",
     "repo_path": "pim/akonadi-contacts"
   },
+  "akonadi-e2e-tests": {
+    "description": "Test suite for end-to-end testing of Akonadi Resources against real servers.",
+    "name": "akonadi-e2e-tests",
+    "project_path": "pim/akonadi-e2e-tests",
+    "repo_path": "pim/akonadi-e2e-tests"
+  },
   "akonadi-exchange": {
     "description": "Akonadi plugin for Exchange groupware functionality",
     "name": "akonadi-exchange",
@@ -1715,6 +1721,12 @@
     "project_path": "frameworks/kconfig",
     "repo_path": "frameworks/kconfig"
   },
+  "kconfigeditor": {
+    "description": "Graphical editor for KConfig files",
+    "name": "kconfigeditor",
+    "project_path": "system/kconfigeditor",
+    "repo_path": "system/kconfigeditor"
+  },
   "kconfigwidgets": {
     "description": "Widgets for KConfig",
     "name": "kconfigwidgets",
@@ -2531,6 +2543,12 @@
     "project_path": "utilities/keepsecret",
     "repo_path": "utilities/keepsecret"
   },
+  "kemoji": {
+    "description": "Framework providing an emoji dictionary, model, search and basic components for use in applications.",
+    "name": "kemoji",
+    "project_path": "libraries/kemoji",
+    "repo_path": "libraries/kemoji"
+  },
   "kemoticons": {
     "description": "KEmoticons",
     "name": "kemoticons",
@@ -2897,6 +2915,12 @@
     "project_path": "libs/kirigami-addons",
     "repo_path": "libraries/kirigami-addons"
   },
+  "kirigami-app-components": {
+    "description": "Kirigami addons and modules necessary to do a full featured KDE application, such as integration with configurable keyboard shortcuts and standard actions.",
+    "name": "kirigami-app-components",
+    "project_path": "libraries/kirigami-app-components",
+    "repo_path": "libraries/kirigami-app-components"
+  },
   "kirigami-gallery": {
     "description": "Kirigami component gallery application",
     "name": "kirigami-gallery",
@@ -3089,6 +3113,12 @@
     "project_path": "pim/kmbox",
     "repo_path": "pim/kmbox"
   },
+  "kmcpclientinspector": {
+    "description": "App which allows the user to inspect apps which implement MCP protocol support.",
+    "name": "kmcpclientinspector",
+    "project_path": "sdk/kmcpclientinspector",
+    "repo_path": "sdk/kmcpclientinspector"
+  },
   "kmediaplayer": {
     "description": "KMediaPlayer",
     "name": "kmediaplayer",
@@ -3104,8 +3134,8 @@
   "kmime": {
     "description": "Library to assist handling MIME data",
     "name": "kmime",
-    "project_path": "pim/kmime",
-    "repo_path": "pim/kmime"
+    "project_path": "frameworks/kmime",
+    "repo_path": "frameworks/kmime"
   },
   "kmines": {
     "description": "KMines is the classic Minesweeper game",
@@ -5399,6 +5429,12 @@
     "project_path": "graphics/optiimage",
     "repo_path": "graphics/optiimage"
   },
+  "os-autoinst-distri-kdelinux": {
+    "description": "End-to-end tests for KDE Linux using openQA",
+    "name": "os-autoinst-distri-kdelinux",
+    "project_path": "kde-linux/os-autoinst-distri-kdelinux",
+    "repo_path": "kde-linux/os-autoinst-distri-kdelinux"
+  },
   "osx-patches": {
     "description": "Fixes for KDE problems that occur on Apple OS X",
     "name": "osx-patches",
@@ -8015,6 +8051,12 @@
     "project_path": "websites/libregraphicsmeeting-org-2026",
     "repo_path": "websites/libregraphicsmeeting-org-2026"
   },
+  "websites-linux-kde-org": {
+    "description": "Website for KDE Linux - linux.kde.org",
+    "name": "websites-linux-kde-org",
+    "project_path": "websites/linux-kde-org",
+    "repo_path": "websites/linux-kde-org"
+  },
   "websites-lists-kde-org": {
     "description": "Necessary code to redirect from lists.kde.org to appropriate mail archives",
     "name": "websites-lists-kde-org",
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 991bcead5d2c..5f74fe6626b9 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,367 +1,377 @@
 {
   "aurorae": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/aurorae-6.6.5.tar.xz",
-    "hash": "sha256-58PecQp1+Z34xPgKdB49HpDlxcra5Eo9GAhh0PXJ3Pk="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/aurorae-6.7.0.tar.xz",
+    "hash": "sha256-U4Ij6+dSEwXSmHPCePheeRDreBCjHSppaY7edqXA2jw="
   },
   "bluedevil": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/bluedevil-6.6.5.tar.xz",
-    "hash": "sha256-Q5ZEeoO12rXEhnaQgkGAw29POSIQdGNyL+1CIC2KRf8="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/bluedevil-6.7.0.tar.xz",
+    "hash": "sha256-P9q0pyS6JGoQ8mNwdspTMniP/1w8YZPM806wMeiXPp0="
   },
   "breeze": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/breeze-6.6.5.tar.xz",
-    "hash": "sha256-BsTD5GbNA6jB5BGjiwR1a24UWHmlYFNLL8RGZtQTMPQ="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/breeze-6.7.0.tar.xz",
+    "hash": "sha256-zzdbuqpF9bobPfA2vwxAt+39eJ6yb25G+d0dMldpy9U="
   },
   "breeze-grub": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/breeze-grub-6.6.5.tar.xz",
-    "hash": "sha256-Ww6HUYdDOwyBDFb732sTpeYPcXdBIqYZNwmc63MPpUY="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/breeze-grub-6.7.0.tar.xz",
+    "hash": "sha256-x+atJoKHKWS9cJucyrD8uTKKz1YpQHwji3XvfYA8+iE="
   },
   "breeze-gtk": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/breeze-gtk-6.6.5.tar.xz",
-    "hash": "sha256-dsqtTKLjzosCrh6+DAaBAbsH21HaR/iPo6QM3OOTq/Y="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/breeze-gtk-6.7.0.tar.xz",
+    "hash": "sha256-KFmeF3tBZqezMvg0pyaWz4gs+fap7hknCKJ/R0wQJ8A="
   },
   "breeze-plymouth": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/breeze-plymouth-6.6.5.tar.xz",
-    "hash": "sha256-0QLuiuPG/pNTVTqPxPxfFSwSh+UEws6XXCxyHzwsiBo="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/breeze-plymouth-6.7.0.tar.xz",
+    "hash": "sha256-2gNHVU33S38RsXA71s3eF2kXQuMqXMzfyTJaGzJhBqU="
   },
   "discover": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/discover-6.6.5.tar.xz",
-    "hash": "sha256-DRRxrfSws7+SrJMiXi5IYEk2d/P7mgLb9EsZOufBU1c="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/discover-6.7.0.tar.xz",
+    "hash": "sha256-A9SisXVxdla/7pB/T7lBILhs3MhmPZTnkkrG8nelWyc="
   },
   "drkonqi": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/drkonqi-6.6.5.tar.xz",
-    "hash": "sha256-srEE1fMCJLyogoAkbKmQrDFNgcsb8NOFdhP/aD25LYI="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/drkonqi-6.7.0.tar.xz",
+    "hash": "sha256-VeZibrxQCJmKInVcjNJx8jNYcqUM3fZfFY/dXNI319M="
   },
   "flatpak-kcm": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/flatpak-kcm-6.6.5.tar.xz",
-    "hash": "sha256-BhN3wGTCrAb3fShQ5xGGfpF2jDyDM9/7jysLohgDsBo="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/flatpak-kcm-6.7.0.tar.xz",
+    "hash": "sha256-SmSQaW60yGQ4sE6X3BY75QsM17t+rPuyBGkglP9gt2s="
   },
   "kactivitymanagerd": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kactivitymanagerd-6.6.5.tar.xz",
-    "hash": "sha256-hZu456bvtCEKglEqvsTXtuqaxviDorHbTT3lyhFFIiQ="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kactivitymanagerd-6.7.0.tar.xz",
+    "hash": "sha256-7QZcLXbIXPjhDdcv+PiechNvxMhVYabJheuX3FGERqE="
   },
   "kde-cli-tools": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kde-cli-tools-6.6.5.tar.xz",
-    "hash": "sha256-F+ygLPPVDSZshfREv+87fBwHpZss3r9sok5v2BuA0SI="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kde-cli-tools-6.7.0.tar.xz",
+    "hash": "sha256-JyD/fvv5e+9GmwL1RInz2bKguYyHGu25Fazbr5nzGZg="
   },
   "kde-gtk-config": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kde-gtk-config-6.6.5.tar.xz",
-    "hash": "sha256-KQKgErqF0tIB+HnRfwtPUZEOQ6HLDXYXiLBjsMF9exA="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kde-gtk-config-6.7.0.tar.xz",
+    "hash": "sha256-2W5YIUxmMrSR0yyqSusVrihPg+inXTu5SFl49Cr0q9k="
   },
   "kdecoration": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kdecoration-6.6.5.tar.xz",
-    "hash": "sha256-BujtBLjzzc0wV6ni0jKR70Gjl2+W/Iz5F0eSGIcaqf0="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kdecoration-6.7.0.tar.xz",
+    "hash": "sha256-rP5WV9iJvw3VuLUBMrvpxi9ItQdPy6gmWhy4TWwie10="
   },
   "kdeplasma-addons": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kdeplasma-addons-6.6.5.tar.xz",
-    "hash": "sha256-SP2ufPqiYEKlkCf76N+DeJsXJFi8KvCiOgFaBLgHGvk="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kdeplasma-addons-6.7.0.tar.xz",
+    "hash": "sha256-i4awt5sK8toJfYHc4JmRPUNXTgjEQop5JYcGkheLQpg="
   },
   "kgamma": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kgamma-6.6.5.tar.xz",
-    "hash": "sha256-+rcERciMmM6QfoltjHHL93cQRIgLXvEW/ulphj5TNgo="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kgamma-6.7.0.tar.xz",
+    "hash": "sha256-6MM9ukfaPqD4kFPpQCmCqx+9tpwlm/CLEEegUEsH3ZI="
   },
   "kglobalacceld": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kglobalacceld-6.6.5.tar.xz",
-    "hash": "sha256-M8lft7PN2rV2bgywY6chr195ayhBEUGDpiRuDvVX7cM="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kglobalacceld-6.7.0.tar.xz",
+    "hash": "sha256-/1423Ly4GC8baVBimTqeosxz0mdTay9ZJt4Dn6dzLGU="
   },
   "kinfocenter": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kinfocenter-6.6.5.tar.xz",
-    "hash": "sha256-m3d/hw8SCTnjdCFc4s7TiVcdS9609vAJLJCLjC4ML9Y="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kinfocenter-6.7.0.tar.xz",
+    "hash": "sha256-303tKcuH12W31fSxYcKaQlWGOES+5kJH5vDT8Miz5aM="
   },
   "kmenuedit": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kmenuedit-6.6.5.tar.xz",
-    "hash": "sha256-HCTxXhPRatnAZD6ioISUIDKf0Qti/SYrSM2t5ngnSCg="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kmenuedit-6.7.0.tar.xz",
+    "hash": "sha256-8n/tXImJrQCtxxS8fzd638qXQsTM06//lHjVAu6v/6s="
   },
   "knighttime": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/knighttime-6.6.5.tar.xz",
-    "hash": "sha256-XyZpKoZFQLmTNREG9Uaf0Xk5vVXnn5Mcj5c5XZxagJ0="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/knighttime-6.7.0.tar.xz",
+    "hash": "sha256-wvx1Kc7zs6gL5HFShtAn/IkI7w/oBArqEGgxpSZfwRM="
   },
   "kpipewire": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kpipewire-6.6.5.tar.xz",
-    "hash": "sha256-eu1/chxboF8ggS6ozeBH3MbjN1ulIbvd2CwlkVq/M00="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kpipewire-6.7.0.tar.xz",
+    "hash": "sha256-2/g5t3nFCMICC9+dZCdiOHy6hQWSkd6rOOigwVIjuts="
   },
   "krdp": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/krdp-6.6.5.tar.xz",
-    "hash": "sha256-heNRMfZAwmn422svhY+wQ/b2JmsfZQMBKdEQwK3LgGE="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/krdp-6.7.0.tar.xz",
+    "hash": "sha256-5lylbPL5ZplFENzOzVOJKSLiYa19upkR0vN0BgKTxts="
   },
   "kscreen": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kscreen-6.6.5.tar.xz",
-    "hash": "sha256-dT68AM91NZwue6OquyD/NZbQ+74vC20+1gmNJygqMnY="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kscreen-6.7.0.tar.xz",
+    "hash": "sha256-rVekMmpkl5poqlBopxUXAtmwLbByBnDkvj4XiQW+2lY="
   },
   "kscreenlocker": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kscreenlocker-6.6.5.tar.xz",
-    "hash": "sha256-m6Cu4yNkBR7rIT1I3TwgiuDOcGIZCjD4VXNbpO/jicw="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kscreenlocker-6.7.0.tar.xz",
+    "hash": "sha256-wxVLaKiF7VXUzVd/gT9VU+oLMdvdMbMrN0SQVVD+w9E="
   },
   "ksshaskpass": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/ksshaskpass-6.6.5.tar.xz",
-    "hash": "sha256-sOiKJUajmiaVeO7e9eooFJpxmnrJdXAZ6f8/klTXWkI="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/ksshaskpass-6.7.0.tar.xz",
+    "hash": "sha256-TY7lYdv64xjil4QR2z1/3wkmY/XUXTafHjqSNNhyzuA="
   },
   "ksystemstats": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/ksystemstats-6.6.5.tar.xz",
-    "hash": "sha256-a14vKmqq6XSJ51gY5/g8JYZXgCJ2CCHGd83rzvpULjY="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/ksystemstats-6.7.0.tar.xz",
+    "hash": "sha256-IiTOQeQudYRaqIbhkueDPOY4uGqjHKDk48sx7zbkBms="
   },
   "kwallet-pam": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kwallet-pam-6.6.5.tar.xz",
-    "hash": "sha256-VDSlD0IYZ/wRGQOJvevENAS2TK3MfYex8I/5XvGZhT4="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kwallet-pam-6.7.0.tar.xz",
+    "hash": "sha256-cdvV1qtSQ+eMUjzjgtU70Uw1cxrwlJf76Sm8pBtprtk="
   },
   "kwayland": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kwayland-6.6.5.tar.xz",
-    "hash": "sha256-r7zVPKil+1AQOEFfFHPD0RVW61btj2U+zgP3fXmcrQE="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kwayland-6.7.0.tar.xz",
+    "hash": "sha256-hiHRfpEAvmDqNAI1II0ET9ApMdvvdqMtmkd94xyOM/Q="
   },
   "kwayland-integration": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kwayland-integration-6.6.5.tar.xz",
-    "hash": "sha256-JyB2THOWP+Br144uyjKeumH7Yl3/bT3PSmjsFndmzm4="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kwayland-integration-6.7.0.tar.xz",
+    "hash": "sha256-IRld2c69WlxzhmOybw4dFaspj1ncqvkkNethi540JcM="
   },
   "kwin": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kwin-6.6.5.tar.xz",
-    "hash": "sha256-bBh856VQYJC0OO+QAQODb6BTdnTd6LMeW0l+8yFkPLQ="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kwin-6.7.0.tar.xz",
+    "hash": "sha256-0gt5gJSp9Y5X3lXso9WLHNy32yk564v3ORjE+rbZrsU="
   },
   "kwin-x11": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kwin-x11-6.6.5.tar.xz",
-    "hash": "sha256-1RcnctW53W7w8yMMtfinjfkUjdBwGdjygqCTHK2UayQ="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kwin-x11-6.7.0.tar.xz",
+    "hash": "sha256-msC4W1kBbfuRWH+MGXD71cbyFdEsmkGazQv30PBJNgY="
   },
   "kwrited": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/kwrited-6.6.5.tar.xz",
-    "hash": "sha256-ud9jS+KqFELYJH1iUKh9ffsczW+bzQHA5iEC1atpNqc="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/kwrited-6.7.0.tar.xz",
+    "hash": "sha256-dUOaklYfbDMoBNHSfa4VvFdVuMmvKNp50WwDLVCQOxA="
   },
   "layer-shell-qt": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/layer-shell-qt-6.6.5.tar.xz",
-    "hash": "sha256-6MFFVFrEnVMl8W/3ELUh3qtuW5dF/MGKtDElIiSo+YI="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/layer-shell-qt-6.7.0.tar.xz",
+    "hash": "sha256-5vSLbr4sPKqjwu9thHBVCQTQMK00lrwQpUCYddstqrA="
   },
   "libkscreen": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/libkscreen-6.6.5.tar.xz",
-    "hash": "sha256-8v0R8vZf+cpP87ULmVMBipKbG/MmOzLsFxxCmORmIUk="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/libkscreen-6.7.0.tar.xz",
+    "hash": "sha256-bvulgFeiY12m8YVbprCOV+Y2yXZCG6Xj9fZn5qV7DOE="
   },
   "libksysguard": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/libksysguard-6.6.5.tar.xz",
-    "hash": "sha256-8IiFSgIQKLew9qc1yJ6apTvRPpA68R7RaknJROM7AN8="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/libksysguard-6.7.0.tar.xz",
+    "hash": "sha256-40wBQ4OZ/CMJDN5NRyJbzY9giZ0TjsrpnMWZZZU2rOM="
   },
   "libplasma": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/libplasma-6.6.5.tar.xz",
-    "hash": "sha256-guArIJj0uskPKM3U+dOk2kVXRA7INHIg2P7ik8H5jYs="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/libplasma-6.7.0.tar.xz",
+    "hash": "sha256-ioXkyessPAC1aDzOOqLJSdBrlWyIeJwbHBELarriAxI="
   },
   "milou": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/milou-6.6.5.tar.xz",
-    "hash": "sha256-P2KF5ftqncdjQ1K7Ov+ALcORBA6SzTx/G5YB3Z1cVNA="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/milou-6.7.0.tar.xz",
+    "hash": "sha256-jJSkw875vGJbVByz1MLwqVv6E9MfPBgGM/fvnScB2x4="
   },
   "ocean-sound-theme": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/ocean-sound-theme-6.6.5.tar.xz",
-    "hash": "sha256-RrdhYOaZjgOzmQxmnW2hZr14XaNWhBGT61SLNYEdxt8="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/ocean-sound-theme-6.7.0.tar.xz",
+    "hash": "sha256-ELK6ypKrcZirzCDVjdrTGRDIxr7uRxH8KkohUFRG8TU="
   },
   "oxygen": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/oxygen-6.6.5.tar.xz",
-    "hash": "sha256-QDSMe+uRHsYcuWxMu16i5hHhifr05MnSspgTvCj3K0o="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/oxygen-6.7.0.tar.xz",
+    "hash": "sha256-ER+2K8PZ86lZ53/TX+VWLKNK14PLzcDBZFh/Vklc/ww="
   },
   "oxygen-sounds": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/oxygen-sounds-6.6.5.tar.xz",
-    "hash": "sha256-TGSFVf58y5vPRvsLRFLahcWCEgFEXrcuxFtdleV5QvY="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/oxygen-sounds-6.7.0.tar.xz",
+    "hash": "sha256-YqPdeoilcNacNwpxomHI3QTZLa+QJQyiqdI8KeZ+HIo="
   },
   "plasma-activities": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-activities-6.6.5.tar.xz",
-    "hash": "sha256-VNBqIqV2WqHpKDSIXQKrx84b+Na9qVM7s0ctT+9XVWI="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-activities-6.7.0.tar.xz",
+    "hash": "sha256-OP+VeZagnBUjbpOwNboSNICliv90iUtht98QIOxEK1k="
   },
   "plasma-activities-stats": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-activities-stats-6.6.5.tar.xz",
-    "hash": "sha256-k6929cQXHQic2aT1ArumOmXyo3GqGoPAxs+wAhpe+6Y="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-activities-stats-6.7.0.tar.xz",
+    "hash": "sha256-K0qu2cRoW8LAVqDLqE1CfvLx63pPhB1Yd9A0e1sRzBM="
+  },
+  "plasma-bigscreen": {
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-bigscreen-6.7.0.tar.xz",
+    "hash": "sha256-IS6811bk2oY4UsvKj9qPE+h/6IDSKSy9S+iPJs8k9IY="
   },
   "plasma-browser-integration": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-browser-integration-6.6.5.tar.xz",
-    "hash": "sha256-PFS/Fc1wxI8mu2Xm14egE6hvI3XY/v0sCsq2ULN4Rvk="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-browser-integration-6.7.0.tar.xz",
+    "hash": "sha256-zVtIPuKJHea7Bi3q62r+DAop6VHgclEMASwVtJsblUs="
   },
   "plasma-desktop": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-desktop-6.6.5.tar.xz",
-    "hash": "sha256-HXWN/8xC4dP7v+oFAACdPceVzxMTuTtXTag2JBdwhfM="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-desktop-6.7.0.tar.xz",
+    "hash": "sha256-Y1E7VPb2CzzX7DXKLwlivfJWaXKTiOhRWsHTuIme5H8="
   },
   "plasma-dialer": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-dialer-6.6.5.tar.xz",
-    "hash": "sha256-LfdMa2g78IA06CyvYLquTV26VB9U2Lp/44r8eomprK0="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-dialer-6.7.0.tar.xz",
+    "hash": "sha256-CKULmVTY8yxCgJknsUz7Kg/GaKc1XhdWGbsNL86izUc="
   },
   "plasma-disks": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-disks-6.6.5.tar.xz",
-    "hash": "sha256-ZgYJofSJwZfTVBmurLwI7HJMXhNTinNus9gawzG59jk="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-disks-6.7.0.tar.xz",
+    "hash": "sha256-mYiOJyaPD1q9+9hd42KxjxymxnDps5LnbaMPUafVzc8="
   },
   "plasma-firewall": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-firewall-6.6.5.tar.xz",
-    "hash": "sha256-1KytApwk6qqY8wfl/zmQOqanLzc8gPOjwX7e36RQ+Ow="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-firewall-6.7.0.tar.xz",
+    "hash": "sha256-eHwVBebooyw/hVu2X0YVY3fuItbcMhpyB5sWB68N8n0="
   },
   "plasma-integration": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-integration-6.6.5.tar.xz",
-    "hash": "sha256-woSC3I0zh7mncP3Jmd0TSAsUcUVoOVyNhr1WiwGBkgo="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-integration-6.7.0.tar.xz",
+    "hash": "sha256-U3sFzUurGwcG+zH5gj+GZt9yleZH51YU8Ctr8UWO/x0="
   },
   "plasma-keyboard": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-keyboard-6.6.5.tar.xz",
-    "hash": "sha256-O7i+EJzESa9U0D8ozBwank1BUMsBua+RalUW7WR0BnE="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-keyboard-6.7.0.tar.xz",
+    "hash": "sha256-gxGV8wjQgRuNeLTIRYFdyhZIuz/sg8nsY30b4ltTq3Q="
   },
   "plasma-login-manager": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-login-manager-6.6.5.tar.xz",
-    "hash": "sha256-F1jwAAMTMmXUljravgaPVXAotTWPQx/ESPWL7txND38="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-login-manager-6.7.0.tar.xz",
+    "hash": "sha256-A8WFlhQcwSYsKxxXSdm2TW5yJclyjUIcblr7ZJNWbuE="
   },
   "plasma-mobile": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-mobile-6.6.5.tar.xz",
-    "hash": "sha256-FkOApuHXXcb7ByCQyqPE5fuAu7PxiNMFvOdnyQueRgA="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-mobile-6.7.0.tar.xz",
+    "hash": "sha256-NCaqC2KblFsHbqzhMMSrvG//b2xd0cK/9/8Ney1HfkI="
   },
   "plasma-nano": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-nano-6.6.5.tar.xz",
-    "hash": "sha256-5RQ97bvNDXW73ktEJ4DMfzeSRw7ngvxFX8sVGQpXllg="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-nano-6.7.0.tar.xz",
+    "hash": "sha256-xOL0nSQVfO62vCWYHi1xYA3SEXJJ6CsMwE+klAEZMYE="
   },
   "plasma-nm": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-nm-6.6.5.tar.xz",
-    "hash": "sha256-yS0J0peNu+a1yJe+rIIs0FPBdHPx1hUG4VK/y0a3C5s="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-nm-6.7.0.tar.xz",
+    "hash": "sha256-spaAzBfEu+UuO5iNW+Q37EtSS1VPoYDq0TvIkQFEz5g="
   },
   "plasma-pa": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-pa-6.6.5.tar.xz",
-    "hash": "sha256-tjwBmB6g0yn9CAE+/ySyR7YJIqvhSXvgEjRmDBXLOCY="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-pa-6.7.0.tar.xz",
+    "hash": "sha256-utzogREH7ldyBxYnWsX8EhFmibw0zkk8q+cijhtlj1E="
   },
   "plasma-sdk": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-sdk-6.6.5.tar.xz",
-    "hash": "sha256-7VQKi9oaYziB/KQfff6WrhfJplS3E3SnnobPVH78yVk="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-sdk-6.7.0.tar.xz",
+    "hash": "sha256-1G1SKRVGImSuXUl7rBb3U7DQtrW1uZtG/fiCP0xWLtM="
   },
   "plasma-setup": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-setup-6.6.5.tar.xz",
-    "hash": "sha256-z756OF13wLUHaJXJ/N3BPHFYBebvEWxzkRNlQGTXxe8="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-setup-6.7.0.tar.xz",
+    "hash": "sha256-3I+l3XRXBW3hwtAEPw83zTBhAg/s0hmMq/83i9XJVx4="
   },
   "plasma-systemmonitor": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-systemmonitor-6.6.5.tar.xz",
-    "hash": "sha256-tuv3web3pCyRoLURlx/WcEHU2bYX7cOk/AsIr0oOx48="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-systemmonitor-6.7.0.tar.xz",
+    "hash": "sha256-9lthyXWIbtxXSZVnAKWkxAWeeRXEl4aFeI/oGKFxS0I="
   },
   "plasma-thunderbolt": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-thunderbolt-6.6.5.tar.xz",
-    "hash": "sha256-VuOigzCWJ5w6nsHbtLU6X6S8NrNWnj9+wZHwAvQL9x8="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-thunderbolt-6.7.0.tar.xz",
+    "hash": "sha256-Pepo91aAHJVHM2ykFVJnLDaTCRwpu/iWjuAf8pKHk6A="
   },
   "plasma-vault": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-vault-6.6.5.tar.xz",
-    "hash": "sha256-aKTjzRYNsVZGiCxaQK7Dqj63CXAaO0J00Ctjk/6rsmg="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-vault-6.7.0.tar.xz",
+    "hash": "sha256-i9cLPTeHidOWpm5pOoCd1rIe3EgWYnWTL399AgdPzhw="
   },
   "plasma-welcome": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-welcome-6.6.5.tar.xz",
-    "hash": "sha256-vJQn1znNyLp/Sf5i0CpxY1Gnct8bK2lsbB8IaVxBJqI="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-welcome-6.7.0.tar.xz",
+    "hash": "sha256-SD8WkxtswsVmaPVCBBjnsvja1XarqgG8dVRsE2HyGQM="
   },
   "plasma-workspace": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-workspace-6.6.5.tar.xz",
-    "hash": "sha256-ZNdTyty5zeasCe7t9rAuxczfvQFyLF6fJTP9CZOw2FQ="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-workspace-6.7.0.tar.xz",
+    "hash": "sha256-mn8qBOikS/JNpNKUu6JwmEoJDvF6CCzR6yXLgYJlHTw="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma-workspace-wallpapers-6.6.5.tar.xz",
-    "hash": "sha256-SgIdvadh2nqvcZLo0DiqHyMFpXalfyOE9UvI7ZBzFBg="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma-workspace-wallpapers-6.7.0.tar.xz",
+    "hash": "sha256-DpIiDArgt8QmROvtb+FZ+wCXqJLmQMsSQgR8kpkx6go="
   },
   "plasma5support": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plasma5support-6.6.5.tar.xz",
-    "hash": "sha256-X0Vofi0oHN/AZmoK13et/Lu7JTQoTKZFDTqn1wC592M="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plasma5support-6.7.0.tar.xz",
+    "hash": "sha256-5g4eR6Pe6TUYZH1mOTwh4kBvd3np6eQ4LXzqaM67+3s="
   },
   "plymouth-kcm": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/plymouth-kcm-6.6.5.tar.xz",
-    "hash": "sha256-eUbJGS4+/JCLtHH+ZCSHgNyBQk2Fs3N60q9o+l5Br6o="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/plymouth-kcm-6.7.0.tar.xz",
+    "hash": "sha256-KrVY7wsm/U4C+iZ4ZBL28be8UHZAe7nuR6fByffgJUc="
   },
   "polkit-kde-agent-1": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/polkit-kde-agent-1-6.6.5.tar.xz",
-    "hash": "sha256-kZkLnNE/IFqZY/iP5gWUK56LbunpEDQxIWv1EZRM4Sc="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/polkit-kde-agent-1-6.7.0.tar.xz",
+    "hash": "sha256-Dyf/KqNhBBhiDEKAS5w9wi9peeXAOCL5OXnUT77R2r8="
   },
   "powerdevil": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/powerdevil-6.6.5.tar.xz",
-    "hash": "sha256-sSX2TnPMjc+ePn4/FU9P67RAZCZZfK1uu+jEgzLjXns="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/powerdevil-6.7.0.tar.xz",
+    "hash": "sha256-djXv/9UD542SvMAwM9VoHlFXfskrxtpy8qsoKLsKNNs="
   },
   "print-manager": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/print-manager-6.6.5.tar.xz",
-    "hash": "sha256-ZeHm9VlBGZXGhRb0XF57f8JCv6K2hxHmIEsxmYGjrm0="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/print-manager-6.7.0.tar.xz",
+    "hash": "sha256-v3tqkw7cG4Ped65YV0O9pOGjpYKt5tICovuiYWrcpbM="
   },
   "qqc2-breeze-style": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/qqc2-breeze-style-6.6.5.tar.xz",
-    "hash": "sha256-jSeflmkDIZchlB6p9BaBYw3BT6RXadnGcsV0k/bJlgM="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/qqc2-breeze-style-6.7.0.tar.xz",
+    "hash": "sha256-gfsPQ/4VwrzRxi50LKuoTWCk65OAwLzsRHtbdyjin7s="
   },
   "sddm-kcm": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/sddm-kcm-6.6.5.tar.xz",
-    "hash": "sha256-RJgRgj8faK3ZZC6uISfiqh8HYc+M48N9t8J+YW6L/9g="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/sddm-kcm-6.7.0.tar.xz",
+    "hash": "sha256-A7Heo6c4BIoGRjO57bgCcWAE9GMLP2p/Bo/QdNcZ700="
   },
   "spacebar": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/spacebar-6.6.5.tar.xz",
-    "hash": "sha256-wULqeA4Qp0QjK2dKAlFvJ4KJ2SBON3VxJgmNKBio4fQ="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/spacebar-6.7.0.tar.xz",
+    "hash": "sha256-XwtcSkDFHaPKxaXWg6uDq/2KNX5FkXYmjs7RWPAxSIU="
   },
   "spectacle": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/spectacle-6.6.5.tar.xz",
-    "hash": "sha256-o333cxpryJvCOsCK0fmVzp8e+zMPPrrZv5Jtym67X8c="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/spectacle-6.7.0.tar.xz",
+    "hash": "sha256-Sw5J3iGyGP9fEwLQzebgZyC8RSQ5bIUA02zWRMnVDGQ="
   },
   "systemsettings": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/systemsettings-6.6.5.tar.xz",
-    "hash": "sha256-YTNO/2RWetIJ4nn2DG0asTtnD5owD96UgP6TWWIyqYY="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/systemsettings-6.7.0.tar.xz",
+    "hash": "sha256-WfJKRQRrZp0awW+A7ngyPrbxchMKusMcbWXPYfBfp58="
+  },
+  "union": {
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/union-6.7.0.tar.xz",
+    "hash": "sha256-0JJd9wpnQiRuadl3btE508UuPDzNtoaT66vKLE6M9Fk="
   },
   "wacomtablet": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/wacomtablet-6.6.5.tar.xz",
-    "hash": "sha256-RLZfANmwMjbTm64P5BPZ9TE32cuWrpabRxDg+xFKDx4="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/wacomtablet-6.7.0.tar.xz",
+    "hash": "sha256-4lBGcIom7JKbkTYcPYZAgu3m/toDgrcSntOKl1SiwKw="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.6.5",
-    "url": "mirror://kde/stable/plasma/6.6.5/xdg-desktop-portal-kde-6.6.5.tar.xz",
-    "hash": "sha256-IdaZWFKUBk/OfHTe5oXCCT73PdCVeXkT5o7xR4CFayc="
+    "version": "6.7.0",
+    "url": "mirror://kde/stable/plasma/6.7.0/xdg-desktop-portal-kde-6.7.0.tar.xz",
+    "hash": "sha256-9a/Ab5SLc7KgED2e5uV3RKmISj8uCBCAd3bsS/cQKto="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/misc/cxx-rust-cssparser/default.nix b/pkgs/kde/misc/cxx-rust-cssparser/default.nix
new file mode 100644
index 000000000000..17b0cf8a5f0e
--- /dev/null
+++ b/pkgs/kde/misc/cxx-rust-cssparser/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  mkKdeDerivation,
+  fetchFromGitLab,
+  rustPlatform,
+  rustc,
+  cargo,
+  cxx-rs,
+  corrosion,
+}:
+
+mkKdeDerivation rec {
+  pname = "cxx-rust-cssparser";
+  version = "1.0.0";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "libraries";
+    repo = "cxx-rust-cssparser";
+    tag = "v${version}";
+    hash = "sha256-zYY9GmQb/Qbbu8AhOGHfrrQ563cIrnx9KMGkdledURw=";
+  };
+
+  extraNativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    cxx-rs
+  ];
+
+  extraBuildInputs = [
+    corrosion
+  ];
+
+  cargoRoot = "rust";
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
+    hash = "sha256-CdOvP7VxS2JMD3MlRtc6QNUCGiVMGxiKayLG6vn6n+8=";
+  };
+
+  dontWrapQtApps = true;
+
+  meta.license = with lib.licenses; [
+    bsd2
+    cc0
+    lgpl2Only
+    lgpl3Only
+  ];
+}
diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix
index 18a9a67a9162..56b463830ad5 100644
--- a/pkgs/kde/plasma/default.nix
+++ b/pkgs/kde/plasma/default.nix
@@ -41,6 +41,7 @@
   oxygen-sounds = callPackage ./oxygen-sounds { };
   plasma-activities = callPackage ./plasma-activities { };
   plasma-activities-stats = callPackage ./plasma-activities-stats { };
+  plasma-bigscreen = callPackage ./plasma-bigscreen { };
   plasma-browser-integration = callPackage ./plasma-browser-integration { };
   plasma-desktop = callPackage ./plasma-desktop { };
   plasma-dialer = callPackage ./plasma-dialer { };
@@ -71,6 +72,7 @@
   spacebar = callPackage ./spacebar { };
   spectacle = callPackage ./spectacle { };
   systemsettings = callPackage ./systemsettings { };
+  union = callPackage ./union { };
   wacomtablet = callPackage ./wacomtablet { };
   xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { };
 }
diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix
index e23fdacdf158..1e33f1fcdc5b 100644
--- a/pkgs/kde/plasma/kdeplasma-addons/default.nix
+++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix
@@ -1,9 +1,37 @@
 {
   mkKdeDerivation,
+  sources,
+  rustPlatform,
+  rustc,
+  cargo,
+  pkg-config,
+  corrosion,
   qtwebengine,
+  hidapi,
 }:
-mkKdeDerivation {
+mkKdeDerivation rec {
   pname = "kdeplasma-addons";
 
-  extraBuildInputs = [ qtwebengine ];
+  inherit (sources.${pname}) version;
+
+  cargoRoot = "kdeds/kameleon/qmk/kameleon-qmk-helper";
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version cargoRoot;
+    src = sources.${pname};
+    hash = "sha256-2gtz9D05VloEKkQGF9/0fuMrFUtp2NpE/mcEd7D3Gkc=";
+  };
+
+  extraNativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    pkg-config
+  ];
+
+  extraBuildInputs = [
+    corrosion
+    qtwebengine
+    hidapi
+  ];
 }
diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
index fcf367a9ffdd..d696d3c095bf 100644
--- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
+++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json
-index 5648bb73..28db7ffb 100644
+index baa7fbea..24b3c30b 100644
 --- a/kcms/audio_information/kcm_audio_information.json
 +++ b/kcms/audio_information/kcm_audio_information.json
-@@ -82,7 +82,7 @@
+@@ -90,7 +90,7 @@
          "Name[zh_CN]": "音频",
          "Name[zh_TW]": "音訊"
      },
@@ -25,10 +25,10 @@ index adb196fd..9d6c8675 100644
      CommandOutputContext *outputContext() const
      {
 diff --git a/kcms/block_devices/kcm_block_devices.json b/kcms/block_devices/kcm_block_devices.json
-index 5d864d49..8ea55707 100644
+index 37912e43..1adfadb3 100644
 --- a/kcms/block_devices/kcm_block_devices.json
 +++ b/kcms/block_devices/kcm_block_devices.json
-@@ -82,7 +82,7 @@
+@@ -90,7 +90,7 @@
          "Name[zh_CN]": "块设备",
          "Name[zh_TW]": "區塊裝置"
      },
@@ -51,10 +51,10 @@ index 2de923f3..6b14f7fb 100644
      CommandOutputContext *outputContext() const
      {
 diff --git a/kcms/cpu/kcm_cpu.json b/kcms/cpu/kcm_cpu.json
-index 7541b258..3ba7f289 100644
+index 05b3b039..e769cdba 100644
 --- a/kcms/cpu/kcm_cpu.json
 +++ b/kcms/cpu/kcm_cpu.json
-@@ -102,7 +102,7 @@
+@@ -104,7 +104,7 @@
          "Name[zh_CN]": "CPU",
          "Name[zh_TW]": "CPU"
      },
@@ -90,10 +90,10 @@ index da803598..4e24eaaf 100755
      printf "%s\n\n" "$data"
  done
 diff --git a/kcms/edid/kcm_edid.json b/kcms/edid/kcm_edid.json
-index 4639da41..1afb5522 100644
+index cf0f6cfe..2e6650a1 100644
 --- a/kcms/edid/kcm_edid.json
 +++ b/kcms/edid/kcm_edid.json
-@@ -74,7 +74,7 @@
+@@ -82,7 +82,7 @@
          "Name[zh_CN]": "EDID",
          "Name[zh_TW]": "EDID"
      },
@@ -116,10 +116,10 @@ index 9f04e7fd..8ef37d2c 100644
      [[nodiscard]] CommandOutputContext *outputContext() const
      {
 diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json
-index a5a21cd6..cddef596 100644
+index 8af87ff5..42382afe 100644
 --- a/kcms/egl/kcm_egl.json
 +++ b/kcms/egl/kcm_egl.json
-@@ -102,7 +102,7 @@
+@@ -104,7 +104,7 @@
          "Name[zh_CN]": "OpenGL (EGL)",
          "Name[zh_TW]": "OpenGL (EGL)"
      },
@@ -155,10 +155,10 @@ index eab20e0f..5a0d2499 100644
                                                     {executable},
                                                     Qt::TextFormat::RichText,
 diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json
-index 900d8d6a..c1bef34f 100644
+index b3525b4f..e2e237a7 100644
 --- a/kcms/glx/kcm_glx.json
 +++ b/kcms/glx/kcm_glx.json
-@@ -101,7 +101,7 @@
+@@ -103,7 +103,7 @@
          "Name[zh_CN]": "OpenGL (GLX)",
          "Name[zh_TW]": "OpenGL (GLX)"
      },
@@ -197,10 +197,10 @@ index 2c009acd..f6c1c8e5 100644
  
  KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args)
 diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in
-index d173229d..71815467 100644
+index d3a071a5..43cc1c38 100644
 --- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in
 +++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in
-@@ -95,7 +95,7 @@
+@@ -99,7 +99,7 @@
          "Name[zh_CN]": "窗口管理器",
          "Name[zh_TW]": "視窗管理員"
      },
@@ -223,10 +223,10 @@ index ddb55b5c..8dc6b668 100644
                                                     parent);
      }
 diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json
-index 87ad4a4c..e3f07e81 100644
+index a0e573e1..a1acfc7e 100644
 --- a/kcms/memory/kcm_memory.json
 +++ b/kcms/memory/kcm_memory.json
-@@ -134,7 +134,7 @@
+@@ -139,7 +139,7 @@
          "Name[zh_CN]": "内存",
          "Name[zh_TW]": "記憶體"
      },
@@ -236,10 +236,10 @@ index 87ad4a4c..e3f07e81 100644
      "X-KDE-Keywords": "Memory,RAM,dmidecode",
      "X-KDE-Keywords[ar]": "Memory,RAM,dmidecode,رام,ذاكرة,ذاكرة حية",
 diff --git a/kcms/network/kcm_network.json b/kcms/network/kcm_network.json
-index 4ab2e0f1..559baf6f 100644
+index 55df7791..f932c500 100644
 --- a/kcms/network/kcm_network.json
 +++ b/kcms/network/kcm_network.json
-@@ -146,7 +146,7 @@
+@@ -147,7 +147,7 @@
          "Name[zh_CN]": "网络接口",
          "Name[zh_TW]": "網路介面"
      },
@@ -262,10 +262,10 @@ index a49284d3..77818fe2 100644
      CommandOutputContext *outputContext() const
      {
 diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json
-index e63b60a9..93f1f484 100644
+index 73d1e8c9..5688b964 100644
 --- a/kcms/opencl/kcm_opencl.json
 +++ b/kcms/opencl/kcm_opencl.json
-@@ -92,7 +92,7 @@
+@@ -96,7 +96,7 @@
          "Name[zh_CN]": "OpenCL",
          "Name[zh_TW]": "OpenCL"
      },
@@ -301,10 +301,10 @@ index 36d82ef8..16ce2703 100644
  endif()
  
 diff --git a/kcms/sensors/kcm_sensors.json b/kcms/sensors/kcm_sensors.json
-index 4f9959dc..1cba9e5f 100644
+index d67d8435..96f04ace 100644
 --- a/kcms/sensors/kcm_sensors.json
 +++ b/kcms/sensors/kcm_sensors.json
-@@ -66,7 +66,7 @@
+@@ -76,7 +76,7 @@
          "Name[zh_CN]": "传感器",
          "Name[zh_TW]": "感測器"
      },
@@ -314,31 +314,34 @@ index 4f9959dc..1cba9e5f 100644
      "X-KDE-Keywords": "lm_sensors,sensors,temp,temperature,volt,voltage,sensors,fan,fan speed,monitoring,amp,amps,current,power",
      "X-KDE-Keywords[ar]": "مستشعرات lm,مستشعرات,درجة الحرارة,درجة الحرارة,فولت,جهد,مستشعرات,مروحة,سرعة المروحة,مراقبة,أمبير,أمبير,تيار,طاقة",
 diff --git a/kcms/sensors/main.cpp b/kcms/sensors/main.cpp
-index 8dae9f8f..ee70f381 100644
+index 276280db..aa8856b6 100644
 --- a/kcms/sensors/main.cpp
 +++ b/kcms/sensors/main.cpp
-@@ -18,7 +18,7 @@ public:
-     explicit KCMSensors(QObject *parent, const KPluginMetaData &data)
+@@ -21,9 +21,9 @@ public:
          : KQuickConfigModule(parent, data)
      {
--        m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent);
-+        m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent);
+         if (QLocale().measurementSystem() == QLocale::ImperialUSSystem) {
+-            m_outputContext = new CommandOutputContext(u"sensors"_s, {u"-f"_s}, parent);
++            m_outputContext = new CommandOutputContext(u"@sensors@"_s, {u"-f"_s}, parent);
+         } else {
+-            m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent);
++            m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent);
+         }
          m_outputContext->setAutoRefreshMs(1000);
      }
-     CommandOutputContext *outputContext() const
 diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json
-index ca4cf9e0..4f6af805 100644
+index 3e6df405..ae08bc95 100644
 --- a/kcms/vulkan/kcm_vulkan.json
 +++ b/kcms/vulkan/kcm_vulkan.json
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,7 @@
          "Name[zh_CN]": "Vulkan",
          "Name[zh_TW]": "Vulkan"
      },
 -    "TryExec": "vulkaninfo",
 +    "TryExec": "@vulkaninfo@",
      "X-KDE-KInfoCenter-Category": "graphical_information",
-     "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag",
-     "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag",
+     "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag,vulkaninfo",
+     "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag,vulkaninfo",
 diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp
 index 5665d9d2..008f1bf0 100644
 --- a/kcms/vulkan/main.cpp
@@ -353,10 +356,10 @@ index 5665d9d2..008f1bf0 100644
      CommandOutputContext *outputContext() const
      {
 diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json
-index 7ca1dcb7..e814570b 100644
+index 3a1a9ad1..572af87e 100644
 --- a/kcms/wayland/kcm_wayland.json
 +++ b/kcms/wayland/kcm_wayland.json
-@@ -106,7 +106,7 @@
+@@ -108,7 +108,7 @@
          "Name[zh_CN]": "Wayland",
          "Name[zh_TW]": "Wayland"
      },
@@ -379,10 +382,10 @@ index 3a4825c7..4633927b 100644
      CommandOutputContext *outputContext() const
      {
 diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json
-index 5b12997a..9debc887 100644
+index b22ecf03..e9240ce7 100644
 --- a/kcms/xserver/kcm_xserver.json
 +++ b/kcms/xserver/kcm_xserver.json
-@@ -146,7 +146,7 @@
+@@ -147,7 +147,7 @@
          "Name[zh_CN]": "X 服务器",
          "Name[zh_TW]": "X 伺服器"
      },
diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 1f477f7f9aea..5f41a9783974 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -6,6 +6,7 @@
   pam,
   pkg-config,
   qtwayland,
+  kirigami-addons,
   freerdp,
 }:
 mkKdeDerivation {
@@ -21,6 +22,8 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtwayland
 
+    kirigami-addons
+
     freerdp
     pam
   ];
diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix
index 2f91e980bbfa..1d543af28794 100644
--- a/pkgs/kde/plasma/kscreen/default.nix
+++ b/pkgs/kde/plasma/kscreen/default.nix
@@ -3,8 +3,10 @@
   pkg-config,
   qtsensors,
   qtwayland,
-  dbus,
+  kitemmodels,
+  plasma5support,
   wayland-protocols,
+  dbus,
 }:
 mkKdeDerivation {
   pname = "kscreen";
@@ -14,6 +16,10 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtsensors
     qtwayland
+
+    kitemmodels
+    plasma5support
+
     wayland-protocols
   ];
 
diff --git a/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch b/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
deleted file mode 100644
index e6408605aa43..000000000000
--- a/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 232e480ab1303f37d37d295b57fdcbb6b6648bca Mon Sep 17 00:00:00 2001
-From: Alois Wohlschlager <alois1@gmx-topmail.de>
-Date: Sun, 7 Aug 2022 16:12:31 +0200
-Subject: [PATCH] Lower CAP_SYS_NICE from the ambient set
-
-The capabilities wrapper raises CAP_SYS_NICE into the ambient set so it
-is inherited by the wrapped program. However, we don't want it to leak
-into the entire desktop environment.
-
-Lower the capability again at startup so that the kernel will clear it
-on exec.
----
- src/main_wayland.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
-index 1720e14e7..f2bb446b0 100644
---- a/src/main_wayland.cpp
-+++ b/src/main_wayland.cpp
-@@ -39,7 +39,9 @@
- #include <QWindow>
- #include <qplatformdefs.h>
- 
-+#include <linux/capability.h>
- #include <sched.h>
-+#include <sys/prctl.h>
- #include <sys/resource.h>
- 
- #include <iomanip>
-@@ -285,6 +287,7 @@ static QString automaticBackendSelection()
- 
- int main(int argc, char *argv[])
- {
-+    prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, CAP_SYS_NICE, 0, 0);
-     KWin::Application::setupMalloc();
-     KWin::Application::setupLocalizedString();
-     KWin::gainRealTime();
--- 
-2.37.1
-
diff --git a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
index d0be721b044c..845106916b76 100644
--- a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
+++ b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
@@ -1,26 +1,13 @@
-From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001
-From: Yaroslav  Bolyukin <iam@lach.pw>
-Date: Wed, 23 Dec 2020 18:02:14 +0300
-Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper
-
-Signed-off-by: Yaroslav  Bolyukin <iam@lach.pw>
----
- src/plugins/qpa/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp
-index efd236b..a69c046 100644
+index c26092700a..2aa3e21e7d 100644
 --- a/src/plugins/qpa/main.cpp
 +++ b/src/plugins/qpa/main.cpp
 @@ -23,7 +23,7 @@ public:
-
+ 
  QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList &paramList)
  {
--    if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
-+    if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
+-    if (!QCoreApplication::applicationFilePath().endsWith(QLatin1StringView("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
++    if (!QCoreApplication::applicationFilePath().endsWith(QLatin1StringView("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
          // Not KWin
          return nullptr;
      }
--- 
-2.29.2
-
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index 140b98923d03..4e6e471ddc42 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -18,7 +18,6 @@
   pipewire,
   krunner,
   python3,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "kwin";
@@ -26,7 +25,6 @@ mkKdeDerivation {
   patches = [
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
-    ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/kde/plasma/plasma-bigscreen/default.nix b/pkgs/kde/plasma/plasma-bigscreen/default.nix
new file mode 100644
index 000000000000..311a6e33a498
--- /dev/null
+++ b/pkgs/kde/plasma/plasma-bigscreen/default.nix
@@ -0,0 +1,39 @@
+{
+  mkKdeDerivation,
+  plasma-workspace,
+  pkg-config,
+  qtwebengine,
+  libcec,
+  sdl3,
+}:
+
+mkKdeDerivation {
+  pname = "plasma-bigscreen";
+
+  postPatch = ''
+    substituteInPlace bin/plasma-bigscreen-wayland.in \
+      --replace-fail @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
+
+    substituteInPlace bin/plasma-bigscreen-wayland.desktop.cmake \
+      --replace-fail @CMAKE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
+  '';
+
+  extraCmakeFlags = [
+    "-DQT_FIND_PRIVATE_MODULES=ON"
+  ];
+
+  extraNativeBuildInputs = [
+    pkg-config
+  ];
+
+  extraBuildInputs = [
+    qtwebengine
+
+    libcec
+    sdl3
+  ];
+
+  dontQmlLint = true;
+
+  passthru.providedSessions = [ "plasma-bigscreen-wayland" ];
+}
diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix
index 30de7c407e2d..e9fa2ec669f4 100644
--- a/pkgs/kde/plasma/plasma-desktop/default.nix
+++ b/pkgs/kde/plasma/plasma-desktop/default.nix
@@ -6,7 +6,6 @@
   glib,
   gsettings-desktop-schemas,
   replaceVars,
-  util-linux,
   pkg-config,
   qtsvg,
   qtwayland,
@@ -35,13 +34,9 @@ mkKdeDerivation {
   pname = "plasma-desktop";
 
   patches = [
-    (replaceVars ./hwclock-path.patch {
-      hwclock = "${lib.getBin util-linux}/bin/hwclock";
-    })
     (replaceVars ./kcm-access.patch {
       gsettings = "${gsettings-wrapper}/bin/gsettings";
     })
-    ./tzdir.patch
     ./no-discover-shortcut.patch
     (replaceVars ./wallpaper-paths.patch {
       wallpapers = "${lib.getBin breeze}/share/wallpapers";
diff --git a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch b/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch
deleted file mode 100644
index 4c0891db97a6..000000000000
--- a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-===================================================================
---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
-+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-@@ -48,10 +48,6 @@
- #include <sys/types.h>
- #endif
-
--// We cannot rely on the $PATH environment variable, because D-Bus activation
--// clears it. So we have to use a reasonable default.
--static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
--
- int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
- {
-     int ret = 0;
-@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
- 
- void ClockHelper::toHwclock()
- {
--    QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
-+    QString hwclock = QLatin1String("@hwclock@");
-     if (!hwclock.isEmpty()) {
-         KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
-     }
diff --git a/pkgs/kde/plasma/plasma-desktop/tzdir.patch b/pkgs/kde/plasma/plasma-desktop/tzdir.patch
deleted file mode 100644
index 97504b330fed..000000000000
--- a/pkgs/kde/plasma/plasma-desktop/tzdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-===================================================================
---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
-+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
-+    QString tz = tzdir + "/" + selectedzone;
-+    if (tzdir.isEmpty()) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove(QStringLiteral("/etc/localtime"));
diff --git a/pkgs/kde/plasma/plasma-keyboard/default.nix b/pkgs/kde/plasma/plasma-keyboard/default.nix
index be510d3ef01d..06f738ae1074 100644
--- a/pkgs/kde/plasma/plasma-keyboard/default.nix
+++ b/pkgs/kde/plasma/plasma-keyboard/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   pkg-config,
   qtvirtualkeyboard,
+  libplasma,
   wayland-protocols,
 }:
 mkKdeDerivation {
@@ -13,6 +14,9 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     qtvirtualkeyboard
+
+    libplasma
+
     wayland-protocols
   ];
 
diff --git a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch b/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch
deleted file mode 100644
index 708a9f6c11ce..000000000000
--- a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
-index bb44514..abbdf57 100644
---- a/src/common/ConfigReader.cpp
-+++ b/src/common/ConfigReader.cpp
-@@ -184,9 +184,6 @@ void ConfigBase::load()
- 
-     files << m_path;
- 
--    if (latestModificationTime <= m_fileModificationTime) {
--        return;
--    }
-     m_fileModificationTime = latestModificationTime;
- 
-     for (const QString &filepath : std::as_const(files)) {
diff --git a/pkgs/kde/plasma/plasma-login-manager/default.nix b/pkgs/kde/plasma/plasma-login-manager/default.nix
index 964c988368fd..47ebbef47cd7 100644
--- a/pkgs/kde/plasma/plasma-login-manager/default.nix
+++ b/pkgs/kde/plasma/plasma-login-manager/default.nix
@@ -11,7 +11,6 @@ mkKdeDerivation {
   pname = "plasma-login-manager";
 
   patches = [
-    ./config-mtime.patch
     ./config-path.patch
 
     (replaceVars ./kwin-path.patch {
diff --git a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch
index bf2eb6047118..360884d1e30b 100644
--- a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch
+++ b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch
@@ -1,10 +1,11 @@
 --- a/src/frontend/startkde/plasma-login-kwin_wayland.service.in
 +++ b/src/frontend/startkde/plasma-login-kwin_wayland.service.in
-@@ -3,6 +3,6 @@ Description=KDE Window Manager (Login Manager Version)
+@@ -3,7 +3,7 @@ Description=KDE Window Manager (Login Manager Version)
  PartOf=graphical-session.target
  
  [Service]
 -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_wayland --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1
-+ExecStart=@kwin_wayland@ --no-lockscreen --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1
++ExecStart=@kwin_wayland@ --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1
+ SuccessExitStatus=15
  BusName=org.kde.KWin
  Slice=session.slice
diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix
index edba027fc4b0..f260e12d8087 100644
--- a/pkgs/kde/plasma/plasma-nm/default.nix
+++ b/pkgs/kde/plasma/plasma-nm/default.nix
@@ -3,6 +3,7 @@
   mkKdeDerivation,
   replaceVars,
   pkg-config,
+  qtkeychain,
   qtwebengine,
   kirigami-addons,
   mobile-broadband-provider-info,
@@ -22,6 +23,7 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
+    qtkeychain
     qtwebengine
     mobile-broadband-provider-info
     openconnect
diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
index a39328027d6d..4c64b37503fc 100644
--- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
+++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
@@ -12,10 +12,10 @@ index f425eb3..5b8cd43 100644
  
  } // namespace PlasmaVault
 diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
-index b992f6f..eb828dd 100644
+index 8636e4e..4f4ba0d 100644
 --- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
 +++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
-@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const
+@@ -204,7 +204,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const
      auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
      KConfigGroup backendConfig(config, "GocryptfsBackend");
  
@@ -25,19 +25,19 @@ index b992f6f..eb828dd 100644
  
  QString GocryptfsBackend::getConfigFilePath(const Device &device) const
 diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp
-index c101079..67c8a83 100644
+index f488d00..6b76565 100644
 --- a/kded/engine/vault.cpp
 +++ b/kded/engine/vault.cpp
-@@ -485,7 +485,7 @@ FutureResult<> Vault::close()
+@@ -480,7 +480,7 @@ FutureResult<> Vault::close()
              } else {
                  // We want to check whether there is an application
                  // that is accessing the vault
--                AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this] {
-+                AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this] {
-                     d->updateMessage(i18n("Unable to lock the vault because an application is using it"));
-                 }) | onSuccess([this](const QString &result) {
-                     // based on ksolidnotify.cpp
-@@ -538,7 +538,7 @@ FutureResult<> Vault::forceClose()
+-                AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this, result] {
++                AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this, result] {
+                     // no application seems to be accessing the vault, bubble
+                     // through the original unmount error
+                     d->updateMessage(result.error().message());
+@@ -534,7 +534,7 @@ FutureResult<> Vault::forceClose()
      using namespace AsynQt::operators;
  
      AsynQt::await(
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index 0a02c8e424cd..d7a60c785318 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkKdeDerivation,
   replaceVars,
+  flatpak,
   fontconfig,
   libxtst,
   libxft,
@@ -82,6 +83,7 @@ mkKdeDerivation {
     libxtst
     libxft
 
+    flatpak
     gpsd
   ];
 
diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
index df8c5981dcfb..30c4d995220f 100644
--- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
+++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/applets/devicenotifier/devicemessagemonitor_p.cpp b/applets/devicenotifier/devicemessagemonitor_p.cpp
-index 173fec78c1..0519424f71 100644
---- a/applets/devicenotifier/devicemessagemonitor_p.cpp
-+++ b/applets/devicenotifier/devicemessagemonitor_p.cpp
-@@ -118,7 +118,7 @@ void DeviceMessageMonitor::queryBlockingApps(const QString &devicePath)
+diff --git a/applets/devicenotifier/messageinfo.cpp b/applets/devicenotifier/messageinfo.cpp
+index e5c987879b..d26287a906 100644
+--- a/applets/devicenotifier/messageinfo.cpp
++++ b/applets/devicenotifier/messageinfo.cpp
+@@ -64,7 +64,7 @@ void MessageInfo::queryBlockingApps(const QString &devicePath)
          Q_EMIT blockingAppsReady(blockApps);
          p->deleteLater();
      });
@@ -25,10 +25,10 @@ index e27e21a7bd..abbf7f32e1 100644
      p.write(input);
      p.closeWriteChannel();
 diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index da28f13837..4af78b7850 100644
+index a150527de6..4798518162 100644
 --- a/kcms/fonts/fonts.cpp
 +++ b/kcms/fonts/fonts.cpp
-@@ -137,7 +137,7 @@ void KFonts::save()
+@@ -151,7 +151,7 @@ void KFonts::save()
      if (fontsAASettings()->forceFontDPI() == 0 && forceFontDPIChanged && KWindowSystem::isPlatformX11()) {
          QProcess proc;
          proc.setProcessChannelMode(QProcess::ForwardedChannels);
@@ -38,10 +38,10 @@ index da28f13837..4af78b7850 100644
              proc.write("Xft.dpi\n");
              proc.closeWriteChannel();
 diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
-index e4d1ad4311..d45bdfad98 100644
+index 32ba97a4d6..c26f45f2e0 100644
 --- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp
 +++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
-@@ -46,7 +46,7 @@ void CFcQuery::run(const QString &query)
+@@ -44,7 +44,7 @@ void CFcQuery::run(const QString &query)
      connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(procExited()));
      connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data);
  
@@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644
  
  void CFcQuery::procExited()
 diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
-index 53f77d0a18..680e81b6e4 100644
+index 0a3fb44698..d44b63350b 100644
 --- a/kcms/krdb/krdb.cpp
 +++ b/kcms/krdb/krdb.cpp
 @@ -425,7 +425,7 @@ void runRdb(unsigned int flags)
@@ -107,7 +107,7 @@ index 7218628ce9..9126475ea4 100644
 +ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
  Slice=session.slice
 diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index b8474dd34f..7d0616e116 100644
+index f9104619bf..af9fc09a67 100644
 --- a/startkde/startplasma.cpp
 +++ b/startkde/startplasma.cpp
 @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
@@ -119,7 +119,7 @@ index b8474dd34f..7d0616e116 100644
  }
  
  QStringList allServices(const QLatin1String &prefix)
-@@ -508,7 +508,7 @@ QProcess *setupKSplash()
+@@ -552,7 +552,7 @@ QProcess *setupKSplash()
          if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
              p = new QProcess;
              p->setProcessChannelMode(QProcess::ForwardedChannels);
diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix
index 2c12c45cddfd..ae2b56a004f2 100644
--- a/pkgs/kde/plasma/powerdevil/default.nix
+++ b/pkgs/kde/plasma/powerdevil/default.nix
@@ -7,10 +7,6 @@
 mkKdeDerivation {
   pname = "powerdevil";
 
-  patches = [
-    # https://invent.kde.org/plasma/powerdevil/-/merge_requests/601
-    ./rb-batterymonitor.patch
-  ];
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     ddcutil
diff --git a/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch b/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch
deleted file mode 100644
index b5808138734f..000000000000
--- a/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/applets/batterymonitor/CMakeLists.txt b/applets/batterymonitor/CMakeLists.txt
-index 28e52d26..3f2bf985 100644
---- a/applets/batterymonitor/CMakeLists.txt
-+++ b/applets/batterymonitor/CMakeLists.txt
-@@ -19,3 +19,5 @@ plasma_add_applet(org.kde.plasma.battery
-         main.xml
-     GENERATE_APPLET_CLASS
- )
-+
-+add_dependencies(org.kde.plasma.battery batterymonitorplugin)
diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix
index dd06f5217637..35409087d6b1 100644
--- a/pkgs/kde/plasma/print-manager/default.nix
+++ b/pkgs/kde/plasma/print-manager/default.nix
@@ -1,10 +1,14 @@
 {
   mkKdeDerivation,
+  kdeclarative,
   cups,
 }:
 mkKdeDerivation {
   pname = "print-manager";
 
   # FIXME: cups-smb?
-  extraBuildInputs = [ cups ];
+  extraBuildInputs = [
+    kdeclarative
+    cups
+  ];
 }
diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix
index 098bc2394cca..dde9c0d5433a 100644
--- a/pkgs/kde/plasma/spectacle/default.nix
+++ b/pkgs/kde/plasma/spectacle/default.nix
@@ -1,5 +1,4 @@
 {
-  fetchpatch,
   mkKdeDerivation,
   pkg-config,
   qtwayland,
@@ -11,15 +10,6 @@
 mkKdeDerivation {
   pname = "spectacle";
 
-  # Backport the upstream switch from runtime QLibrary loading to direct
-  # linking so Spectacle OCR can find Tesseract reliably on NixOS.
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/graphics/spectacle/-/commit/13b0be099e7abe9bbb17b90e62c2e83afb248db7.patch";
-      hash = "sha256-HEgHsuajaF+WVMiRp0YKRmi+/NsIy5s8frwMJRIdDY8=";
-    })
-  ];
-
   extraNativeBuildInputs = [ pkg-config ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/plasma/union/default.nix b/pkgs/kde/plasma/union/default.nix
new file mode 100644
index 000000000000..b9d29eb91afe
--- /dev/null
+++ b/pkgs/kde/plasma/union/default.nix
@@ -0,0 +1,11 @@
+{
+  mkKdeDerivation,
+  kcoreaddons,
+}:
+mkKdeDerivation {
+  pname = "union";
+
+  extraBuildInputs = [
+    kcoreaddons
+  ];
+}

From 34c8ce36563e363c578c5e81d13ab560345eeeaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 12:23:48 +0000
Subject: [PATCH 242/339] qlever-control: 0.5.47 -> 0.5.48

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

diff --git a/pkgs/by-name/ql/qlever-control/package.nix b/pkgs/by-name/ql/qlever-control/package.nix
index ed6aeef694e1..b6610311a142 100644
--- a/pkgs/by-name/ql/qlever-control/package.nix
+++ b/pkgs/by-name/ql/qlever-control/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "qlever-control";
-  version = "0.5.47";
+  version = "0.5.48";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "qlever-dev";
     repo = "qlever-control";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sNTI8H7dzK4rDhLzRrf3nWSkn3Z5xHG1rU77+59CwHY=";
+    hash = "sha256-mjWMRXRo2iU8C8fArXTcuVmts67MuCq8nR9dD87nR1g=";
   };
 
   build-system = with python3Packages; [

From a5c6947aeb50f4bec5ce4cc014c1c64ff1bafe6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 12:24:48 +0000
Subject: [PATCH 243/339] git-ls: 7.0.1 -> 7.1.2

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

diff --git a/pkgs/by-name/gi/git-ls/package.nix b/pkgs/by-name/gi/git-ls/package.nix
index 2653b1e7a374..50b39e921d7c 100644
--- a/pkgs/by-name/gi/git-ls/package.nix
+++ b/pkgs/by-name/gi/git-ls/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-ls";
-  version = "7.0.1";
+  version = "7.1.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
     owner = "llimllib";
     repo = "git-ls";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2D82VbOf/NPCXHNraiOfWwRthKElg1AgNr8dxY41AiA=";
+    hash = "sha256-g+LFQEud4nF+3hRaH8JcjQHx6Ol2LDRRP2HdQ2oLfls=";
   };
 
   vendorHash = "sha256-Bk6IBG+BrqY4FNVIlbSSSnqqAeL+8SJUtRXuIp4e8f8=";

From b8808c3da9b30406a888b18735230f75e7378a79 Mon Sep 17 00:00:00 2001
From: DESPsyched <priyanshu.tripathi@deshaw.com>
Date: Tue, 16 Jun 2026 08:46:51 -0400
Subject: [PATCH 244/339] python3Packages.claude-agent-sdk: add dependency on
 sniffio

This was added in v0.1.67 (https://github.com/anthropics/claude-agent-sdk-python/commit/62c8bfd0e50b309ec520ee57b4ad8f03cb6a69ee)
---
 pkgs/development/python-modules/claude-agent-sdk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index c24b84006289..747d6db55ca5 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -8,6 +8,7 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
+  sniffio,
   typing-extensions,
 }:
 
@@ -28,6 +29,7 @@ buildPythonPackage (finalAttrs: {
   dependencies = [
     anyio
     mcp
+    sniffio
     typing-extensions
   ];
 

From 834eeb28b187f4e7f181596a0931a0a0f66b0468 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 13:03:52 +0000
Subject: [PATCH 245/339] giada: 1.4.2 -> 1.5.0

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

diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index c76f5c574370..650f37868857 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "giada";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = "giada";
     tag = finalAttrs.version;
-    hash = "sha256-GVK/VyqRatxptuQGINaev5RVmafZNxogdKUzC5b4ns4=";
+    hash = "sha256-AceH2FO75WF/Cmk3wd6u495M277iuZp/21nBl3K4jHU=";
     fetchSubmodules = true;
   };
 

From 9e34df757eed676e95e9001a729f433a74ee2376 Mon Sep 17 00:00:00 2001
From: "Katja Ramona Sophie Kwast (zaphyra)" <git@zaphyra.eu>
Date: Tue, 16 Jun 2026 15:05:31 +0200
Subject: [PATCH 246/339] gomuks-web: 26.05 -> 26.06

---
 pkgs/by-name/go/gomuks-web/package.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix
index 2fa7366d7570..7c85ab2f0abe 100644
--- a/pkgs/by-name/go/gomuks-web/package.nix
+++ b/pkgs/by-name/go/gomuks-web/package.nix
@@ -11,17 +11,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "gomuks-web";
-  version = "26.05";
+  version = "26.06";
 
   src = fetchFromGitHub {
     owner = "gomuks";
     repo = "gomuks";
     tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0";
-    hash = "sha256-BoTD4c9ZhfyFytsxUCvTIoCoBiFbPW1T1uGWRDx+OIE=";
+    hash = "sha256-Q4hu3bcB16iuqASZvlv7nDvxj8CFX66qWp6DHIUTmh4=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-WJQmei6+T98k2Dkma3rHM2c7pzvze0hT8W5UnnARLok=";
+  vendorHash = "sha256-UH/T3eqFy0KrG/ouEzifJeWXXwe5cUPYG7DpIO0GsYc=";
 
   nativeBuildInputs = [
     nodejs
@@ -37,11 +37,20 @@ buildGoModule (finalAttrs: {
     npmRoot = "web";
     npmDeps = fetchNpmDeps {
       src = "${finalAttrs.src}/web";
-      hash = "sha256-H76LUuhEqjuAh7PxjIjMBW5TvsOg9Ra2T7Y39SfktqM=";
+      hash = "sha256-RiOes+tmAxhA9IkyA6yWQXTjjXyZg2Z8FmPTgcmCg/g=";
     };
   };
 
   postPatch = ''
+    # required until libheif gets bumped
+    substituteInPlace ./go.mod \
+      --replace-fail 'github.com/strukturag/libheif v1.23.0' 'github.com/strukturag/libheif v1.21.2'
+
+    substituteInPlace ./go.sum \
+      --replace-fail 'github.com/strukturag/libheif v1.23.0 h1:G9Fjf/b8dvTgLIk148tUKp7Z7rgu88FC+Mc8o92U98k=' 'github.com/strukturag/libheif v1.21.2 h1:YFD3crf+d33cFVQh3aTkkVGwJFyWpfqVT4XhzHWU6mA=' \
+      --replace-fail 'github.com/strukturag/libheif v1.23.0/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=' 'github.com/strukturag/libheif v1.21.2/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks='
+
+
     substituteInPlace ./web/build-wasm.sh \
       --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=${finalAttrs.src.tag}" \
       --replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=unknown"
@@ -52,6 +61,7 @@ buildGoModule (finalAttrs: {
   tags = [
     "goolm"
     "libheif"
+    "sqlite_fts5"
   ];
 
   ldflags = [

From 45dd3c1f7a73b021cd31cc9a9553e91c0e9eff8f Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Mon, 15 Jun 2026 12:50:24 -0300
Subject: [PATCH 247/339] maintainers/lucasew: disown some packages

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 nixos/tests/xrdp-with-audio-pulseaudio.nix                    | 4 ++--
 .../networking/instant-messengers/pidgin/default.nix          | 2 +-
 pkgs/by-name/ba/backgroundremover/package.nix                 | 2 +-
 pkgs/by-name/br/bruno-cli/package.nix                         | 1 -
 pkgs/by-name/br/bruno/package.nix                             | 1 -
 pkgs/by-name/ch/chatd/package.nix                             | 2 +-
 pkgs/by-name/en/enroot/package.nix                            | 2 +-
 pkgs/by-name/fl/flet-client-flutter/package.nix               | 1 -
 pkgs/by-name/ga/gallery-dl/package.nix                        | 1 -
 pkgs/by-name/np/npm-lockfile-fix/package.nix                  | 1 -
 pkgs/by-name/pi/piped/package.nix                             | 2 +-
 pkgs/by-name/pm/pmbootstrap/package.nix                       | 1 -
 pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix            | 2 +-
 pkgs/by-name/ra/ranger/package.nix                            | 1 -
 pkgs/by-name/sh/shadershark/package.nix                       | 2 +-
 pkgs/by-name/un/unarc/package.nix                             | 2 +-
 pkgs/by-name/xp/xpra-html5/package.nix                        | 4 +---
 pkgs/by-name/xp/xpra/package.nix                              | 1 -
 pkgs/by-name/xr/xrdp/package.nix                              | 1 -
 pkgs/development/python-modules/anyqt/default.nix             | 2 +-
 pkgs/development/python-modules/baycomp/default.nix           | 2 +-
 pkgs/development/python-modules/bbox/default.nix              | 2 +-
 pkgs/development/python-modules/facenet-pytorch/default.nix   | 2 +-
 pkgs/development/python-modules/flet-cli/default.nix          | 1 -
 pkgs/development/python-modules/flet-desktop/default.nix      | 1 -
 pkgs/development/python-modules/flet-web/default.nix          | 1 -
 pkgs/development/python-modules/flet/default.nix              | 1 -
 pkgs/development/python-modules/hsh/default.nix               | 2 +-
 pkgs/development/python-modules/minexr/default.nix            | 2 +-
 pkgs/development/python-modules/mouseinfo/default.nix         | 2 +-
 pkgs/development/python-modules/naked/default.nix             | 2 +-
 pkgs/development/python-modules/opentsne/default.nix          | 2 +-
 pkgs/development/python-modules/pyautogui/default.nix         | 2 +-
 pkgs/development/python-modules/pygetwindow/default.nix       | 2 +-
 pkgs/development/python-modules/pyquaternion/default.nix      | 2 +-
 pkgs/development/python-modules/pyrect/default.nix            | 2 +-
 pkgs/development/python-modules/pyscreeze/default.nix         | 2 +-
 pkgs/development/python-modules/pytweening/default.nix        | 2 +-
 pkgs/development/python-modules/qasync/default.nix            | 2 +-
 pkgs/development/python-modules/rtfunicode/default.nix        | 2 +-
 pkgs/development/python-modules/serverfiles/default.nix       | 2 +-
 pkgs/development/python-modules/trubar/default.nix            | 2 +-
 pkgs/development/python-modules/yacs/default.nix              | 2 +-
 43 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/nixos/tests/xrdp-with-audio-pulseaudio.nix b/nixos/tests/xrdp-with-audio-pulseaudio.nix
index cc630143b990..0023e6307031 100644
--- a/nixos/tests/xrdp-with-audio-pulseaudio.nix
+++ b/nixos/tests/xrdp-with-audio-pulseaudio.nix
@@ -10,8 +10,8 @@
   # - Open a browser or something that plays sound. Ex: chromium
 
   name = "xrdp-with-audio-pulseaudio";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ lucasew ];
+  meta = {
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index cff21dd33d16..b30c26877e9e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -175,7 +175,7 @@ let
       homepage = "https://pidgin.im/";
       license = lib.licenses.gpl2Plus;
       platforms = lib.platforms.unix;
-      maintainers = [ lib.maintainers.lucasew ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix
index 6b59dea21ab1..b46784154509 100644
--- a/pkgs/by-name/ba/backgroundremover/package.nix
+++ b/pkgs/by-name/ba/backgroundremover/package.nix
@@ -107,7 +107,7 @@ let
       homepage = "https://BackgroundRemoverAI.com";
       downloadPage = "https://github.com/nadermx/backgroundremover/releases";
       license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.lucasew ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
index 8f9c54f3e414..3feb18f23ddf 100644
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -119,7 +119,6 @@ buildNpmPackage {
     maintainers = with lib.maintainers; [
       gepbird
       kashw2
-      lucasew
       mattpolzin
       water-sucks
     ];
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index ba007dc0a2c2..14f7d8b96727 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -196,7 +196,6 @@ buildNpmPackage rec {
     maintainers = with lib.maintainers; [
       gepbird
       kashw2
-      lucasew
       mattpolzin
       redyf
       water-sucks
diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix
index 5a7a52e44a68..0aac9451c4d4 100644
--- a/pkgs/by-name/ch/chatd/package.nix
+++ b/pkgs/by-name/ch/chatd/package.nix
@@ -90,7 +90,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/BruceMacD/chatd";
     changelog = "https://github.com/BruceMacD/chatd/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     mainProgram = "chatd";
     platforms = electron.meta.platforms;
   };
diff --git a/pkgs/by-name/en/enroot/package.nix b/pkgs/by-name/en/enroot/package.nix
index 0cf1e5027bb2..7bff08c621fd 100644
--- a/pkgs/by-name/en/enroot/package.nix
+++ b/pkgs/by-name/en/enroot/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/NVIDIA/enroot";
     changelog = "https://github.com/NVIDIA/enroot/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     mainProgram = "enroot";
   };
 })
diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix
index 7d85c1fc14ea..867b9d0f2e9c 100644
--- a/pkgs/by-name/fl/flet-client-flutter/package.nix
+++ b/pkgs/by-name/fl/flet-client-flutter/package.nix
@@ -92,7 +92,6 @@ flutter338.buildFlutterApplication rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       heyimnova
-      lucasew
     ];
     mainProgram = "flet";
   };
diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index a7e3de1ed9e4..dc49a388b40a 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -55,7 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     maintainers = with lib.maintainers; [
       dawidsowa
       FlameFlag
-      lucasew
     ];
   };
 })
diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix
index d5ca66514895..e0a3b430e1b6 100644
--- a/pkgs/by-name/np/npm-lockfile-fix/package.nix
+++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix
@@ -35,7 +35,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     mainProgram = "npm-lockfile-fix";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      lucasew
       felschr
     ];
   };
diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index e336b6ba7ef4..aab4f2408d10 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -47,7 +47,7 @@ buildNpmPackage rec {
   meta = {
     homepage = "https://github.com/TeamPiped/Piped";
     description = "Efficient and privacy-friendly YouTube frontend";
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     license = [ lib.licenses.agpl3Plus ];
   };
 
diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 127e66e01a8c..6563b0c44e9a 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -81,7 +81,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       onny
-      lucasew
       ungeskriptet
     ];
     mainProgram = "pmbootstrap";
diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
index 532dbb392eb4..2d8f61780942 100644
--- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     description = "xrdp sink/source pulseaudio modules";
     homepage = "https://github.com/neutrinolabs/pulseaudio-module-xrdp";
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
   };
diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix
index 58f55f30a3a9..3cbd8343854b 100644
--- a/pkgs/by-name/ra/ranger/package.nix
+++ b/pkgs/by-name/ra/ranger/package.nix
@@ -93,7 +93,6 @@ python3Packages.buildPythonApplication {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       toonn
-      lucasew
     ];
     mainProgram = "ranger";
   };
diff --git a/pkgs/by-name/sh/shadershark/package.nix b/pkgs/by-name/sh/shadershark/package.nix
index 617099efd266..80888fac95c3 100644
--- a/pkgs/by-name/sh/shadershark/package.nix
+++ b/pkgs/by-name/sh/shadershark/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "OpenGL/X11 application for GNU/Linux consisting of a single window that shows simple 3D scene of a textured rectangle with applied vertex and fragment shaders (GLSL)";
     homepage = "https://graphics.globalcode.info/v_0/shader-shark.xhtml";
     license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/un/unarc/package.nix b/pkgs/by-name/un/unarc/package.nix
index 5b1829ab5cae..cb3bbab57aa9 100644
--- a/pkgs/by-name/un/unarc/package.nix
+++ b/pkgs/by-name/un/unarc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "Unpacker for ArC (FreeArc) archives ('ArC\\1' header)";
     homepage = "https://github.com/xredor/unarc";
     license = lib.licenses.unfree; # unknown
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     mainProgram = "unarc";
   };
 }
diff --git a/pkgs/by-name/xp/xpra-html5/package.nix b/pkgs/by-name/xp/xpra-html5/package.nix
index 72a7d8397ea8..0d74efbfeabd 100644
--- a/pkgs/by-name/xp/xpra-html5/package.nix
+++ b/pkgs/by-name/xp/xpra-html5/package.nix
@@ -37,8 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Xpra-org/xpra-html5/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.linux;
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [
-      lucasew
-    ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index a4de10b06d8f..6d9c26e42de9 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -304,7 +304,6 @@ effectiveBuildPythonApplication rec {
     maintainers = with lib.maintainers; [
       numinit
       mvnetbiz
-      lucasew
     ];
   };
 }
diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix
index 922867b7a7a4..ff484fd150ce 100644
--- a/pkgs/by-name/xr/xrdp/package.nix
+++ b/pkgs/by-name/xr/xrdp/package.nix
@@ -214,7 +214,6 @@ let
       license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [
         chvp
-        lucasew
       ];
       platforms = lib.platforms.linux;
     };
diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix
index 36eb77416ae1..a5bde7eecedd 100644
--- a/pkgs/development/python-modules/anyqt/default.nix
+++ b/pkgs/development/python-modules/anyqt/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/ales-erjavec/anyqt";
     changelog = "https://github.com/ales-erjavec/anyqt/releases/tag/${finalAttrs.version}";
     license = [ lib.licenses.gpl3Only ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix
index 34a7a81333e8..af6474de2e17 100644
--- a/pkgs/development/python-modules/baycomp/default.nix
+++ b/pkgs/development/python-modules/baycomp/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Library for Bayesian comparison of classifiers";
     homepage = "https://github.com/janezd/baycomp";
     license = [ lib.licenses.mit ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix
index aabb088dbeeb..771a21fa2a44 100644
--- a/pkgs/development/python-modules/bbox/default.nix
+++ b/pkgs/development/python-modules/bbox/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage {
     description = "Python library for 2D/3D bounding boxes";
     homepage = "https://github.com/varunagrawal/bbox";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/facenet-pytorch/default.nix b/pkgs/development/python-modules/facenet-pytorch/default.nix
index bfd0ba85a2eb..9e8a0b21df1e 100644
--- a/pkgs/development/python-modules/facenet-pytorch/default.nix
+++ b/pkgs/development/python-modules/facenet-pytorch/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Pretrained Pytorch face detection (MTCNN) and facial recognition (InceptionResnet) models";
     homepage = "https://github.com/timesler/facenet-pytorch";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flet-cli/default.nix b/pkgs/development/python-modules/flet-cli/default.nix
index 577383f7b2db..e3665998a44a 100644
--- a/pkgs/development/python-modules/flet-cli/default.nix
+++ b/pkgs/development/python-modules/flet-cli/default.nix
@@ -59,7 +59,6 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       heyimnova
-      lucasew
     ];
     mainProgram = "flet";
   };
diff --git a/pkgs/development/python-modules/flet-desktop/default.nix b/pkgs/development/python-modules/flet-desktop/default.nix
index 13d0a0d9b6a9..61e340c61cfb 100644
--- a/pkgs/development/python-modules/flet-desktop/default.nix
+++ b/pkgs/development/python-modules/flet-desktop/default.nix
@@ -37,7 +37,6 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       heyimnova
-      lucasew
     ];
   };
 }
diff --git a/pkgs/development/python-modules/flet-web/default.nix b/pkgs/development/python-modules/flet-web/default.nix
index a0248b969690..f2e4583456f6 100644
--- a/pkgs/development/python-modules/flet-web/default.nix
+++ b/pkgs/development/python-modules/flet-web/default.nix
@@ -44,7 +44,6 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       heyimnova
-      lucasew
     ];
   };
 }
diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix
index 0e0a22f36ea9..cdf5e2e20934 100644
--- a/pkgs/development/python-modules/flet/default.nix
+++ b/pkgs/development/python-modules/flet/default.nix
@@ -93,7 +93,6 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       heyimnova
-      lucasew
     ];
     mainProgram = "flet";
   };
diff --git a/pkgs/development/python-modules/hsh/default.nix b/pkgs/development/python-modules/hsh/default.nix
index cdaf058abe3c..6498374e17fb 100644
--- a/pkgs/development/python-modules/hsh/default.nix
+++ b/pkgs/development/python-modules/hsh/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/chrissimpkins/hsh";
     downloadPage = "https://github.com/chrissimpkins/hsh/releases";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix
index 3a8435e72744..aa1fe13ee685 100644
--- a/pkgs/development/python-modules/minexr/default.nix
+++ b/pkgs/development/python-modules/minexr/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Minimal, standalone OpenEXR reader for single-part, uncompressed scan line files";
     homepage = "https://github.com/cheind/py-minexr";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix
index 1cf2449460a7..d19cc6fe82ae 100644
--- a/pkgs/development/python-modules/mouseinfo/default.nix
+++ b/pkgs/development/python-modules/mouseinfo/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage {
     description = "Application to display XY position and RGB color information for the pixel currently under the mouse. Works on Python 2 and 3";
     homepage = "https://github.com/asweigart/mouseinfo";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/naked/default.nix b/pkgs/development/python-modules/naked/default.nix
index b169b2e0a649..6d2e807c3055 100644
--- a/pkgs/development/python-modules/naked/default.nix
+++ b/pkgs/development/python-modules/naked/default.nix
@@ -109,6 +109,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/chrissimpkins/naked";
     downloadPage = "https://github.com/chrissimpkins/naked/tags";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix
index 8c2f13122c90..930c1e5665d0 100644
--- a/pkgs/development/python-modules/opentsne/default.nix
+++ b/pkgs/development/python-modules/opentsne/default.nix
@@ -62,7 +62,7 @@ let
       homepage = "https://github.com/pavlin-policar/openTSNE";
       changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/v${version}";
       license = lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [ lucasew ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix
index 57125a380d67..24d8f0c064cc 100644
--- a/pkgs/development/python-modules/pyautogui/default.nix
+++ b/pkgs/development/python-modules/pyautogui/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/asweigart/pyautogui";
     changelog = "https://github.com/asweigart/pyautogui/blob/${finalAttrs.src.rev}/CHANGES.txt";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/pygetwindow/default.nix b/pkgs/development/python-modules/pygetwindow/default.nix
index cccaf6629b9c..c9519b858ece 100644
--- a/pkgs/development/python-modules/pygetwindow/default.nix
+++ b/pkgs/development/python-modules/pygetwindow/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Simple, cross-platform module for obtaining GUI information on applications' windows";
     homepage = "https://github.com/asweigart/PyGetWindow";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix
index 4e66ac7d9cf2..c5e3680e3574 100644
--- a/pkgs/development/python-modules/pyquaternion/default.nix
+++ b/pkgs/development/python-modules/pyquaternion/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Library for representing and using quaternions";
     homepage = "http://kieranwynn.github.io/pyquaternion/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix
index a5503cfd2215..251e5e1116cc 100644
--- a/pkgs/development/python-modules/pyrect/default.nix
+++ b/pkgs/development/python-modules/pyrect/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Simple module with a Rect class for Pygame-like rectangular areas";
     homepage = "https://github.com/asweigart/pyrect";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix
index ce819f7b2956..8205dd6a5bc6 100644
--- a/pkgs/development/python-modules/pyscreeze/default.nix
+++ b/pkgs/development/python-modules/pyscreeze/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage {
     description = "PyScreeze is a simple, cross-platform screenshot module for Python 2 and 3";
     homepage = "https://github.com/asweigart/pyscreeze";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytweening/default.nix b/pkgs/development/python-modules/pytweening/default.nix
index 21280b657deb..074af0424899 100644
--- a/pkgs/development/python-modules/pytweening/default.nix
+++ b/pkgs/development/python-modules/pytweening/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Set of tweening / easing functions implemented in Python";
     homepage = "https://github.com/asweigart/pytweening";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix
index c1b317c445e2..110ecca557c0 100644
--- a/pkgs/development/python-modules/qasync/default.nix
+++ b/pkgs/development/python-modules/qasync/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Allows coroutines to be used in PyQt/PySide applications by providing an implementation of the PEP 3156 event-loop";
     homepage = "https://github.com/CabbageDevelopment/qasync";
     license = [ lib.licenses.bsd2 ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rtfunicode/default.nix b/pkgs/development/python-modules/rtfunicode/default.nix
index 6f876d4ad45d..41c25a15a6e6 100644
--- a/pkgs/development/python-modules/rtfunicode/default.nix
+++ b/pkgs/development/python-modules/rtfunicode/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     description = "Encoder for unicode to RTF 1.5 command sequences";
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     license = lib.licenses.bsd2;
     homepage = "https://github.com/mjpieters/rtfunicode";
     changelog = "https://github.com/mjpieters/rtfunicode/releases/tag/${finalAttrs.src.tag}";
diff --git a/pkgs/development/python-modules/serverfiles/default.nix b/pkgs/development/python-modules/serverfiles/default.nix
index 5e6670efaac5..d591c23b88c1 100644
--- a/pkgs/development/python-modules/serverfiles/default.nix
+++ b/pkgs/development/python-modules/serverfiles/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage (finalAttrs: {
     description = "Utility that accesses files on a HTTP server and stores them locally for reuse";
     homepage = "https://github.com/biolab/serverfiles";
     license = [ lib.licenses.gpl3Plus ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix
index 416aaf75c985..6ef9e9c2f649 100644
--- a/pkgs/development/python-modules/trubar/default.nix
+++ b/pkgs/development/python-modules/trubar/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/janezd/trubar";
     changelog = "https://github.com/janezd/trubar/releases/tag/${version}";
     license = [ lib.licenses.mit ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix
index e8b5d63afe00..fc6db5333b80 100644
--- a/pkgs/development/python-modules/yacs/default.nix
+++ b/pkgs/development/python-modules/yacs/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Yet Another Configuration System";
     homepage = "https://github.com/rbgirshick/yacs";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ lucasew ];
+    maintainers = [ ];
   };
 }

From 8bbd6feba06092b90ed5985e726c392acc3aa4fb Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 16 Jun 2026 15:34:25 +0200
Subject: [PATCH 248/339] haxor-news: Remove

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ha/haxor-news/package.nix | 51 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 pkgs/by-name/ha/haxor-news/package.nix

diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix
deleted file mode 100644
index f4e7b439b52f..000000000000
--- a/pkgs/by-name/ha/haxor-news/package.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchPypi,
-  python3Packages,
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "haxor-news";
-  version = "unstable-2022-04-22";
-  format = "setuptools";
-
-  # haven't done a stable release in 3+ years, but actively developed
-  src = fetchFromGitHub {
-    owner = "donnemartin";
-    repo = "haxor-news";
-    rev = "8294e4498858f036a344b06e82f08b834c2a8270";
-    hash = "sha256-0eVk5zj7F3QDFvV0Kv9aeV1oeKxr/Kza6M3pK6hyYuY=";
-  };
-
-  propagatedBuildInputs = with python3Packages; [
-    click
-    colorama
-    requests
-    pygments
-    prompt-toolkit
-    six
-  ];
-
-  # will fail without pre-seeded config files
-  doCheck = false;
-
-  nativeCheckInputs = with python3Packages; [
-    unittestCheckHook
-    mock
-  ];
-
-  unittestFlagsArray = [
-    "-s"
-    "tests"
-    "-v"
-  ];
-
-  meta = {
-    homepage = "https://github.com/donnemartin/haxor-news";
-    description = "Browse Hacker News like a haxor";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ matthiasbeyer ];
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 287314f2930b..6f5df2d5e35a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -976,6 +976,7 @@ mapAliases {
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
   haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'.";
   haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'.";
+  haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16
   helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05
   HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
   hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10

From a84ad8a3fa1449b16de6b03f6382061ff294c6dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 Jun 2026 15:50:22 +0200
Subject: [PATCH 249/339] nixos/rustical: fix unix domain socket support

While the config supported UNIX domain sockets, the runtime environment
did not. For this to work we need to relax the UMask, which is not great
and will be fixed once Rustical gains socket activation.
---
 nixos/modules/services/web-apps/rustical.nix |  5 ++-
 nixos/tests/web-apps/rustical.nix            | 32 +++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/web-apps/rustical.nix b/nixos/modules/services/web-apps/rustical.nix
index a92daf8c07b4..56661c9c24d6 100644
--- a/nixos/modules/services/web-apps/rustical.nix
+++ b/nixos/modules/services/web-apps/rustical.nix
@@ -149,6 +149,8 @@ in
         EnvironmentFile = cfg.environmentFiles;
         Restart = "on-failure";
         StateDirectory = "rustical";
+        RuntimeDirectory = "rustical";
+        RuntimeDirectoryMode = "0750";
 
         CapabilityBoundingSet = "";
         DevicePolicy = "closed";
@@ -172,6 +174,7 @@ in
         RestrictAddressFamilies = [
           "AF_INET"
           "AF_INET6"
+          "AF_UNIX"
         ];
         RestrictNamespaces = true;
         RestrictRealtime = true;
@@ -181,7 +184,7 @@ in
           "~@privileged @resources"
         ];
         SystemCallErrorNumber = "EPERM";
-        UMask = "0077";
+        UMask = "0007";
       };
     };
   };
diff --git a/nixos/tests/web-apps/rustical.nix b/nixos/tests/web-apps/rustical.nix
index 15a718e87702..3213cfd61f09 100644
--- a/nixos/tests/web-apps/rustical.nix
+++ b/nixos/tests/web-apps/rustical.nix
@@ -4,10 +4,6 @@
   ...
 }:
 
-let
-  port = "4000";
-in
-
 {
   name = "rustical";
 
@@ -15,14 +11,21 @@ in
 
   containers.machine =
     {
+      config,
       pkgs,
       ...
     }:
     {
-      services.rustical = {
+      services.rustical.enable = true;
+      services.nginx = {
         enable = true;
-        settings.http.bind = "[::]:${port}";
+        virtualHosts."localhost" = {
+          locations."/" = {
+            proxyPass = "http://${config.services.rustical.settings.http.bind}";
+          };
+        };
       };
+      systemd.services.nginx.serviceConfig.SupplementaryGroups = [ "rustical" ];
       environment.systemPackages = with pkgs; [ calendar-cli ];
     };
 
@@ -32,8 +35,6 @@ in
       ...
     }:
     let
-      url = "http://localhost:${toString port}";
-
       createPrincipalScript = pkgs.writeScript "rustical-create-principal" ''
         #!${lib.getExe pkgs.expect}
         spawn rustical principals create alice --password
@@ -45,30 +46,31 @@ in
       calendarCliConfig = (pkgs.formats.json { }).generate "rustical-test-calendar-cli.json" {
         default = {
           caldav_user = "alice";
-          caldav_url = "${url}/caldav/";
-          calendar_url = "${url}/caldav/principal/alice";
+          caldav_url = "http://localhost/caldav/";
+          calendar_url = "http://localhost/caldav/principal/alice";
         };
         testcal = {
           inherits = "default";
-          calendar_url = "${url}/caldav/principal/alice/testcal";
+          calendar_url = "http://localhost/caldav/principal/alice/testcal";
         };
       };
     in
     # python
     ''
       machine.wait_for_unit("rustical.service")
-      machine.wait_for_open_port(${port})
+      machine.wait_for_file("${lib.removePrefix "unix:" containers.machine.services.rustical.settings.http.bind}")
+      machine.wait_for_open_port(80)
 
       with subtest("Smoketest"):
-        machine.succeed("curl --fail ${url}")
+        machine.succeed("curl --fail http://localhost")
 
       with subtest("Create principal"):
         machine.succeed("${createPrincipalScript}")
         machine.succeed("rustical principals list | grep alice")
 
       with subtest("Generate token for principal"):
-        machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' ${url}/frontend/login")
-        machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' ${url}/frontend/user/alice/app_token > token.txt")
+        machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' http://localhost/frontend/login")
+        machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' http://localhost/frontend/user/alice/app_token > token.txt")
 
       with subtest("Interact with caldav"):
         machine.succeed('calendar-cli --config-file ${calendarCliConfig} --caldav-pass "$(cat token.txt)" calendar create testcal')

From ffae09286f3cbb1a9082935a3d01fe8814a8f4da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 14:00:05 +0000
Subject: [PATCH 250/339] phrase-cli: 2.64.0 -> 2.65.0

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

diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 99710f030816..ea116e76f006 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "phrase-cli";
-  version = "2.64.0";
+  version = "2.65.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = finalAttrs.version;
-    sha256 = "sha256-UTfVHUExjTsswhTaoDPIckkqRbVyo95AwBUOXEFQE/M=";
+    sha256 = "sha256-9GFprrLcae/uiQCi2PolLAUP89nCa02DZ3tEXUyXvhw=";
   };
 
-  vendorHash = "sha256-HbgLFtKpmacjArmV3t1AkPKQ+nY9OLLyivZNlxbuoNY=";
+  vendorHash = "sha256-vlssNVS1zTjYdp63NrR2rWOan5ng6t2BYEXv4L9q8Gc=";
 
   ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${finalAttrs.version}" ];
 

From 2052acb80b779b11d70444fb5867b3c67a35247e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 14:04:52 +0000
Subject: [PATCH 251/339] vscode-extensions.vscjava.vscode-java-pack: 0.31.0 ->
 0.31.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b1e6471984db..e89636a5cd8b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5156,8 +5156,8 @@ let
         mktplcRef = {
           name = "vscode-java-pack";
           publisher = "vscjava";
-          version = "0.31.0";
-          hash = "sha256-E0GJoITZIh2XemVpyPh3gAEtlvM2PZHgNzZDctSpwIA=";
+          version = "0.31.1";
+          hash = "sha256-SfrsL27uQyrtsNyqZe0q5Fv5sHMwRvBZ+iS6/JIpFVo=";
         };
         meta = {
           description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more";

From 877b0c0dc79896d97ec25fb3cfbf73efd06eea35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 14:11:30 +0000
Subject: [PATCH 252/339] terraform-providers.hashicorp_tfe: 0.77.0 -> 0.78.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 3f42d79daa0b..26e6bc1d0227 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -661,13 +661,13 @@
     "vendorHash": "sha256-CwTlb0QTq0lpZK90IL6mBLoarFYFLsjiLYauGEaR1Rk="
   },
   "hashicorp_tfe": {
-    "hash": "sha256-GRrtwrShJj+d2h6CpxjP+QmRKQLTWoNt5889ek9rfyE=",
+    "hash": "sha256-otBeETd3wrGdpDU4MbY+qyad7ZVaoljlphBNytB36BY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.77.0",
+    "rev": "v0.78.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-DutNev1ABazfV6QOWMFsFc0QSkffARhaJ7RXTWG2Jyo="
+    "vendorHash": "sha256-PKAFhHCaeCtV1frMyCidCcJgWTA8/7Cbdq6h3RTeqAQ="
   },
   "hashicorp_time": {
     "hash": "sha256-5+iPq2It3oFHPBHWshfIuNo1xkOPcuSYyljt6j+j7lg=",

From 7bcbc7d93e8b7de8122384533fd6db94a56ddbc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 14:17:06 +0000
Subject: [PATCH 253/339] 
 python3Packages.microsoft-kiota-serialization-multipart: 1.10.2 -> 1.10.3

---
 .../microsoft-kiota-serialization-multipart/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
index aa9770764983..5cd49138df9e 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-multipart";
-  version = "1.10.2";
+  version = "1.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-multipart-v${version}";
-    hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I=";
+    hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/multipart/";

From e67d4f5f3bc461b27770d658d1ef12e72398e608 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 16:25:04 +0200
Subject: [PATCH 254/339] cewl: 5.5.2 -> 6.2.1

https://github.com/digininja/CeWL/releases/tag/6.2.1
---
 pkgs/by-name/ce/cewl/Gemfile.lock |  8 ++++----
 pkgs/by-name/ce/cewl/gemset.nix   | 26 ++++++++++++++++++--------
 pkgs/by-name/ce/cewl/package.nix  | 11 +++++++----
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ce/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock
index 6f9bd20b1e0f..65a86f8fadef 100644
--- a/pkgs/by-name/ce/cewl/Gemfile.lock
+++ b/pkgs/by-name/ce/cewl/Gemfile.lock
@@ -6,19 +6,19 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0924)
+    mime-types-data (3.2026.0414)
     mini_exiftool (2.14.0)
       ostruct (>= 0.6.0)
       pstore (>= 0.1.3)
     mini_portile2 (2.8.9)
-    nokogiri (1.18.10)
+    nokogiri (1.19.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     ostruct (0.6.3)
-    pstore (0.2.0)
+    pstore (0.2.1)
     racc (1.8.1)
     rexml (3.4.4)
-    rubyzip (3.2.2)
+    rubyzip (3.4.0)
     spider (0.7.0)
 
 PLATFORMS
diff --git a/pkgs/by-name/ce/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix
index 1fc11621b17b..19cab141ee24 100644
--- a/pkgs/by-name/ce/cewl/gemset.nix
+++ b/pkgs/by-name/ce/cewl/gemset.nix
@@ -38,10 +38,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2025.0924";
+    version = "3.2026.0414";
   };
   mini_exiftool = {
     dependencies = [
@@ -76,10 +76,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
+      sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
       type = "gem";
     };
-    version = "1.18.10";
+    version = "1.19.3";
   };
   ostruct = {
     groups = [ "default" ];
@@ -96,10 +96,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a3lrq8k62n8bazhxgdmjykni9wv0mcjks5vi1g274i3wblcgrfn";
+      sha256 = "06icf1n6z7snygcq51zdm1zdz20cpkd4qw76s6b9wmv65h7lv403";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.2.1";
   };
   racc = {
     groups = [ "default" ];
@@ -126,10 +126,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0";
+      sha256 = "0yzmmwya4zis5f7zkhhp8p92m1xh2sg6rlbnlhsvc0m3xg4rpqvd";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.4.0";
   };
   spider = {
     groups = [ "default" ];
@@ -141,4 +141,14 @@
     };
     version = "0.7.0";
   };
+  getoptlong = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
 }
diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix
index a3cdebb0d54f..16ff14d7a948 100644
--- a/pkgs/by-name/ce/cewl/package.nix
+++ b/pkgs/by-name/ce/cewl/package.nix
@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
   bundlerEnv,
   bundlerUpdateScript,
@@ -14,12 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cewl";
-  version = "5.5.2";
+  version = "6.2.1";
+
   src = fetchFromGitHub {
     owner = "digininja";
     repo = "CeWL";
     tag = finalAttrs.version;
-    hash = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc=";
+    hash = "sha256-wMTGAB4P925z2UYNvlN4kSu1SLzKyB4a/Cjq4BofJ9w=";
   };
 
   buildInputs = [ rubyEnv.wrappedRuby ];
@@ -34,8 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Custom wordlist generator";
-    mainProgram = "cewl";
     homepage = "https://digi.ninja/projects/cewl.php/";
+    changelog = "https://github.com/digininja/CeWL/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Plus;
+    maintainers = [ ];
+    mainProgram = "cewl";
   };
 })

From 1c02cdae7b1556b74e23f70d4c344d59f0fcf09c Mon Sep 17 00:00:00 2001
From: Edgar Pireyn <edgar@pireyn.be>
Date: Sun, 3 May 2026 15:03:31 +0200
Subject: [PATCH 255/339] frp: 0.66.0 -> 0.69.1

This update refactors the packaging of the dashboard (now compiled
using npm). It is therefore built in the dashboard.nix file and
used in the package's preBuild phase.
---
 pkgs/by-name/fr/frp/dashboard.nix | 34 +++++++++++++++++++++++++++++++
 pkgs/by-name/fr/frp/package.nix   | 22 +++++++++++++-------
 2 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/fr/frp/dashboard.nix

diff --git a/pkgs/by-name/fr/frp/dashboard.nix b/pkgs/by-name/fr/frp/dashboard.nix
new file mode 100644
index 000000000000..facbdd467ea7
--- /dev/null
+++ b/pkgs/by-name/fr/frp/dashboard.nix
@@ -0,0 +1,34 @@
+{
+  buildNpmPackage,
+  frp,
+}:
+let
+  builder =
+    name:
+    buildNpmPackage {
+      pname = "${name}-dashboard";
+      inherit (frp) version src;
+
+      sourceRoot = "source/web";
+
+      preBuild = ''
+        pushd ${name}
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        cp -r dist $out
+        runHook postInstall
+      '';
+
+      npmDepsHash = "sha256-XuqQPfywzK81anAD1pAl1TMQqb1+hH2QxLwuTn7zCPU=";
+
+      meta = frp.meta // {
+        description = "Dashboard for frp";
+      };
+    };
+in
+{
+  frpc = builder "frpc";
+  frps = builder "frps";
+}
diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index a5e1ddbfb695..7766e6ce5ca6 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -1,22 +1,24 @@
 {
   buildGoModule,
+  callPackage,
   lib,
   fetchFromGitHub,
   nixosTests,
 }:
-
+let
+  web = callPackage ./dashboard.nix { };
+in
 buildGoModule (finalAttrs: {
   pname = "frp";
-  version = "0.66.0";
-
+  version = "0.69.1";
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = "frp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GFvXdhX7kA43kppWWdL7KhummUCqpa1cQ7V2d9ISGfo=";
+    hash = "sha256-3tOOgnzZZ05En5NMLbp4UFNazX950Jbosvszmjf947c=";
   };
 
-  vendorHash = "sha256-m5ECF0cgp2LfsTKey02MHz5TfqfzOCT5cU5trUfrOjY=";
+  vendorHash = "sha256-JrkIztnmhEYAogr4pDWrPu9/j+C0VLpEyNbh2UK5UcY=";
 
   doCheck = false;
 
@@ -25,8 +27,14 @@ buildGoModule (finalAttrs: {
     "cmd/frps"
   ];
 
-  passthru.tests = {
-    frp = nixosTests.frp;
+  preBuild = ''
+    cp -r ${web.frpc} web/frpc/dist
+    cp -r ${web.frps} web/frps/dist
+  '';
+
+  passthru = {
+    tests.frp = nixosTests.frp;
+    inherit web;
   };
 
   meta = {

From d8123742614a8a56dfe2d7cca4af27e190a9ab8a Mon Sep 17 00:00:00 2001
From: Edgar Pireyn <edgar@pireyn.be>
Date: Sat, 13 Jun 2026 22:56:31 +0200
Subject: [PATCH 256/339] frp: add self as maintainer

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

diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index 7766e6ce5ca6..25b5cde69a00 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -47,5 +47,6 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/fatedier/frp";
     license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ epireyn ];
   };
 })

From d9b1f283ab0ead3e4c82a77bea86297504836caf Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 16 Jun 2026 13:51:48 +0000
Subject: [PATCH 257/339] mistral-rs: 0.8.3 -> 0.8.4

Diff: https://github.com/EricLBuehler/mistral.rs/compare/v0.8.3...v0.8.4

Changelog: https://github.com/EricLBuehler/mistral.rs/releases/tag/v0.8.4
---
 pkgs/by-name/mi/mistral-rs/package.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index 760ba33786d0..88733f003905 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -73,14 +73,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mistral-rs";
-  version = "0.8.3";
+  version = "0.8.4";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "EricLBuehler";
     repo = "mistral.rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ohkr45VXuXB7Ms8igZxQ7shrJa3+WBVT1fNYlc6JvZQ=";
+    hash = "sha256-BSP8fi4grbEzGOfR4tGCJVjIom/1d2mnFrK8O6BRWL4=";
   };
 
   patches = [
@@ -94,9 +94,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail \
           "lto = true" \
           "lto = false"
+    ''
+    # Prevent build scripts from attempting to clone cutlass (which would fail in the sandbox anyway).
+    # Instead, we provide cutlass in buildInputs.
+    + lib.optionalString cudaSupport ''
+      substituteInPlace mistralrs-flash-attn/build.rs \
+        --replace-fail \
+          ".with_cutlass(Some(CUTLASS_COMMIT))" \
+          ""
+
+      substituteInPlace mistralrs-quant/build.rs \
+        --replace-fail \
+          'builder = builder.with_cutlass(Some("7d49e6c7e2f8896c47f586706e67e1fb215529dc"));' \
+          ""
     '';
 
-  cargoHash = "sha256-ZwUCzbRpDgT7KwsT9kPGsGp4iU/0I+lrMFqM3UCwkYw=";
+  cargoHash = "sha256-T4TPm31fihx9ZvQ6jme67yrc0osl4c9CiAm4+rISgFs=";
 
   nativeBuildInputs = [
     pkg-config
@@ -121,6 +134,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cudaPackages.cuda_nvrtc
     cudaPackages.libcublas
     cudaPackages.libcurand
+
+    # For compiling kernels
+    cudaPackages.cutlass
   ]
   ++ lib.optionals mklSupport [ mkl ];
 

From eec506e16b9b8304df51b799426763b321b1f99d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 14:45:12 +0000
Subject: [PATCH 258/339] python3Packages.microsoft-kiota-serialization-text:
 1.10.2 -> 1.10.3

---
 .../microsoft-kiota-serialization-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
index 6094582d51d0..800a324d4bc8 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-text";
-  version = "1.10.2";
+  version = "1.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-text-v${version}";
-    hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I=";
+    hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/text/";

From 92fc36a8e9dd64c706cf63ba538b91130d47d412 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 16 Jun 2026 09:35:50 -0500
Subject: [PATCH 259/339] luaPackages.tree-sitter-kulala_http: init at 0.2.0-1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 30 +++++++++++++++++++
 pkgs/development/lua-modules/overrides.nix    |  7 +++++
 3 files changed, 38 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 5a7ff4b27883..d9e899ca2f45 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -172,6 +172,7 @@ toml-edit,,,,,5.1,mrcjkb
 tomlua,,,,,,birdee
 tree-sitter-cli,,,,,,
 tree-sitter-http,,,,0.0.33-1,,
+tree-sitter-kulala_http,,,,,,
 tree-sitter-norg,,,,,5.1,mrcjkb
 tree-sitter-norg-meta,,,,,,
 tree-sitter-orgmode,,,,,5.1,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index c1d29b481de2..7059d3b6e6d4 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -6231,6 +6231,36 @@ final: prev: {
     }
   ) { };
 
+  tree-sitter-kulala_http = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+      luarocks-build-treesitter-parser,
+    }:
+    buildLuarocksPackage {
+      pname = "tree-sitter-kulala_http";
+      version = "0.2.0-1";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/tree-sitter-kulala_http-0.2.0-1.rockspec";
+          sha256 = "19zl90z7jm3qz62f4q4hp95a0z78k3db1lrb6bhhn27kwiy4ww5z";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/mistweaverco/tree-sitter-kulala-http/archive/v0.2.0.zip";
+        sha256 = "0cc0ff8py1mqdxscp3q6zvpiryanc8fjx2y60csng00bzx4g42mj";
+      };
+
+      nativeBuildInputs = [ luarocks-build-treesitter-parser ];
+
+      meta = {
+        homepage = "https://kulala.app";
+        license = lib.licenses.mit;
+        description = "Tree-sitter grammar for http (kulala-flavour).";
+      };
+    }
+  ) { };
+
   tree-sitter-norg = callPackage (
     {
       buildLuarocksPackage,
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 313f222eaa72..6819850eef40 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -1261,6 +1261,13 @@ in
     ];
   });
 
+  tree-sitter-kulala_http = prev.tree-sitter-kulala_http.overrideAttrs (old: {
+    nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+      tree-sitter
+      writableTmpDirAsHomeHook
+    ];
+  });
+
   tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (old: {
     meta = (old.meta or { }) // {
       broken = lua.luaversion != "5.1";

From b978a44087f70ec906769eed03d0eb21ebc960ea Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 09:07:16 -0500
Subject: [PATCH 260/339] vimPlugins: update on 2026-06-15

---
 .../editors/vim/plugins/generated.nix         | 311 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   6 +-
 .../use-packaged-tree-sitter-parser.patch     |   8 +-
 3 files changed, 163 insertions(+), 162 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index bfde5100281c..ebb177a5b0fd 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -446,12 +446,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-06-10";
+    version = "0-unstable-2026-06-14";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "961c2a806abf56d4e100713ec9dc71d2c8d9d022";
-      hash = "sha256-p4YkQeJybRAbZ2zwK39rm/0Q5iSJqYlhJde7bXV6J/Y=";
+      rev = "3dca2d2153cfbc9aab937c1be0441e371101b0b8";
+      hash = "sha256-TBm3EG55pAQIR4cPHuiu4bK5/oRblnAxxzX7u07rpBE=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -924,12 +924,12 @@ final: prev: {
 
   amp-nvim = buildVimPlugin {
     pname = "amp.nvim";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "ampcode";
       repo = "amp.nvim";
-      rev = "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434";
-      hash = "sha256-f/li32jpVigbZANnnbgSArnOH4nusj0DUz7952K+Znw=";
+      rev = "b851d97d8e8782e58343608d8de7d9eb3a88090f";
+      hash = "sha256-SdpKR1hfSyJ25tD7G1u4wYOHRNyeuTKbdMKG80iCUB4=";
     };
     meta.homepage = "https://github.com/ampcode/amp.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -1050,12 +1050,12 @@ final: prev: {
 
   artio-nvim = buildVimPlugin {
     pname = "artio.nvim";
-    version = "0-unstable-2026-05-04";
+    version = "0-unstable-2026-06-14";
     src = fetchFromGitHub {
       owner = "comfysage";
       repo = "artio.nvim";
-      rev = "0b08d6862afe685fd78963808d022d7c15c89546";
-      hash = "sha256-SrYZPFBQVJgm0X/CzyOOTfDwgNBIrjH+jlW6K8aE2Ec=";
+      rev = "ff2b4351004f3b512525276d554dc6f0cd412a14";
+      hash = "sha256-6wEtjgF36RfaHBanNp49Nb/+WR/b9qElUpV7SNbpESU=";
     };
     meta.homepage = "https://github.com/comfysage/artio.nvim/";
     meta.license = getLicenseFromSpdxId "EUPL-1.2";
@@ -1120,12 +1120,12 @@ final: prev: {
 
   async-nvim = buildVimPlugin {
     pname = "async.nvim";
-    version = "0-unstable-2026-06-10";
+    version = "0-unstable-2026-06-11";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "async.nvim";
-      rev = "f72017409d703ecf25972a05c6f89acb31adb952";
-      hash = "sha256-E8ZS7m2QejmImzmQ+wrgSUlC2x4tkMHv7xGt+XDqcXQ=";
+      rev = "e2a813be9cd143ab1181de6d8a0720e0230cd86e";
+      hash = "sha256-b7jE3tY+6nlbIFTuOxKz4w6jDw7hlyvgBYy0Jg6McAc=";
     };
     meta.homepage = "https://github.com/lewis6991/async.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2030,12 +2030,12 @@ final: prev: {
 
   blink-indent = buildVimPlugin {
     pname = "blink.indent";
-    version = "2.1.2";
+    version = "2.2.0";
     src = fetchFromGitHub {
       owner = "Saghen";
       repo = "blink.indent";
-      tag = "v2.1.2";
-      hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng=";
+      tag = "v2.2.0";
+      hash = "sha256-x4nILac79C60FVsMQiWqlU1FjM891W5U9UZWwGAjnk0=";
     };
     meta.homepage = "https://github.com/Saghen/blink.indent/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2547,12 +2547,12 @@ final: prev: {
 
   claudecode-nvim = buildVimPlugin {
     pname = "claudecode.nvim";
-    version = "0.3.0-unstable-2026-06-09";
+    version = "0.3.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "coder";
       repo = "claudecode.nvim";
-      rev = "7b8b7090c16f4151401a281741a4bf37050ebd26";
-      hash = "sha256-NHhoAqCTa1+go+DYFj25eH0ZDmAqbA9tpHtj3IarCUU=";
+      rev = "2ee26319eb0c101fb2a6da1c9d6650dfa39363da";
+      hash = "sha256-wf+O0PxSoslPkpn1owN2jGUiH0zN7o7hWcKAb6Pd5ns=";
     };
     meta.homepage = "https://github.com/coder/claudecode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2631,12 +2631,12 @@ final: prev: {
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "0-unstable-2026-06-05";
+    version = "0-unstable-2026-06-14";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "38f320fb9f0c4c9f1019f412f561c4d370a94d23";
-      hash = "sha256-U8lLK5FzeOiJVUI0Y3AQ7TM+21tegMnnRbn18c7yXfc=";
+      rev = "98cdc162572a7b77733030425d8d045d68f2a1fd";
+      hash = "sha256-juAaEd08WGmI3ipfKMUbeTmLDK6nCOx/omCbRopIMHE=";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -3484,12 +3484,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-06-08";
+    version = "0.0.82-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "92ab906cab1e6b19ad03f754df4f3930f9eae22c";
-      hash = "sha256-c0ChbihCajCuEh1hu5XOFtomiFA6OzbCl7eNpzPfBXM=";
+      rev = "207dc0f4feb2fc5db54bf4f7b6fea9b21168c293";
+      hash = "sha256-3dGV25DHXSt40N/X2XyaCg5rzgP3cxjoGHJx/ZwRt0o=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = unfree;
@@ -3568,12 +3568,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.15.0";
+    version = "19.16.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.15.0";
-      hash = "sha256-M/2pkFeL+sWwrXiCcE38WWmPb73kdCwC8AWg3ldScY0=";
+      tag = "v19.16.0";
+      hash = "sha256-EUzpQYHEtIP5pVdhsUNWF0Gv7PegMVd25j9WC3Knsq4=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -3582,12 +3582,12 @@ final: prev: {
 
   codecompanion-spinner-nvim = buildVimPlugin {
     pname = "codecompanion-spinner.nvim";
-    version = "0.2.5";
+    version = "0.3.0";
     src = fetchFromGitHub {
       owner = "franco-ruggeri";
       repo = "codecompanion-spinner.nvim";
-      tag = "v0.2.5";
-      hash = "sha256-QSkiyV70kFkArCnTXYRR+Dt4i5XSq072tYnOnHbKEBc=";
+      tag = "v0.3.0";
+      hash = "sha256-icFyR0q814mfLj+wT3ArSYwo50EWpn9BgI81qhbQDCQ=";
     };
     meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -4073,12 +4073,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2.0.4";
+    version = "3.0.0";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      tag = "v2.0.4";
-      hash = "sha256-+hQ4Og0ZZS/tvs4z5733qRu5+W4D24HgHHPIL5vd0Eo=";
+      tag = "v3.0.0";
+      hash = "sha256-xjdTysyt7BMb8a9c2HPQN85EujhQv9ZCQ87yWHjELls=";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -4171,12 +4171,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-06-10";
+    version = "0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "5054268e58e9e45dbdae598c2d7cca232085d2ce";
-      hash = "sha256-SxffEztUDSXp1skO52Pi8XQCinWwFbw34Nn3cvC9GW8=";
+      rev = "7911f272700449891cbe79e3f87690c4ac638c91";
+      hash = "sha256-kP+LrA9Rs0Kfx8eTJ0Cpt5Yg/7RDZS8Ujkm7M8D2pHM=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -4591,12 +4591,12 @@ final: prev: {
 
   ddc-source-lsp = buildVimPlugin {
     pname = "ddc-source-lsp";
-    version = "1.2.0-unstable-2026-05-24";
+    version = "1.2.0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-source-lsp";
-      rev = "a8fef26851f3b648e064fa3aeb7c8c054684e846";
-      hash = "sha256-vB3sCEJw67kJLON+AXo6B/38jBAFq079EouVxaI9QlQ=";
+      rev = "7718b6d9539ebddc18e961f90ff1aca7975ffe5c";
+      hash = "sha256-2JVCuFXc6mtXUDEB1lVgWC2q38kvwr9tyjKO/Z4iY9k=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
     meta.license = unfree;
@@ -5181,12 +5181,12 @@ final: prev: {
 
   diagram-nvim = buildVimPlugin {
     pname = "diagram.nvim";
-    version = "0-unstable-2026-02-21";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "3rd";
       repo = "diagram.nvim";
-      rev = "89d8110ec15021ac9a03ff2317d27b900c45bf60";
-      hash = "sha256-0KgZ/3q26b7MxMPRXp4/mgfl7tIUD3PnC6TYgagDGP4=";
+      rev = "a221810b17cdda2d5fdddba9bab3eba6fab8fabc";
+      hash = "sha256-+K5o50CtBFqn37t6GnAnI1p2CfCyA1w4TIhMKpfZX4A=";
     };
     meta.homepage = "https://github.com/3rd/diagram.nvim/";
     meta.license = unfree;
@@ -5209,12 +5209,12 @@ final: prev: {
 
   diffs-nvim = buildVimPlugin {
     pname = "diffs.nvim";
-    version = "0.3.3";
+    version = "0.4.0";
     src = fetchFromGitHub {
       owner = "barrettruth";
       repo = "diffs.nvim";
-      tag = "v0.3.3";
-      hash = "sha256-g/kXdeNT2NLgQ+iPTI1GdlJyzvSHrcJoCLa0tPDj3gM=";
+      tag = "v0.4.0";
+      hash = "sha256-ZkdvFn5oIlHfXXbO68GxtLrVkF2vxYlG8Fglrkc3Byc=";
     };
     meta.homepage = "https://github.com/barrettruth/diffs.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5237,12 +5237,12 @@ final: prev: {
 
   diffview-plus-nvim = buildVimPlugin {
     pname = "diffview-plus.nvim";
-    version = "0.34";
+    version = "0.35";
     src = fetchFromGitHub {
       owner = "dlyongemallo";
       repo = "diffview-plus.nvim";
-      tag = "v0.34";
-      hash = "sha256-M3Hf4y9HGFquBOK/Stv5FIxoVYX4aoO4dbbYQNPhisk=";
+      tag = "v0.35";
+      hash = "sha256-yoxylfQjTRrN95w+pgkBWLquBdb4knB5Sjplk2rcKVs=";
     };
     meta.homepage = "https://github.com/dlyongemallo/diffview-plus.nvim/";
     meta.license = unfree;
@@ -5419,12 +5419,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-06-09";
+    version = "0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "5c9577f6fc086e211ccc7d93b763e9a5ace4e64b";
-      hash = "sha256-E+f0SHaTN8FI3gEs4t+6NuS5xn45kneK39kSam+Ya9M=";
+      rev = "70f29290cad01cdcbdb03941034a95e5ef9fc365";
+      hash = "sha256-4fqj9U24NizLuEWs5sL2MZXyGmznTTV0dmmZgZ0zdmA=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -6334,12 +6334,12 @@ final: prev: {
     pname = "fyler.nvim";
     version = "2.0.0-unstable-2025-11-23";
     src = fetchFromGitHub {
-      owner = "A7Lavinraj";
+      owner = "FylerOrg";
       repo = "fyler.nvim";
       rev = "bb8b9f30c652c948d35211958b0deec3496bcc08";
       hash = "sha256-Caf1dJiIATbs0PNjSANjA3QgHg7PdeMz9Pjoc0Ti7G4=";
     };
-    meta.homepage = "https://github.com/A7Lavinraj/fyler.nvim/";
+    meta.homepage = "https://github.com/FylerOrg/fyler.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
@@ -6388,12 +6388,12 @@ final: prev: {
 
   fzf-vim = buildVimPlugin {
     pname = "fzf.vim";
-    version = "0-unstable-2026-06-02";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "356608e2ae5d9127e2c964885ea2b21ea7aea9ab";
-      hash = "sha256-3u6E8HgLVwAk75fOAWP1zrRb54N4YG6MbRDrKpn7bdw=";
+      rev = "d2a59a992a2455f609c0fde2ebd84427ea8f919a";
+      hash = "sha256-TQR+ivA4nnichGdCDSeL2WeT+dHfNeQM1BPdrXM0Cd8=";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7073,12 +7073,12 @@ final: prev: {
 
   guh-nvim = buildVimPlugin {
     pname = "guh.nvim";
-    version = "0.0.1-unstable-2026-06-10";
+    version = "0.0.1-unstable-2026-06-14";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "guh.nvim";
-      rev = "89bca23616361fa316c72b1171bc7aa3401800be";
-      hash = "sha256-HEDQMSbWWg7UEru+hf0cT+7KbIMi1r1cU5YcgaBLq/E=";
+      rev = "92ffef63af03b7188b8d11e052eaa3822b59820c";
+      hash = "sha256-5vAyerfY08J0J4qQY5vPmNRRjDQGv2B+nUxIgs6I1DQ=";
     };
     meta.homepage = "https://github.com/justinmk/guh.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8418,12 +8418,12 @@ final: prev: {
 
   koda-nvim = buildVimPlugin {
     pname = "koda.nvim";
-    version = "2.10.3";
+    version = "2.11.0";
     src = fetchFromGitHub {
       owner = "oskarnurm";
       repo = "koda.nvim";
-      tag = "v2.10.3";
-      hash = "sha256-CU634QzBkPRVntJ/fKBu/V0WNQ7K9fzqOtMIUEb9/Vw=";
+      tag = "v2.11.0";
+      hash = "sha256-OiWW7c+cd/MioepNN40pFO3hTAm9ov80I1mVYmTW428=";
     };
     meta.homepage = "https://github.com/oskarnurm/koda.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8460,13 +8460,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "6.9.2";
+    version = "6.11.1";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      tag = "v6.9.2";
-      hash = "sha256-7q/lV939qxozpsE0SM272ztSdzqIDuAdrgXSITCDLko=";
-      fetchSubmodules = true;
+      tag = "v6.11.1";
+      hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k=";
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9580,12 +9579,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2.2.0";
+    version = "2.3.0";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      tag = "v2.2.0";
-      hash = "sha256-wWoRUg2nvmqaEWxjYEOk1q+jQyKupgJi2LubhewcVCw=";
+      tag = "v2.3.0";
+      hash = "sha256-yaR7P33ZQdJNAh0P3slN/TS0OL9p6ShMEIWGF4rFqxQ=";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -9608,12 +9607,12 @@ final: prev: {
 
   mason-nvim = buildVimPlugin {
     pname = "mason.nvim";
-    version = "2.3.0";
+    version = "2.3.1";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason.nvim";
-      tag = "v2.3.0";
-      hash = "sha256-O+11o3c0iNZ4tMZV80QbzwuMV3mP2Ml4lXQKHz4uR54=";
+      tag = "v2.3.1";
+      hash = "sha256-zx45l5yZeWgnkzaQeY+V3GK84arritj7jfpJ64Go9rg=";
     };
     meta.homepage = "https://github.com/mason-org/mason.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -10014,12 +10013,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "5af2b6be4a4beb673f3196a414f6fd932bbedd48";
-      hash = "sha256-DVvZOwUQCT/TGfkdy65BjH7gPPDIQ9ib2VCqOPzG5fs=";
+      rev = "05be51814a718e74244829754a2a900a430a8d8b";
+      hash = "sha256-B7Z7rYEnxWTl09oO2fXtRFKdGVYwRCY3B7hsgj5kNzE=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10126,12 +10125,12 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "520995f1d75da0e4cc901ee95080b1ff2bc46b94";
-      hash = "sha256-Q61iFTDA2groQu3qMNJu0yuVnB6NtsGNihpGD5ppeuI=";
+      rev = "d48ad47359218d2b019034f95f601b3861180885";
+      hash = "sha256-sDW/9Y5MhzvklkiW7XmrDslCCGDcYliJ5awgj1Ko558=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10154,12 +10153,12 @@ final: prev: {
 
   mini-input = buildVimPlugin {
     pname = "mini.input";
-    version = "0-unstable-2026-06-07";
+    version = "0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.input";
-      rev = "44477bc40a1d9556decab08cd0e13187f9d909e4";
-      hash = "sha256-ex0BKThn97+lnWm6EaI4JuCViQ7B6na+n5yCX9OJavU=";
+      rev = "d97776877c2dadbc7b5830d47eefa99e33e48cb1";
+      hash = "sha256-fOILbrCQciZtMTKtLzXtFKghc/ocR09szG7yyPaunFs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.input/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10224,12 +10223,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "0.17.0-unstable-2026-05-28";
+    version = "0.17.0-unstable-2026-06-11";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "eb2246ede307fc863a12e9d9b0fa4b7ca9b88188";
-      hash = "sha256-gX1li7+jJq0/I0rT13aJsBIbFFrufJIFhz2bFGGy+mw=";
+      rev = "317e20ad3bdf0f4535f9a7efdae7fbe5c4439f29";
+      hash = "sha256-arVLHeI7ON1pMTNq1D17XqQdWZHRMrNKwnYXUb1PWNM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10266,12 +10265,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.17.0-unstable-2026-06-07";
+    version = "0.17.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "ff8b3580935818ef2f21bdd651f057a2ae071eab";
-      hash = "sha256-wVRhe2ufPG/2DRtJGyAAhoCOTX8CLB2zZ8TQOQz9TqQ=";
+      rev = "7ed410c73ebb910754c2938a6dae50c51c3a096a";
+      hash = "sha256-yyJ0BwKMOi+c2WODEUnlRB5iz+3i4u8G7zL4mtayRMQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10308,12 +10307,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "0.17.0-unstable-2026-06-06";
+    version = "0.17.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "1ffba38c7221669d3da7792d4bbe1c9761075f4d";
-      hash = "sha256-N/RdA7mEno3E5D4c9gxm9ZIlzAz3f7CPAJbyGEiECBM=";
+      rev = "f8ea97c5e89cc923f466e0706046eaa3988f246c";
+      hash = "sha256-ZQcB/4D0xVAJswotuSFOspFFHs1BtrHvCF0uDv1yhr0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10336,12 +10335,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "9a08aa14e02abb790c823a622d7d6c736cbbe65a";
-      hash = "sha256-1w8t2ANiBue7mNk5QYhi8aBHGGNvIbrKPQgGqGO0RqI=";
+      rev = "c59e203fef0de69b8cb67edb07b4fc10d455bb44";
+      hash = "sha256-5auuFMTQGO4gSUadW4iSwAZDZYyKBHZVAJCJjXDO1yI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11022,12 +11021,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-06-10";
+    version = "1.4.0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "3a0a976a10cba0ff9d9406e4652755881321ecf9";
-      hash = "sha256-hPv22eaPTY0UKoCxOXq/D1eUGOomAc8D0CB5mRs1ueQ=";
+      rev = "0748437c07b5e7fd19af738ed0562479381424b1";
+      hash = "sha256-rCYdnx//W0m20ph62PEwdMcx8xd0ZIlATBxjlZARjJ4=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11106,12 +11105,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-05-13";
+    version = "3.0.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "99326a1310fb2d616b455d2fd16d01bf00682f06";
-      hash = "sha256-ZKK4JbeuMGYvUjG1B6vLZTeSMeQTXQGFQAlIMqqN660=";
+      rev = "5d1b65d6215928e941e1a6a4e76e02fd45ada31f";
+      hash = "sha256-K7AtBKS2b77pjfdxb11A7U7ED+XTjn4W8ajk//8U7TA=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11487,12 +11486,12 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "0.37.3";
+    version = "0.38.0";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      tag = "v0.37.3";
-      hash = "sha256-ALVudtC49gAQOGwucOh7zvhbUyZX0lTGyizhn+QCPl4=";
+      tag = "v0.38.0";
+      hash = "sha256-R24mbFbYTH166gq8EZOuLDZ7dA2Yhjmrc77K2os5jtE=";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12521,11 +12520,11 @@ final: prev: {
 
   nvim-dap-disasm = buildVimPlugin {
     pname = "nvim-dap-disasm";
-    version = "0-unstable-2026-02-25";
+    version = "0-unstable-2026-06-14";
     src = fetchgit {
       url = "https://codeberg.org/Jorenar/nvim-dap-disasm";
-      rev = "1119f3f2b22e411adcd123cdcf6d0425b61a31a7";
-      hash = "sha256-lq0tbMksVXccf6GGD7OxWAuoD9w8tlt30dpJSMtN4g8=";
+      rev = "b86a1e3f03f268635f9b362ccc8ffa5f240dd25d";
+      hash = "sha256-hkoFEH8UoAzWOue1YTrHCQn7/N54fXsHpOZ5xAaSbIw=";
     };
     meta.homepage = "https://codeberg.org/Jorenar/nvim-dap-disasm";
     meta.license = unfree;
@@ -12687,12 +12686,12 @@ final: prev: {
 
   nvim-docs-view = buildVimPlugin {
     pname = "nvim-docs-view";
-    version = "0-unstable-2026-05-08";
+    version = "0-unstable-2026-06-11";
     src = fetchFromGitHub {
       owner = "amrbashir";
       repo = "nvim-docs-view";
-      rev = "9a262fa7e181e924d355e8725c68c48f076138b1";
-      hash = "sha256-zsrrsTIpjRqDS/NXQH7TA6CjZj3PK8kstD9EB4omSGw=";
+      rev = "a1696d058a4223d8c3615bb305abfa638c5689a9";
+      hash = "sha256-Ws/s3tgFTZczTVDjagBSY2bfso7oWRFB4oy/Y3DFdEA=";
     };
     meta.homepage = "https://github.com/amrbashir/nvim-docs-view/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12757,12 +12756,12 @@ final: prev: {
 
   nvim-gdb = buildVimPlugin {
     pname = "nvim-gdb";
-    version = "0-unstable-2026-05-08";
+    version = "0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "3ea9e52a7be60373a127be9dcc94773bc1d6e25c";
-      hash = "sha256-y8dxr4xAOX7+PKCd2h3iMlmWZtmBr9Wp6ecjAYFtunc=";
+      rev = "67abac716b626ece57f3a7c72121542f0b3edfe9";
+      hash = "sha256-6MnwKYvOL3b0hKOnLTvdRYrZkZBYt4XAK2jlFw+DfTM=";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13706,12 +13705,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "1.17.0-unstable-2026-06-08";
+    version = "1.17.0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "82f58063d67defc620e1ef8be606fc62a7b5dc1e";
-      hash = "sha256-JfOkJkTGVWPw7dhcbDNPsyeNbidrtIvzJhPYUQJ1NoY=";
+      rev = "fb343438d49fba8c35ecc4829d66fca7a1f0ed3d";
+      hash = "sha256-JhLDjrRqY/vWN+R6suVvMZLkZQkLq5IpSFwPojkYYqg=";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.license = unfree;
@@ -14434,12 +14433,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.11.0";
+    version = "0.13.1";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      tag = "v0.11.0";
-      hash = "sha256-i6Ty/TXy9Ph6Ex39qumfgH7ArenH159EHy1UFvNBJfI=";
+      tag = "v0.13.1";
+      hash = "sha256-RusMzeU22v4Lnx1n7q3uucLI6AFVk1AUE+IvpDlvuLw=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15500,12 +15499,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "0-unstable-2026-05-26";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "624c01e8175901484eac74512baf35e9dfe269b8";
-      hash = "sha256-PPGSMbLVHLghqaVfRsViw7gYHrL4RtiH0Svw8H65TpE=";
+      rev = "7eaa150061ea18fdbe18fbb924d236e3ddccc57d";
+      hash = "sha256-CMnRH1M4/ha+QEGGCcuVXwRFSs69O6VycJlKMFYh6CI=";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15906,12 +15905,12 @@ final: prev: {
 
   scnvim = buildVimPlugin {
     pname = "scnvim";
-    version = "0-unstable-2026-04-20";
+    version = "0-unstable-2026-06-15";
     src = fetchFromGitHub {
       owner = "davidgranstrom";
       repo = "scnvim";
-      rev = "ec347b24168ac922de4dcddc181efd2fcdcfa0d0";
-      hash = "sha256-cqZF3b+DkOQUOSU502vGQx8RNzH4b97B9zqHO9v8IBI=";
+      rev = "b7d48851e98e6111ad62f94a3c3ddc9b037122e8";
+      hash = "sha256-k5a7d3exVXdjHuILfYIj6cinWoev8h6wYBlNXowuHsw=";
     };
     meta.homepage = "https://github.com/davidgranstrom/scnvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -16004,12 +16003,12 @@ final: prev: {
 
   searchbox-nvim = buildVimPlugin {
     pname = "searchbox.nvim";
-    version = "0-unstable-2026-06-01";
+    version = "0-unstable-2026-06-13";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "searchbox.nvim";
-      rev = "e66c850fbdebf493969da87e4f665acfb539b9c3";
-      hash = "sha256-3HFofdEzVK+kXENrll8rxq/Huyg8HhiDg8P7n0JFQXE=";
+      rev = "83a43dbc52d27755ab1a9f710a11c987f6a73813";
+      hash = "sha256-kUJZvXY1JbHvPUyq80nfP7aygi+ZtjcWGPCbsbvHLLQ=";
     };
     meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16201,12 +16200,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-06-05";
+    version = "2.1.0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "6806149fd36d1c5e797debe3e18b2c07219b685a";
-      hash = "sha256-INxUHLtQBnnmbKBmQNgcdm4FxP5Amig2Q2s6pAub11U=";
+      rev = "501ea73e433246cbd53f0b14bbd205fa44831e4d";
+      hash = "sha256-P7XFoM3zZmlOrhRwiY3xJdJZuiIlJAgijLWukt6OHfI=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17085,12 +17084,12 @@ final: prev: {
 
   tagbar = buildVimPlugin {
     pname = "tagbar";
-    version = "3.1.1-unstable-2026-05-17";
+    version = "3.1.1-unstable-2026-06-14";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "b37b05ff1925b0b3931f031ebf88690aa0974375";
-      hash = "sha256-Vqjq6ClXntfg2579MG37MQJWv6tN/4Y5/uuF4OqFMDQ=";
+      rev = "07cb8247487208124978daff8e13624667635457";
+      hash = "sha256-bezgPiUz5EKKjTLuP6SpWGRCEYo8VXGvoF96qhR0aF8=";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
     meta.license = unfree;
@@ -18168,15 +18167,15 @@ final: prev: {
 
   transparent-nvim = buildVimPlugin {
     pname = "transparent.nvim";
-    version = "0-unstable-2025-06-22";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "xiyaowong";
       repo = "transparent.nvim";
-      rev = "8ac59883de84e9cd1850ea25cf087031c5ba7d54";
-      hash = "sha256-GlN7/+TmXld2UVPN2rDP7nKqbnswiezmGXn+uGK5I5c=";
+      rev = "e00ca1cf09caef575edf8da7e5a8b9193893b4c7";
+      hash = "sha256-VMWvh5QLV7y65SPEbKacrdL6WvHSF+z+LEaWugxqQOI=";
     };
     meta.homepage = "https://github.com/xiyaowong/transparent.nvim/";
-    meta.license = unfree;
+    meta.license = getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18758,12 +18757,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2.1.2";
+    version = "2.1.3";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      tag = "v2.1.2";
-      hash = "sha256-8y4Dc+AXx4+DmnOAYYD6Yyi0GDyI6fwdM4AKsmM5hZU=";
+      tag = "v2.1.3";
+      hash = "sha256-ULBLMmJQe93N3uOPx6h8wif+38g0OSC7haklfVJyZdA=";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -21882,12 +21881,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "0-unstable-2026-05-10";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "6034ccf6a4682c91f90f38fae4c882068e6723fe";
-      hash = "sha256-3ytgSsTvtmq9jC2qyeBzKLK+x0UppyVODggcspDX7ZE=";
+      rev = "49f318424ed17fb8d49122daa39820fd6a2880f5";
+      hash = "sha256-r/YS0LFio0BNTCUh0nRrAndUfcJgYio+ADCoqq8NH8U=";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -22190,12 +22189,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "0.0.1-unstable-2026-05-21";
+    version = "0.0.1-unstable-2026-06-11";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "1558bbaba4cbb593901e3dfc4d0f1a0cd212b09c";
-      hash = "sha256-wMF4y4eMz7UR50GpBvStDsQ0SpKUt48tll6rqEr6AHY=";
+      rev = "bffb50ffa688e651a3d4ad827c90b887d5c67200";
+      hash = "sha256-4AzLUvDTv8stTk2oKvjXetinK5YGx636TwP9yKdluZs=";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -23940,11 +23939,11 @@ final: prev: {
 
   vim-solarized8 = buildVimPlugin {
     pname = "vim-solarized8";
-    version = "1.6.4-unstable-2026-03-11";
+    version = "1.6.4-unstable-2026-06-11";
     src = fetchgit {
       url = "https://codeberg.org/lifepillar/vim-solarized8/";
-      rev = "5dfbfb00be8237619c680302fc9250e391b1686a";
-      hash = "sha256-qJLlHsXKcLC+bpirfcuBj3igK9dDk8L9oVGPzWhtkEI=";
+      rev = "1cb22c68158a3e27cf5943052a4bd36c3dd4151c";
+      hash = "sha256-XPhiSwyV0A23e6NOEb8OejC68WtVVTL5A4YranlghZs=";
     };
     meta.homepage = "https://codeberg.org/lifepillar/vim-solarized8/";
     meta.license = unfree;
@@ -25241,12 +25240,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2.17-unstable-2026-05-26";
+    version = "2.17-unstable-2026-06-13";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "24e229914182ff301496a3e2c4214b28c4928d3f";
-      hash = "sha256-y45zOpF68G51jVdCsa27iiDdw2YEmHZNgkIHDI62nAo=";
+      rev = "fedb7ffc1bebf254cc74e7419c3a5930b6719065";
+      hash = "sha256-h1GZnhQrm8c+e/vbecBwWbFj4QOX3TbagYp3Ea3tk/Q=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25535,12 +25534,12 @@ final: prev: {
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "0.11-unstable-2026-03-26";
+    version = "0.12";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "44f266fc8ed6f8fbc6bae47ee1ca6ba32e5995f8";
-      hash = "sha256-wcoiv8lPBr/r4yMw4tO6SmNQ09f1SjFqWlNDat7oXDk=";
+      tag = "v0.12";
+      hash = "sha256-6562XAJFqmWUo/IzBI6Mmy2Jp1p9smwt4LV95X6Cf5w=";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25747,12 +25746,12 @@ final: prev: {
     pname = "xeno.nvim";
     version = "0-unstable-2025-10-23";
     src = fetchFromGitHub {
-      owner = "kyzadev";
+      owner = "kyzabuilds";
       repo = "xeno.nvim";
       rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb";
       hash = "sha256-zTGclrlxThgqEvj8K3fQ87G98g3VDqvp/dCnZwSm4I8=";
     };
-    meta.homepage = "https://github.com/kyzadev/xeno.nvim/";
+    meta.homepage = "https://github.com/kyzabuilds/xeno.nvim/";
     meta.license = unfree;
     meta.hydraPlatforms = [ ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 28890b26907e..08d0361c408b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1657,6 +1657,7 @@ assertNoAdditions {
     checkInputs = with self; [
       luasnip
       null-ls-nvim
+      plenary-nvim
     ];
     nvimSkipModules = [
       "init"
@@ -2012,9 +2013,8 @@ assertNoAdditions {
     let
       kulala-http-grammar = neovimUtils.grammarToPlugin (
         tree-sitter.buildGrammar {
-          inherit (old) version src meta;
           language = "kulala_http";
-          location = "lua/tree-sitter";
+          inherit (luaPackages.tree-sitter-kulala_http) version src meta;
           generate = false;
         }
       );
@@ -2036,6 +2036,7 @@ assertNoAdditions {
         "cli.kulala_cli"
         # Upstream test harnesses are not require-safe modules
         "minit"
+        "minit-userscript"
         "minitest"
         "test"
         # Legacy parser module; active parsing is handled by kulala-core
@@ -2482,6 +2483,7 @@ assertNoAdditions {
     dependencies = with self; [
       mason-nvim
       null-ls-nvim
+      plenary-nvim
     ];
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
index 2398bd254e22..d7bd71b2c4c6 100644
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
@@ -10,10 +10,10 @@ index 5f37046..c60c474 100644
    return vim.treesitter.language.add(parser_name) == true
  end
  
-@@ -48,7 +47,6 @@ M.register_parser = function()
-   -- queries/kulala_http/*.scm live under lua/tree-sitter/queries/
-   vim.opt.rtp:prepend(parser_source_path)
-   ensure_site_rtp()
+@@ -48,7 +47,3 @@ M.register_parser = function()
+-  -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/
+-  vim.opt.rtp:prepend(parser_source_path)
+-  ensure_site_rtp()
 -  sync_queries()
    vim.treesitter.language.register(parser_name, filetypes)
    vim.treesitter.language.register("markdown", "kulala_ui")

From a6362d8c05b78795397a0d047ad491e2a5061b20 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 09:09:30 -0500
Subject: [PATCH 261/339] vimPlugins: resolve github repository redirects

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index aa0ff553697b..5b71424dab58 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -450,7 +450,7 @@ https://github.com/shumphrey/fugitive-gitlab.vim/,,
 https://github.com/BeneCollyridam/futhark-vim/,,
 https://github.com/tzachar/fuzzy.nvim/,,
 https://github.com/rktjmp/fwatch.nvim/,,
-https://github.com/A7Lavinraj/fyler.nvim/,stable,
+https://github.com/FylerOrg/fyler.nvim/,stable,
 https://github.com/stsewd/fzf-checkout.vim/,,
 https://github.com/monkoose/fzf-hoogle.vim/,,
 https://github.com/gfanto/fzf-lsp.nvim/,,
@@ -1836,7 +1836,7 @@ https://github.com/natecraddock/workspaces.nvim/,,
 https://github.com/andrewferrier/wrapping.nvim/,,
 https://github.com/tweekmonster/wstrip.vim/,,
 https://github.com/piersolenski/wtf.nvim/,,
-https://github.com/kyzadev/xeno.nvim/,,
+https://github.com/kyzabuilds/xeno.nvim/,,
 https://github.com/Mythos-404/xmake.nvim/,,
 https://github.com/drmingdrmer/xptemplate/,,
 https://github.com/guns/xterm-color-table.vim/,,

From 9cd025a377c3e3c58df271c181c6f4576b78c9ee Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 09:25:20 -0500
Subject: [PATCH 262/339] vimPlugins.null-ls-nvim: remove

Upstream deleted the repository, and none-ls-nvim is the maintained fork for users that need null-ls-compatible functionality.
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../applications/editors/vim/plugins/generated.nix | 14 --------------
 .../applications/editors/vim/plugins/overrides.nix | 11 ++---------
 .../editors/vim/plugins/vim-plugin-names           |  1 -
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 7dc05270b5c0..9bf4e706a40e 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -55,6 +55,7 @@ mapAliases (
     mind-nvim = throw "'vimPlugins.mind-nvim' has been removed: the upstream repository got deleted"; # Added 2026-05-03
     minsnip-nvim = throw "'vimPlugins.minsnip-nvim' has been removed: the upstream repository got deleted"; # Added 2025-08-30
     neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10
+    null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15
     nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18
     nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index ebb177a5b0fd..316a0db1aa27 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12183,20 +12183,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  null-ls-nvim = buildVimPlugin {
-    pname = "null-ls.nvim";
-    version = "0-unstable-2023-08-12";
-    src = fetchFromGitHub {
-      owner = "jose-elias-alvarez";
-      repo = "null-ls.nvim";
-      rev = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7";
-      hash = "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=";
-    };
-    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
-    meta.license = unfree;
-    meta.hydraPlatforms = [ ];
-  };
-
   numb-nvim = buildVimPlugin {
     pname = "numb.nvim";
     version = "1.1.0";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 08d0361c408b..5fbeef6c5535 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1656,7 +1656,7 @@ assertNoAdditions {
     ];
     checkInputs = with self; [
       luasnip
-      null-ls-nvim
+      none-ls-nvim
       plenary-nvim
     ];
     nvimSkipModules = [
@@ -2482,7 +2482,7 @@ assertNoAdditions {
   mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
     dependencies = with self; [
       mason-nvim
-      null-ls-nvim
+      none-ls-nvim
       plenary-nvim
     ];
   };
@@ -3096,13 +3096,6 @@ assertNoAdditions {
     dependencies = [ self.aniseed ];
   };
 
-  null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
-    dependencies = [ self.plenary-nvim ];
-    meta = old.meta // {
-      license = lib.licenses.unlicense;
-    };
-  });
-
   nvchad = super.nvchad.overrideAttrs {
     # You've signed up for a distro, providing dependencies.
     dependencies = with self; [
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5b71424dab58..b88ffdcf9b7c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -868,7 +868,6 @@ https://github.com/shaunsingh/nord.nvim/,,
 https://github.com/alexvzyl/nordic.nvim/,,
 https://github.com/vigoux/notifier.nvim/,,
 https://github.com/jlesquembre/nterm.nvim/,,
-https://github.com/jose-elias-alvarez/null-ls.nvim/,,
 https://github.com/nacro90/numb.nvim/,,
 https://github.com/nvchad/nvchad/,,
 https://github.com/nvchad/ui/,,nvchad-ui

From 3b742e22c60556a4ea4ecd2aeed6258c30b5a7e8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 09:26:40 -0500
Subject: [PATCH 263/339] vimPlugins.nvim-lsp-ts-utils: remove

Upstream deleted the repository, so keep a throwing alias instead of a stale generated package.
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../applications/editors/vim/plugins/generated.nix | 14 --------------
 .../editors/vim/plugins/vim-plugin-names           |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 9bf4e706a40e..3cb69dfde76d 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -57,6 +57,7 @@ mapAliases (
     neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10
     null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15
     nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18
+    nvim-lsp-ts-utils = throw "'vimPlugins.nvim-lsp-ts-utils' has been removed: upstream deleted repository"; # Added 2026-06-15
     nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     peskcolor-vim = throw "'vimPlugins.peskcolor-vim' has been removed: abandoned by upstream"; # Added 2024-08-23
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 316a0db1aa27..920f2b20e9a5 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13101,20 +13101,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  nvim-lsp-ts-utils = buildVimPlugin {
-    pname = "nvim-lsp-ts-utils";
-    version = "0-unstable-2022-07-17";
-    src = fetchFromGitHub {
-      owner = "jose-elias-alvarez";
-      repo = "nvim-lsp-ts-utils";
-      rev = "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7";
-      hash = "sha256-38YOgLDtku2BPCaNEmX0555x1QmHuuDSCZL274bBhcg=";
-    };
-    meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
-    meta.license = getLicenseFromSpdxId "Unlicense";
-    meta.hydraPlatforms = [ ];
-  };
-
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
     version = "2.10.0";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index b88ffdcf9b7c..5917b790b245 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -934,7 +934,6 @@ https://github.com/martineausimon/nvim-lilypond-suite/,,
 https://codeberg.org/mfussenegger/nvim-lint/,,
 https://github.com/antosha417/nvim-lsp-file-operations/,,
 https://github.com/mrded/nvim-lsp-notify/,,
-https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
 https://github.com/neovim/nvim-lspconfig/,,
 https://github.com/RishabhRD/nvim-lsputils/,,
 https://github.com/sam4llis/nvim-lua-gf/,,

From c09c07a6649ef35baa2a6e80930a18ccab499951 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 09:27:25 -0500
Subject: [PATCH 264/339] vimPlugins.typescript-nvim: remove

Upstream deleted the repository, so keep a throwing alias instead of a stale generated package.
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../applications/editors/vim/plugins/generated.nix | 14 --------------
 .../applications/editors/vim/plugins/overrides.nix | 11 -----------
 .../editors/vim/plugins/vim-plugin-names           |  1 -
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 3cb69dfde76d..a83a782436c7 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -71,6 +71,7 @@ mapAliases (
     sparkup = throw "'vimPlugins.sparkup' was removed: the upstream repository got deleted"; # Added 2025-08-06
     syntax-tree-surfer = throw "'vimPlugins.syntax-tree-surfer' has been archived"; # Added 2025-12-18
     todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23
+    typescript-nvim = throw "'vimPlugins.typescript-nvim' has been removed: upstream deleted repository"; # Added 2026-06-15
     vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12
     vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14
     # keep-sorted end
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 920f2b20e9a5..85489fefd586 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -18405,20 +18405,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  typescript-nvim = buildVimPlugin {
-    pname = "typescript.nvim";
-    version = "0-unstable-2023-08-12";
-    src = fetchFromGitHub {
-      owner = "jose-elias-alvarez";
-      repo = "typescript.nvim";
-      rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467";
-      hash = "sha256-tStomym4qd7IXj/ohYAc3akImNsOJdC7nQL+CkdMomc=";
-    };
-    meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
-    meta.license = getLicenseFromSpdxId "Unlicense";
-    meta.hydraPlatforms = [ ];
-  };
-
   typescript-tools-nvim = buildVimPlugin {
     pname = "typescript-tools.nvim";
     version = "0-unstable-2025-11-18";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 5fbeef6c5535..03edb8dac52b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -4627,17 +4627,6 @@ assertNoAdditions {
     runtimeDeps = [ television ];
   };
 
-  typescript-nvim = super.typescript-nvim.overrideAttrs {
-    checkInputs = [
-      # Optional null-ls integration
-      self.none-ls-nvim
-    ];
-    dependencies = with self; [
-      nvim-lspconfig
-      plenary-nvim
-    ];
-  };
-
   typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-lspconfig
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5917b790b245..97bcfcc72948 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1314,7 +1314,6 @@ https://github.com/alexpasmantier/tv.nvim/,,
 https://github.com/folke/twilight.nvim/,,
 https://github.com/pmizio/typescript-tools.nvim/,,
 https://github.com/leafgarland/typescript-vim/,,
-https://github.com/jose-elias-alvarez/typescript.nvim/,,
 https://github.com/MrPicklePinosaur/typst-conceal.vim/,,
 https://github.com/chomosuke/typst-preview.nvim/,,
 https://github.com/kaarmu/typst.vim/,,

From 6c6ad84e70063d3eeacade83ce41dc5442a0c850 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 15:04:06 +0000
Subject: [PATCH 265/339] faas-cli: 0.18.8 -> 0.18.9

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

diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index b10b405a7815..490442c52191 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -24,13 +24,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "faas-cli";
-  version = "0.18.8";
+  version = "0.18.9";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = finalAttrs.version;
-    sha256 = "sha256-JiIKCrNH6aWiCqw1ji5RwNrHwLHuSbw/iwqzrumfQQQ=";
+    sha256 = "sha256-QiRO7oJk/zjUOWr1giW29/QJY/YiKkLzROB6OxN8kIc=";
   };
 
   vendorHash = null;

From e06b33e3b903b8a5314041a8f31d791b14a70f76 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:34:55 +0000
Subject: [PATCH 266/339] =?UTF-8?q?evolution-data-server:=203.60.1=20?=
 =?UTF-8?q?=E2=86=92=203.60.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.60.1...3.60.2
---
 .../evolution-data-server/hardcode-gsettings.patch   | 12 ++++++------
 pkgs/by-name/ev/evolution-data-server/package.nix    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
index 9a45269b21f9..c259dd0f1269 100644
--- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
@@ -130,7 +130,7 @@ index 9d986d2..d63902a 100644
  	g_object_unref (settings);
  
 diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
-index 60ff97f..8535dec 100644
+index c24a37a..e5cf57e 100644
 --- a/src/addressbook/libedata-book/e-book-meta-backend.c
 +++ b/src/addressbook/libedata-book/e-book-meta-backend.c
 @@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void)
@@ -338,7 +338,7 @@ index 94f0769..8de758b 100644
  		g_clear_object (&settings);
  
 diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c
-index 2c0b6ef..b354332 100644
+index 3de034a..b6732ba 100644
 --- a/src/camel/camel-utils.c
 +++ b/src/camel/camel-utils.c
 @@ -363,7 +363,19 @@ void
@@ -363,10 +363,10 @@ index 2c0b6ef..b354332 100644
  		G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
  	G_UNLOCK (mi_user_headers);
 diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
-index e605049..9961fea 100644
+index e3f2391..374c72d 100644
 --- a/src/camel/providers/imapx/camel-imapx-server.c
 +++ b/src/camel/providers/imapx/camel-imapx-server.c
-@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
+@@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
  	if (do_old_flags_update) {
  		GSettings *eds_settings;
  
@@ -507,10 +507,10 @@ index 3738359..f9ce2d9 100644
  		g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
-index c999d4d..e9cf7c5 100644
+index 9f56da2..f82921a 100644
 --- a/src/libedataserver/e-oauth2-service.c
 +++ b/src/libedataserver/e-oauth2-service.c
-@@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
+@@ -95,7 +95,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
  	name_len = strlen (name);
  	hostname_len = strlen (hostname);
  
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 4a686d1d2775..65178d7ce4cc 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evolution-data-server";
-  version = "3.60.1";
+  version = "3.60.2";
 
   outputs = [
     "out"
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-M/ktO4gi66BMMTeWwHeMu2Who4Ry6FftxfmIVMyps0w=";
+    hash = "sha256-IITb2sOWNxs2XVBMH/RYZrqNyi8SUuXaHT2cM6vcEoY=";
   };
 
   patches = [

From 99728d9ec3c9cce625edb0e447ecd1dbe1087eb3 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:36:17 +0000
Subject: [PATCH 267/339] =?UTF-8?q?gdm:=2050.0=20=E2=86=92=2050.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gdm/-/compare/50.0...50.1
---
 pkgs/by-name/gd/gdm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index a84f733c3345..6495cdc457d8 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -44,7 +44,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdm";
-  version = "50.0";
+  version = "50.1";
 
   outputs = [
     "out"
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ZG9T1o8tLRRxRv+uuFBH3ti4E9yxwQTY8Ow2ymCetb8=";
+    hash = "sha256-dwFZNzUSGSQQ9BK10MRnjsFXPxrks5yB/nWGH+iJAXQ=";
   };
 
   mesonFlags = [

From df9ee173ed727614d166cb33d0e01d3b26ce7723 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:38:38 +0000
Subject: [PATCH 268/339] =?UTF-8?q?gnome-control-center:=2050.1=20?=
 =?UTF-8?q?=E2=86=92=2050.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/50.1...50.2
---
 pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 6fdf165b7ec8..d4d1d2eeaa6e 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -77,11 +77,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-control-center";
-  version = "50.1";
+  version = "50.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
-    hash = "sha256-64MkkdCI5PdCbopZKxBCikWlc2wL/+IQXFHExow6Ud0=";
+    hash = "sha256-tWvriHuUMumAp1e5juydMdiWlev/tHkbPDvUeWI6kmE=";
   };
 
   patches = [

From 9179733defecd874460759e58778c5dc65c0872a Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:40:23 +0000
Subject: [PATCH 269/339] =?UTF-8?q?gnome-session:=2050.0=20=E2=86=92=2050.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-session/-/compare/50.0...50.1
---
 pkgs/by-name/gn/gnome-session/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index f1f41e7ea312..2ae9f47e8790 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -27,7 +27,7 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-session";
   # Also bump ./ctl.nix when bumping major version.
-  version = "50.0";
+  version = "50.1";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vncIzZ0mDhrBg4FTE9u2ILGHbq1bo5zn6i5tx629ckY=";
+    hash = "sha256-Yom2r6RNPkyZnOV2H/iywQujCfVflCXysT+YIIyB9vs=";
   };
 
   patches = [

From 459d7086cab166218a4134ce3f45cfd9be18f6fa Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:41:28 +0000
Subject: [PATCH 270/339] =?UTF-8?q?gnome-shell:=2050.1=20=E2=86=92=2050.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/50.1...50.2
---
 pkgs/by-name/gn/gnome-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index bede5d2d751e..94315515d002 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
-  version = "50.1";
+  version = "50.2";
 
   outputs = [
     "out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-G0d2AXLBTz9O3Rya/zZfTeRVg1F78PgN9NOsvU5MspQ=";
+    hash = "sha256-UyFUIOUO/dTQYRultZ4Qy0yJ+j9R4q3f2Vyt4GGgmik=";
   };
 
   patches = [

From bcd725fed02f896637e0ed088e9c7b387d0454e7 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:43:34 +0000
Subject: [PATCH 271/339] =?UTF-8?q?gnome-software:=2050.1=20=E2=86=92=2050?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-software/-/compare/50.1...50.2
---
 pkgs/by-name/gn/gnome-software/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index 52b81eec1fce..c89227c58930 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-software";
-  version = "50.1";
+  version = "50.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-aWfu/sadUdNNIAWFye3+JPFRgD5J7ZKEo9dO2w5TQKg=";
+    hash = "sha256-ysroXVfkbRj0p8j+M0vzXIwY51uKZvrVbgzioA4c/j8=";
   };
 
   patches = [

From f1407811b9b0e5e0b7b27dd19b8cd3f5bf99c4d4 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:44:23 +0000
Subject: [PATCH 272/339] =?UTF-8?q?gnome-text-editor:=2050.0=20=E2=86=92?=
 =?UTF-8?q?=2050.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/50.0...50.1
---
 pkgs/by-name/gn/gnome-text-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
index ffafb849bb03..8c8fb7beaaaf 100644
--- a/pkgs/by-name/gn/gnome-text-editor/package.nix
+++ b/pkgs/by-name/gn/gnome-text-editor/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-text-editor";
-  version = "50.0";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ncKZ2k2qCFQjtdSNtZ8AIa1V50FDpcuKsuX/4Xln9Fs=";
+    hash = "sha256-9oA2sJ03j6qIO/6Tbkecb/NwJ8L/7RAdr5Et9wxR0OY=";
   };
 
   nativeBuildInputs = [

From 391ebae7949f74f690b52fb159c116a95c930132 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:45:19 +0000
Subject: [PATCH 273/339] =?UTF-8?q?gnome-user-docs:=2050.0=20=E2=86=92=205?=
 =?UTF-8?q?0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/50.0...50.2
---
 pkgs/by-name/gn/gnome-user-docs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
index 246b3cd0420c..6327615c371b 100644
--- a/pkgs/by-name/gn/gnome-user-docs/package.nix
+++ b/pkgs/by-name/gn/gnome-user-docs/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-user-docs";
-  version = "50.0";
+  version = "50.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6OIzJBhMfphcUE8F9tnGNCDJqdH2Tv3l2iqBEjYHL3g=";
+    hash = "sha256-g0hj2RYYmuE/clYr6B04FyMuE20NN+w3aBERH/oVlUI=";
   };
 
   nativeBuildInputs = [

From b8764a66a676abcdb5a42e35ef347be785cd5236 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:46:43 +0000
Subject: [PATCH 274/339] =?UTF-8?q?gnome-user-share:=2048.2=20=E2=86=92=20?=
 =?UTF-8?q?48.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-user-share/-/compare/48.2...48.3
---
 pkgs/by-name/gn/gnome-user-share/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix
index 1cc81d060b58..e5043acb06d8 100644
--- a/pkgs/by-name/gn/gnome-user-share/package.nix
+++ b/pkgs/by-name/gn/gnome-user-share/package.nix
@@ -26,11 +26,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-user-share";
-  version = "48.2";
+  version = "48.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Ayho1Ar4UIC6Thi6XatGwOZj7H5DiUnwgsgFeV9ivwY=";
+    hash = "sha256-oE1IP0mz92naj/Xi0/y/++rztsa3HYLSoqYju0seDdQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From e20dab6b2ed0109bd9421019748187c63c7e749f Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:50:35 +0000
Subject: [PATCH 275/339] =?UTF-8?q?gupnp-av:=200.14.4=20=E2=86=92=200.14.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gupnp-av/-/compare/gupnp-av-0.14.4...gupnp-av-0.14.5
---
 pkgs/by-name/gu/gupnp-av/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gu/gupnp-av/package.nix b/pkgs/by-name/gu/gupnp-av/package.nix
index 9ab6982ea828..22422a67b388 100644
--- a/pkgs/by-name/gu/gupnp-av/package.nix
+++ b/pkgs/by-name/gu/gupnp-av/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gupnp-av";
-  version = "0.14.4";
+  version = "0.14.5";
 
   outputs = [
     "out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor finalAttrs.version}/gupnp-av-${finalAttrs.version}.tar.xz";
-    sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc=";
+    sha256 = "k5GPz1r1Kf2ls9LZ/Dt3zZPfiAZJObgvJJ9Vd9jeHAI=";
   };
 
   strictDeps = true;

From 250bde9c3c8e65a5a4570ba5512da5e4dd105f76 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:53:05 +0000
Subject: [PATCH 276/339] =?UTF-8?q?nautilus:=2050.1=20=E2=86=92=2050.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/nautilus/-/compare/50.1...50.2.2
---
 pkgs/by-name/na/nautilus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix
index d535f9081431..d210135a1d87 100644
--- a/pkgs/by-name/na/nautilus/package.nix
+++ b/pkgs/by-name/na/nautilus/package.nix
@@ -44,7 +44,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nautilus";
-  version = "50.1";
+  version = "50.2.2";
 
   outputs = [
     "out"
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1ieTuWWXcbZqa24FK1Iin4aN2+wTiKC2ae7wvSESEu4=";
+    hash = "sha256-4eKF7930LtMN2lsp9/jSQtq0vBQJqQVIY7NnutSzTVo=";
   };
 
   patches = [

From efec514c0b771e0d63f7e64670debbcc06481afb Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 17:55:02 +0000
Subject: [PATCH 277/339] =?UTF-8?q?orca:=2050.1.2=20=E2=86=92=2050.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/orca/-/compare/50.1.2...50.2
---
 pkgs/by-name/or/orca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 6cb77c9b2ed0..d666bd22a269 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -31,13 +31,13 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "orca";
-  version = "50.1.2";
+  version = "50.2";
 
   pyproject = false;
 
   src = fetchurl {
     url = "mirror://gnome/sources/orca/${lib.versions.major finalAttrs.version}/orca-${finalAttrs.version}.tar.xz";
-    hash = "sha256-hZK1PfhCOep13aqN7GeSyE0rmft7R6X9kCLGr4ymV6g=";
+    hash = "sha256-BxRCHN6OxLr0fxjktKErTlxKPP47FhVp4HD+A3cT/QQ=";
   };
 
   patches = [

From 20aefa7228383ffb304beb3161da2a67be0d6d00 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 18:07:12 +0000
Subject: [PATCH 278/339] =?UTF-8?q?papers:=2050.0=20=E2=86=92=2050.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/papers/-/compare/50.0...50.2
---
 pkgs/by-name/pa/papers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index c1a16e039543..2695ea244070 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papers";
-  version = "50.0";
+  version = "50.2";
 
   outputs = [
     "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MBsg60a8ZNbKcuo3F10o2orqT4YT5HG5TDGF5cTRvAU=";
+    hash = "sha256-rhvc8c1Hy1DJ2EdleEYH+Bxy3xfdbmrZM/6hQXPSufQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From b196b6a6d6469cc442f53fce7f7e994c64fb6d61 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 18:11:23 +0000
Subject: [PATCH 279/339] =?UTF-8?q?rygel:=2045.1=20=E2=86=92=2045.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/rygel/-/compare/45.1...45.2
---
 pkgs/by-name/ry/rygel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index 53e2e425b73a..a22928d51c55 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -38,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rygel";
-  version = "45.1";
+  version = "45.2";
 
   # TODO: split out lib
   outputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zzhuKA2Or5tmd6L0i6eEhMcqCVVNXFjFHNh/pZRWF8g=";
+    hash = "sha256-IOV7cLFahl133Dj594arxSxksRH+X5OKYsKNcS3xMx0=";
   };
 
   patches = [

From 077ef53a6b2d5cc7c93cbd6f305124cc9379ce62 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 18:12:10 +0000
Subject: [PATCH 280/339] =?UTF-8?q?sushi:=2050.rc.1=20=E2=86=92=2050.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/sushi/-/compare/50.rc.1...50.0
---
 pkgs/by-name/su/sushi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix
index 6bb8f31e72ed..714cf91381a0 100644
--- a/pkgs/by-name/su/sushi/package.nix
+++ b/pkgs/by-name/su/sushi/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sushi";
-  version = "50.rc.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${lib.versions.major finalAttrs.version}/sushi-${finalAttrs.version}.tar.xz";
-    hash = "sha256-l6efnH4IsLF2Am7Ux6BDXwYSxMENoz1H4rr6ucYpImM=";
+    hash = "sha256-qyUXeQjVzMWFaHaageubTzIwZ4bmxzYYGT6/YaEn7gA=";
   };
 
   nativeBuildInputs = [

From 3a2d18f8682844c64313fc4ea05c94f58b020bea Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Tue, 9 Jun 2026 18:13:11 +0000
Subject: [PATCH 281/339] =?UTF-8?q?yelp:=2049.0=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/yelp/-/compare/49.0...49.1
---
 pkgs/by-name/ye/yelp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix
index 197b9a79dff1..30b0cbce2796 100644
--- a/pkgs/by-name/ye/yelp/package.nix
+++ b/pkgs/by-name/ye/yelp/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yelp";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-5mFOCx9Lpf57jRSb3UJnPwMGVvvc1zaumGBxkZfGNFc=";
+    hash = "sha256-Pj6U7y0slIfMUQYuOvv6FXjOvSnYDIQ1e21+5tz9inQ=";
   };
 
   nativeBuildInputs = [

From 9c40cf3a9fd2e893bb61f057b1f46b7888e2a1f9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 15 Jun 2026 15:48:35 +0000
Subject: [PATCH 282/339] =?UTF-8?q?mutter:=2050.1=20=E2=86=92=2050.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mutter/-/compare/50.1...50.2
---
 pkgs/by-name/mu/mutter/package.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index d6e132537610..88a35c0432be 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -1,5 +1,6 @@
 {
   fetchurl,
+  fetchpatch,
   runCommand,
   lib,
   stdenv,
@@ -72,7 +73,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "50.1";
+  version = "50.2";
 
   outputs = [
     "out"
@@ -83,9 +84,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-k0RQLORz94h5Xya0X4uP9TwKNrhnRw1wWhGj7gkRAh4=";
+    hash = "sha256-/ejfinRlAMUfHJJbUeV8PdhwByM771Yweegx9Tv6O1Y=";
   };
 
+  patches = [
+    # mutter 50.2 spams logs, clutter_input_focus_set_cursor_location
+    # https://gitlab.gnome.org/GNOME/mutter/-/work_items/4840
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/f1570318ec3e9a38615eb91708bb71628ab8bcfd.patch";
+      hash = "sha256-73GI2DTgoEBUQGa7nTUIur/ZuDHgDu4SwjUWHBRCyuo=";
+    })
+  ];
+
   mesonFlags = [
     "-Degl_device=true"
     "-Dinstalled_tests=false" # TODO: enable these

From 97823cb3dbef2c3915adb321b2c19321f0fae074 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 16 Jun 2026 17:35:58 +0200
Subject: [PATCH 283/339] dua: 2.34.0 -> 2.35.0

Changelog: https://github.com/Byron/dua-cli/releases/tag/v2.35.0
Diff: https://github.com/Byron/dua-cli/compare/v2.34.0...v2.35.0

skip another interactive test
---
 pkgs/by-name/du/dua/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index f851a097f925..e538551b9fd6 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dua";
-  version = "2.34.0";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F09Ne+2Ospw44L97nwHXp/ELM9B3G2Mt0Crau//zV/c=";
+    hash = "sha256-dlm8jp7Bh0DgUN4ztalE6uPSzeJy+JDfai39xZKiptw=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -22,12 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-g92G/4mfHH7zW14eoodL7j179Iah5iAH78zlmcxM/AM=";
+  cargoHash = "sha256-620Emfkuzyc8/LVr8codB1/IAemxDBOnhS/rL6gR8R8=";
 
   checkFlags = [
     # Skip interactive tests
     "--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked"
     "--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked"
+    "--skip=interactive::app::tests::journeys_readonly::once_allows_replayed_quit_to_exit stdout"
     "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only"
     "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion"
     "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels"

From 9f0e511369be431f3a18f6d6934dcb6944b7a88d Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Sat, 13 Jun 2026 12:53:18 -0700
Subject: [PATCH 284/339] signal-desktop: 8.13.0 -> 8.14.0

---
 .../signal-desktop/chromium-147-llvm-22.patch |  13 ++
 .../si/signal-desktop/libsignal-node.nix      |   8 +-
 pkgs/by-name/si/signal-desktop/package.nix    |  40 +++---
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |   6 +-
 .../si/signal-desktop/signal-sqlcipher.nix    |  16 +--
 .../si/signal-desktop/webrtc-sources.json     | 132 +++++++++---------
 pkgs/by-name/si/signal-desktop/webrtc.nix     |  27 +++-
 7 files changed, 136 insertions(+), 106 deletions(-)
 create mode 100644 pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch

diff --git a/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch b/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch
new file mode 100644
index 000000000000..1d79abd77e10
--- /dev/null
+++ b/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch
@@ -0,0 +1,13 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index c092446fa0715351f72913fd449c8dddb855a10f..83670b496575a85ecb02a4671c0287fd0e052c5a 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -616,7 +616,7 @@ config("compiler") {
+     # The performance improvement does not seem worth the risk. See
+     # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
+     # for discussion.
+-    if (!is_wasm) {
++    if (false) {
+       cflags += [ "-fno-lifetime-dse" ]
+     }
+ 
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 5bca80dff986..003d78c4a602 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -15,23 +15,23 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.94.1";
+  version = "0.94.4";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-re9IAC0R2QOIjyOLUjdaJw/TgDA4JT1nhtOskE5A0FQ=";
+    hash = "sha256-Uh/j8cXUWgWgSo9UBfYOFuC8i+2YdMwGHcXf55PkGgU=";
   };
 
-  cargoHash = "sha256-EVwIRUJ8SmajjocZj3dAHkTiR7Q78m/lf+4qls/oZAM=";
+  cargoHash = "sha256-st6zTKvxSsyMce22E8nFsJMGjQkk9sEAzSCmyZP8x20=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-bEQb+36IB+kXSbIkAFDpeIXWeHoQoIIiHo9q5AbaTio=";
+    hash = "sha256-A/RTWBHnI9eBrguXezOb5qSkGzIyVl66ATAA/ZUtk3Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index de8764171560..85db438a0183 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -6,12 +6,12 @@
   node-gyp,
   fetchPnpmDeps,
   pnpmConfigHook,
-  electron_41,
+  pnpmBuildHook,
+  electron_42,
   python3,
   makeWrapper,
   callPackage,
   fetchFromGitHub,
-  fetchpatch,
   fetchurl,
   jq,
   makeDesktopItem,
@@ -32,7 +32,7 @@ assert lib.warnIf (commandLineArgs != "")
 let
   nodejs = nodejs_24;
   pnpm = pnpm_10_29_2;
-  electron = electron_41;
+  electron = electron_42;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
   signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@@ -40,13 +40,13 @@ let
   webrtc = callPackage ./webrtc.nix { };
   ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };
 
-  version = "8.13.0";
+  version = "8.14.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-gOYnjNCjI1eNVzcb7sx0XDXbhrAdvlgsZQaRuyBXpwI=";
+    hash = "sha256-U5xJumoKWc1hGZ7OML05U7U3DFdrnRHUlfIU3qYph6w=";
     # Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They
     # are fetched separately below.
     postFetch = ''
@@ -68,23 +68,18 @@ let
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname src version;
       inherit pnpm;
-      fetcherVersion = 3;
-      hash = "sha256-CPZkybD/rCBMBK9qUSweBdLr9hXu0Ztn8fekqrRzUR4=";
+      fetcherVersion = 4;
+      hash = "sha256-WmDSa4PrASaqs8X68LYaPBeE+i+Jh3FfWF30SseN74Y=";
     };
 
     strictDeps = true;
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
+      pnpmBuildHook
       pnpm
     ];
 
-    buildPhase = ''
-      runHook preBuild
-      pnpm run build
-      runHook postBuild
-    '';
-
     installPhase = ''
       runHook preInstall
       cp -r dist $out
@@ -101,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
     node-gyp
     nodejs
     pnpmConfigHook
+    pnpmBuildHook
     pnpm
     makeWrapper
     python3
@@ -173,14 +169,14 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-3EEeHmtOAdcm2Q3eNUEl2RbTFRB4YBKcZLFtEmwbVOk=";
+    fetcherVersion = 4;
+    hash = "sha256-YQY+ohfLcaR2jzB9bzWpNQImuLja2DQ9iwDKhoH8kiU=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1780508208;
+    SOURCE_DATE_EPOCH = 1781124627;
   };
 
   preBuild = ''
@@ -234,17 +230,15 @@ stdenv.mkDerivation (finalAttrs: {
     node-gyp rebuild
     popd
     test -f node_modules/fs-xattr/build/Release/xattr.node
-  '';
 
-  buildPhase = ''
-    runHook preBuild
-
-    export npm_config_nodedir=${electron.headers}
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
     cp -r ${sticker-creator} sticker-creator/dist
+  '';
 
-    pnpm run generate
+  pnpmBuildScript = "generate";
+
+  postBuild = ''
     pnpm exec electron-builder \
       ${
         if stdenv.hostPlatform.isDarwin then "--mac" else "--linux"
@@ -254,8 +248,6 @@ stdenv.mkDerivation (finalAttrs: {
       -c.electronVersion=${electron.version} \
       -c.npmRebuild=false \
       ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
-
-    runHook postBuild
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index a3e26f4cab83..f406a0956ed3 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.69.0";
+  version = "2.69.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KQ/zAyj9caArZvl8SwMFfRcye1IzPoChjnYA0A8GcWw=";
+    hash = "sha256-XKzZ9AUGunOTs4vchWNlBYDIln25kRfxyQ2RZCr29Bs=";
   };
 
-  cargoHash = "sha256-DlRAPFluKdfU1YutDNQbAEF95aydd+duc6T2hqYWwGQ=";
+  cargoHash = "sha256-U1Zf7fCNoJNBYyIN/IRI41Gj6sK+iiUwGbAfYEo+a/0=";
 
   preConfigure = ''
     # Check for matching webrtc version
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 4b3a7dfc07c0..bdbf1db57ebd 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
+  pnpmBuildHook,
   nodejs,
   rustPlatform,
   cargo,
@@ -27,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm; # may be different than top-level pnpm
-    fetcherVersion = 3;
-    hash = "sha256-/EcPuqTXXGw1dEN6l1x84cUGyx890/rujjT+zJouIvM=";
+    fetcherVersion = 4;
+    hash = "sha256-HK3AetwGqFq/dhxX+aWgUww6eLCeQEkZIVsmmnYqdmM=";
   };
 
   cargoRoot = "deps/extension";
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
+    pnpmBuildHook
     pnpm
     rustPlatform.cargoSetupHook
     cargo
@@ -53,16 +55,14 @@ stdenv.mkDerivation (finalAttrs: {
     cctools.libtool
   ];
 
-  buildPhase = ''
-    runHook preBuild
-
+  preBuild = ''
     export npm_config_nodedir=${nodejs}
-    pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"
-    pnpm run build
 
-    runHook postBuild
+    pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"
   '';
 
+  pnpmBuildScript = "build";
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 8033f49cabf0..f8d8f9204096 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,25 +1,25 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-TsVGiR9qXq6AmvPETkCQP7BGgO21/SUwZJZrSXlj7p8=",
+            "hash": "sha256-T3zxuDqTiThU9Tv3cmJASK6cMo2W/crYYPyshVeV6LM=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7680g"
+            "tag": "7778b"
         },
         "fetcher": "fetchFromGitHub"
     },
     "src/build": {
         "args": {
-            "hash": "sha256-ZPEL0Oy07aAd/qtboCcbD7t55f4EzHiOnE3fiVkZE3Q=",
-            "rev": "a37e61dc22fd633ab32146e7000068a57a2864ff",
+            "hash": "sha256-XmuuR4mLcaoAPCr82ka6ldtE4OmYFmXlWjNaP/wM2BQ=",
+            "rev": "dd54dd5186566a13bda647123c22540666b12ace",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-wR2qwqxiRmInKzQiVIiZ13SNKuY5k+aJ+dxKAWV1zdo=",
-            "rev": "6a18683f555b4ac8b05ac8395c29c84483ac9588",
+            "hash": "sha256-BvGCdJ3EgUZX6MC3jf86YNl4LzUxpxiptCEBv3bqBIo=",
+            "rev": "95ed44cf5f06dbb5861030b91c9db9ccb4316762",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
@@ -35,40 +35,40 @@
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-cE8uCDkhkzFjrEJ3ccXq5H45WJ3wvmirLeeSymnR8bk=",
-            "rev": "b887106bc278bb2a49e21f3a0ab2019574e7e47a",
+            "hash": "sha256-tUh/eOrf71OjndY6p6IOJ5MFJUnuisDGWXJzsHHyrHs=",
+            "rev": "629b7bb6055714e23d8125bf790cfc8d94a94159",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-fSsA88V0cv/hAJEZJ7p+RnrnkceLMZCa+XaP+1awo9M=",
-            "rev": "e43b96b7a65dd3f45f066983061e6f8b2f3a112d",
+            "hash": "sha256-sLMCkUCadVZIX5bTVovDd5tPn0ZB/CH/d0tQic8lEQg=",
+            "rev": "4923971b35e39f6bd9be8bc19c4680785a15c80d",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-4eCoRVe47hZ6hc3gXgBS1gY64d+sPqeI08hNMh6JkUY=",
-            "rev": "305bcfce00b189f2297f53365b0454f96009927d",
+            "hash": "sha256-OIaU7GoHYKq1ZyPaW/gLSKNq1ipw5nAgjqcPIFXtGwE=",
+            "rev": "8dce4fd20ab7e768c0a5103edc1d8cb7e54366ba",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-dtuBGcYwwaqSKiW7ASFveAeJqcdnFLeU97ip8D786/Q=",
-            "rev": "79099fdf668ae097c9eca7052fd5c4c5de6c9098",
+            "hash": "sha256-igcX5XwacIwoGbqIcZKwlJYpRWl9Uc32WdpXyHO7UVA=",
+            "rev": "8be0e3114685fcc1589561067282edf75ea1259a",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-Buh+Ixx8CTqBb0vuu/Fnv6fx15lPMOatYGPAgQ0aWEI=",
-            "rev": "39805a224bb6c6e80e403a4ebe9a150c7ca0b4d1",
+            "hash": "sha256-f57wYazKyGrjfzcQ7EVqwIG8p+bHLGK0Qb/tZERxwY8=",
+            "rev": "5a34891efa6e41c8aca8842386b8ee528963ffdf",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -99,16 +99,16 @@
     },
     "src/third_party/compiler-rt/src": {
         "args": {
-            "hash": "sha256-7Jnb0tzi0SkS9vL7VurdTk6Igz5I8ol4H4nRqcZ2+O0=",
-            "rev": "d606e955eec3d4fb0bf831dea336c3b24cba2f27",
+            "hash": "sha256-ay0gzhNjAah27LQd/i0ex6EcHEdqpsWBT9Tw510coRM=",
+            "rev": "bb7645f5e11c9c1d719a890fcb09ccfaaa14580f",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/cpuinfo/src": {
         "args": {
-            "hash": "sha256-eXrfeFK0ADKAYoy/vESv7nQnH0oGpeZKlX8XEqPQspo=",
-            "rev": "84818a41e074779dbb00521a4731d3e14160ff15",
+            "hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=",
+            "rev": "7607ca500436b37ad23fb8d18614bec7796b68a7",
             "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -123,24 +123,24 @@
     },
     "src/third_party/dav1d/libdav1d": {
         "args": {
-            "hash": "sha256-E3da/LJ8HNy1osExmupovqnL8JHgVNzPUCG5F8TJKXQ=",
-            "rev": "b546257f770768b2c88258c533da38b91a06f737",
+            "hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII=",
+            "rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75",
             "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-RsmH8kxnmzOKsrfmDqULDeQsvRr1l+p8ZE1a4bPLVLs=",
-            "rev": "9fd48a305e18b9bbaf61734557ce2c46497192b3",
+            "hash": "sha256-r/mmibfbCBpV9reVbHc/S7FKffrtE729y2Mot/JsHgc=",
+            "rev": "ce1ebad2c35c9387186f01d77edeea28a254c955",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/eigen3/src": {
         "args": {
-            "hash": "sha256-GpuSoq887Z1qGKsc4+Vz8X+Sx40P6UnWhaQgrmigkdQ=",
-            "rev": "afb43805349cf1cbec0083d94256bb8f72cbc53b",
+            "hash": "sha256-/nzzcoJ87L7EVsRfAeok3UbxNKQeAWOFjmwZ3TYmGmI=",
+            "rev": "002229ce470065878afb7c2f6f96d22c9a9b7ba0",
             "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -155,8 +155,8 @@
     },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-LphjwzqsrvAOzd+O+lJ/gGfaWuX4h2/UrRC694ftwSs=",
-            "rev": "9e588ab02e16326026aa61cc3b6515da20520cec",
+            "hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs=",
+            "rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -187,16 +187,16 @@
     },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-CorCyTiS2fumIF0jhqQgw7VjGkjGXNVD8efdmfZ2wUo=",
-            "rev": "e3a0652b6d706ee1ce77d4dda606b6597dd8b5c4",
+            "hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw=",
+            "rev": "99b479dc34728936b006679a31e12b8cf432fc55",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-CqJJ1hj9nQkGONB+5tJgafg1xvrPgTuE3tM8RjO2RY0=",
-            "rev": "54dfec04d5c9ad1f22b08002ab6a5e2d0de77671",
+            "hash": "sha256-0Fk2W4rS1xB6YcXsDbrMfmZUfMxNlGz29xRcBHZbijA=",
+            "rev": "dc327134097700121e4ecd6e1d54d1d0a832a18d",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -235,8 +235,8 @@
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-GvzPndJkPZsVCp0LtaQ29rnORQ7xSZ76if/feEIhvkI=",
-            "rev": "f394c3f07b4c685b9f6948b36d65ca10a629f4fa",
+            "hash": "sha256-LQrig9/ceXS1LclfN9b9DoAvwltIA1R5fSpmHTmaN8s=",
+            "rev": "5e9fb9cbfb12a10ff9c16fbc360328d224b838d6",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -251,16 +251,16 @@
     },
     "src/third_party/harfbuzz-ng/src": {
         "args": {
-            "hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=",
-            "rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b",
+            "hash": "sha256-jQZElINbJgiVj1IHhkrtBCL5jGYzZrjJkO7gt+bgMA4=",
+            "rev": "6f4c5cec306d31e6822303f5ba248a14293d588e",
             "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/icu": {
         "args": {
-            "hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs=",
-            "rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd",
+            "hash": "sha256-hKIzBQVs4C/QJ4BdP3DTm6au9hq8BE0kG1VphtbtHVE=",
+            "rev": "b4aae6832c06df9d538d41b249403cf0678f16b4",
             "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -291,8 +291,8 @@
     },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-SE9nevzv+e2pVvRECQM0bg3dU1l7rE/4bLPuZDHFi18=",
-            "rev": "557586fde2fdc09dff9c3edf6943d6d54aa8914c",
+            "hash": "sha256-uO+zjmt0g5m780WR823UJ0AmQA+dfVFOjPChTLAciTM=",
+            "rev": "f3dddebddd0dba76fbfb97b96b6336bcf1d3a30c",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -323,56 +323,56 @@
     },
     "src/third_party/libjpeg_turbo": {
         "args": {
-            "hash": "sha256-FeSS7D3NietL34KgpaDFenBf/GcvapGSpkiKwgIOOHs=",
-            "rev": "6bb85251a8382b5e07f635a981ac685cc5ab5053",
+            "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=",
+            "rev": "d1f5f2393e0d51f840207342ae86e55a86443288",
             "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libpfm4/src": {
         "args": {
-            "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=",
-            "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+            "hash": "sha256-6YaPJcI6Qk0F1Dv5evfFq3MVSsBpsQ7sIreSuHZmOUo=",
+            "rev": "41878eab48c50bb9ec5f741a013e971bb5a9dff2",
             "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libsrtp": {
         "args": {
-            "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
-            "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+            "hash": "sha256-xC//VEFrI94nCkyLnRa6uQ+hJQqe41v0Qjm4LJ7K84I=",
+            "rev": "e8383771af8aa4096f5bcfe3743a5ea128f88a9a",
             "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-iRfpzVN+QEpN6okwVs5oEtZqIJYzFGxsUO/IJY1c/W8=",
-            "rev": "ba19d93d6d4f467fba11ff20fe2fc7c056f79345",
+            "hash": "sha256-miwz3+/fq+7Ohsn8J6xrLsQn/VqyezS9vZO9XzEuZZA=",
+            "rev": "db838d918570d4e381ecf9f5cc70a0098c9c2cd6",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-/FtYzbcOgOlaaWCoJfYns5oye7DoRZx1/xew3lN7tAM=",
-            "rev": "e83e25f791932202256479052f18bdd03a091147",
+            "hash": "sha256-8vej9g9+L73eOIuXZNfOWe6pV/cNr4JZOihZUtRxbFA=",
+            "rev": "3fce57ecc905d95a4619f33d09851d68c5a88663",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-2lnobd22L9u+h6JGWJoWT/0gjhI5JImDsEjn+RRYzJg=",
-            "rev": "917276084a49be726c90292ff0a6b0a3d571a6af",
+            "hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98=",
+            "rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-ZPsVBO+5v1xR9lvzHi616unK4HEak07Sy/reMSYwiok=",
-            "rev": "d99c56d4b9f6663bff528c4fac5313bceb32e762",
+            "hash": "sha256-nrd+E7LRTclF/Qa3wBvlutJ/wbLQKr73LOBk9k0qFOI=",
+            "rev": "adccc443070c58badd6414fd9a4380ca8c78e7c4",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -387,8 +387,8 @@
     },
     "src/third_party/nasm": {
         "args": {
-            "hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=",
-            "rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f",
+            "hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8=",
+            "rev": "45252858722aad12e545819b2d0f370eb865431b",
             "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -411,8 +411,8 @@
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-xOFm5u6uwzktkHCLuLmy3ryiuVN8B8Fo+ltHbFmilOY=",
-            "rev": "2074b65d22dd04b65c2688647b9386a63338f0b9",
+            "hash": "sha256-ZDQsBVFq9TgGGf5r2vv8nsHvFy03NM+SkbaXPoa345Q=",
+            "rev": "40b1342aa7bd47d9c963c3617fd98ec1551528f9",
             "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -443,32 +443,32 @@
     },
     "src/third_party/ruy/src": {
         "args": {
-            "hash": "sha256-zJ7EYxIoZvN2uOfPscKzWycBO057g4bMnTys2sUrp2M=",
-            "rev": "576e020f06334118994496b45f9796ed7fda3280",
+            "hash": "sha256-4To1BMUgzj2/sV7USN9W0CgHnpRmaktEspfhwWWeVBc=",
+            "rev": "2af88863614a8298689cc52b1a47b3fcad7be835",
             "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/tflite/src": {
         "args": {
-            "hash": "sha256-pIhOSb9eLzel5oDPCpxCvI2XJ2jGLdLURCRkd1BbMkk=",
-            "rev": "01e030d23d3b904d98cbf908da74d63b3c186949",
+            "hash": "sha256-nvU3p6TzEqBkDtZEoxCZGPsQA0oZNJID8raqHBDS0ko=",
+            "rev": "8fd527849069a358ad6c2980b9a9b34a53c53717",
             "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/xnnpack/src": {
         "args": {
-            "hash": "sha256-OdrwYAazY0E3han/fpFjlAiguY4M/xnCMJjL3KAIhvw=",
-            "rev": "4574c4d9b00703c15f2218634ddf101597b22b18",
+            "hash": "sha256-vOUwMXZJbYxTGPpdD5uc9ATfPIpThCDHV/YTlWN0ajw=",
+            "rev": "97f3177fd836fff03b48a886bb130591866ad7ca",
             "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/tools": {
         "args": {
-            "hash": "sha256-QKFYNmNwVcm7aAP3aeuSrY2ScbgMPs4/odf62dI0WJg=",
-            "rev": "f8f65faf07b1132c9d01932ef95846e9a82b8d54",
+            "hash": "sha256-PDjcHq8BTDLD6OsYFfvjw8ffmam/4YSx8SF0G/NvebY=",
+            "rev": "f363a79871a91f36322e845e3134e2f04e1fc18a",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index 4bec7936bc87..9f6465a4e84b 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -97,6 +97,32 @@ stdenv.mkDerivation (finalAttrs: {
       revert = true;
       hash = "sha256-WZsN2qm6lX121bDf7SoN75flXtCTmPPpwtHK0ayjkPc=";
     })
+
+    # https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L620-L623
+    # clang++: error: unknown argument: '-fno-lifetime-dse'
+    ./chromium-147-llvm-22.patch
+
+    # https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L624-L644
+    # clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=return'
+    (fetchpatch {
+      name = "chromium-148-revert-build-Add--fsanitizer=return-config.patch";
+      # https://chromium-review.googlesource.com/c/chromium/src/+/7629257
+      url = "https://chromium.googlesource.com/chromium/src/+/99ba1f5302f9433efdb4df302cb7b7de56c72e4c^!?format=TEXT";
+      decode = "base64 -d";
+      revert = true;
+      hash = "sha256-/qzzxwTdPMwIdsqD/G02S7kKHCj3QxECL+g1WYEaWmU=";
+    })
+    # ERROR Unresolved dependencies.
+    # //apps:apps(//build/toolchain/linux/unbundle:default)
+    #   needs //build/config/compiler:sanitize_return(//build/toolchain/linux/unbundle:default)
+    (fetchpatch {
+      name = "chromium-148-revert-build-Enable--fsanitizer=return-config.patch";
+      # https://chromium-review.googlesource.com/c/chromium/src/+/7629258
+      url = "https://chromium.googlesource.com/chromium/src/+/9357bfbea03753fe52264c9ec36abe74f48cfef5^!?format=TEXT";
+      decode = "base64 -d";
+      revert = true;
+      hash = "sha256-14fTHNh3vGsf4KgeH8uLX+aK3lrjK0VKd1dfK1g7r0I=";
+    })
   ];
 
   postPatch = ''
@@ -196,7 +222,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "WebRTC library used by Signal";
     homepage = "https://github.com/SignalApp/webrtc";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From 48bac9bc4166a81d31d53072651d48057b1b33f1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:44:54 +0300
Subject: [PATCH 285/339] gtdialog: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/gt/gtdialog/package.nix | 46 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/by-name/gt/gtdialog/package.nix

diff --git a/pkgs/by-name/gt/gtdialog/package.nix b/pkgs/by-name/gt/gtdialog/package.nix
deleted file mode 100644
index bcfe50d7324b..000000000000
--- a/pkgs/by-name/gt/gtdialog/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  cdk,
-  unzip,
-  gtk2,
-  glib,
-  ncurses,
-  pkg-config,
-  fetchFromGitHub,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gtdialog";
-  version = "1.6";
-
-  src = fetchFromGitHub {
-    owner = "orbitalquark";
-    repo = "gtdialog";
-    rev = "gtdialog_${finalAttrs.version}";
-    hash = "sha256-TdYwT4bC+crTSNGJIr1Nno+/h1YgxNp0BR5MQtxdrVg=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    unzip
-  ];
-  buildInputs = [
-    cdk
-    gtk2
-    glib
-    ncurses
-  ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = {
-    description = "Cross-platform helper for creating interactive dialogs";
-    mainProgram = "gtdialog";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux;
-    homepage = "http://foicica.com/gtdialog";
-    downloadPage = "http://foicica.com/gtdialog/download";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 749962b7e66e..4120f7f074c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -969,6 +969,7 @@ mapAliases {
   gscrabble = throw "'gscrabble' has been removed, as it is unmaintained upstream, and broken in nixpkgs"; # Added 2026-01-03
   gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06
   gssdp = throw "'gssdp' (version 1.4) has been removed as it was unmaintained upstream and depended on libsoup 2.4. Consider using `gssdp_1_6` instead"; # Added 2026-06-07
+  gtdialog = throw "'gtdialog' has been removed, as it depended on GTK 2. Consider using 'yad' or 'zenity' instead."; # Added 2026-05-22
   gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   gtkgnutella = gtk-gnutella; # Added 2026-05-21

From bf007c2ede65bc3b17cb08c5dca4066157e4bbc1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:45:05 +0300
Subject: [PATCH 286/339] gtklp: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/gt/gtklp/000-autoconf.patch      | 23 ------
 .../gt/gtklp/001-format-parameter.patch       | 22 ------
 pkgs/by-name/gt/gtklp/package.nix             | 76 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 4 files changed, 1 insertion(+), 121 deletions(-)
 delete mode 100644 pkgs/by-name/gt/gtklp/000-autoconf.patch
 delete mode 100644 pkgs/by-name/gt/gtklp/001-format-parameter.patch
 delete mode 100644 pkgs/by-name/gt/gtklp/package.nix

diff --git a/pkgs/by-name/gt/gtklp/000-autoconf.patch b/pkgs/by-name/gt/gtklp/000-autoconf.patch
deleted file mode 100644
index c1698bee1fdc..000000000000
--- a/pkgs/by-name/gt/gtklp/000-autoconf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch origin: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/3
-
-diff --git a/configure.ac b/configure.ac
-index b7a30e9..3768ae9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h])
- 
- AC_CONFIG_MACRO_DIR([m4])
- AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
- 
- dnl Extra params
- CUPSCONFIGPATH=""
-@@ -30,8 +31,6 @@ AC_SUBST(XLIBS)
- 
- dnl Checks for header files
- 
--dnl internationalization macros
--AM_GNU_GETTEXT
- 
- 
- # Forte Compiler ############################################################
diff --git a/pkgs/by-name/gt/gtklp/001-format-parameter.patch b/pkgs/by-name/gt/gtklp/001-format-parameter.patch
deleted file mode 100644
index 6cfc90beb02a..000000000000
--- a/pkgs/by-name/gt/gtklp/001-format-parameter.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Patch source: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/1
-
---- a/libgtklp/libgtklp.c	2020-08-25 17:31:52.427298559 +0100
-+++ b/libgtklp/libgtklp.c	2020-08-25 17:36:37.728154682 +0100
-@@ -939,7 +939,7 @@
- 		gtk_widget_show(pixmapwid);
- 
- 		if (strlen(gerror2) == 0)
--			snprintf(tmplabel, (size_t) MAXLINE, gerror1);
-+			snprintf(tmplabel, (size_t) MAXLINE, "%s", gerror1);
- 		else
- 			snprintf(tmplabel, (size_t) MAXLINE, gerror1, gerror2);
- 		label = gtk_label_new(tmplabel);
-@@ -973,7 +973,7 @@
- #endif
- 	} else {
- 		if (strlen(gerror2) == 0)
--			g_warning(gerror1);
-+			g_warning("%s", gerror1);
- 		else
- 			g_warning(gerror1, gerror2);
- 	}
diff --git a/pkgs/by-name/gt/gtklp/package.nix b/pkgs/by-name/gt/gtklp/package.nix
deleted file mode 100644
index 8b4f3b209865..000000000000
--- a/pkgs/by-name/gt/gtklp/package.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  lib,
-  stdenv,
-  autoreconfHook,
-  cups,
-  fetchurl,
-  gettext,
-  glib,
-  gtk2,
-  libtool,
-  openssl,
-  pkg-config,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gtklp";
-  version = "1.3.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gtklp/gtklp-${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-vgdgkEJZX6kyA047LXA4zvM5AewIY/ztu1GIrLa1O6s=";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    cups
-  ];
-
-  buildInputs = [
-    cups
-    gettext
-    glib
-    gtk2
-    libtool
-    openssl
-  ];
-
-  outputs = [
-    "out"
-    "doc"
-    "man"
-  ];
-
-  strictDeps = true;
-
-  patches = [
-    ./000-autoconf.patch
-    ./001-format-parameter.patch
-  ];
-
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar';
-  #     file.o:libgtklp/libgtklp.h:83: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  postPatch = ''
-    substituteInPlace include/defaults.h \
-      --replace "netscape" "firefox" \
-      --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \
-                "http://localhost:631/help/"
-  '';
-
-  preInstall = ''
-    install -D -m0644 -t $doc/share/doc AUTHORS BUGS ChangeLog README USAGE
-  '';
-
-  meta = {
-    homepage = "https://gtklp.sirtobi.com";
-    description = "GTK-based graphical frontend for CUPS";
-    license = with lib.licenses; [ gpl2Only ];
-    mainProgram = "gtklp";
-    maintainers = [ ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4120f7f074c8..0a581bef2a4d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -973,6 +973,7 @@ mapAliases {
   gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   gtkgnutella = gtk-gnutella; # Added 2026-05-21
+  gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22
   gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12
   gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28
   guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27

From bf30dd0b21528f4e91cb35a6b9ebd03231989c7a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 03:25:06 +0300
Subject: [PATCH 287/339] asunder: switch to GTK 3 fork

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/as/asunder/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix
index 3299b9ef16d5..31bb09cb0179 100644
--- a/pkgs/by-name/as/asunder/package.nix
+++ b/pkgs/by-name/as/asunder/package.nix
@@ -1,9 +1,10 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  autoreconfHook,
+  fetchFromGitHub,
   makeWrapper,
-  gtk2,
+  gtk3,
   libcddb,
   intltool,
   pkg-config,
@@ -36,20 +37,24 @@ let
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.0.2";
   pname = "asunder";
-  src = fetchurl {
-    url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-txNB10bM9WqnexeFxq+BqmQdCErD00t4vrU3YYhItks=";
+  version = "3.1.0-unstable-2025-03-24";
+
+  src = fetchFromGitHub {
+    owner = "rizalmart";
+    repo = "asunder-gtk3";
+    rev = "e3676704f7c7912e61ad7d78fe19015c102a27e1";
+    hash = "sha256-bJVrSbjOUkmrF76e6euM5VPwbvvRrA5ZLPzZGjEep98=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     intltool
     makeWrapper
     pkg-config
   ];
   buildInputs = [
-    gtk2
+    gtk3
     libcddb
   ];
 
@@ -61,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Graphical Audio CD ripper and encoder for Linux";
     mainProgram = "asunder";
-    homepage = "http://littlesvr.ca/asunder/index.php";
+    homepage = "https://github.com/rizalmart/asunder-gtk3";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ mudri ];
     platforms = lib.platforms.linux;

From 11c1745faca631d84febd306b340923294d673ad Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 03:25:15 +0300
Subject: [PATCH 288/339] gftp: switch to GTK 3

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/gf/gftp/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix
index 68cf2bf9510e..1bb023756a27 100644
--- a/pkgs/by-name/gf/gftp/package.nix
+++ b/pkgs/by-name/gf/gftp/package.nix
@@ -5,24 +5,22 @@
   meson,
   ninja,
   gettext,
-  gtk2,
+  gtk3,
   ncurses,
   openssl,
   pkg-config,
   readline,
-  nix-update-script,
-  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gftp";
-  version = "2.9.1b-unstable-2025-05-12";
+  version = "2.9.1b-unstable-2026-03-30";
 
   src = fetchFromGitHub {
     owner = "masneyb";
     repo = "gftp";
-    rev = "48114635f7b7b1f9a5eda985021ea53b10a7a030";
-    hash = "sha256-unTsd2xX8Y71ItE3gYHoxUPgViK/xhZdx0IQYvDPaEc=";
+    rev = "f64d27b116be1fc444e0f50ec375847b72df65f7";
+    hash = "sha256-2CVRIrSOBi1AUoEKiyYhMmGcIIBnwMQ3EQsgBIvlXEs=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    gtk2
+    gtk3
     ncurses
     openssl
     readline

From 35d4acf531ff0857b8d4295bd28bc7543ad8f3f5 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:45:37 +0300
Subject: [PATCH 289/339] xzgv: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/xz/xzgv/package.nix | 47 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/by-name/xz/xzgv/package.nix

diff --git a/pkgs/by-name/xz/xzgv/package.nix b/pkgs/by-name/xz/xzgv/package.nix
deleted file mode 100644
index 8439c3176a9e..000000000000
--- a/pkgs/by-name/xz/xzgv/package.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  gtk2,
-  libexif,
-  pkg-config,
-  texinfo,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xzgv";
-  version = "0.9.2";
-  src = fetchurl {
-    url = "mirror://sourceforge/xzgv/xzgv-${finalAttrs.version}.tar.gz";
-    sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
-  };
-  nativeBuildInputs = [
-    pkg-config
-    texinfo
-  ];
-  buildInputs = [
-    gtk2
-    libexif
-  ];
-  env.NIX_CFLAGS_COMPILE = toString [
-    # gcc15 build failure
-    "-std=gnu17"
-  ];
-  postPatch = ''
-    substituteInPlace config.mk \
-      --replace /usr/local $out
-    substituteInPlace Makefile \
-      --replace "all: src man" "all: src man info"
-  '';
-  preInstall = ''
-    mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
-  '';
-  meta = {
-    homepage = "https://sourceforge.net/projects/xzgv/";
-    description = "Picture viewer for X with a thumbnail-based selector";
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.womfoo ];
-    platforms = lib.platforms.linux;
-    mainProgram = "xzgv";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0a581bef2a4d..9a19614b67e9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2714,6 +2714,7 @@ mapAliases {
   xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27
   xxgdb = throw "'xxgdb' seems inactive and doesn't compile with glibc 2.42"; # Added 2025-09-28
   xxHash = warnAlias "'xxHash' has been renamed to 'xxhash'" xxhash; # Added 2026-02-12
+  xzgv = throw "'xzgv' has been removed, as it depended on GTK 2. Consider using 'geeqie' or 'gthumb' instead."; # Added 2026-05-22
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yacas-gui = throw "'yacas-gui' has been removed, as it depended on qt5 webengine. Upstream is considering deprecation of the gui entirely, see https://github.com/grzegorzmazur/yacas/issues/361."; # Added 2026-02-11

From 22079f8d54d0c49f7bc0469546b475fcd629a6f3 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:45:48 +0300
Subject: [PATCH 290/339] artha: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/ar/artha/package.nix | 39 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/ar/artha/package.nix

diff --git a/pkgs/by-name/ar/artha/package.nix b/pkgs/by-name/ar/artha/package.nix
deleted file mode 100644
index 85d7a879b094..000000000000
--- a/pkgs/by-name/ar/artha/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  autoreconfHook,
-  fetchurl,
-  dbus-glib,
-  gtk2,
-  pkg-config,
-  wordnet,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "artha";
-  version = "1.0.5";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/artha/${finalAttrs.version}/artha-${finalAttrs.version}.tar.bz2";
-    sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-  buildInputs = [
-    dbus-glib
-    gtk2
-    wordnet
-  ];
-
-  meta = {
-    description = "Offline thesaurus based on WordNet";
-    homepage = "https://artha.sourceforge.net";
-    license = lib.licenses.gpl2;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-    mainProgram = "artha";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9a19614b67e9..f8062b8ab237 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -327,6 +327,7 @@ mapAliases {
   argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27
   aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27
   arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  artha = throw "'artha' has been removed, as the packaged GTK 2 application is unmaintained upstream. Consider using 'wordnet' instead."; # Added 2026-05-22
   artichoke = throw "artichoke has been removed due to being archived upstream."; # Added 2025-11-04
   artim-dark = aritim-dark; # Added 2025-07-27
   artyFX = openav-artyfx; # Added 2026-02-08

From 9dca59caf5cea179b67fd17b008e7f477de2b70a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:45:58 +0300
Subject: [PATCH 291/339] gbdfed: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/gb/gbdfed/Makefile.patch | 15 --------
 pkgs/by-name/gb/gbdfed/package.nix    | 49 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 3 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/gb/gbdfed/Makefile.patch
 delete mode 100644 pkgs/by-name/gb/gbdfed/package.nix

diff --git a/pkgs/by-name/gb/gbdfed/Makefile.patch b/pkgs/by-name/gb/gbdfed/Makefile.patch
deleted file mode 100644
index 9c437deca07c..000000000000
--- a/pkgs/by-name/gb/gbdfed/Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git "a/Makefile.in" "b/Makefile.in"
-index b482958..472b8da 100644
---- "a/Makefile.in"
-+++ "b/Makefile.in"
-@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs
- CC = @CC@
- CFLAGS = @XX_CFLAGS@ @CFLAGS@
- 
--DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
--	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
--	-DGTK_DISABLE_DEPRECATED
-+DEFINES = @DEFINES@
- 
- SRCS = bdf.c \
-        bdfcons.c \
diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix
deleted file mode 100644
index ef988794e367..000000000000
--- a/pkgs/by-name/gb/gbdfed/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  freetype,
-  gtk2-x11,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  version = "1.6";
-  pname = "gbdfed";
-
-  src = fetchurl {
-    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${finalAttrs.version}.tar.bz2";
-    sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    freetype
-    gtk2-x11
-  ];
-
-  patches = [ ./Makefile.patch ];
-
-  hardeningDisable = [ "format" ];
-
-  postPatch = ''
-    # gcc15
-    substituteInPlace bdfgrab.c --replace-fail 'int (*old_error_handler)();' 'XErrorHandler old_error_handler;'
-    substituteInPlace hbf.c --replace-fail 'typedef	int	bool;' '// typedef	int	bool;'
-  '';
-
-  meta = {
-    description = "Bitmap Font Editor";
-    longDescription = ''
-      gbdfed lets you interactively create new bitmap font files or modify existing ones.
-      It allows editing multiple fonts and multiple glyphs,
-      it allows cut and paste operations between fonts and glyphs and editing font properties.
-      The editor works natively with BDF fonts.
-    '';
-    homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    platforms = lib.platforms.all;
-    mainProgram = "gbdfed";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f8062b8ab237..4e519a3476e4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -858,6 +858,7 @@ mapAliases {
   garage_1_x = warnAlias "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
   garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16
   gavrasm = throw "'gavrasm' has been removed. Use 'avra' instead."; # Added 2025-12-21
+  gbdfed = throw "'gbdfed' has been removed, as it is unmaintained upstream and depends on GTK 2. Consider using 'fontforge' instead."; # Added 2026-05-22
   gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc10 = throw "gcc10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08

From f5cc3b36f162ed743a985247bf762add9ae11cd6 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:46:20 +0300
Subject: [PATCH 292/339] chemtool: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/ch/chemtool/package.nix | 61 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 pkgs/by-name/ch/chemtool/package.nix

diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix
deleted file mode 100644
index 344b1d66150b..000000000000
--- a/pkgs/by-name/ch/chemtool/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  libx11,
-  gtk2,
-  fig2dev,
-  wrapGAppsHook3,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "chemtool";
-  version = "1.6.14";
-
-  src = fetchurl {
-    url = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-${finalAttrs.version}.tar.gz";
-    sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    libx11
-    gtk2
-    fig2dev
-  ];
-
-  # Workaround build on -fno-common toolchains like upstream gcc-10.
-  # Otherwise built fails as:
-  #   ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of
-  #     `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}")
-  '';
-
-  meta = {
-    homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/";
-    description = "Draw chemical structures";
-    longDescription = ''
-      Chemtool is a program for drawing organic molecules. It runs under the X
-      Window System using the GTK widget set.
-
-      Most operations in chemtool can be accomplished using the mouse - the
-      first (usually the left) button is used to select or place things, the
-      middle button modifies properties (e.g. reverses the direction of a bond),
-      and the right button is used to delete objects.
-
-      The program offers essentially unlimited undo/redo, two text fonts plus
-      symbols, seven colors, drawing at several zoom scales, and square and
-      hexagonal backdrop grids for easier alignment.
-    '';
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4e519a3476e4..c2c07565d362 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -475,6 +475,7 @@ mapAliases {
   check_systemd = throw "'check_systemd' has been renamed to/replaced by 'nagiosPlugins.check_systemd'"; # Converted to throw 2025-10-27
   check_zfs = throw "'check_zfs' has been renamed to/replaced by 'nagiosPlugins.check_zfs'"; # Converted to throw 2025-10-27
   checkSSLCert = throw "'checkSSLCert' has been renamed to/replaced by 'nagiosPlugins.check_ssl_cert'"; # Converted to throw 2025-10-27
+  chemtool = throw "'chemtool' has been removed, as it is unmaintained upstream and depends on GTK 2. Consider using 'avogadro2' instead."; # Added 2026-05-22
   chiaki4deck = throw "'chiaki4deck' has been renamed to/replaced by 'chiaki-ng'"; # Converted to throw 2025-10-27
   chit = throw "'chit' has been removed from nixpkgs because it was unmaintained upstream and used insecure dependencies"; # Added 2025-11-28
   chkrootkit = throw "chkrootkit has been removed as it is unmaintained and archived upstream and didn't even work on NixOS"; # Added 2025-09-12

From cca51b0cdd911db32f723c5c6823215b7efe3c36 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:50:40 +0300
Subject: [PATCH 293/339] fped: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/fp/fped/package.nix | 63 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/by-name/fp/fped/package.nix

diff --git a/pkgs/by-name/fp/fped/package.nix b/pkgs/by-name/fp/fped/package.nix
deleted file mode 100644
index 0cfb5c180913..000000000000
--- a/pkgs/by-name/fp/fped/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  flex,
-  bison,
-  fig2dev,
-  imagemagick,
-  netpbm,
-  gtk2,
-  pkg-config,
-}:
-
-stdenv.mkDerivation {
-  pname = "fped";
-  version = "unstable-2017-05-11";
-
-  src = fetchgit {
-    url = "git://projects.qi-hardware.com/fped.git";
-    rev = "fa98e58157b6f68396d302c32421e882ac87f45b";
-    sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config'
-  '';
-
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: postscript.o:postscript.h:29: multiple definition of
-  #     `postscript_params'; fped.o:postscript.h:29: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  # This uses '/bin/bash', '/usr/local' and 'lex' by default
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "LEX=flex"
-    "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt"
-  ];
-
-  nativeBuildInputs = [
-    flex
-    bison
-    pkg-config
-    imagemagick
-    fig2dev
-    netpbm
-  ];
-
-  buildInputs = [
-    flex
-    gtk2
-  ];
-
-  meta = {
-    description = "Editor that allows the interactive creation of footprints electronic components";
-    mainProgram = "fped";
-    homepage = "http://projects.qi-hardware.com/index.php/p/fped/";
-    license = lib.licenses.gpl2;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c2c07565d362..71405fa29d29 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -827,6 +827,7 @@ mapAliases {
   ); # Converted to warning 2025-10-28
   forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
+  fped = throw "'fped' has been removed, as it is unmaintained upstream and depends on GTK 2. Consider using 'kicad' instead."; # Added 2026-05-22
   fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
   framac = frama-c; # Added 2026-04-24
   framework-system-tools = throw "'framework-system-tools' has been renamed to/replaced by 'framework-tool'"; # Converted to throw 2025-10-27

From f6ef66e41b9a551d9d3ce9d32a07c222c3252c7f Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 May 2026 01:51:00 +0300
Subject: [PATCH 294/339] hasmail: drop

Assisted-by: codex with gpt-5.5-high
---
 pkgs/by-name/ha/hasmail/package.nix | 43 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/by-name/ha/hasmail/package.nix

diff --git a/pkgs/by-name/ha/hasmail/package.nix b/pkgs/by-name/ha/hasmail/package.nix
deleted file mode 100644
index e562a4a24ad6..000000000000
--- a/pkgs/by-name/ha/hasmail/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  pkg-config,
-  pango,
-  cairo,
-  gtk2,
-}:
-
-buildGoModule {
-  pname = "hasmail-unstable";
-  version = "2019-08-24";
-
-  src = fetchFromGitHub {
-    owner = "jonhoo";
-    repo = "hasmail";
-    rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d";
-    hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w=";
-  };
-
-  vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk=";
-
-  doCheck = false;
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    pango
-    cairo
-    gtk2
-  ];
-
-  meta = {
-    description = "Simple tray icon for detecting new email on IMAP servers";
-    mainProgram = "hasmail";
-    homepage = "https://github.com/jonhoo/hasmail";
-    license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ doronbehar ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 71405fa29d29..a999b542c1b5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -988,6 +988,7 @@ mapAliases {
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
+  hasmail = throw "'hasmail' has been removed, as the GTK 2 project is no longer maintained upstream."; # Added 2026-05-22
   haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'.";
   haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'.";
   haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16

From 35ce86165095543a2244b14251ca21bd5b67d824 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 1 May 2026 03:56:57 +0300
Subject: [PATCH 295/339] ghcWithPackages: throw on non-derivation inputs

Previously the user-supplied package list was passed directly through
`lib.closePropagation` and an `isHaskellLibrary`-attribute filter, so
mistakes such as `[ dontCheck hp.foo ]` (forgetting parentheses around
the override) silently produced a GHC environment with the affected
package missing instead of failing.

Validate each top-level entry up front. We deliberately accept any
derivation (not just Haskell libraries), because shellFor passes
mixed inputs like `libraryFrameworkDepends` through here on Darwin;
those are still silently dropped by the existing closure-side filter.
The user-error case the issue is about -- non-derivation values like
functions or strings -- is now rejected with a helpful message that
points at the canonical fix.

Fixes #30304

Assisted-by: claude-code with claude-opus-4-8[1m]-high
---
 .../haskell-modules/with-packages-wrapper.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 9968ea355363..37bf1e450314 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -48,7 +48,24 @@ let
 
   hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null;
 
-  packages = selectPackages haskellPackages ++ [ hoogleWithPackages' ];
+  # Catches obviously-wrong inputs (functions, strings, etc.) but lets
+  # non-Haskell derivations through; shellFor passes libraryFrameworkDepends
+  # and similar mixed inputs in, and those are dropped later by the
+  # closure-side `isHaskellLibrary` filter.
+  checkPackage =
+    p:
+    if p == null || lib.isDerivation p then
+      p
+    else
+      throw ''
+        ghcWithPackages: expected a derivation, got a ${builtins.typeOf p}.
+        A common cause is missing parentheses around an override, e.g.
+          (hp: [ dontCheck hp.foo ])
+        should be written as
+          (hp: [ (dontCheck hp.foo) ]).
+      '';
+
+  packages = map checkPackage (selectPackages haskellPackages ++ [ hoogleWithPackages' ]);
 
   isHaLVM = ghc.isHaLVM or false;
   ghcCommand' = "ghc";

From 2c76a5766f6dcc7cc3484eb2a4aae750c4b2dde3 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Tue, 16 Jun 2026 18:48:57 +0300
Subject: [PATCH 296/339] python3Packages.exllamav3: 0.0.42 -> 0.0.43

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

diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix
index 0f8baeda4922..ab7e43ef490f 100644
--- a/pkgs/development/python-modules/exllamav3/default.nix
+++ b/pkgs/development/python-modules/exllamav3/default.nix
@@ -29,14 +29,14 @@ let
 in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "exllamav3";
-  version = "0.0.42";
+  version = "0.0.43";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "turboderp-org";
     repo = "exllamav3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kdI2BT7T2+mrdgWE7aXTeqC49WP6qEus+LfQGk0ozhA=";
+    hash = "sha256-68v8ptvtOzRTnnRXrgU0emqmbCO0pECidgJ36bwm8/s=";
   };
 
   pythonRelaxDeps = [

From 7a1dbb4ced58ac876c5204ce39f6236738c082b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 16 Jun 2026 17:54:52 +0200
Subject: [PATCH 297/339] kinfocenter: also substitute aha

---
 pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch | 2 +-
 pkgs/kde/plasma/kinfocenter/default.nix           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
index d696d3c095bf..3c9f541bf7e1 100644
--- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
+++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
@@ -257,7 +257,7 @@ index a49284d3..77818fe2 100644
          const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, u"kinfocenter/network/ip.sh"_s, QStandardPaths::LocateFile);
          const QString darkness = QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark ? u"1"_s : u"0"_s;
 -        m_outputContext = new CommandOutputContext({u"ip"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent);
-+        m_outputContext = new CommandOutputContext({u"@ip@"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent);
++        m_outputContext = new CommandOutputContext({u"@ip@"_s, u"@aha@"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent);
      }
      CommandOutputContext *outputContext() const
      {
diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix
index 2e8ebe634cd9..443a98adb4c8 100644
--- a/pkgs/kde/plasma/kinfocenter/default.nix
+++ b/pkgs/kde/plasma/kinfocenter/default.nix
@@ -55,7 +55,7 @@ mkKdeDerivation {
   ];
 
   postPatch = ''
-    substituteInPlace kcms/firmware_security/fwupdmgr.sh \
+    substituteInPlace kcms/{firmware_security/fwupdmgr.sh,network/ip.sh} \
       --replace-fail " aha " " ${lib.getExe aha} "
   '';
 

From 3bd7c74a68f2f06fbec266c6ab12a70f662dd6f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 15:59:05 +0000
Subject: [PATCH 298/339] cargo-xwin: 0.22.0 -> 0.23.0

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

diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 0cfaa744dda1..a29905cec257 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-xwin";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lJu/TyzKDj0yHCP83ouc6e52E48taOTQ9WpWAiqUxl4=";
+    hash = "sha256-pWaJKk4XgBeY4llRTHvuMg0mAfEV4GFpeWGaM8eYsN4=";
   };
 
-  cargoHash = "sha256-k3PuEjiew012+m4RRVKNOdxKvFPWIxKHgG/SrBjM2WM=";
+  cargoHash = "sha256-iO0uAYdi8Vy9gi7lHsGRmhDsVNQCqo4E/nbTfI32jDs=";
 
   meta = {
     description = "Cross compile Cargo project to Windows MSVC target with ease";

From 4308e24d1bd393bc1316eaf20bbb1495e700d37c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 16:12:12 +0000
Subject: [PATCH 299/339] asciinema: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix
index 5d93445c8101..9b690bf3b8c6 100644
--- a/pkgs/by-name/as/asciinema/package.nix
+++ b/pkgs/by-name/as/asciinema/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asciinema";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "asciinema";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58=";
+    hash = "sha256-MZMc1YypMP2JEbpDmsGj+Sm+y3mfr50DnoCN04rY9xY=";
   };
 
-  cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8=";
+  cargoHash = "sha256-Qzxlp/c5VowlZplu7iMVh0a3+raQXsYmO8OEC45dSl4=";
 
   env.ASCIINEMA_GEN_DIR = "gendir";
 

From 559fe1e719de2e3ac72d86df59ec60b425db7cdc Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Tue, 16 Jun 2026 09:22:23 -0700
Subject: [PATCH 300/339] llvmPackages_22: 22.1.7 -> 22.1.8

---
 pkgs/development/compilers/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index ac4a5ef58288..8d7fffead8b5 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -26,7 +26,7 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
-    "22.1.7".officialRelease.sha256 = "sha256-AmozlrL8AAlfr+F7OrJqr3ecd/KhBx5Bngj3SopPdyY=";
+    "22.1.8".officialRelease.sha256 = "sha256-SF7wFuh4kXZTytpdgX7vUZItKtRobnVICm+ixze4iG0=";
     "23.0.0-git".gitRelease = {
       rev = "47ef7495ad781b742a0c4435ca72590d297ba8bf";
       rev-version = "23.0.0-unstable-2026-06-07";

From 74925e2eaf96271e3d6895d10e3845062df1c04f Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Tue, 16 Jun 2026 18:39:39 +0200
Subject: [PATCH 301/339] python3Packages.jupyterlab: 4.5.7 -> 4.5.8

---
 .../python-modules/jupyterlab/default.nix      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 2db60782171a..0d638d798b65 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -21,16 +21,16 @@
   traitlets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "jupyterlab";
-  version = "4.5.7";
+  version = "4.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterlab";
     repo = "jupyterlab";
-    tag = "v${version}";
-    hash = "sha256-kJ9DWfb9VWEPfpG17E3KIvGqWlr0iO2a094Ne7LS1U8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OtytFZdgGzbQF3icglwRpAn0HhJNyjI6oNS01gfpzkA=";
   };
 
   nativeBuildInputs = [
@@ -43,9 +43,9 @@ buildPythonPackage rec {
   '';
 
   offlineCache = yarn-berry_3.fetchYarnBerryDeps {
-    inherit src;
-    sourceRoot = "${src.name}/jupyterlab/staging";
-    hash = "sha256-2YGs0clj44BSEGdp3wChw97jFSMiAeMnCv3PNhdnEeA=";
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/jupyterlab/staging";
+    hash = "sha256-wgqwEl01VinYU5haL1X8Na1lNNcyqCfRaRBze4ypPPo=";
   };
 
   preBuild = ''
@@ -85,11 +85,11 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "jupyterlab" ];
 
   meta = {
-    changelog = "https://github.com/jupyterlab/jupyterlab/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jupyterlab/jupyterlab/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Jupyter lab environment notebook server extension";
     license = lib.licenses.bsd3;
     homepage = "https://jupyter.org/";
     teams = [ lib.teams.jupyter ];
     mainProgram = "jupyter-lab";
   };
-}
+})

From 10cac15763a9d4ce8b5d6bce7615e2f06ea4a09b Mon Sep 17 00:00:00 2001
From: haansn08 <stefan@kikeriki.at>
Date: Tue, 16 Jun 2026 18:56:32 +0200
Subject: [PATCH 302/339] python3Packages.jupyterlab: enable structuredAttrs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <gaetan@glepage.com>
---
 pkgs/development/python-modules/jupyterlab/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 0d638d798b65..14f3391f329d 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -25,6 +25,7 @@ buildPythonPackage (finalAttrs: {
   pname = "jupyterlab";
   version = "4.5.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "jupyterlab";

From f45669144c8d176b0c2573e59fb58cfec7bd9910 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 17:01:19 +0000
Subject: [PATCH 303/339] cocoon: 0.9.0 -> 0.10

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

diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix
index 34b58d9ad51a..bbd5dc372d26 100644
--- a/pkgs/by-name/co/cocoon/package.nix
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cocoon";
-  version = "0.9.0";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "haileyok";
     repo = "cocoon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MmDUTFcXonAwHzeeIBxTk4KOVuCNHmaBFHMqHkf4+Yc=";
+    hash = "sha256-SvLXtn4Nr8zcvvjGarNLYeKqyniI6eg50cnqV6Q+3/s=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     "-X main.Version=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-bux3OfHT8f1FVpBAZUP23vo8M6h8nPTJbi/GTUzhdc4=";
+  vendorHash = "sha256-Vkf5XyJA/Vdufa1OpCzgIGSQa5pVsFCTfaAVI7l947E=";
 
   passthru = {
     tests = lib.optionalAttrs stdenvNoCC.hostPlatform.isLinux { inherit (nixosTests) cocoon; };

From de5d8d81fce8036d23c3ea39cc893794d410417f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 17:11:03 +0000
Subject: [PATCH 304/339] salt: 3008.0 -> 3008.1

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

diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix
index 481c2e370eea..6f0fcb1ba5a6 100644
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@@ -11,12 +11,12 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "salt";
-  version = "3008.0";
+  version = "3008.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-az5PJTHJnD2wZtgds1KDnHdn3oRsk94/+UZRoX054tE=";
+    hash = "sha256-abf3Phwx7IjP7CqbvVZsf84Ajdqrmiab4xfPeyb2j/w=";
   };
 
   patches = [

From bebf07f2f4ec916f7b8fb7c66f07107a219fb930 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 17:15:09 +0000
Subject: [PATCH 305/339] mathicgb: 1.3 -> 1.4

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

diff --git a/pkgs/by-name/ma/mathicgb/package.nix b/pkgs/by-name/ma/mathicgb/package.nix
index 3e11ddd869c6..cf88e8024712 100644
--- a/pkgs/by-name/ma/mathicgb/package.nix
+++ b/pkgs/by-name/ma/mathicgb/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mathicgb";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "Macaulay2";
     repo = "mathicgb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zcHaYzznvbBkfeFXNxIxy9qlyD0esOvwUIOuEli4rwc=";
+    hash = "sha256-34ASkRPNH6d8TSJmyZmYZVOi1p02nHgMVXXWVJMNZ1c=";
   };
 
   buildInputs = [

From deb3ad2f00c72449a96b965319d01ed9281374f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 17:30:47 +0000
Subject: [PATCH 306/339] goperf: 0-unstable-2026-05-12 ->
 0-unstable-2026-06-15

---
 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 72e33364d2c9..8e7dee2c1b42 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-05-12";
+  version = "0-unstable-2026-06-15";
 
   src = fetchgit {
     url = "https://go.googlesource.com/perf";
-    rev = "3cf34090a3db6bb64df2259e30021db7ff5d9595";
-    hash = "sha256-2dz8GCzmyS8LkN1zzyCO8cn/NBKmPhIqFRfILc9/lVo=";
+    rev = "9e4b9ddef5b6a4371594ec978cb4b8088bec845d";
+    hash = "sha256-q03UUW5fJPLd6UicH+q2KEC9sx3Ph64ebzi4sxW4+rg=";
   };
 
-  vendorHash = "sha256-H9aP7PGzq5gmFvlYrkrOFfqCSdlpoQkIkTwKMgwr2hs=";
+  vendorHash = "sha256-qGQpf0T1qBcu+25VF2xnbvImj+Fs81Ru9tho/0RJwzo=";
 
   passthru.updateScript = writeShellScript "update-goperf" ''
     export UPDATE_NIX_ATTR_PATH=goperf

From 7857fe928d52adb029a0f69023912c3f23ccf209 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rebeccat@mercury.com>
Date: Tue, 16 Jun 2026 10:39:56 -0700
Subject: [PATCH 307/339] python3Packages.git-revise: fix `meta.changelog`

The `${version}` includes an `-unstable` suffix, so it didn't resolve in
the repo.

See:
- #514132
---
 pkgs/development/python-modules/git-revise/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix
index b7c099dd5b8b..afd01dcad68c 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/pkgs/development/python-modules/git-revise/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Efficiently update, split, and rearrange git commits";
     homepage = "https://github.com/mystor/git-revise";
-    changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/mystor/git-revise/blob/main/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "git-revise";
     maintainers = with lib.maintainers; [ _9999years ];

From 96402cbd9bbf1d49e0ab0665fa4cae44a3d69b41 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rebeccat@mercury.com>
Date: Tue, 16 Jun 2026 10:39:56 -0700
Subject: [PATCH 308/339] python3Packages.git-revise: Remove redundant `rec`

After pointing the `meta.changelog` attr to the `CHANGELOG.md` on
`main`, the `rec` isn't used for anything.
---
 pkgs/development/python-modules/git-revise/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix
index afd01dcad68c..12cc6f7e715a 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/pkgs/development/python-modules/git-revise/default.nix
@@ -8,7 +8,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "git-revise";
   version = "0.7.0-unstable-2025-01-28";
   format = "setuptools";

From 0c9300243bbf49cc201db73d36e2ff72bc34a659 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 16 Jun 2026 16:07:51 +0000
Subject: [PATCH 309/339] python3Packages.correctionlib: 2.8.0 -> 2.9.0

Diff: https://github.com/cms-nanoAOD/correctionlib/compare/v2.8.0...v2.9.0

Changelog: https://github.com/cms-nanoAOD/correctionlib/releases/tag/v2.9.0
---
 .../python-modules/correctionlib/default.nix  | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index ca0d6a987256..b5e79d0e1a0b 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -13,6 +14,8 @@
   ninja,
 
   # buildInputs
+  boost,
+  eigen,
   zlib,
 
   # dependencies
@@ -30,19 +33,29 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "correctionlib";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "cms-nanoAOD";
     repo = "correctionlib";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-zIKxMulID6JomaSDuI57cHA7xAZIfGBOOYCKS7Xrkaw=";
+    hash = "sha256-jxn5AYqHPtEPE9C5Gv9s556UH6KE1liC8JDw00vMaLg=";
   };
 
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail "-Wall -Wextra -Wpedantic -Werror" ""
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        "-Wall -Wextra -Wpedantic -Werror" \
+        "" \
+      --replace-fail \
+        "set(BUILTIN_BOOST ON)" \
+        "set(BUILTIN_BOOST OFF)" \
+      --replace-fail \
+        "set(BUILTIN_EIGEN ON)" \
+        "set(BUILTIN_EIGEN OFF)"
   '';
 
   build-system = [
@@ -57,7 +70,11 @@ buildPythonPackage (finalAttrs: {
   ];
   dontUseCmakeConfigure = true;
 
-  buildInputs = [ zlib ];
+  buildInputs = [
+    boost
+    eigen
+    zlib
+  ];
 
   dependencies = [
     numpy
@@ -66,6 +83,8 @@ buildPythonPackage (finalAttrs: {
     rich
   ];
 
+  pythonImportsCheck = [ "correctionlib" ];
+
   nativeCheckInputs = [
     # One test requires running the produced `correctionlib` binary
     addBinToPathHook
@@ -75,7 +94,10 @@ buildPythonPackage (finalAttrs: {
     scipy
   ];
 
-  pythonImportsCheck = [ "correctionlib" ];
+  disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [
+    # AssertionError: assert 0.9518682535564676 == 0.9518682535564679
+    "test_lwtnn_example"
+  ];
 
   meta = {
     description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis";

From 2fc7270138619914819dbdeb7696c8b1367b4501 Mon Sep 17 00:00:00 2001
From: FlameFlag <git@ps1.sh>
Date: Tue, 16 Jun 2026 20:49:20 +0300
Subject: [PATCH 310/339] stats: move a post-fixup comment

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

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 0da129d80fcb..4df7b9d1ab34 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -333,9 +333,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # Stats is an app bundle with nested frameworks, so sign the bundle to generate
+  # sealed resources instead of signing only the Mach-O files.
   postFixup = ''
-    # Stats is an app bundle with nested frameworks, so sign the bundle to
-    # generate sealed resources instead of signing only the Mach-O files
     ${lib.getExe rcodesign} sign "$out/Applications/Stats.app"
   '';
 

From fc4dd33f627b3101e31ada4d4ce4f5febe98d870 Mon Sep 17 00:00:00 2001
From: FlameFlag <git@ps1.sh>
Date: Mon, 8 Jun 2026 13:45:03 +0300
Subject: [PATCH 311/339] stats: 2.12.7 -> 3.0.3

---
 pkgs/by-name/st/stats/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 4df7b9d1ab34..0825a624f088 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -24,6 +24,7 @@ let
     "Bluetooth"
     "Sensors"
     "Clock"
+    "Remote"
   ];
   modules = lib.tail frameworks;
 
@@ -53,7 +54,7 @@ let
       # CFBundleVersion is extracted from upstream's Info.plist at build time
       Description = "Simple macOS system monitor in your menu bar";
       LSApplicationCategoryType = "public.app-category.utilities";
-      LSMinimumSystemVersion = "11.0";
+      LSMinimumSystemVersion = "12.0";
       LSUIElement = true;
       NSAppTransportSecurity = {
         NSAllowsArbitraryLoads = true;
@@ -67,13 +68,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.12.7";
+  version = "3.0.3";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "exelban";
     repo = "Stats";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qx4FI+MnFknIrTOPP+8wyy1wqFMWyaunmags023ay6A=";
+    hash = "sha256-HYuS0mFzzln+EjYUmQgjCPFsF4aGP+4QWalDL0vt3OA=";
   };
 
   nativeBuildInputs = [
@@ -204,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildFramework CPU "Modules/CPU/bridge.h" \
       -lKit -framework IOKit
 
-    buildFramework GPU "" \
+    buildFramework GPU "Modules/GPU/bridge.h" \
       -lKit -framework IOKit -framework Metal
 
     buildFramework RAM "" \
@@ -258,6 +262,9 @@ stdenv.mkDerivation (finalAttrs: {
     buildFramework Clock "" \
       -lKit
 
+    buildFramework Remote "" \
+      -lKit
+
     echo "=== Building Stats app ==="
 
     statsSwiftFiles=()
@@ -312,12 +319,6 @@ stdenv.mkDerivation (finalAttrs: {
       --app-icon AppIcon \
       "Stats/Supporting Files/Assets.xcassets"
 
-    actool \
-      --compile "$app/Contents/Frameworks/Kit.framework/Resources" \
-      --platform macosx \
-      --minimum-deployment-target 14.0 \
-      "Kit/Supporting Files/Assets.xcassets"
-
     # Copy localization files
     find "Stats/Supporting Files" -name '*.lproj' -type d -exec cp -r {} "$app/Contents/Resources/" \;
 

From 04f917691576210165bc7625375b7ffff417c26e Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 16 Jun 2026 20:02:53 +0200
Subject: [PATCH 312/339] nixos/release: remove tests.allDrivers

We discussed in #staging:nixos.org (Matrix) that the drivers itself are
helpful for development, but that executing them in Hydra don't provide
a benefit over executing the tests themself.
---
 nixos/release.nix | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index efc2570c5a70..baecebb63580 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -54,27 +54,6 @@ let
               ${system} = hydraJob test;
             }
         );
-    }
-    // {
-      # for typechecking of the scripts and evaluation of
-      # the nodes, without running VMs.
-      allDrivers = import ./tests/all-tests.nix {
-        inherit system;
-        pkgs = import ./.. { inherit system; };
-        callTest =
-          config:
-          let
-            inherit (config) driver;
-          in
-          lib.optionalAttrs (builtins.elem system (getPlatforms driver)) (
-            if attrNamesOnly then
-              hydraJob driver
-            else
-              {
-                ${system} = hydraJob driver;
-              }
-          );
-      };
     };
 
   allTests = foldAttrs recursiveUpdate { } (

From 9e0033270b0905f4905a6a24699008e2756332f7 Mon Sep 17 00:00:00 2001
From: Ian Mitchell <mitchell.ian.2001@gmail.com>
Date: Tue, 16 Jun 2026 14:29:33 -0400
Subject: [PATCH 313/339] sc3-plugins: add pretentiousUsername as maintainer

---
 .../interpreters/supercollider/plugins/sc3-plugins.nix        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
index f13f8feb1c17..6377ada48dca 100644
--- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
+++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
@@ -48,7 +48,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Community plugins for SuperCollider";
     homepage = "https://supercollider.github.io/sc3-plugins/";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      pretentiousUsername
+    ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };

From eedf730c91c967a81206137c3432bcfdcd3fe804 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 20:31:11 +0200
Subject: [PATCH 314/339] linja-sike: remove erroned attribute

---
 pkgs/by-name/li/linja-sike/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/li/linja-sike/package.nix b/pkgs/by-name/li/linja-sike/package.nix
index d92f4ce44ee9..f4fecd7b947a 100644
--- a/pkgs/by-name/li/linja-sike/package.nix
+++ b/pkgs/by-name/li/linja-sike/package.nix
@@ -18,8 +18,6 @@ stdenvNoCC.mkDerivation {
 
   __structuredAttrs = true;
 
-  stripDeps = true;
-
   postPatch = "cp $src linja-sike-5.otf";
 
   nativeBuildInputs = [ installFonts ];

From 70a7aec4935d6d610ca38f93ee1c77f2512c3766 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 18:32:17 +0000
Subject: [PATCH 315/339] snx-rs: 6.1.0 -> 6.1.1

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

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 1400702fb362..d48a683fc66c 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -15,13 +15,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "snx-rs";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WIaCvtlQ6iqc7LA8XRauwI3o5paGIDYqd5lANe5V6HA=";
+    hash = "sha256-64xwXC8s7BY8fzwrmpoF2sNqkknUj2AHLZprnuM1Be8=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-TwuaquPHlPJNn6JpMhyoqsqy7D64QHAqFdXXVjvxEck=";
+  cargoHash = "sha256-/SQBcItOANmqcCzZ5/uKcVYA9btDqzApHJRSNbDh/ws=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";

From 9e0b8c0431587c6fc10c075a7b4700f0f039ed6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 18:38:39 +0000
Subject: [PATCH 316/339] libretro.swanstation: 0-unstable-2026-05-20 ->
 0-unstable-2026-06-14

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

diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix
index 4c46caf841d1..13be1cc06c10 100644
--- a/pkgs/applications/emulators/libretro/cores/swanstation.nix
+++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2026-05-20";
+  version = "0-unstable-2026-06-14";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "62697276b95848bd35b9c7b81daab899a98e0789";
-    hash = "sha256-jisW5Mk5PF3rxj9mF5FJXtktAKEAq2a6DUvCXBgri3E=";
+    rev = "93b213d805591c4f1488339c4a16f0b4cb68d44a";
+    hash = "sha256-l4HhejwOKE/bk9HFf2mDTDqc223m6UofTIF+BgMIDEw=";
   };
 
   extraNativeBuildInputs = [ cmake ];

From ea65e705b5ff308ce3a06578286ad3bd050fe61e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 20:39:02 +0200
Subject: [PATCH 317/339] python3Packages.gekko: fix doCheck attribute

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

diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix
index 86117f7ded48..5f763a440a0f 100644
--- a/pkgs/development/python-modules/gekko/default.nix
+++ b/pkgs/development/python-modules/gekko/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   dependencies = [ numpy ];
 
   # Module has no tests
-  doCHeck = false;
+  doCheck = false;
 
   pythonImportsCheck = [ "gekko" ];
 

From f991be3ec90cb788507c662aeee9c43cd34e7132 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 20:44:57 +0200
Subject: [PATCH 318/339] re-Isearch: fix buildInputs attribute

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

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 03b6ffbc4fe6..be99cd7ee0a4 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ writableTmpDirAsHomeHook ];
 
-  buildinputs = [
+  buildInputs = [
     db
     file # libmagic
     libnsl

From 29c66c6eaac511679d7a70ffe96654c04a5f7dfd Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 15 Jun 2026 13:55:04 +0200
Subject: [PATCH 319/339] pkgs.formats.configobj: init

Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
---
 .../development/settings-options.section.md   |   8 ++
 pkgs/pkgs-lib/formats.nix                     |   2 +
 pkgs/pkgs-lib/formats/configobj/default.nix   |  36 ++++++
 pkgs/pkgs-lib/formats/configobj/generate.py   |   7 ++
 pkgs/pkgs-lib/tests/formats.nix               | 104 ++++++++++++++++++
 5 files changed, 157 insertions(+)
 create mode 100644 pkgs/pkgs-lib/formats/configobj/default.nix
 create mode 100644 pkgs/pkgs-lib/formats/configobj/generate.py

diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index f3257a56d71b..8675c1ef08a5 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -322,6 +322,14 @@ have a predefined type and string generator already declared under
 
     The attribute `lib.type.atom` contains the used INI atom.
 
+`pkgs.formats.configobj` { }
+
+:   A function taking an attribute set with values
+
+    It returns a set with [ConfigObj](https://pypi.org/project/configobj/)-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result).
+    The type of the input is an attribute mapping supporting both atoms and nested attribute sets (sections/subsections), as supported by ConfigObj.
+    The renderer is based on Python's `configobj` module.
+
 `pkgs.formats.iniWithGlobalSection` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. }
 
 :   A function taking an attribute set with values
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index e6806816d1c8..cd42759bdf98 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -131,6 +131,8 @@ optionalAttrs allowAliases aliases
 
   php = (import ./formats/php/default.nix { inherit lib pkgs; }).format;
 
+  configobj = (import ./formats/configobj/default.nix { inherit lib pkgs; }).format;
+
   json =
     { }:
     {
diff --git a/pkgs/pkgs-lib/formats/configobj/default.nix b/pkgs/pkgs-lib/formats/configobj/default.nix
new file mode 100644
index 000000000000..8179c4412e5f
--- /dev/null
+++ b/pkgs/pkgs-lib/formats/configobj/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  pkgs,
+}:
+let
+  inherit (lib)
+    toJSON
+    ;
+
+  inherit (lib.types)
+    serializableValueWith
+    ;
+in
+{
+  format =
+    { }:
+    {
+      type = serializableValueWith { typeName = "ConfigObj mapping"; };
+
+      generate =
+        name: value:
+        pkgs.runCommandLocal name
+          {
+            nativeBuildInputs = [
+              (pkgs.python3.withPackages (ps: [ ps.configobj ]))
+            ];
+
+            valuesJSON = toJSON value;
+            __structuredAttrs = true;
+            strictDeps = true;
+          }
+          ''
+            printf "%s" "$valuesJSON" | python3 ${./generate.py} > "$out"
+          '';
+    };
+}
diff --git a/pkgs/pkgs-lib/formats/configobj/generate.py b/pkgs/pkgs-lib/formats/configobj/generate.py
new file mode 100644
index 000000000000..5863396c120d
--- /dev/null
+++ b/pkgs/pkgs-lib/formats/configobj/generate.py
@@ -0,0 +1,7 @@
+import json
+import sys
+from configobj import ConfigObj
+
+config = ConfigObj(interpolation=False, encoding="UTF8")
+config.update(json.load(sys.stdin))
+config.write(sys.stdout.buffer)
diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index 7e3f6457588f..ee6d817287c2 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -229,6 +229,110 @@ runBuildTests {
     '';
   };
 
+  configobjAtoms = shouldPass {
+    format = formats.configobj { };
+    input = {
+      bool = true;
+      int = 10;
+      float = 3.141;
+      str = "string";
+    };
+    expected = ''
+      bool = True
+      float = 3.141
+      int = 10
+      str = string
+    '';
+  };
+
+  configobjListWithoutListToValue = shouldPass {
+    format = formats.configobj { };
+    input = {
+      items = [
+        1
+        true
+        "x"
+      ];
+    };
+    expected = ''
+      items = 1, True, x
+    '';
+  };
+
+  configobjNestedAttrsets = shouldPass {
+    format = formats.configobj { };
+    input = {
+      server = {
+        host = "127.0.0.1";
+        port = 8080;
+        enabled = true;
+        tags = [
+          "web"
+          "nix"
+          42
+        ];
+      };
+
+      logging = {
+        level = "info";
+        rotate = true;
+      };
+
+      interfaces = {
+        local = {
+          address = "123";
+          coin = {
+            foo = "bar";
+          };
+        };
+        remote = {
+          address = "456";
+        };
+      };
+    };
+    expected = ''
+      [interfaces]
+      [[local]]
+      address = 123
+      [[[coin]]]
+      foo = bar
+      [[remote]]
+      address = 456
+      [logging]
+      level = info
+      rotate = True
+      [server]
+      enabled = True
+      host = 127.0.0.1
+      port = 8080
+      tags = web, nix, 42
+    '';
+  };
+
+  configobjNullableValues = shouldPass {
+    format = formats.configobj { };
+    input = {
+      nullable = null;
+      nested = {
+        keep = "ok";
+        missing = null;
+      };
+    };
+    expected = ''
+      nullable = None
+      [nested]
+      keep = ok
+      missing = None
+    '';
+  };
+
+  configobjInvalidAtom = shouldFail {
+    format = formats.configobj { };
+    input = {
+      function = _: 1;
+    };
+  };
+
   iniInvalidAtom = shouldFail {
     format = formats.ini { };
     input = {

From 63357e1454343a5a3ae0ef8bf11693050787ad47 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 16 Jun 2026 12:05:44 -0700
Subject: [PATCH 320/339] python3Packages.aioopenssl: remove
 __darwinAllowLocalNetworking + typo

Not needed for build to work on aarch64-darwin.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/python-modules/aioopenssl/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioopenssl/default.nix b/pkgs/development/python-modules/aioopenssl/default.nix
index cb6336de2438..2079742d0e93 100644
--- a/pkgs/development/python-modules/aioopenssl/default.nix
+++ b/pkgs/development/python-modules/aioopenssl/default.nix
@@ -66,8 +66,6 @@ buildPythonPackage rec {
     "test_starttls"
   ];
 
-  __darwinAlowLocalNetworking = true;
-
   meta = {
     description = "TLS-capable transport using OpenSSL for asyncio";
     homepage = "https://github.com/horazont/aioopenssl";

From 098b37fb8f3055730b3a96d7ae206a3084f41e4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 19:13:41 +0000
Subject: [PATCH 321/339] burn-central-cli: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix
index 793b429274dc..0d0f2dc810f7 100644
--- a/pkgs/by-name/bu/burn-central-cli/package.nix
+++ b/pkgs/by-name/bu/burn-central-cli/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "burn-central-cli";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "tracel-ai";
     repo = "burn-central-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wXLfmCV6aElnYnhOCScr/3+4I6oOfNPrZ8+0t4TPDOA=";
+    hash = "sha256-1QXlN1cq5MKZAPgGx5mnf8Jy7o4CnKJDKi0sSith6n0=";
   };
 
   strictDeps = true;
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildAndTestSubdir = "crates/burn-central-cli";
 
-  cargoHash = "sha256-MeDIYFXkyJdxierq9iVIAvEIc8JU13szrbSTfKyUkJk=";
+  cargoHash = "sha256-c0DfH5wtm/aiK8Mcf7xqVqnFzByMKkbspF1reeGZNJw=";
 
   nativeBuildInputs = [
     pkg-config

From dc5302f4ea3147904cddc60c54ad49dd3be33590 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 16 Jun 2026 15:14:19 -0400
Subject: [PATCH 322/339] simple64: fix strictDeps typo, enable
 __structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/si/simple64/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix
index 49457d450826..c393ebb4a1b7 100644
--- a/pkgs/by-name/si/simple64/package.nix
+++ b/pkgs/by-name/si/simple64/package.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp ${cheats-json} cheats.json
   '';
 
-  stictDeps = true;
+  strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     qt6.wrapQtAppsHook

From 82326c7ffdedfb92e74046eb76ff0987d6c186a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 19:15:28 +0000
Subject: [PATCH 323/339] libretro.gambatte: 0-unstable-2026-06-05 ->
 0-unstable-2026-06-14

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

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index d72170bb68f0..a4b475e12d83 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-06-05";
+  version = "0-unstable-2026-06-14";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "6716e6ee39c2abd3ea325f66fb26e7f866f4c5dc";
-    hash = "sha256-sn8UWO1YR3qLpsR0dwpyy42L+QWrYpwO2lL4NqgUmWM=";
+    rev = "e99e1bd9b91de67ac12c77c3679c85447c26e8c8";
+    hash = "sha256-i5Bx5MstvwwKfH/Lmlj3jheQsbHP2BU8Ecpp3m5D8HA=";
   };
 
   meta = {

From be763e5ddd3ffde4f459444c371fb8d7b3fab7dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 19:18:47 +0000
Subject: [PATCH 324/339] rasm: 3.2.4bis -> 3.2.5

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

diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index dbbd77ca3183..998529d3e015 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rasm";
-  version = "3.2.4bis";
+  version = "3.2.5";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "EdouardBERGE";
     repo = "rasm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D9V9CqCCy0EYRIX0nr+kwxPH7W2KIIq67jabP7ZzETE=";
+    hash = "sha256-sLSODTaVxhybtkzRAjQw4bRSPhp9O69S5OzkEq/pK0M=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From c0d7252f6ba5f8552aed7a98e48477d5bc26d1c0 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 16 Jun 2026 22:10:16 +0200
Subject: [PATCH 325/339] luaPackages.kulala-nvim: init at 6.14.0-1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index d9e899ca2f45..1eaef0621fbd 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -35,6 +35,7 @@ haskell-tools.nvim,,,,,5.1,mrcjkb
 http,,,,0.4-0,,vcunat
 inspect,,,,,,
 jsregexp,,,,0.0.7-2,,
+kulala.nvim,,,,,,
 ldbus,,,https://luarocks.org/dev,,,
 ldoc,,,,,,
 lgi,,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 7059d3b6e6d4..f9d65d943136 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1312,6 +1312,38 @@ final: prev: {
     }
   ) { };
 
+  kulala-nvim = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+      luaOlder,
+      tree-sitter-kulala_http,
+    }:
+    buildLuarocksPackage {
+      pname = "kulala.nvim";
+      version = "6.14.0-1";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/kulala.nvim-6.14.0-1.rockspec";
+          sha256 = "05nj8yy1cqs2ybpx53zg06a4cisz5xwp8nir6p1vamnmmsj8xq06";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.14.0.zip";
+        sha256 = "1y8bbc3v9508pg500gx5vip5pd416zx4kkmsqfjjcnq86x8wsl7q";
+      };
+
+      disabled = luaOlder "5.1";
+      propagatedBuildInputs = [ tree-sitter-kulala_http ];
+
+      meta = {
+        homepage = "https://kulala.app/usage";
+        license = lib.licenses.mit;
+        description = "A fully-featured 🤏 HTTP/GraphQL/gRPC/Websocket-client 🐼 interface 🖥️ for Neovim ❤️, that supports the Jetbrains .http spec (with full scripting support).";
+      };
+    }
+  ) { };
+
   ldbus = callPackage (
     {
       buildLuarocksPackage,

From 7b2b40513cb1a9e0271e7fe4e2771e80e127728f Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 16 Jun 2026 22:12:03 +0200
Subject: [PATCH 326/339] vimPlugins.kulala-nvim: replace with lua package

---
 .../editors/vim/plugins/generated.nix         | 14 ---------
 .../editors/vim/plugins/luaPackagePlugins.nix |  1 +
 .../editors/vim/plugins/overrides.nix         |  4 ---
 .../kulala-nvim/do-not-install-grammar.patch  | 15 ----------
 .../use-packaged-tree-sitter-parser.patch     | 29 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  1 -
 6 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
 delete mode 100644 pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 85489fefd586..dc433b28353a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8458,20 +8458,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  kulala-nvim = buildVimPlugin {
-    pname = "kulala.nvim";
-    version = "6.11.1";
-    src = fetchFromGitHub {
-      owner = "mistweaverco";
-      repo = "kulala.nvim";
-      tag = "v6.11.1";
-      hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k=";
-    };
-    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
-    meta.license = getLicenseFromSpdxId "MIT";
-    meta.hydraPlatforms = [ ];
-  };
-
   lackluster-nvim = buildVimPlugin {
     pname = "lackluster.nvim";
     version = "0-unstable-2025-10-06";
diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
index b8c8dccb4960..5bac2daba0b2 100644
--- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
@@ -15,6 +15,7 @@ let
     "grug-far-nvim"
     "haskell-tools-nvim"
     "image-nvim"
+    "kulala-nvim"
     "lsp-progress-nvim"
     "lualine-nvim"
     "luasnip"
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 03edb8dac52b..63cf04e188fa 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2020,10 +2020,6 @@ assertNoAdditions {
       );
     in
     {
-      patches = (old.patches or [ ]) ++ [
-        ./patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
-      ];
-
       dependencies = [ kulala-http-grammar ];
 
       postPatch = ''
diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
deleted file mode 100644
index 00a76f9c0492..000000000000
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua
-index 7298f95..d781a12 100644
---- a/lua/kulala/config/init.lua
-+++ b/lua/kulala/config/init.lua
-@@ -122,6 +122,10 @@ local function setup_treesitter_master()
- end
- 
- local function set_kulala_parser()
-+  assert(vim.treesitter.language.add("kulala_http"))
-+  vim.treesitter.language.register("kulala_http", { "http", "rest" })
-+  do return end
-+
-   local parsers = vim.F.npcall(require, "nvim-treesitter.parsers")
- 
-   if not parsers then
diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
deleted file mode 100644
index d7bd71b2c4c6..000000000000
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/lua/kulala/config/parser.lua b/lua/kulala/config/parser.lua
-index 5f37046..c60c474 100644
---- a/lua/kulala/config/parser.lua
-+++ b/lua/kulala/config/parser.lua
-@@ -37,7 +37,6 @@ local function sync_queries()
- end
- 
- local function load_parser()
--  if not Fs.file_exists(parser_target_path) then return false end
-   return vim.treesitter.language.add(parser_name) == true
- end
- 
-@@ -48,7 +47,3 @@ M.register_parser = function()
--  -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/
--  vim.opt.rtp:prepend(parser_source_path)
--  ensure_site_rtp()
--  sync_queries()
-   vim.treesitter.language.register(parser_name, filetypes)
-   vim.treesitter.language.register("markdown", "kulala_ui")
-   local backend = require("kulala.backend")
-@@ -94,7 +92,7 @@ local function has_kulala_parser()
- end
- 
- M.is_up_to_date = function()
--  return has_kulala_parser() and is_parser_ver_current()
-+  return load_parser()
- end
- 
- M.setup = function()
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 97bcfcc72948..1ca54bd8537c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -602,7 +602,6 @@ https://github.com/frabjous/knap/,,
 https://github.com/oskarnurm/koda.nvim/,,
 https://github.com/b3nj5m1n/kommentary/,,
 https://github.com/udalov/kotlin-vim/,,
-https://github.com/mistweaverco/kulala.nvim/,,
 https://github.com/slugbyte/lackluster.nvim/,,
 https://github.com/qnighy/lalrpop.vim/,,
 https://github.com/Wansmer/langmapper.nvim/,,

From 763b4cc1777c3258e55516e045cfb57eaaf5f4e2 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 16 Jun 2026 13:24:14 -0700
Subject: [PATCH 327/339] python3Packages.pyobjus: fix __structuredAttrs typo

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/python-modules/pyobjus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyobjus/default.nix b/pkgs/development/python-modules/pyobjus/default.nix
index 7ad8bd677dd1..29438e2effd4 100644
--- a/pkgs/development/python-modules/pyobjus/default.nix
+++ b/pkgs/development/python-modules/pyobjus/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
   pname = "pyobjus";
   version = "1.2.4";
   pyproject = true;
-  __structureAttrs = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "kivy";

From a3414fc47ef83007c1b6ec0cf37a8f9f82f544fc Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 16 Jun 2026 22:26:46 +0200
Subject: [PATCH 328/339] doc: add note on adding a single Lua package

---
 doc/languages-frameworks/lua.section.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md
index 366f7a497fc8..97161970d8e4 100644
--- a/doc/languages-frameworks/lua.section.md
+++ b/doc/languages-frameworks/lua.section.md
@@ -162,6 +162,14 @@ the package `luarocks-packages-updater`:
 nix-shell -p luarocks-packages-updater --run luarocks-packages-updater
 ```
 
+To add a new package without updating all packages, run
+
+```sh
+
+nix-shell -p luarocks-packages-updater
+luarocks-packages-updater add <package-name>
+```
+
 [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
 The automation only goes so far though and some packages need to be customized.
 These customizations go in [pkgs/development/lua-modules/overrides.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/overrides.nix).

From 2c1393b50cc19ed15935df0368d11eb96af7dc72 Mon Sep 17 00:00:00 2001
From: Sergey Makarov <12733495+SeTSeR@users.noreply.github.com>
Date: Tue, 16 Jun 2026 23:31:06 +0300
Subject: [PATCH 329/339] far2l: add smakarov as maintainer

Signed-off-by: Sergey Makarov <12733495+SeTSeR@users.noreply.github.com>
---
 pkgs/by-name/fa/far2l/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 0288a3dfaa7c..ab3e3d2f5c9d 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -130,7 +130,10 @@ stdenv.mkDerivation rec {
     description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems";
     homepage = "https://github.com/elfmz/far2l";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ hypersw ];
+    maintainers = with lib.maintainers; [
+      hypersw
+      smakarov
+    ];
     platforms = lib.platforms.unix;
   };
 }

From 865a4dd05ceada5672a548fe935e8375b835e3e7 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 16 Jun 2026 22:37:24 +0200
Subject: [PATCH 330/339] doc: update outdated neovim-luarocks-based-plugins
 section

---
 doc/languages-frameworks/neovim.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md
index 6296a0389ec2..b131e65a0e59 100644
--- a/doc/languages-frameworks/neovim.section.md
+++ b/doc/languages-frameworks/neovim.section.md
@@ -151,6 +151,8 @@ For instance:
 ```
 To update these packages, you should use the lua updater rather than vim's.
 
+To add a lua package to the `vimPlugins` set, add it to the `luarocksPackageNames` list in [luaPackagePlugins.nix](https://github.com/nixos/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix).
+
 ## Treesitter {#neovim-plugin-treesitter}
 
 [Treesitter](https://tree-sitter.github.io/) provides syntax parsing for Neovim, enabling features like:

From 67623898740162b5b8ea830a1b2776762d64a34a Mon Sep 17 00:00:00 2001
From: Micha Ober <git@ober-mail.de>
Date: Tue, 16 Jun 2026 22:02:19 +0200
Subject: [PATCH 331/339] nixos/strichliste: fix typos in config keys

---
 .../modules/services/web-apps/strichliste.nix | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix
index e32a2a169169..44d0754460cc 100644
--- a/nixos/modules/services/web-apps/strichliste.nix
+++ b/nixos/modules/services/web-apps/strichliste.nix
@@ -128,21 +128,23 @@ in
           };
 
           account = {
-            lower = mkOption {
-              type = types.int;
-              default = -200000;
-              example = 0;
-              description = ''
-                The credit limit for user accounts.
-              '';
-            };
+            boundary = {
+              lower = mkOption {
+                type = types.int;
+                default = -200000;
+                example = 0;
+                description = ''
+                  The credit limit for user accounts.
+                '';
+              };
 
-            upper = mkOption {
-              type = types.ints.positive;
-              default = 200000;
-              description = ''
-                The maximum balance on a user account.
-              '';
+              upper = mkOption {
+                type = types.ints.positive;
+                default = 200000;
+                description = ''
+                  The maximum balance on a user account.
+                '';
+              };
             };
           };
 
@@ -256,7 +258,7 @@ in
               };
             };
 
-            transaction = {
+            transactions = {
               enabled = mkOption {
                 type = types.bool;
                 default = true;

From 2fec1f1b4d3094afc0b0a221d54abc4e91f920e8 Mon Sep 17 00:00:00 2001
From: Micha Ober <git@ober-mail.de>
Date: Tue, 16 Jun 2026 22:02:46 +0200
Subject: [PATCH 332/339] strichliste: enable strict validation of
 composer.json

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

diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix
index f81fceed7452..ca9221531e91 100644
--- a/pkgs/by-name/st/strichliste/package.nix
+++ b/pkgs/by-name/st/strichliste/package.nix
@@ -21,7 +21,7 @@ php.buildComposerProject2 (finalAttrs: {
   vendorHash = "sha256-PLq+XiZIJyyzVq+87timGO/jbPB4ZYQqSZilZMIE4Cw=";
   composerNoDev = true;
   composerNoPlugins = false;
-  composerStrictValidation = false;
+  composerStrictValidation = true;
 
   postPatch = ''
     substituteInPlace config/services.yaml \

From 6cec788e01436ad90abc2871dfc3d83d4db9e0bb Mon Sep 17 00:00:00 2001
From: Micha Ober <git@ober-mail.de>
Date: Tue, 16 Jun 2026 22:03:07 +0200
Subject: [PATCH 333/339] strichliste: use optimized autoloader

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

diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix
index ca9221531e91..03ce5c895245 100644
--- a/pkgs/by-name/st/strichliste/package.nix
+++ b/pkgs/by-name/st/strichliste/package.nix
@@ -28,6 +28,10 @@ php.buildComposerProject2 (finalAttrs: {
       --replace-fail "strichliste.yaml" "/etc/strichliste.yaml"
   '';
 
+  postBuild = ''
+    composer dump-autoload --optimize --no-dev --no-scripts --no-interaction --no-cache
+  '';
+
   postInstall = ''
     mkdir $out/bin
     ln -s $out/share/php/strichliste-backend/bin/console $out/bin/strichliste-console

From a17b5e97d4eb7f591ceeb3200221adc18cb36b85 Mon Sep 17 00:00:00 2001
From: Micha Ober <git@ober-mail.de>
Date: Tue, 16 Jun 2026 22:04:17 +0200
Subject: [PATCH 334/339] nixos/strichliste: fix stale cache on config change

---
 .../modules/services/web-apps/strichliste.nix | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix
index 44d0754460cc..8aa78f62bcd0 100644
--- a/nixos/modules/services/web-apps/strichliste.nix
+++ b/nixos/modules/services/web-apps/strichliste.nix
@@ -478,20 +478,15 @@ in
         inherit (cfg) environment;
         serviceConfig = {
           Type = "oneshot";
+          RemainAfterExit = true;
           User = "strichliste";
           Group = "strichliste";
           EnvironmentFile = cfg.environmentFiles;
-          ExecStart = map toString [
-            [
-              (lib.getExe cfg.packages.backend)
-              "cache:clear"
-            ]
-            [
-              (lib.getExe cfg.packages.backend)
-              "doctrine:migrations:migrate"
-              "--allow-no-migration"
-              "--no-interaction"
-            ]
+          ExecStart = toString [
+            (lib.getExe cfg.packages.backend)
+            "doctrine:migrations:migrate"
+            "--allow-no-migration"
+            "--no-interaction"
           ];
         };
       };
@@ -499,6 +494,11 @@ in
       systemd.services.phpfpm-strichliste = {
         inherit (cfg) environment;
         serviceConfig.EnvironmentFile = cfg.environmentFiles;
+        restartTriggers = [ settingsFile ];
+        preStart = toString [
+          (lib.getExe cfg.packages.backend)
+          "cache:clear"
+        ];
       };
 
       services.phpfpm.pools.strichliste = {

From 7c90e1c283e42e7cafeff1dafdc4b2def735e2f3 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Tue, 16 Jun 2026 20:39:28 +0300
Subject: [PATCH 335/339] rustfinity: 0.3.0 -> 0.4.9

---
 pkgs/by-name/ru/rustfinity/package.nix | 33 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix
index a73d835f43aa..e2a9cdc21077 100644
--- a/pkgs/by-name/ru/rustfinity/package.nix
+++ b/pkgs/by-name/ru/rustfinity/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchCrate,
   pkg-config,
@@ -8,32 +7,38 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustfinity";
-  version = "0.3.0";
+  version = "0.4.9";
+  __structuredAttrs = true;
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-5UhKL6lXli1mGorThv3SFclVKDATmxklZQ+S5hwqQgc=";
+    hash = "sha256-0xEVYHvVOugfE4mQxYt+U7AsejOxm/SnDV8HsmcZxBs=";
   };
 
-  cargoHash = "sha256-ZzVGr/Zj+WKKAUqJEbDZgEL7fHzRiI/aSF6e5sLZY+o=";
+  cargoHash = "sha256-Zc3m+hTotgCqBguUB/KM4BtGsdD4W5MR/ZBg2X/0nNk=";
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
 
   env.OPENSSL_NO_VENDOR = 1;
 
-  # Requires network and fs access
-  checkFlags = [
-    "--skip=challenge::tests::test_challenge_exists"
-    "--skip=crates_io::tests::test_get_latest_version"
-    "--skip=dir::tests::test_get_current_dir"
-    "--skip=download::tests::download_file::test_downloads_file"
-    "--skip=download::tests::download_file::test_renames_starter"
+  # Fail to run in sandbox environment
+  checkFlags = map (t: "--skip=${t}") [
+    "challenge::tests::test_challenge_exists"
+    "crates_io::tests::test_get_latest_version"
+    "dir::tests::test_get_current_dir"
+    "download::tests::download_file::test_downloads_file"
+    "download::tests::download_file::test_renames_starter"
   ];
 
   meta = {
     description = "CLI for Rustfinity challenges solving";
-    homepage = "https://github.com/dcodesdev/rustfinity.com/tree/main/crates/cli";
+    homepage = "https://github.com/rustfinity/rustfinity/tree/main/crates/cli";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "rustfinity";

From 3b573ba6536e71e2acf22bee96aa8eea47968336 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Tue, 16 Jun 2026 22:34:44 +0300
Subject: [PATCH 336/339] sampo: 0.17.4 -> 0.18.0

---
 pkgs/by-name/sa/sampo/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix
index 37e2834096c2..d88d26101e3e 100644
--- a/pkgs/by-name/sa/sampo/package.nix
+++ b/pkgs/by-name/sa/sampo/package.nix
@@ -9,21 +9,22 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sampo";
-  version = "0.17.4";
+  version = "0.18.0";
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bruits";
     repo = "sampo";
-    tag = "sampo-v${finalAttrs.version}";
-    hash = "sha256-P+CekuDM3u+iG2HmCNWxZoTCaKtAUMnrNre4zeGNPrQ=";
+    tag = "cargo-sampo-v${finalAttrs.version}";
+    hash = "sha256-LPgY/UA2AF871bid8wqxzIhTDnsHsQ7IhY/eNYE6Npk=";
   };
 
+  cargoHash = "sha256-U52xGXJlz7cM1fJWZMp51iNgYQRA8AKJ0OkbxlAB5C8=";
+
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ];
 
-  cargoHash = "sha256-udMpH0LWNqPTORSb1/c686stgvti5shx/O9rcH7YZNs=";
-
   cargoBuildFlags = [
     "-p"
     "sampo"
@@ -35,12 +36,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=sampo-v([0-9\\.]*)" ]; };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=cargo-sampo-v([0-9\\.]*)" ];
+  };
 
   meta = {
     description = "Automate changelogs, versioning, and publishing—even for monorepos across multiple package registries";
     homepage = "https://github.com/bruits/sampo";
-    changelog = "https://github.com/bruits/sampo/blob/sampo-v${finalAttrs.version}/crates/sampo/CHANGELOG.md";
+    changelog = "https://github.com/bruits/sampo/blob/${finalAttrs.src.tag}/crates/sampo/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "sampo";

From 917d02a40568b3da36e0f08795852d91d6e8c3a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Jun 2026 17:41:54 +0200
Subject: [PATCH 337/339] metasploit: 6.1.131 -> 6.4.138

---
 pkgs/tools/security/metasploit/Gemfile      |   3 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 111 ++++++++--------
 pkgs/tools/security/metasploit/default.nix  |   4 +-
 pkgs/tools/security/metasploit/gemset.nix   | 134 ++++++++++----------
 pkgs/tools/security/metasploit/update.sh    |   5 +-
 5 files changed, 133 insertions(+), 124 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index d585c9aa8529..2ec782aa8ee7 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.131"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.138"
 
+gem "getoptlong"
 gem "syslog", "~> 0.3.0"
 gem 'mini_portile2', '~> 2.8.0'
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 67268ea9ea24..1b52846420a0 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 69fa9eb257ea532c8e0f6ecd545b7e1257d42899
-  ref: refs/tags/6.4.131
+  revision: 3c697125a820552a1d5f9e2a75c05c18dc9c53bb
+  ref: refs/tags/6.4.138
   specs:
-    metasploit-framework (6.4.131)
+    metasploit-framework (6.4.138)
       aarch64
       abbrev
       actionpack (~> 7.2.0)
@@ -75,7 +75,7 @@ GIT
       pdf-reader
       pg
       puma
-      rack (~> 2.2)
+      rack (~> 3.1)
       railties
       rasn1 (= 0.14.0)
       rb-readline
@@ -105,16 +105,16 @@ GIT
       rinda
       ruby-macho
       ruby-mysql
-      ruby_smb (~> 3.3.17)
+      ruby_smb (~> 3.3.19)
       rubyntlm
       rubyzip
-      sinatra (~> 3.2)
+      sinatra (~> 4.1)
       sqlite3 (= 1.7.3)
       sshkey
       stringio (= 3.1.1)
       swagger-blocks
       syslog
-      thin (~> 1.x)
+      thin (~> 2.0)
       tzinfo
       tzinfo-data
       unix-crypt
@@ -175,8 +175,8 @@ GEM
     arel-helpers (2.17.0)
       activerecord (>= 3.1.0)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1245.0)
-    aws-sdk-core (3.246.0)
+    aws-partitions (1.1260.0)
+    aws-sdk-core (3.252.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -184,24 +184,24 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.614.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-ec2 (1.623.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ec2instanceconnect (1.70.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-ec2instanceconnect (1.73.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.143.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-iam (1.148.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.124.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-kms (1.129.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-s3 (1.225.1)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ssm (1.212.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-ssm (1.216.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -211,7 +211,7 @@ GEM
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     bindata (2.4.15)
-    bootsnap (1.24.3)
+    bootsnap (1.24.6)
       msgpack (~> 1.2)
     bson (5.2.0)
     builder (3.3.0)
@@ -247,11 +247,11 @@ GEM
     eventmachine (1.2.7)
     faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.1)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.4)
       net-http (~> 0.5)
     faraday-retry (2.4.0)
       faraday (~> 2.0)
@@ -291,7 +291,7 @@ GEM
     jmespath (1.6.2)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.19.5)
+    json (2.19.9)
     json-schema (6.2.0)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
@@ -306,7 +306,7 @@ GEM
     lru_redux (1.1.0)
     mcp (0.13.0)
       json-schema (>= 4.1)
-    metasm (1.0.5)
+    metasm (1.0.6)
     metasploit-concern (5.0.6)
       activemodel (>= 7.0, < 8.1)
       activesupport (>= 7.0, < 8.1)
@@ -314,7 +314,7 @@ GEM
       mutex_m
       railties (>= 7.0, < 8.1)
       zeitwerk
-    metasploit-credential (6.0.23)
+    metasploit-credential (6.0.26)
       bigdecimal
       csv
       drb
@@ -327,7 +327,7 @@ GEM
       railties
       rex-socket
       rubyntlm
-      rubyzip (< 3.0.0)
+      rubyzip (>= 3.1.1, < 4.0)
     metasploit-model (5.0.5)
       activemodel (>= 7.0, < 8.1)
       activesupport (>= 7.0, < 8.1)
@@ -365,7 +365,7 @@ GEM
     nessus_rest (0.1.6)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-ldap (0.20.0)
@@ -390,7 +390,7 @@ GEM
     octokit (10.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    openssl (3.3.2)
+    openssl (3.3.3)
     openssl-ccm (1.3.0)
       openssl (~> 3.0)
     openssl-cmac (2.1.0)
@@ -413,24 +413,25 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
-    psych (5.3.1)
+    psych (5.4.0)
       date
       stringio
     public_suffix (7.0.5)
-    puma (8.0.1)
+    puma (8.0.2)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.23)
-    rack-protection (3.2.0)
+    rack (3.2.6)
+    rack-protection (4.2.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
+    rackup (2.3.1)
+      rack (>= 3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -456,7 +457,7 @@ GEM
       erb
       psych (>= 4.0.0)
       tsort
-    recog (3.1.26)
+    recog (3.1.29)
       nokogiri
     redcarpet (3.6.1)
     reline (0.6.3)
@@ -466,7 +467,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rex-arch (0.1.19)
+    rex-arch (0.1.20)
       rex-text
     rex-bin_tools (0.1.16)
       metasm
@@ -509,7 +510,7 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.66)
+    rex-socket (0.1.67)
       dnsruby
       rex-core
     rex-sslscan (0.1.13)
@@ -517,7 +518,7 @@ GEM
       rex-socket
       rex-text
     rex-struct2 (0.1.5)
-    rex-text (0.2.62)
+    rex-text (0.2.64)
       bigdecimal
     rex-zip (0.1.6)
       rex-text
@@ -530,7 +531,7 @@ GEM
     ruby-macho (5.0.0)
     ruby-mysql (4.2.1)
     ruby-rc4 (0.1.5)
-    ruby_smb (3.3.19)
+    ruby_smb (3.3.21)
       bindata (= 2.4.15)
       openssl-ccm
       openssl-cmac
@@ -538,16 +539,18 @@ GEM
       windows_error (>= 0.1.4)
     rubyntlm (0.6.5)
       base64
-    rubyzip (2.4.1)
+    rubyzip (3.4.0)
     sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
     simpleidn (0.2.3)
-    sinatra (3.2.0)
+    sinatra (4.2.1)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.2.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.2.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
@@ -557,10 +560,11 @@ GEM
     swagger-blocks (3.0.0)
     syslog (0.3.0)
       logger
-    thin (1.8.2)
+    thin (2.0.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
+      logger
+      rack (>= 1, < 4)
     thor (1.5.0)
     tilt (2.7.0)
     timeout (0.6.1)
@@ -576,7 +580,7 @@ GEM
     warden (1.2.9)
       rack (>= 2.0.9)
     webrick (1.9.2)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.1)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -598,12 +602,13 @@ GEM
     xmlrpc (0.3.4)
       rexml
       webrick
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  getoptlong
   metasploit-framework!
   mini_portile2 (~> 2.8.0)
   syslog (~> 0.3.0)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 79373b655e7e..72b90c13cf11 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metasploit-framework";
-  version = "6.4.131";
+  version = "6.4.138";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     tag = finalAttrs.version;
-    hash = "sha256-7u03A8H5vLQXekVLQ6oQtLwC6SW0JLqk37GUyjgtiZU=";
+    hash = "sha256-T1wo7sBcUXdVfcd0ipgYgJaOPwk4YMch45fGBrZB4gs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 5ea6776a5ce2..b6f5bc69f171 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -124,80 +124,80 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ipmr7n0affhj0y08a049wyz3n480i92y2s49v6qgsxs86y02dbi";
+      sha256 = "0yik5fxc7cvz1qi5w1idim1d47wf110k3q1rix9jc081prwzynh4";
       type = "gem";
     };
-    version = "1.1245.0";
+    version = "1.1260.0";
   };
   aws-sdk-core = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6xqkipjli9vl40d4wqxcl7035lav9f9hnczilhwmj8i7n68f1r";
+      sha256 = "074awkbb7rs9332vvxifxndrjambxf1bkj8w8hwj5krazk5l5h09";
       type = "gem";
     };
-    version = "3.246.0";
+    version = "3.252.0";
   };
   aws-sdk-ec2 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qq191bqffds55aw0dpi7iyl9135p12gj52ianrkan4l5l0bmwkb";
+      sha256 = "1q7vdkpf7hdrmnmrzkzwp34rpn1w6d2r1ww8mb509kyknj0w4akc";
       type = "gem";
     };
-    version = "1.614.0";
+    version = "1.623.0";
   };
   aws-sdk-ec2instanceconnect = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ln5gqbni3z635k5fxvajn05mbx9j1i6qd20x7dblkxcryy7dmyi";
+      sha256 = "05y3jzikzlwmm6hgjm37xdgmy05nml5pv3vqj3v38s7lqibymca0";
       type = "gem";
     };
-    version = "1.70.0";
+    version = "1.73.0";
   };
   aws-sdk-iam = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14lhz5awd4g7nyaqq7vdigsw45r1vz7vbmkfhgp3946pxiib6cv5";
+      sha256 = "06pspb80vy866gy7qi9i10m2pf8kyljxqq4xhcq88pm2pi306d4y";
       type = "gem";
     };
-    version = "1.143.0";
+    version = "1.148.0";
   };
   aws-sdk-kms = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z7k84m1wqf2zra9pm5xb8lndwj6npfd02r743b9zr6p0svhml20";
+      sha256 = "0hrkb8ar61zgswz16rcf1x00n1liwn236lh5zpya9x11yf6m8grn";
       type = "gem";
     };
-    version = "1.124.0";
+    version = "1.129.0";
   };
   aws-sdk-s3 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z4cl87lbyw9qgp1l52sbjnysw63zmxih9wfhjfdvv67d9gdlzr3";
+      sha256 = "04k5wasssinx66vws2jn4vhzfisg30mkhbdmcs3m99dhp66kmcnl";
       type = "gem";
     };
-    version = "1.220.0";
+    version = "1.225.1";
   };
   aws-sdk-ssm = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nkv1vz1ziw7myj20cdvha0bw36ax3bw98bj8v8jkqzqhkkpq4w9";
+      sha256 = "0b5n97zwv8zj2rx392wplakgrh2z45npcwxllkjml0l3s4rv00vx";
       type = "gem";
     };
-    version = "1.212.0";
+    version = "1.216.0";
   };
   aws-sigv4 = {
     groups = [ "default" ];
@@ -274,10 +274,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1n6a9m8rb20yzb20w89fkjgggm2lzf1vl6ha5fjhlbvyb4h3vypp";
+      sha256 = "0jhnvalyqhjv10y2m804z2s9wabmys4a4di6187jjch3qy4an2y6";
       type = "gem";
     };
-    version = "1.24.3";
+    version = "1.24.6";
   };
   bson = {
     groups = [ "default" ];
@@ -504,20 +504,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
+      sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq";
       type = "gem";
     };
-    version = "2.14.1";
+    version = "2.14.3";
   };
   faraday-net_http = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
+      sha256 = "125m3qri52vwh5v9dhq0dkqxf8629cxrf99yyc01pva72wasyy0f";
       type = "gem";
     };
-    version = "3.4.2";
+    version = "3.4.4";
   };
   faraday-retry = {
     groups = [ "default" ];
@@ -744,10 +744,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0n9ch455pnvl9vxs2f3j77bpdmxg5g3mn3vyr9wxa0a87raii2i1";
+      sha256 = "16mp8vzgxa8nsa81np042za453j8b0ihpjkf666s7byxrnvjb44v";
       type = "gem";
     };
-    version = "2.19.5";
+    version = "2.19.9";
   };
   json-schema = {
     groups = [ "default" ];
@@ -824,10 +824,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dpjbkdvi4h6v0g01db7vlcsg15pfiyslkz3zd7wfk04yrc6g7wi";
+      sha256 = "1j6c64fnsifna8x7b6bcpb286fiiapn7fnqrc1zwpxjdw78fg1mg";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.0.6";
   };
   metasploit-concern = {
     groups = [ "default" ];
@@ -844,22 +844,22 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1czk0s3nrf0a2f72l1jg81fdi9a91bfw88m6y11xsm2g1wpw8x1f";
+      sha256 = "10gkaf04nbiya1rd2pxasap451sn91ykwn4ja3qa7sbpwhiavymy";
       type = "gem";
     };
-    version = "6.0.23";
+    version = "6.0.26";
   };
   metasploit-framework = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       fetchSubmodules = false;
-      rev = "69fa9eb257ea532c8e0f6ecd545b7e1257d42899";
-      sha256 = "15c95lwcm55ivyjbl95l4plh5g5l22m46js5g8bv9g7rq41kgvgf";
+      rev = "3c697125a820552a1d5f9e2a75c05c18dc9c53bb";
+      sha256 = "02z286v0dilpwchwfq1q14zqx5l032c8lx67gmapflawq3p2hp2g";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.4.131";
+    version = "6.4.138";
   };
   metasploit-model = {
     groups = [ "default" ];
@@ -1016,10 +1016,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ax0f0r97jm83q462vsrcbdxprs894fyyc44v62c48ihgb39hmcs";
+      sha256 = "03ga2h4i5hsk8pdlicyfvqfsbh55vrbikb0nkx9x7vx7fl6kdw19";
       type = "gem";
     };
-    version = "0.6.4";
+    version = "0.6.4.1";
   };
   net-ldap = {
     groups = [ "default" ];
@@ -1150,10 +1150,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz";
+      sha256 = "0dfkwb2n4l7wrcal4f8niadvphhi181jdf7s48qw31r9iw9h4sfl";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.3.3";
   };
   openssl-ccm = {
     groups = [ "default" ];
@@ -1290,10 +1290,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb";
+      sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql";
       type = "gem";
     };
-    version = "5.3.1";
+    version = "5.4.0";
   };
   public_suffix = {
     groups = [ "default" ];
@@ -1310,10 +1310,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z6k79ns8wgz12k3m2r0jc9ddiq6zh8imr4azg0ihmv50w6fb53v";
+      sha256 = "1yw6nvkvddriacmva8hm0za0961d6j96dm7zm6748rmyzcfqgvf8";
       type = "gem";
     };
-    version = "8.0.1";
+    version = "8.0.2";
   };
   racc = {
     groups = [ "default" ];
@@ -1330,30 +1330,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "175ni9qsai9x2ykwvdbd5dzfyncaxpyn6dhjxjw70iq60xz9vzm8";
+      sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy";
       type = "gem";
     };
-    version = "2.2.23";
+    version = "3.2.6";
   };
   rack-protection = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w";
+      sha256 = "1b4bamcbpk29i7jvly3i7ayfj69yc1g03gm4s7jgamccvx12hvng";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.2.1";
   };
   rack-session = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0";
+      sha256 = "1s7zcxlmg88a6dam4aqbgk9xkpy6dkdfqmmcszkkliy3q3w38m2r";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "2.1.2";
   };
   rack-test = {
     groups = [ "default" ];
@@ -1370,10 +1370,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jf2ncj2nx56vh96hh2nh6h4r530nccxh87z7c2f37wq515611ms";
+      sha256 = "0s48d2a0z5f0cg4npvzznf933vipi6j7gmk16yc913kpadkw4ybc";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "2.3.1";
   };
   rails-dom-testing = {
     groups = [ "default" ];
@@ -1450,10 +1450,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b7kx4d9gmifph452fflx0ddp1bns53sb4p3xp4qnaw0ix4s6wm7";
+      sha256 = "115v9cgqf7l66rybv9846dfhs0fma475jn8akcpxgb85wy1q4ma5";
       type = "gem";
     };
-    version = "3.1.26";
+    version = "3.1.29";
   };
   redcarpet = {
     groups = [ "default" ];
@@ -1490,10 +1490,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "080avj9lqd7pr3g3cfrs4sh22c2fadhzc4q72plfsh13cfgchflz";
+      sha256 = "0b9svs55zi4bi53wj792qc43d1gjn1p96sb36ikr7f4pfz13yry7";
       type = "gem";
     };
-    version = "0.1.19";
+    version = "0.1.20";
   };
   rex-bin_tools = {
     groups = [ "default" ];
@@ -1620,10 +1620,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qjvlk214vm2nj5kxw47iy595vai0pp9x4c5vns2nlllij21734x";
+      sha256 = "18khrgjlkzwy91jc67rparjw22jbf1p7wwk5qh8nm9i8nbzm5f54";
       type = "gem";
     };
-    version = "0.1.66";
+    version = "0.1.67";
   };
   rex-sslscan = {
     groups = [ "default" ];
@@ -1650,10 +1650,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0b3pr6v6b376ca40xsixbsg5qvnzkjsr3yqn9693gl0543dx2gp7";
+      sha256 = "0fbrnxsbrqvy799ppizyg9hdklml5j9mv7480lcnw4366a7mz0a5";
       type = "gem";
     };
-    version = "0.2.62";
+    version = "0.2.64";
   };
   rex-zip = {
     groups = [ "default" ];
@@ -1730,10 +1730,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14k7yqad3cbg82y6yl0xxdbkhq9abxa7knffn0xz3jk9vk7ql56v";
+      sha256 = "0v63xqvlkprvxmlwav43qlkdffvr4bbhk6im0978l9w5qyqd1fdn";
       type = "gem";
     };
-    version = "3.3.19";
+    version = "3.3.21";
   };
   rubyntlm = {
     groups = [ "default" ];
@@ -1750,10 +1750,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
+      sha256 = "0yzmmwya4zis5f7zkhhp8p92m1xh2sg6rlbnlhsvc0m3xg4rpqvd";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "3.4.0";
   };
   sawyer = {
     groups = [ "default" ];
@@ -1790,10 +1790,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf";
+      sha256 = "103h6wjpcqp3i034hi44za2v365yz7qk9s5df8lmasq43nqvkbmp";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.2.1";
   };
   sqlite3 = {
     groups = [ "default" ];
@@ -1860,10 +1860,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08g1yq6zzvgndj8fd98ah7pp8g2diw28p8bfjgv7rvjvp8d2am8w";
+      sha256 = "1sddrm5n8jfvyqcmfhxrif6jsp1vla4wv9sx9f3c7xbphdjfbgav";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "2.0.1";
   };
   thor = {
     groups = [ "default" ];
@@ -1990,10 +1990,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd";
+      sha256 = "15idgibqpdaj97f734drx8a7k1jcc8wvxlk2nbafac72ihikicjs";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
   };
   websocket-extensions = {
     groups = [ "default" ];
@@ -2060,9 +2060,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pbkiwwla5gldgb3saamn91058nl1sq1344l5k36xsh9ih995nnq";
+      sha256 = "04hx33lsnp4q0qf8982mz0acs1dap5s2bsmihi0n0g08249sc4kj";
       type = "gem";
     };
-    version = "2.7.5";
+    version = "2.8.2";
   };
 }
diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh
index 76d7cf0ca945..ccebeebf7742 100755
--- a/pkgs/tools/security/metasploit/update.sh
+++ b/pkgs/tools/security/metasploit/update.sh
@@ -4,11 +4,14 @@
 set -eu -o pipefail
 cd "$(dirname "$(readlink -f "$0")")"
 
-latest=$(curl https://github.com/rapid7/metasploit-framework/tags.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
+latest=$(curl -sL https://github.com/rapid7/metasploit-framework/tags.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
 echo "Updating metasploit to $latest"
 
 sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile
 
+# Remove stale bundler git cache so bundle lock fetches the updated tags
+find "${XDG_DATA_HOME:-$HOME/.local/share}/gem/ruby" -maxdepth 4 -type d -name "metasploit-framework-*" -exec rm -rf {} + 2>/dev/null || true
+
 BUNDLE_FORCE_RUBY_PLATFORM=true bundle lock --update
 bundix
 sed -i '/[ ]*dependencies =/d' gemset.nix

From 71f3d0fe9132a8cb7ded21ea5c0c286d159a1f5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 17 Jun 2026 01:09:02 +0200
Subject: [PATCH 338/339] python3Packages.css-inline: 0.20.2 -> 0.21.0

https://github.com/Stranger6667/css-inline/blob/python-v0.21.0/CHANGELOG.md
---
 .../python-modules/css-inline/Cargo.lock      | 235 +++++++++---------
 .../python-modules/css-inline/default.nix     |   6 +-
 2 files changed, 114 insertions(+), 127 deletions(-)

diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock
index c133908f899e..31deb8f6548a 100644
--- a/pkgs/development/python-modules/css-inline/Cargo.lock
+++ b/pkgs/development/python-modules/css-inline/Cargo.lock
@@ -25,9 +25,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base64"
@@ -37,9 +37,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 
 [[package]]
 name = "built"
@@ -53,9 +53,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.20.2"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "bytes"
@@ -77,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.58"
+version = "1.2.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
+checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -99,9 +99,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "num-traits",
@@ -141,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "css-inline"
-version = "0.20.2"
+version = "0.21.0"
 dependencies = [
  "cssparser",
  "html5ever",
@@ -157,7 +157,7 @@ dependencies = [
 
 [[package]]
 name = "css-inline-python"
-version = "0.20.2"
+version = "0.21.0"
 dependencies = [
  "built",
  "css-inline",
@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.36.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2"
+checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98"
 dependencies = [
  "cssparser-macros",
  "dtoa-short",
@@ -182,9 +182,9 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+checksum = "10a2a99df6e410a8ff4245aa2006499ea662245f967cc7c0a38c83ef8eb44dbf"
 dependencies = [
  "quote",
  "syn",
@@ -213,9 +213,9 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -239,9 +239,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "equivalent"
@@ -251,9 +251,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "find-msvc-tools"
@@ -354,9 +354,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -381,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
  "itoa",
@@ -420,9 +420,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -440,15 +440,14 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.7"
+version = "0.27.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
 dependencies = [
  "http",
  "hyper",
  "hyper-util",
  "rustls",
- "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service",
@@ -606,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -620,16 +619,6 @@ version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
-[[package]]
-name = "iri-string"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.18"
@@ -638,21 +627,20 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
  "cfg-if",
  "futures-util",
- "once_cell",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "litemap"
@@ -671,15 +659,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "lru"
-version = "0.16.3"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
+checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
 dependencies = [
  "hashbrown",
 ]
@@ -703,15 +691,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "mio"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
  "wasi",
@@ -868,9 +856,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
+checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c"
 dependencies = [
  "libc",
  "once_cell",
@@ -882,9 +870,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
+checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078"
 dependencies = [
  "target-lexicon",
 ]
@@ -897,9 +885,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690"
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
+checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -907,9 +895,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
+checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -919,13 +907,12 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
+checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn",
 ]
@@ -1002,9 +989,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -1031,9 +1018,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -1129,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.37"
+version = "0.23.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
+checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
 dependencies = [
  "once_cell",
  "ring",
@@ -1143,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
  "web-time",
  "zeroize",
@@ -1153,9 +1140,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.10"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1182,9 +1169,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "selectors"
-version = "0.36.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
+checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d"
 dependencies = [
  "bitflags",
  "cssparser",
@@ -1201,9 +1188,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 dependencies = [
  "serde",
  "serde_core",
@@ -1241,9 +1228,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
  "memchr",
@@ -1284,15 +1271,15 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "siphasher"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "slab"
@@ -1302,15 +1289,15 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -1354,9 +1341,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1446,9 +1433,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.50.0"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -1526,20 +1513,20 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
  "bitflags",
  "bytes",
  "futures-util",
  "http",
  "http-body",
- "iri-string",
  "pin-project-lite",
  "tower",
  "tower-layer",
  "tower-service",
+ "url",
 ]
 
 [[package]]
@@ -1641,9 +1628,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -1654,9 +1641,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1664,9 +1651,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1674,9 +1661,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -1687,18 +1674,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.94"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1716,9 +1703,9 @@ dependencies = [
 
 [[package]]
 name = "web_atoms"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576"
+checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538"
 dependencies = [
  "phf",
  "phf_codegen",
@@ -1728,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
+checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -1973,9 +1960,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "yoke"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -1996,18 +1983,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.48"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.48"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2016,9 +2003,9 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
@@ -2037,9 +2024,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
 
 [[package]]
 name = "zerotrie"
diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix
index 3cc64092fe69..4de308eaf582 100644
--- a/pkgs/development/python-modules/css-inline/default.nix
+++ b/pkgs/development/python-modules/css-inline/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "css-inline";
-  version = "0.20.2";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "css-inline";
     rev = "python-v${version}";
-    hash = "sha256-tJEeYvM7T2Lerz5SYpQTuuMoHS6obiMuFexfN8+quHc=";
+    hash = "sha256-hXrcomE//BScA395zXSKQayeRn8G8ivfcIJkIKu+PUE=";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       cd bindings/python
       ln -s ${./Cargo.lock} Cargo.lock
     '';
-    hash = "sha256-sScfevpg/BZngzipANHxwIjqDsaBPF4xCSgJc5YR2gM=";
+    hash = "sha256-Nj7DA20qCvSQ6EhC6GO+25TBqPeAf3SV/gmpRISgWtM=";
   };
 
   nativeBuildInputs = [

From c014c14d2481a7a00e985ecb2b315cd4510e9c4a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 16 Jun 2026 19:11:18 -0400
Subject: [PATCH 339/339] google-chrome: 149.0.7827.114 -> 149.0.7827.155

Announcement: https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop_01750511403.html
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 92004e0cdb4c..4bc1561e336c 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -179,11 +179,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "149.0.7827.114";
+    version = "149.0.7827.155";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-GVvehY+e5thM3nHYMQd/uI8HTnjvL/w8UeRpUWouzlA=";
+      hash = "sha256-g0PHfyCIpOQ2bw3+Tmiu+jt+eTJs0so71+tjxhHwZVY=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -289,11 +289,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "149.0.7827.115";
+    version = "149.0.7827.156";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/ny2unjynyv52nhojnzjueghuma_149.0.7827.115/GoogleChrome-149.0.7827.115.dmg";
-      hash = "sha256-q1jMxveB5FFA+wA5a5mnSPWoQFkNHQ20x51R8A/yUsk=";
+      url = "http://dl.google.com/release2/chrome/acfqxa67egsofsrqnco2a4sd4pta_149.0.7827.156/GoogleChrome-149.0.7827.156.dmg";
+      hash = "sha256-fd7IqNxvaMO28Yhlc4gk8M+P7Sq+ZrplRXbnrxPDcvw=";
     };
 
     dontPatch = true;