From d7b5e1a95a54abc72005bd45ea55b774cae20d81 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Thu, 23 Jan 2025 16:50:30 +0100
Subject: [PATCH 001/111] wire-desktop: Add versions.json to enable
 updateScript

---
 pkgs/by-name/wi/wire-desktop/package.nix   | 20 ++++++++------------
 pkgs/by-name/wi/wire-desktop/versions.json | 10 ++++++++++
 2 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/by-name/wi/wire-desktop/versions.json

diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index 0f89a5bb4881..e3138a19d99a 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -26,25 +26,21 @@ let
 
   pname = "wire-desktop";
 
+  versions = builtins.fromJSON (builtins.readFile ./versions.json);
+
   version =
-    let
-      x86_64-darwin = "3.39.5211";
-    in
     {
-      inherit x86_64-darwin;
-      aarch64-darwin = x86_64-darwin;
-      x86_64-linux = "3.39.3653";
+      x86_64-darwin = versions.macos.version;
+      aarch64-darwin = versions.macos.version;
+      x86_64-linux = versions.linux.version;
     }
     .${system} or throwSystem;
 
   hash =
-    let
-      x86_64-darwin = "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY=";
-    in
     {
-      inherit x86_64-darwin;
-      aarch64-darwin = x86_64-darwin;
-      x86_64-linux = "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls=";
+      x86_64-darwin = versions.macos.hash;
+      aarch64-darwin = versions.macos.hash;
+      x86_64-linux = versions.linux.hash;
     }
     .${system} or throwSystem;
 
diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json
new file mode 100644
index 000000000000..c346a28aa85f
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/versions.json
@@ -0,0 +1,10 @@
+{
+  "linux": {
+    "version": "3.39.3653",
+    "hash": "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls="
+  },
+  "macos": {
+    "version": "3.39.5211",
+    "hash": "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY="
+  }
+}

From cf36c820c542b992f0635435b34b5ce516fd5cfa Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 31 Dec 2024 14:01:07 +0100
Subject: [PATCH 002/111] wire-desktop: Add updateScript

---
 pkgs/by-name/wi/wire-desktop/package.nix | 22 +++++-
 pkgs/by-name/wi/wire-desktop/update.sh   | 86 ++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/wi/wire-desktop/update.sh

diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index e3138a19d99a..d7092b4afeca 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -71,8 +71,21 @@ let
     hydraPlatforms = [ ];
   };
 
+  passthru.updateScript = {
+    command = [
+      ./update.sh
+      ./.
+    ];
+    supportedFeatures = [ "commit" ];
+  };
+
   linux = stdenv.mkDerivation rec {
-    inherit pname version meta;
+    inherit
+      pname
+      version
+      meta
+      passthru
+      ;
 
     src = fetchurl {
       url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb";
@@ -147,7 +160,12 @@ let
   };
 
   darwin = stdenv.mkDerivation {
-    inherit pname version meta;
+    inherit
+      pname
+      version
+      meta
+      passthru
+      ;
 
     src = fetchurl {
       url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg";
diff --git a/pkgs/by-name/wi/wire-desktop/update.sh b/pkgs/by-name/wi/wire-desktop/update.sh
new file mode 100755
index 000000000000..baf3477b30b8
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/update.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq
+
+set -e
+
+cd $1
+
+releases=$(curl -L \
+  -H "Accept: application/vnd.github+json" \
+  -H "X-GitHub-Api-Version: 2022-11-28" \
+  "https://api.github.com/repos/wireapp/wire-desktop/releases" \
+)
+
+latest=$(jq --argjson suffix '{ "linux": ".deb", "macos": ".pkg" }' \
+  --slurpfile versions versions.json '
+  def platform_latest(platform):
+    map(select(.tag_name | startswith(platform)))
+    | max_by(.tag_name)
+    | { version: .tag_name | ltrimstr(platform + "/")
+      , url: .assets.[]
+             | .browser_download_url
+             | select(endswith($suffix.[platform]))
+      };
+
+  . as $releases
+  | $versions.[] as $old
+  | $old
+  | with_entries( .key as $key
+                  | { key: $key, value: $releases | platform_latest($key) }
+                  | select(.value.version != $old.[$key].version)
+                )
+' <<< "$releases"
+)
+
+urlHashes=$(
+  printf '{ '
+  function entries () {
+    local sep=''
+    for url in $(jq --raw-output '.[].url' <<< "$latest"); do
+      printf '%s"%s": "%s"\n' "$sep" "$url" \
+        "$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))"
+      sep=', '
+    done
+  }
+  entries
+  printf '}'
+)
+
+commit=$(jq --arg versionJSON "$(printf '%s/versions.json' "$1")" \
+  --slurpfile versions versions.json '
+  $versions.[] as $old
+  | to_entries
+  | map("\(.key) \($old.[.key].version) -> \(.value.version)")
+  | join(", ")
+  | [ if . == ""
+      then empty
+      else { attrPath: "wire-desktop"
+           , oldVersion: "A"
+           , newVersion: "B"
+           , files: [ $versionJSON ]
+           , commitMessage: "wire-desktop: \(.)"
+           }
+      end
+    ]
+' <<< "$latest"
+)
+
+tempfile=$(mktemp)
+
+updated=$(jq --argjson hashes "$urlHashes" --slurpfile versions versions.json '
+  $versions.[] as $old
+  | $old + map_values(with_entries(if .key == "url"
+                                   then { key: "hash"
+                                        , value: $hashes.[.value]
+                                        }
+                                   else .
+                                   end
+                                  )
+                     )
+' <<< "$latest" > $tempfile
+)
+
+mv $tempfile versions.json
+
+printf '%s' "$commit"
+exit 0

From f17eea9f30683576834589fe6bd6e396a687f90e Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Thu, 9 Jan 2025 14:57:24 +0100
Subject: [PATCH 003/111] wire-desktop: Add empty hash check

---
 pkgs/by-name/wi/wire-desktop/update.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wi/wire-desktop/update.sh b/pkgs/by-name/wi/wire-desktop/update.sh
index baf3477b30b8..65fb554d6aab 100755
--- a/pkgs/by-name/wi/wire-desktop/update.sh
+++ b/pkgs/by-name/wi/wire-desktop/update.sh
@@ -37,8 +37,11 @@ urlHashes=$(
   function entries () {
     local sep=''
     for url in $(jq --raw-output '.[].url' <<< "$latest"); do
-      printf '%s"%s": "%s"\n' "$sep" "$url" \
-        "$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))"
+      hash=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))
+      if [ -z "$hash" ]; then
+        printf 'Failed to retrieve hash for %s\n' "$url" 2>&1
+      fi
+      printf '%s"%s": "%s"\n' "$sep" "$url" "$hash"
       sep=', '
     done
   }

From 5d21839349aebbbd71b611cbaa485d94284186f6 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 15 Apr 2025 16:58:08 +0000
Subject: [PATCH 004/111] wire-desktop: linux 3.39.3653 -> 3.40.3718, macos
 3.39.5211 -> 3.40.5285

---
 pkgs/by-name/wi/wire-desktop/versions.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json
index c346a28aa85f..3ef3c71d0589 100644
--- a/pkgs/by-name/wi/wire-desktop/versions.json
+++ b/pkgs/by-name/wi/wire-desktop/versions.json
@@ -1,10 +1,10 @@
 {
   "linux": {
-    "version": "3.39.3653",
-    "hash": "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls="
+    "version": "3.40.3718",
+    "hash": "sha256-1jBhF+Rnys8C3DaVbCKHDiylox2WG1qRvwnDbQrp1Mk="
   },
   "macos": {
-    "version": "3.39.5211",
-    "hash": "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY="
+    "version": "3.40.5285",
+    "hash": "sha256-pcWB3irdPyDj55dWmNyc+oThVGgHtIu//EAk1k/56is="
   }
 }

From 15a8c6739ace8be4ff2d1c3fe43dcb3af337e2f9 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sun, 29 Jun 2025 17:32:02 +0900
Subject: [PATCH 005/111] git-lfs: 3.6.1 -> 3.7.0

https://github.com/git-lfs/git-lfs/releases/tag/v3.7.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/gi/git-lfs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix
index 42d7b2b17abc..c834a9851eb6 100644
--- a/pkgs/by-name/gi/git-lfs/package.nix
+++ b/pkgs/by-name/gi/git-lfs/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "git-lfs";
-  version = "3.6.1";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "git-lfs";
     repo = "git-lfs";
     tag = "v${version}";
-    hash = "sha256-zZ9VYWVV+8G3gojj1m74syvsYM1mX0YT4hKnpkdMAQk=";
+    hash = "sha256-EFuuyD83aYe6XMKbRfAykVMfGFOQ4I6ORvMRm0Q8vfM=";
   };
 
-  vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0=";
+  vendorHash = "sha256-6H0KpLin+DqwEg5bdzaxj2CoNSneZ/ET43MTrrdF3h8=";
 
   nativeBuildInputs = [
     asciidoctor

From cea6d77f662d2b06b714c44d5df4a7eae7df9ed7 Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Fri, 4 Jul 2025 13:59:34 -0700
Subject: [PATCH 006/111] _1password-gui{,-beta}: Re-enable Wayland support

- Gate Electron's Ozone platform hint behind NIXOS_OZONE_WL env var.
- No need to gate on WAYLAND_DISPLAY because Electron will first check
  XDG_SESSION_TYPE==wayland [^1], if it fails, then it will check for
  WAYLAND_DISPLAY[^2], even setting it to `wayland-0` if it finds a
  `wayland-0` socket under $XDG_SESSION_DIR.
- No need to restore `--enable-features=WaylandWindowDecorations` switch
  as it's been enabled by default since Aug 2023.
  https://github.com/electron/electron/pull/39644/files
- No point in passing --enable-wayland-ime=true, which requires GTK4
  but 1Password ships linking only against GTK3.

[^1] linux/display_server_utils.cc:MaybeFixPlatformName - https://source.chromium.org/chromium/chromium/src/+/main:ui/linux/display_server_utils.cc;l=72-74;drc=3a35ef8d20836722c95b230f7248c73faea599e7;bpv=0;bpt=1
[^2] linux/display_server_utils.cc:InspectWaylandDisplay - https://source.chromium.org/chromium/chromium/src/+/main:ui/linux/display_server_utils.cc;l=34-51;drc=3a35ef8d20836722c95b230f7248c73faea599e7;bpv=1;bpt=1
---
 pkgs/by-name/_1/_1password-gui/linux.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix
index 03fec5bd4922..009608d5f77e 100644
--- a/pkgs/by-name/_1/_1password-gui/linux.nix
+++ b/pkgs/by-name/_1/_1password-gui/linux.nix
@@ -146,12 +146,8 @@ stdenv.mkDerivation {
     makeShellWrapper $out/share/1password/1password $out/bin/1password \
       "''${gappsWrapperArgs[@]}" \
       --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
-      # Currently half broken on wayland (e.g. no copy functionality)
-      # See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406
-      # Remove this comment when upstream fixes:
-      # https://1password.community/discussion/comment/624011/#Comment_624011
-      #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} \
+      --add-flags "\''${NIXOS_OZONE_WL:+--ozone-platform-hint=auto}"
   '';
 
   passthru.updateScript = ./update.sh;

From bfce999b9d397a87db0d403b767e0380bf72f5a8 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sat, 16 Aug 2025 21:14:55 +0200
Subject: [PATCH 007/111] handheld-daemon: Fix chmod path in udev rules

---
 pkgs/by-name/ha/handheld-daemon/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index a85dc8fdf190..4c06d473ee3e 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -70,6 +70,9 @@ python3Packages.buildPythonApplication rec {
 
     substituteInPlace src/hhd/plugins/plugin.py \
       --replace-fail '"id"' '"${lib.getExe' coreutils "id"}"'
+
+    substituteInPlace usr/lib/udev/rules.d/83-hhd.rules \
+      --replace-fail '/bin/chmod' '${lib.getExe' coreutils "chmod"}'
   '';
 
   build-system = with python3Packages; [
@@ -89,8 +92,8 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   postInstall = ''
-    install -Dm644 $src/usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
-    install -Dm644 $src/usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
+    install -Dm644 usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
+    install -Dm644 usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
   '';
 
   meta = {

From c5906cc638ac55d695a1872d71a49aea1c6a50f8 Mon Sep 17 00:00:00 2001
From: Rein <rein@rein.icu>
Date: Sun, 17 Aug 2025 22:47:08 +0200
Subject: [PATCH 008/111] maintainers: add rein

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 16e01024e300..bf48145227c4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21371,6 +21371,15 @@
     githubId = 337811;
     name = "Rehno Lindeque";
   };
+  rein = {
+    email = "rein@rein.icu";
+    github = "re1n0";
+    githubId = 227051429;
+    name = "rein";
+    keys = [
+      { fingerprint = "66A8 1706 2227 9BD9 586A  CEDD 5B29 A881 3F47 65C4"; }
+    ];
+  };
   relrod = {
     email = "ricky@elrod.me";
     github = "relrod";

From 62674262590cc7b17b56e5f08ee6a52899a44616 Mon Sep 17 00:00:00 2001
From: Rein <rein@rein.icu>
Date: Sun, 17 Aug 2025 22:47:42 +0200
Subject: [PATCH 009/111] tukai: init at 0.2.3

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

diff --git a/pkgs/by-name/tu/tukai/package.nix b/pkgs/by-name/tu/tukai/package.nix
new file mode 100644
index 000000000000..580514d0333d
--- /dev/null
+++ b/pkgs/by-name/tu/tukai/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  writableTmpDirAsHomeHook,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tukai";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "hlsxx";
+    repo = "tukai";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YJtna4NIk9mmwymepFSZB8viUSPDU4XouRE5GCujSmk=";
+  };
+
+  cargoHash = "sha256-1V1DrewPGDJWmOoYdtK1HS/t83zFac/tgatfDTKxAmA=";
+
+  nativeBuildInputs = [
+    pkg-config
+    writableTmpDirAsHomeHook
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal-based touch typing application";
+    homepage = "https://github.com/hlsxx/tukai";
+    changelog = "https://github.com/hlsxx/tukai/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      rein
+    ];
+    mainProgram = "tukai";
+  };
+})

From 81b728b3eb6c9a03663ac98d0dee6df9a86cd6e5 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 01:46:37 -0400
Subject: [PATCH 010/111] virt-top: fix build for gettext 0.25

---
 pkgs/applications/virtualization/virt-top/default.nix  |  4 ++++
 .../virtualization/virt-top/gettext-0.25.patch         | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/virtualization/virt-top/gettext-0.25.patch

diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 732aa7d11b08..2a29b0db8b2a 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-C1a47pWtjb38bnwmZ2Zq7/LlW3+BF5BGNMRFi97/ngU=";
   };
 
+  patches = [
+    ./gettext-0.25.patch
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/virtualization/virt-top/gettext-0.25.patch b/pkgs/applications/virtualization/virt-top/gettext-0.25.patch
new file mode 100644
index 000000000000..476dbf7d722c
--- /dev/null
+++ b/pkgs/applications/virtualization/virt-top/gettext-0.25.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac.orig	2025-08-23 01:41:53
++++ b/configure.ac	2025-08-23 01:42:14
+@@ -123,6 +123,7 @@
+ 
+ dnl Check for gettext.
+ AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.25])
+ 
+ dnl Write gettext modules for the programs.
+ dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html

From 2cddeeb21195301e2d8c36a4b3dcbb2d1c5e60c7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 09:50:42 +0200
Subject: [PATCH 011/111] lxterminal: small cleanup

---
 pkgs/by-name/lx/lxterminal/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix
index 9fb97945ae4e..e698ad2c501a 100644
--- a/pkgs/by-name/lx/lxterminal/package.nix
+++ b/pkgs/by-name/lx/lxterminal/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  automake,
-  autoconf,
+  autoreconfHook,
   intltool,
   pkg-config,
   gtk3,
@@ -26,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "lxde";
     repo = "lxterminal";
     tag = finalAttrs.version;
-    sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";
+    hash = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";
   };
 
   configureFlags = [
@@ -35,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    automake
-    autoconf
+    autoreconfHook
     intltool
     pkg-config
     wrapGAppsHook3
@@ -57,10 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./respect-xml-catalog-files-var.patch
   ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
   doCheck = true;
 
   passthru.tests.test = nixosTests.terminal-emulators.lxterminal;

From ba6c6c9b05fe7b2776fb6615fde83946b9e972db Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 09:32:49 +0200
Subject: [PATCH 012/111] lxde.lxrandr: 0.3.2 -> 0.3.3

---
 pkgs/desktops/lxde/core/lxrandr/default.nix   | 42 +++++++++++++------
 .../respect-xml-catalog-files-var.patch       | 15 +++++++
 2 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch

diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix
index 2e395e8c10fa..2399a5c327d9 100644
--- a/pkgs/desktops/lxde/core/lxrandr/default.nix
+++ b/pkgs/desktops/lxde/core/lxrandr/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   pkg-config,
   intltool,
   gtk2,
@@ -9,35 +9,53 @@
   xrandr,
   withGtk3 ? false,
   gtk3,
+  autoreconfHook,
+  libxslt,
+  docbook_xsl,
+  docbook_xml_dtd_412,
+  libxml2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxrandr";
-  version = "0.3.2";
+  version = "0.3.3";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
-    sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxrandr";
+    tag = finalAttrs.version;
+    hash = "sha256-EGUnvV1FqQUJkjGwxgVecXOohAu8Qa8Prgk6xZfJBe4=";
   };
 
-  configureFlags = lib.optional withGtk3 "--enable-gtk3";
+  configureFlags = [
+    "--enable-man"
+  ]
+  ++ lib.optional withGtk3 "--enable-gtk3";
 
   nativeBuildInputs = [
+    autoreconfHook
     pkg-config
     intltool
+    libxslt
+    libxml2
+    docbook_xml_dtd_412
+    docbook_xsl
   ];
+
+  patches = [ ./respect-xml-catalog-files-var.patch ];
+
   buildInputs = [
     libX11
     xrandr
     (if withGtk3 then gtk3 else gtk2)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Standard screen manager of LXDE";
     mainProgram = "lxrandr";
     homepage = "https://lxde.org/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ rawkode ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ rawkode ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch b/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch
new file mode 100644
index 000000000000..598f506118f2
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch
@@ -0,0 +1,15 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index be626c5..b449b1b 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
+ [
+   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+-  if $jh_found_xmlcatalog && \
+-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++  # empty argument forces libxml to use XML_CATALOG_FILES variable
++  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+     AC_MSG_RESULT([found])
+     ifelse([$3],,,[$3
+ ])dnl

From e8d7b1bee572a205919be9ccc4f5d80561c8c5f9 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:02:54 +0200
Subject: [PATCH 013/111] lxde.lxpanel: change upstream source

---
 pkgs/desktops/lxde/core/lxpanel/default.nix | 23 ++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index fa3f77840c45..f2ae37e93620 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch2,
+  fetchFromGitHub,
+  autoreconfHook,
   pkg-config,
   gettext,
   m4,
@@ -34,9 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "lxpanel";
   version = "0.10.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lxde/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug=";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxpanel";
+    tag = finalAttrs.version;
+    hash = "sha256-YUoDFO+Ip6uWjXMP+PTJqcfiGPAE4EfjQz8F4M0FxZM=";
   };
 
   patches = [
@@ -48,13 +50,17 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [
+    autoreconfHook
     pkg-config
     gettext
     m4
     intltool
     libxmlxx
   ];
+
   buildInputs = [
     (if withGtk3 then keybinder3 else keybinder)
     (if withGtk3 then gtk3 else gtk2)
@@ -74,13 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional supportAlsa alsa-lib;
 
-  postPatch = ''
-    substituteInPlace src/Makefile.in \
-      --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
-    substituteInPlace plugins/Makefile.in \
-      --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
-  '';
-
   configureFlags = lib.optional withGtk3 "--enable-gtk3";
 
   meta = {

From abe24880dcb8c8f22fd204d7cd477e0eee12f9dc Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:05:44 +0200
Subject: [PATCH 014/111] lxde.lxpanel: 0.10.1 -> 0.11.1

---
 pkgs/desktops/lxde/core/lxpanel/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index f2ae37e93620..c970ea9e4ac3 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -32,24 +32,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxpanel";
-  version = "0.10.1";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxpanel";
     tag = finalAttrs.version;
-    hash = "sha256-YUoDFO+Ip6uWjXMP+PTJqcfiGPAE4EfjQz8F4M0FxZM=";
+    hash = "sha256-jpe5AfRkyTVKQ9biOJiWKv0OVqP8gRCzfhSLDjnrEPc=";
   };
 
-  patches = [
-    # fix build with gcc14
-    # https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c
-    (fetchpatch2 {
-      url = "https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c.patch?full_index=1";
-      hash = "sha256-lj4CWdiUQhEc9J8UNKcP7/tmsGnPjA5pwXAok5YFW4M=";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
@@ -88,5 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     maintainers = [ lib.maintainers.ryneeverett ];
     platforms = lib.platforms.linux;
+    mainProgram = "lxpanel";
   };
 })

From db00f84b57848a24dba7e1b75628db9075e65763 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:25:07 +0200
Subject: [PATCH 015/111] lxde.lxtask: cleanup

---
 pkgs/desktops/lxde/core/lxtask/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index 84e1b76ad428..4f83726c5b43 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -10,14 +10,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxtask";
   version = "0.1.12";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxtask";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-BI50jV/17jGX91rcmg98+gkoy35oNpdSSaVDLyagbIc=";
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://lxde.sourceforge.net/";
     description = "Lightweight and desktop independent task manager";
     mainProgram = "lxtask";
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
       Desktop Environment, it's totally desktop independent and only
       requires pure GTK.
     '';
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.romildo ];
   };
-}
+})

From efeacf485257148762598ee3b5b60f08026fd2fe Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 26 Aug 2025 15:25:29 +0000
Subject: [PATCH 016/111] mealie: add 'pytest-asyncio'

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

diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index cd20fb65b996..4865bd59a9f5 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -102,7 +102,10 @@ pythonpkgs.buildPythonApplication rec {
         --set OUT "$out"
     '';
 
-  nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ];
+  nativeCheckInputs = with pythonpkgs; [
+    pytestCheckHook
+    pytest-asyncio
+  ];
 
   # Needed for tests
   preCheck = ''

From de82920a5bcf9b7941c41cc1c8faa59b18a44dff Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 26 Aug 2025 15:32:44 +0000
Subject: [PATCH 017/111] mealie: 3.0.2 -> 3.1.2

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

diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index 4865bd59a9f5..bed561c1c343 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -11,12 +11,12 @@
 }:
 
 let
-  version = "3.0.2";
+  version = "3.1.2";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     tag = "v${version}";
-    hash = "sha256-0GlHfyoVEqmfTDSN9BGXrLRkStRjWjv2qzZac2oYu7Q=";
+    hash = "sha256-8ZLXXA4NKR7GaCdgk8XDMjAssQsKP1wZpEZPYWpglwk=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };

From 81d0aed5d0bcf64b87a3dc20ca7c6da3750a97f3 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <Sebastian.Neubauer@amd.com>
Date: Tue, 26 Aug 2025 18:39:43 +0200
Subject: [PATCH 018/111] rgp: 2.3 -> 2.5

Changelog: https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/tag/v2.5
---
 pkgs/development/tools/rgp/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index aaccbdba360f..57239437c85b 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -5,6 +5,7 @@
   fetchurl,
   autoPatchelfHook,
   dbus,
+  directx-shader-compiler,
   fontconfig,
   freetype,
   glib,
@@ -18,21 +19,23 @@
   libxcb,
   libXi,
   libxkbcommon,
+  libxml2_13,
   ncurses,
   wayland,
+  xcbutil,
   zlib,
 }:
 
 let
-  buildNum = "2024-09-26-1411";
+  buildNum = "2025-06-12-1681";
 in
 stdenv.mkDerivation {
   pname = "rgp";
-  version = "2.3";
+  version = "2.5";
 
   src = fetchurl {
     url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
-    hash = "sha256-mgIFDStgat4E+67TaSLrcwgWTu7zLf7Nkn6zBlgeVcQ=";
+    hash = "sha256-e7IxoaZi77klrihRO6vDh1o2Clj5lNsVlzQ7btgLsu4=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +45,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     dbus
+    directx-shader-compiler
     fontconfig
     freetype
     glib
@@ -55,8 +59,10 @@ stdenv.mkDerivation {
     libxcb
     libXi
     libxkbcommon
+    libxml2_13
     ncurses
     wayland
+    xcbutil
     zlib
   ];
 

From b80fccf9acd5f64c17b91e071355233b26263361 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 6 Jul 2025 14:43:03 +0800
Subject: [PATCH 019/111] python3Packages.mpi4py: skip spawn related tests for
 openmpi

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

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 202ba506dfe1..42422d61a0d7 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -54,6 +54,10 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
+  # skip spawn related tests for openmpi implemention
+  # see https://github.com/mpi4py/mpi4py/issues/545#issuecomment-2343011460
+  env.MPI4PY_TEST_SPAWN = if mpi.pname == "openmpi" then 0 else 1;
+
   passthru = {
     inherit mpi;
   };

From 45fcd358c88d136fd5bd3d10bf42f8fc54477d7a Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 27 Aug 2025 07:03:07 +0800
Subject: [PATCH 020/111] rpi-imager: 1.9.4 -> 1.9.6

---
 pkgs/by-name/rp/rpi-imager/package.nix        |  47 +-
 .../remove-vendoring-and-lsblk-check.patch    | 575 ------------------
 .../rp/rpi-imager/remove-vendoring.patch      |  94 +++
 3 files changed, 115 insertions(+), 601 deletions(-)
 delete mode 100644 pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch
 create mode 100644 pkgs/by-name/rp/rpi-imager/remove-vendoring.patch

diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix
index 286e1b74063a..d502c1ec40f1 100644
--- a/pkgs/by-name/rp/rpi-imager/package.nix
+++ b/pkgs/by-name/rp/rpi-imager/package.nix
@@ -10,7 +10,7 @@
   qt6,
   wrapGAppsHook4,
   testers,
-  util-linux,
+  writeShellScriptBin,
   xz,
   gnutls,
   zstd,
@@ -20,35 +20,35 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpi-imager";
-  version = "1.9.4";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-imager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ih7FeAKTKSvuwsrMgKQ0VEUYHHT6L99shxfAIjAzErk=";
+    hash = "sha256-HJLl0FOseZgW3DMi8M3SqIN/UHBDkIc09vKcenhSnO8=";
   };
 
-  sourceRoot = "${finalAttrs.src.name}/src";
-
-  # By default, the builder checks for JSON support in lsblk by running "lsblk --json",
-  # but that throws an error, as /sys/dev doesn't exist in the sandbox.
-  # This patch removes the check.
-  # remove-vendoring.patch from
-  # https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/raw/main/remove-vendoring.patch
-  patches = [ ./remove-vendoring-and-lsblk-check.patch ];
+  patches = [ ./remove-vendoring.patch ];
 
   postPatch = ''
-    substituteInPlace ../debian/org.raspberrypi.rpi-imager.desktop \
+    substituteInPlace debian/org.raspberrypi.rpi-imager.desktop \
       --replace-fail "/usr/bin/" ""
   '';
 
+  preConfigure = ''
+    cd src
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
     qt6.wrapQtAppsHook
     wrapGAppsHook4
-    util-linux
+    # Fool upstream's cmake lsblk check a bit
+    (writeShellScriptBin "lsblk" ''
+      echo "our lsblk has --json support but it doesn't work in our sandbox"
+    '')
   ];
 
   buildInputs = [
@@ -67,16 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtwayland
   ];
 
-  cmakeFlags =
-    # Disable vendoring
-    [
-      (lib.cmakeBool "ENABLE_VENDORING" false)
-    ]
-    # Disable telemetry and update check.
-    ++ lib.optionals (!enableTelemetry) [
-      (lib.cmakeBool "ENABLE_CHECK_VERSION" false)
-      (lib.cmakeBool "ENABLE_TELEMETRY" false)
-    ];
+  cmakeFlags = [
+    # Isn't relevant for Nix
+    (lib.cmakeBool "ENABLE_CHECK_VERSION" false)
+    (lib.cmakeBool "ENABLE_TELEMETRY" enableTelemetry)
+  ];
 
   qtWrapperArgs = [
     "--unset QT_QPA_PLATFORMTHEME"
@@ -105,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
       ymarkus
       anthonyroussel
     ];
-    platforms = lib.platforms.all;
-    # does not build on darwin
-    broken = stdenv.hostPlatform.isDarwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # could not find xz
+    badPlatforms = lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch b/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch
deleted file mode 100644
index b4db2c0efc91..000000000000
--- a/pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch
+++ /dev/null
@@ -1,575 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,7 @@
- cmake_minimum_required(VERSION 3.22)
- OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)
- OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
-+OPTION (ENABLE_VENDORING "Use vendored dependencies" ON)
- 
- # We use FetchContent_Populate() instead of FetchContent_MakeAvailable() to allow EXCLUDE_FROM_ALL
- # This prevents the dependencies from being built by default, which is our desired behavior
-@@ -58,410 +59,156 @@ if (APPLE)
-     endforeach()
- endif(APPLE)
- 
-+## Preferentially build the bundled code. Full vendoring is to follow in a later version.
-+
- # Bundled code will occasionally use identical options - eg, BUILD_TESTING.
- set(BUILD_TESTING OFF)
- set(BUILD_STATIC_LIBS ON)
- set(BUILD_SHARED_LIBS OFF)
- 
--include(FetchContent)
--
--# Bundled liblzma
--set(LIBLZMA_VERSION "5.8.1")
--FetchContent_Declare(xz
--    GIT_REPOSITORY https://github.com/tukaani-project/xz.git
--    GIT_TAG v${LIBLZMA_VERSION}
--    ${USE_OVERRIDE_FIND_PACKAGE}
--)
--set(XZ_MICROLZMA_DECODER OFF CACHE BOOL "" FORCE)
--set(XZ_MICROLZMA_ENCODER OFF CACHE BOOL "" FORCE)
--set(XZ_LZIP_DECODER OFF CACHE BOOL "" FORCE)
--set(XZ_ENABLE_SANDBOX OFF CACHE BOOL "" FORCE)
--set(XZ_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
--set(XZ_ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)
--set(XZ_DECODERS
--    lzma1
--    lzma2
--    delta
--)
--set(XZ_ENCODERS
--    lzma1
--    lzma2
--    delta
--)
--set(CREATE_LZMA_SYMLINKS OFF CACHE BOOL "" FORCE)
--set(CREATE_XZ_SYMLINKS OFF CACHE BOOL "" FORCE)
--FetchContent_GetProperties(xz)
--if(NOT xz_POPULATED)
--    FetchContent_Populate(xz)
--    add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
--unset(XZ_MICROLZMA_DECODER)
--unset(XZ_MICROLZMA_ENCODER)
--unset(XZ_LZIP_DECODER)
--unset(XZ_ENABLE_SANDBOX)
--unset(XZ_BUILD_SHARED_LIBS)
--unset(XZ_ENABLE_DOXYGEN)
--unset(CREATE_LZMA_SYMLINKS)
--unset(CREATE_XZ_SYMLINKS)
--set(LIBLZMA_FOUND true CACHE BOOL "" FORCE)
--set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
--set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
--set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE)
--set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)
--set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)
--set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)
--set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)
--
--# Bundled zstd
--set(ZSTD_VERSION "1.5.7")
--FetchContent_Declare(zstd
--    GIT_REPOSITORY https://github.com/facebook/zstd.git
--    GIT_TAG v${ZSTD_VERSION}
--    SOURCE_SUBDIR build/cmake
--    ${USE_OVERRIDE_FIND_PACKAGE}
--)
--set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)
--set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
--set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE)
--set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
--set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
--FetchContent_GetProperties(zstd)
--if(NOT zstd_POPULATED)
--    FetchContent_Populate(zstd)
--    add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
--unset(ZSTD_BUILD_PROGRAMS)
--unset(ZSTD_BUILD_SHARED)
--unset(ZSTD_BUILD_STATIC)
--unset(ZSTD_BUILD_TESTS)
--unset(ZSTD_BUILD_DICTBUILDER)
--set(ZSTD_FOUND true CACHE BOOL "" FORCE)
--set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "" FORCE)
--set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
--set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
--set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
--set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
--set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
--set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
--set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)
--
--# Remote nghttp2
--set(NGHTTP2_VERSION "1.65.0")
--FetchContent_Declare(nghttp2
--    GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git
--    GIT_TAG        v${NGHTTP2_VERSION}
--    ${USE_OVERRIDE_FIND_PACKAGE}
--)
--set(BUILD_EXAMPLES OFF)
--set(ENABLE_LIB_ONLY ON)
--set(ENABLE_FAILMALLOC OFF)
--FetchContent_GetProperties(nghttp2)
--if(NOT nghttp2_POPULATED)
--    FetchContent_Populate(nghttp2)
--    add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
--unset(ENABLE_LIB_ONLY)
--unset(ENABLE_FAILMALLOC)
--unset(BUILD_EXAMPLES)
--set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE)
--set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE)
--set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
--set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
--set(NGHTTP2_FOUND true CACHE BOOL "" FORCE)
--
--
--# Bundled zlib
--set(ZLIB_VERSION "1.4.1.1")
--set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
--set(ZLIB_BUILD_SHARED OFF CACHE BOOL "" FORCE)
--set(ZLIB_BUILD_STATIC ON CACHE BOOL "" FORCE)
--set(ZLIB_BUILD_TESTS OFF CACHE BOOL "" FORCE)
--set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE)
--FetchContent_Declare(zlib
--    GIT_REPOSITORY https://github.com/madler/zlib.git
--    GIT_TAG 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 # v1.4.1.1, as of 27/05/2025
--    ${USE_OVERRIDE_FIND_PACKAGE}
--)
--FetchContent_GetProperties(zlib)
--if(NOT zlib_POPULATED)
--    FetchContent_Populate(zlib)
--    add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
--unset(ZLIB_BUILD_EXAMPLES)
--unset(ZLIB_BUILD_SHARED)
--unset(ZLIB_BUILD_STATIC)
--unset(ZLIB_BUILD_TESTS)
--unset(SKIP_INSTALL_ALL)
--# Set zlib variables that libarchive's CMake will use
--set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # This is to help FindZlib.cmake find the static library over the shared one
--set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
--
--# On Windows with MinGW, zlib builds with .a extension, not .lib
--# Set the correct library path before find_package
--if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
--    set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libzlibstatic.a CACHE FILEPATH "" FORCE)
--    set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libzlibstatic.a CACHE STRING "" FORCE)
--else()
--    set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a CACHE FILEPATH "" FORCE)
--    set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libz.a CACHE STRING "" FORCE)
--endif()
--
--# Since we're building zlib ourselves with EXCLUDE_FROM_ALL, we don't need find_package
--# Instead, we'll create the ZLIB::ZLIB target manually and set all required variables
--set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
--set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
--
--# Create ZLIB::ZLIB target manually since we're not using find_package
--# Set zlib variables that other packages expect
--set(ZLIB_FOUND TRUE CACHE BOOL "" FORCE)
--add_library(ZLIB::ZLIB STATIC IMPORTED)
--if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
--    set_target_properties(ZLIB::ZLIB PROPERTIES
--        IMPORTED_LOCATION "${zlib_BINARY_DIR}/libzlibstatic.a"
--        INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"
--    )
--    add_dependencies(ZLIB::ZLIB zlibstatic)
--else()
--    set_target_properties(ZLIB::ZLIB PROPERTIES
--        IMPORTED_LOCATION "${zlib_BINARY_DIR}/libz.a"
--        INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"
-+if(ENABLE_VENDORING)
-+    # Bundled liblzma
-+    set(XZ_MICROLZMA_DECODER OFF)
-+    set(XZ_MICROLZMA_ENCODER OFF)
-+    set(XZ_LZIP_DECODER OFF)
-+    set(XZ_ENABLE_SANDBOX OFF)
-+    set(XZ_BUILD_SHARED_LIBS OFF)
-+    set(XZ_ENABLE_DOXYGEN OFF)
-+    set(XZ_DECODERS
-+        lzma1
-+        lzma2
-+        delta
-     )
--    add_dependencies(ZLIB::ZLIB zlibstatic)
--endif()
--
--# Debug output
--message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}")
--message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}")
--message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}")
--
--# Bundled libarchive
--
--set(ENABLE_WERROR OFF CACHE BOOL "")
--set(ENABLE_INSTALL OFF CACHE BOOL "")
--set(ENABLE_TEST OFF CACHE BOOL "")
--set(ENABLE_CNG OFF CACHE BOOL "")
--set(ENABLE_MBEDTLS OFF CACHE BOOL "")
--set(ENABLE_NETTLE OFF CACHE BOOL "")
--set(ENABLE_OPENSSL OFF CACHE BOOL "")
--# Configure libarchive with explicit zlib support
--set(ENABLE_ZLIB ON CACHE BOOL "")
--set(ENABLE_BZip2 OFF CACHE BOOL "")
--set(ENABLE_LZ4 OFF CACHE BOOL "")
--set(ENABLE_LZO OFF CACHE BOOL "")
--set(ENABLE_LIBB2 OFF CACHE BOOL "")
--set(ENABLE_LIBXML2 OFF CACHE BOOL "")
--set(ENABLE_EXPAT OFF CACHE BOOL "")
--set(ENABLE_PCREPOSIX OFF CACHE BOOL "")
--set(ENABLE_PCRE2POSIX OFF CACHE BOOL "")
--set(ENABLE_LIBGCC OFF CACHE BOOL "")
--set(ENABLE_TAR OFF CACHE BOOL "")
--set(ENABLE_CPIO OFF CACHE BOOL "")
--set(ENABLE_CAT OFF CACHE BOOL "")
--set(BUILD_SHARED_LIBS OFF CACHE BOOL "")
--set(ARCHIVE_BUILD_STATIC_LIBS ON CACHE BOOL "")
--set(ARCHIVE_BUILD_EXAMPLES OFF CACHE BOOL "")
--set(ENABLE_ZSTD ON CACHE BOOL "")
--set(POSIX_REGEX_LIB "libc" CACHE STRING "" FORCE)
--set(LIBARCHIVE_VERSION "3.8.0")
--
--# Create a patch script to fix ZSTD detection in libarchive
--set(LIBARCHIVE_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/libarchive_zstd_patch.cmake")
--file(WRITE ${LIBARCHIVE_PATCH_FILE} "
--# Read the original CMakeLists.txt
--file(READ \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" CONTENT)
--
--# Find the start and end of the ZSTD section
--string(FIND \"\${CONTENT}\" \"IF(ZSTD_FOUND)\" ZSTD_START)
--string(FIND \"\${CONTENT}\" \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\" ZSTD_END)
--
--if(ZSTD_START GREATER -1 AND ZSTD_END GREATER -1)
--    # Calculate positions
--    math(EXPR ZSTD_END \"\${ZSTD_END} + 40\") # Length of \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\"
--    
--    # Extract parts before and after the ZSTD section
--    string(SUBSTRING \"\${CONTENT}\" 0 \${ZSTD_START} BEFORE_ZSTD)
--    string(SUBSTRING \"\${CONTENT}\" \${ZSTD_END} -1 AFTER_ZSTD)
--    
--    # Create the new ZSTD section
--    set(NEW_ZSTD_SECTION \"IF(ZSTD_FOUND)
--  SET(HAVE_ZSTD_H 1)
--  INCLUDE_DIRECTORIES(\\\${ZSTD_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS \\\${ZSTD_LIBRARY})
--  
--  # Check if ZSTD variables were provided externally (indicating static build)
--  get_property(ZSTD_LIB_IS_CACHE CACHE ZSTD_LIBRARY PROPERTY TYPE)
--  get_property(ZSTD_INC_IS_CACHE CACHE ZSTD_INCLUDE_DIR PROPERTY TYPE)
--  if(ZSTD_LIB_IS_CACHE AND ZSTD_INC_IS_CACHE)
--    # Skip function checks for static builds and assume all functions are available
--    message(STATUS \\\"Using provided ZSTD library: \\\${ZSTD_LIBRARY}\\\")
--    SET(HAVE_LIBZSTD 1)
--    SET(HAVE_ZSTD_compressStream 1)
--    SET(HAVE_ZSTD_minCLevel 1)
--  else()
--    # Original function checks for dynamic builds
--    CMAKE_PUSH_CHECK_STATE()
--    SET(CMAKE_REQUIRED_LIBRARIES \\\${ZSTD_LIBRARY})
--    SET(CMAKE_REQUIRED_INCLUDES \\\${ZSTD_INCLUDE_DIR})
--    CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)
--    CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)
--    CHECK_FUNCTION_EXISTS(ZSTD_minCLevel HAVE_ZSTD_minCLevel)
--    CMAKE_POP_CHECK_STATE()
--  endif()
--ENDIF(ZSTD_FOUND)
--MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\")
--    
--    # Combine the parts
--    set(NEW_CONTENT \"\${BEFORE_ZSTD}\${NEW_ZSTD_SECTION}\")
--    
--    # Write the modified content back
--    file(WRITE \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" \"\${NEW_CONTENT}\${AFTER_ZSTD}\")
--    message(STATUS \"Patched libarchive CMakeLists.txt for static ZSTD support\")
--else()
--    message(WARNING \"Could not find ZSTD section in libarchive CMakeLists.txt\")
--endif()
--")
--
--FetchContent_Declare(libarchive
--    GIT_REPOSITORY https://github.com/libarchive/libarchive.git
--    GIT_TAG v${LIBARCHIVE_VERSION}
--    PATCH_COMMAND ${CMAKE_COMMAND} -P ${LIBARCHIVE_PATCH_FILE}
--    ${USE_OVERRIDE_FIND_PACKAGE}
--)
--FetchContent_GetProperties(libarchive)
--if(NOT libarchive_POPULATED)
--    FetchContent_Populate(libarchive)
--    add_subdirectory(${libarchive_SOURCE_DIR} ${libarchive_BINARY_DIR} EXCLUDE_FROM_ALL)
--endif()
--
--# Ensure libarchive is built after zlib
--if (TARGET archive_static AND TARGET ZLIB::ZLIB)
--    add_dependencies(archive_static ZLIB::ZLIB)
--endif()
--
--unset(POSIX_REGEX_LIB)
--unset(ENABLE_WERROR)
--unset(ENABLE_INSTALL)
--unset(ENABLE_TEST)
--unset(ENABLE_CNG)
--unset(ENABLE_MBEDTLS)
--unset(ENABLE_NETTLE)
--unset(ENABLE_OPENSSL)
--unset(ENABLE_ZLIB)
--unset(ENABLE_BZip2)
--unset(ENABLE_LZ4)
--unset(ENABLE_LZO)
--unset(ENABLE_LIBB2)
--unset(ENABLE_LIBXML2)
--unset(ENABLE_EXPAT)
--unset(ENABLE_PCREPOSIX)
--unset(ENABLE_PCRE2POSIX)
--unset(ENABLE_LIBGCC)
--unset(ENABLE_TAR)
--unset(ENABLE_CPIO)
--unset(ENABLE_CAT)
--unset(ARCHIVE_BUILD_SHARED_LIBS)
--unset(ENABLE_ZSTD)
--set(LibArchive_FOUND true CACHE BOOL "" FORCE)
--set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)
--set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
--set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
--
--# Bundled libcurl
--set(CURL_VERSION "8.13.0")
--string(REPLACE "." "_" CURL_TAG ${CURL_VERSION})
--FetchContent_Declare(curl
--    GIT_REPOSITORY https://github.com/curl/curl.git
--    GIT_TAG curl-${CURL_TAG}
--    ${USE_OVERRIDE_FIND_PACKAGE}
--)
--set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
--set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)
--set(BUILD_MISC_DOCS OFF CACHE BOOL "" FORCE)
--set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)
--set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
--set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE)
--set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE)
--set(CURL_DISABLE_ALTSVC ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_KERBEROS_AUTH ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_DICT ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_DISABLE_FORM_API ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_FTP ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_GOPHER ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_IMAP ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_LDAPS ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_MQTT ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_NETRC ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_POP3 ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_RTSP ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_SMTP ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_TELNET ON CACHE BOOL "" FORCE)
--set(CURL_DISABLE_TFTP ON CACHE BOOL "" FORCE)
--set(CURL_ZSTD ON)
--set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
--set(CURL_DISABLE_INSTALL ON)
--if (APPLE)
--    # TODO: SecureTransport is a deprecated API in macOS, supporting
--    #       only up to TLS v1.2. cURL has not implemented the replacement,
--    #       Network.framework, and so we will need to select an alternative.
--    #       Best recommendation: Libressl, as used by Apple in the curl binary
--    #       on macOS.
--    set(CURL_USE_SECTRANSP ON)
--    set(CURL_DEFAULT_SSL_BACKEND "secure-transport")
--    set(USE_APPLE_IDN ON)
--else()
--    if (WIN32)
--        set(CURL_USE_SCHANNEL ON)
--        set(CURL_DEFAULT_SSL_BACKEND "schannel")
--    else ()
--        set(CURL_USE_GNUTLS ON)
--        set(CURL_DEFAULT_SSL_BACKEND "gnutls")
--    endif(WIN32)
--endif(APPLE)
--
--FetchContent_GetProperties(curl)
--if(NOT curl_POPULATED)
--    FetchContent_Populate(curl)
--    add_subdirectory(${curl_SOURCE_DIR} ${curl_BINARY_DIR} EXCLUDE_FROM_ALL)
-+    set(XZ_ENCODERS "")
-+    set(CREATE_LZMA_SYMLINKS OFF)
-+    set(CREATE_XZ_SYMLINKS OFF)
-+    add_subdirectory(dependencies/xz-5.8.1)
-+    set(LIBLZMA_FOUND true)
-+    set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)
-+    set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)
-+    set(LIBLZMA_LIBRARY liblzma)
-+    set(LIBLZMA_LIBRARIES liblzma)
-+
-+    # Bundled zstd
-+    set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)
-+    set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
-+    set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-+    set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
-+    add_subdirectory(dependencies/zstd-1.5.7/build/cmake)
-+    set(Zstd_FOUND true)
-+    set(ZSTD_FOUND true)
-+    set(Zstd_VERSION "1.5.7")
-+    set(ZSTD_VERSION "1.5.7")
-+    set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
-+    set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
-+    set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
-+    set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
-+    set(Zstd_LIBRARIES libzstd_static)
-+    set(ZSTD_LIBRARIES libzstd_static)
-+    set(ZSTD_LIBRARY libzstd_static)
-+
-+    # Bundled zlib
-+    set(ZLIB_BUILD_EXAMPLES OFF)
-+    set(SKIP_INSTALL_ALL ON)
-+    add_subdirectory(dependencies/zlib-1.4.1.1)
-+    set(ZLIB_FOUND TRUE)
-+    set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")
-+    set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")
-+    set(ZLIB_LIBRARY zlibstatic)
-+    set(ZLIB_LIBRARIES zlibstatic)
-+
-+    # Bundled libarchive
-+    set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "")
-+    set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "")
-+    set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "")
-+    add_subdirectory(dependencies/libarchive-3.7.7)
-+    set(LibArchive_FOUND true)
-+    set(LibArchive_LIBRARIES archive_static)
-+    set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.8/libarchive)
-+
-+    # Bundled libcurl
-+    set(CMAKE_CURL_INCLUDES)
-+    set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
-+    set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)
-+    set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)
-+    set(CURL_USE_LIBPSL OFF)
-+    set(CURL_USE_LIBSSH2 OFF)
-+    set(CURL_DISABLE_ALTSVC ON)
-+    set(CURL_DISABLE_KERBEROS_AUTH ON)
-+    set(CURL_DISABLE_DICT ON)
-+    set(CURL_DISABLE_DISABLE_FORM_API ON)
-+    set(CURL_DISABLE_FTP ON)
-+    set(CURL_DISABLE_GOPHER ON)
-+    set(CURL_DISABLE_IMAP ON)
-+    set(CURL_DISABLE_LDAP ON)
-+    set(CURL_DISABLE_LDAPS ON)
-+    set(CURL_DISABLE_MQTT ON)
-+    set(CURL_DISABLE_NETRC ON)
-+    set(CURL_DISABLE_POP3 ON)
-+    set(CURL_DISABLE_RTSP ON)
-+    set(CURL_DISABLE_SMTP ON)
-+    set(CURL_DISABLE_TELNET ON)
-+    set(CURL_DISABLE_TFTP ON)
-+    set(CURL_ZSTD ON)
-+    set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
-+    set(CURL_DISABLE_INSTALL ON)
-+    if (APPLE)
-+        # TODO: SecureTransport is a deprecated API in macOS, supporting
-+        #       only up to TLS v1.2. cURL has not implemented the replacement,
-+        #       Network.framework, and so we will need to select an alternative.
-+        #       Best recommendation: Libressl, as used by Apple in the curl binary
-+        #       on macOS.
-+        set(CURL_USE_SECTRANSP ON)
-+        set(CURL_DEFAULT_SSL_BACKEND "secure-transport")
-+        set(USE_APPLE_IDN ON)
-+    else()
-+        if (WIN32)
-+            set(CURL_USE_SCHANNEL ON)
-+            set(CURL_DEFAULT_SSL_BACKEND "schannel")
-+        else ()
-+            set(CURL_USE_GNUTLS ON)
-+            set(CURL_DEFAULT_SSL_BACKEND "gnutls")
-+        endif(WIN32)
-+    endif(APPLE)
-+
-+    add_subdirectory(dependencies/curl-8.13.0)
-+    set(CURL_FOUND true)
-+    set(CURL_LIBRARIES libcurl_static)
-+    set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)
-+    set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)
-+
-+elseif (NOT ENABLE_VENDORING AND UNIX)
-+    # Find the libraries that were subject to vendoring in the system instead,
-+    # To keep the possibility of delivery via Linux distro packages
-+    find_package(ZLIB)
-+    if(ZLIB_FOUND)
-+        set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB)
-+    endif()
-+    find_package(LibLZMA)
-+    if(LIBLZMA_FOUND)
-+        set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)
-+    endif()
-+    find_package(CURL 8.13.0 REQUIRED)
-+    find_package(LibArchive 3.7.8 REQUIRED)
- endif()
- 
--unset(BUILD_CURL_EXE)
--unset(BUILD_LIBCURL_DOCS)
--unset(BUILD_MISC_DOCS)
--unset(ENABLE_CURL_MANUAL)
--unset(BUILD_EXAMPLES)
--unset(CURL_USE_LIBPSL)
--unset(CURL_USE_LIBSSH2)
--unset(CURL_DISABLE_ALTSVC)
--unset(CURL_DISABLE_KERBEROS_AUTH)
--unset(CURL_DISABLE_DICT)
--unset(CURL_DISABLE_DISABLE_FORM_API)
--unset(CURL_DISABLE_FTP)
--unset(CURL_DISABLE_GOPHER)
--unset(CURL_DISABLE_IMAP)
--unset(CURL_DISABLE_LDAP)
--unset(CURL_DISABLE_LDAPS)
--unset(CURL_DISABLE_MQTT)
--unset(CURL_DISABLE_NETRC)
--unset(CURL_DISABLE_POP3)
--unset(CURL_DISABLE_RTSP)
--unset(CURL_DISABLE_SMTP)
--unset(CURL_DISABLE_TELNET)
--unset(CURL_DISABLE_TFTP)
--unset(CURL_ZSTD)
--unset(CURL_ENABLE_EXPORT_TARGET)
--unset(CURL_DISABLE_INSTALL)
--unset(CURL_USE_SECTRANSP)
--unset(CURL_DEFAULT_SSL_BACKEND)
--unset(USE_APPLE_IDN)
--unset(CURL_USE_SCHANNEL)
--unset(CURL_USE_GNUTLS)
--
--set(CURL_FOUND true CACHE BOOL "" FORCE)
--set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)
--set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
--set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
--
- # Adding headers explicity so they are displayed in Qt Creator
- set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h
-     devicewrapper.h devicewrapperblockcacheentry.h devicewrapperpartition.h devicewrapperstructs.h devicewrapperfatpartition.h wlancredentials.h
-@@ -928,11 +675,6 @@ else()
-         if (NOT LSBLK)
-             message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")
-         endif()
--
--        execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret)
--        if (ret EQUAL "1")
--            message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")
--        endif()
-     endif()
- 
-     install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/pkgs/by-name/rp/rpi-imager/remove-vendoring.patch b/pkgs/by-name/rp/rpi-imager/remove-vendoring.patch
new file mode 100644
index 000000000000..10906221599f
--- /dev/null
+++ b/pkgs/by-name/rp/rpi-imager/remove-vendoring.patch
@@ -0,0 +1,94 @@
+diff --git c/src/CMakeLists.txt w/src/CMakeLists.txt
+index f9e020ce..c5f71914 100644
+--- c/src/CMakeLists.txt
++++ w/src/CMakeLists.txt
+@@ -68,6 +68,10 @@ set(BUILD_SHARED_LIBS OFF)
+ 
+ include(FetchContent)
+ 
++find_package(LibLZMA)
++if(LIBLZMA_FOUND)
++    set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)
++else()
+ # Bundled liblzma
+ set(LIBLZMA_VERSION "5.8.1")
+ FetchContent_Declare(xz
+@@ -114,7 +118,10 @@ set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)
+ set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)
+ set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)
+ set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)
++endif()
+ 
++find_package(zstd ${ZSTD_VERSION})
++if(NOT zstd_FOUND)
+ # Bundled zstd
+ set(ZSTD_VERSION "1.5.7")
+ FetchContent_Declare(zstd
+@@ -147,32 +154,12 @@ set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH
+ set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
+ set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
+ set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)
+-
+-# Remote nghttp2
+-set(NGHTTP2_VERSION "1.66.0")
+-FetchContent_Declare(nghttp2
+-    GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git
+-    GIT_TAG        v${NGHTTP2_VERSION}
+-    ${USE_OVERRIDE_FIND_PACKAGE}
+-)
+-set(BUILD_EXAMPLES OFF)
+-set(ENABLE_LIB_ONLY ON)
+-set(ENABLE_FAILMALLOC OFF)
+-FetchContent_GetProperties(nghttp2)
+-if(NOT nghttp2_POPULATED)
+-    FetchContent_Populate(nghttp2)
+-    add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL)
+ endif()
+-unset(ENABLE_LIB_ONLY)
+-unset(ENABLE_FAILMALLOC)
+-unset(BUILD_EXAMPLES)
+-set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE)
+-set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE)
+-set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
+-set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
+-set(NGHTTP2_FOUND true CACHE BOOL "" FORCE)
+-
+ 
++find_package(ZLIB)
++if(ZLIB_FOUND)
++    set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB)
++else()
+ # Bundled zlib
+ set(ZLIB_VERSION "1.4.1.1")
+ set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+@@ -236,7 +223,10 @@ endif()
+ message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}")
+ message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}")
+ message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}")
++endif()
+ 
++find_package(LibArchive)
++if(NOT LibArchive_FOUND)
+ # Bundled libarchive
+ 
+ set(ENABLE_WERROR OFF CACHE BOOL "")
+@@ -368,8 +358,11 @@ set(LibArchive_FOUND true CACHE BOOL "" FORCE)
+ set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)
+ set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
+ set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
++endif()
+ 
+ # Bundled libcurl
++find_package(CURL)
++if(NOT CURL_FOUND)
+ set(CURL_VERSION "8.14.1")
+ string(REPLACE "." "_" CURL_TAG ${CURL_VERSION})
+ FetchContent_Declare(curl
+@@ -516,6 +509,7 @@ set(CURL_FOUND true CACHE BOOL "" FORCE)
+ set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)
+ set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
+ set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
++endif()
+ 
+ # Adding headers explicity so they are displayed in Qt Creator
+ set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h

From 27b23c793a053b3cb802100a15a82d714c17629c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 26 Aug 2025 23:40:48 +0000
Subject: [PATCH 021/111] flutter335: 3.35.1 -> 3.35.2

---
 .../compilers/flutter/versions/3_35/data.json | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index 683e5ea6230b..94de9bf9b4d5 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.35.1",
-  "engineVersion": "1e9a811bf8e70466596bcf0ea3a8b5adb5f17f7f",
+  "version": "3.35.2",
+  "engineVersion": "a8bfdfc394deaed5c57bd45a64ac4294dc976a72",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=",
-      "x86_64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4="
+      "aarch64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=",
+      "x86_64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=",
-      "x86_64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q="
+      "aarch64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=",
+      "x86_64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w="
     }
   },
   "dartVersion": "3.9.0",
@@ -21,53 +21,53 @@
     "x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=",
     "aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs="
   },
-  "flutterHash": "sha256-1G7PZLMm0VsT0CWygxOk0GGiXbtJGIBBvccQcaqV+EQ=",
+  "flutterHash": "sha256-g9g10WVf7CNoXYN8DVsWRK9N2Gz/2iQufMiQkJC35ZA=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=",
-      "aarch64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=",
-      "x86_64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=",
-      "x86_64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA="
+      "aarch64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=",
+      "aarch64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=",
+      "x86_64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=",
+      "x86_64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
-      "aarch64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
-      "x86_64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
-      "x86_64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s="
+      "aarch64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
+      "aarch64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
+      "x86_64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
+      "x86_64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo="
     },
     "ios": {
-      "aarch64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
-      "aarch64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
-      "x86_64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
-      "x86_64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs="
+      "aarch64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
+      "aarch64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
+      "x86_64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
+      "x86_64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew="
     },
     "linux": {
-      "aarch64-darwin": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=",
-      "aarch64-linux": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=",
-      "x86_64-darwin": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=",
-      "x86_64-linux": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs="
+      "aarch64-darwin": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=",
+      "aarch64-linux": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=",
+      "x86_64-darwin": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=",
+      "x86_64-linux": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI="
     },
     "macos": {
-      "aarch64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
-      "aarch64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
-      "x86_64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
-      "x86_64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo="
+      "aarch64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
+      "aarch64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
+      "x86_64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
+      "x86_64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA="
     },
     "universal": {
-      "aarch64-darwin": "sha256-+EfVH+XpI4d/UlFs6rZKdfK00IzDFz9o4CuzJRdDNfw=",
-      "aarch64-linux": "sha256-1jYtJ/toFDfUG2HIKyM1XT9rl0Fzl3or67q9ZVl1vDg=",
-      "x86_64-darwin": "sha256-nACkicnu+Pkimpyx3q/uxUcLz/xAExLbXHl+Ex4kFzA=",
-      "x86_64-linux": "sha256-XGxRc2LOqgxd8Zbd2XWhA6yj39WJCa5DC5UGYIiw4RY="
+      "aarch64-darwin": "sha256-Nv36HXVFlpGTmWlobDiMJczVIgUShvoVi8dqAWpbkJM=",
+      "aarch64-linux": "sha256-SlB09ZiXtz3DJSiv9gTy4ogHpJ9JRVzgy2nmqqmGMYs=",
+      "x86_64-darwin": "sha256-yZbzy+DNREPxzZ/F6BdjmQoOrUE+5rIw6E4CuUePPWQ=",
+      "x86_64-linux": "sha256-AdA1xjD5nkBTzp7k1FLe218FD9o1aSJHZx1nOyhneGY="
     },
     "web": {
-      "aarch64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
-      "aarch64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
-      "x86_64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
-      "x86_64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs="
+      "aarch64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
+      "aarch64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
+      "x86_64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
+      "x86_64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ="
     },
     "windows": {
-      "x86_64-darwin": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=",
-      "x86_64-linux": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ="
+      "x86_64-darwin": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=",
+      "x86_64-linux": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o="
     }
   },
   "pubspecLock": {
@@ -346,11 +346,11 @@
         "dependency": "direct main",
         "description": {
           "name": "dwds",
-          "sha256": "b14203ae57d2ef575d115e30a303c7fe643c5e6af5acfb1330d4c57091ee11c6",
+          "sha256": "b2f7e3241de2adbd5caa87ae9d05a0f9c59b9cbb8c77aeaeebf6c277821f25d5",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "24.4.0"
+        "version": "24.4.0+1"
       },
       "extension_discovery": {
         "dependency": "direct main",

From 255fca4d8b37766f250c1b337ba95f30b4407789 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 04:54:01 +0000
Subject: [PATCH 022/111] debian-devscripts: 2.25.18 -> 2.25.15+deb13u1

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

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index d211a934998b..089ea98cbbfe 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.18";
+  version = "2.25.15+deb13u1";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-POmUwNYKfdWda80T44S6x2Dg2TpezMirXuiI95Z077Q=";
+    hash = "sha256-szyVLpeIQozPXwBgL4nIYog4znUzweIt8q7nczo5q+g=";
   };
 
   patches = [

From 392d256429a46badb213afba4f26272190bacd5f Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:39:59 +0200
Subject: [PATCH 023/111] lxde.lxappearance: change upstream source

---
 .../lxde/core/lxappearance/default.nix        | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index f7d297f0f423..e0c3f44d67a4 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -1,29 +1,39 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   intltool,
   pkg-config,
   libX11,
   gtk2,
   gtk3,
+  libxslt,
+  docbook_xsl,
   wrapGAppsHook3,
   withGtk3 ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxappearance";
   version = "0.6.3";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz";
-    sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxappearance";
+    tag = finalAttrs.version;
+    hash = "sha256-YxU6jikCRmV2b+080nyMFU9FCMlz77KIqJqoCHVjp8M=";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [
     pkg-config
     intltool
     wrapGAppsHook3
+    autoreconfHook
+    libxslt
+    docbook_xsl
   ];
 
   buildInputs = [
@@ -35,6 +45,8 @@ stdenv.mkDerivation rec {
     ./lxappearance-0.6.3-xdg.system.data.dirs.patch
   ];
 
+  env.XSLTPROC = lib.getExe' libxslt "xsltproc";
+
   configureFlags = lib.optional withGtk3 "--enable-gtk3";
 
   meta = with lib; {
@@ -45,4 +57,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };
-}
+})

From 3c2a77a54aa84534e7197be456869c51a8c3498c Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:41:17 +0200
Subject: [PATCH 024/111] lxde.lxappearance: 0.6.3 -> 0.6.4

---
 pkgs/desktops/lxde/core/lxappearance/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index e0c3f44d67a4..4897e6613d8a 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxappearance";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxappearance";
     tag = finalAttrs.version;
-    hash = "sha256-YxU6jikCRmV2b+080nyMFU9FCMlz77KIqJqoCHVjp8M=";
+    hash = "sha256-t5P3JYGZzhTaJ3s23r6yrAQoFcCV5uteHh67sWY1KrI=";
   };
 
   enableParallelBuilding = true;
@@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = lib.optional withGtk3 "--enable-gtk3";
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight program for configuring the theme and fonts of gtk applications";
     mainProgram = "lxappearance";
     homepage = "https://lxde.org/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
   };
 })

From 12683a1aebd93c6f356e572403af8e8dc1090cfe Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:52:43 +0200
Subject: [PATCH 025/111] libfm: change upstream source

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

diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index f536195d36e5..b7ea50a6e8c7 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -1,8 +1,10 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   fetchpatch,
+  autoreconfHook,
+  gtk-doc,
   glib,
   intltool,
   menu-cache,
@@ -23,9 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = if extraOnly then "libfm-extra" else "libfm";
   version = "1.3.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pcmanfm/libfm-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "libfm";
+    tag = finalAttrs.version;
+    hash = "sha256-SQHV4kv8Fz24x7g2G8qc+uJR9qeN1Ez1KHnKK9YULY0=";
   };
 
   patches = [
@@ -37,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    autoreconfHook
     vala
     pkg-config
     intltool
+    gtk-doc
   ];
   buildInputs = [
     glib
@@ -56,11 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
 
-  postPatch = ''
-    # Ensure the files are re-generated from Vala sources.
-    rm src/actions/*.c
-  '';
-
   # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
   postInstall = optionalString (!extraOnly) ''
     rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc

From 2e1742e6dadb9702dac4684af8667260cb3f1ce0 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 10:59:44 +0200
Subject: [PATCH 026/111] libfm: 1.3.2 -> 1.4.0

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

diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index b7ea50a6e8c7..6b2eacdc2b2c 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -23,23 +23,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = if extraOnly then "libfm-extra" else "libfm";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libfm";
     tag = finalAttrs.version;
-    hash = "sha256-SQHV4kv8Fz24x7g2G8qc+uJR9qeN1Ez1KHnKK9YULY0=";
+    hash = "sha256-dmu5ygPuZe2YWAzIVPx5zskQeB51hXcLbMczxWgCr78=";
   };
 
-  patches = [
-    # Add casts to fix -Werror=incompatible-pointer-types
-    (fetchpatch {
-      url = "https://github.com/lxde/libfm/commit/fbcd183335729fa3e8dd6a837c13a23ff3271000.patch";
-      hash = "sha256-RbX8jkP/5ao6NWEnv8Pgy4zwZaiDsslGlRRWdoV3enA=";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     vala

From a017e7294e63c35a000a7495dd41492dddcacfb3 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 11:06:15 +0200
Subject: [PATCH 027/111] menu-cache: change upstream url

---
 pkgs/by-name/me/menu-cache/package.nix | 30 ++++++++++++++++----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix
index 0994473826e1..80c3a52db9ae 100644
--- a/pkgs/by-name/me/menu-cache/package.nix
+++ b/pkgs/by-name/me/menu-cache/package.nix
@@ -1,20 +1,24 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   fetchpatch,
   glib,
   pkg-config,
   libfm-extra,
+  autoreconfHook,
+  gtk-doc,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "menu-cache";
   version = "1.1.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lxde/menu-cache-${version}.tar.xz";
-    sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "menu-cache";
+    tag = finalAttrs.version;
+    hash = "sha256-UPSBAoDjI4nwyDsGK5yIrAR03WhGMSxv1IePSQ3SzxE=";
   };
 
   patches = [
@@ -27,18 +31,22 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gtk-doc
+  ];
 
   buildInputs = [
     glib
     libfm-extra
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to read freedesktop.org menu files";
     homepage = "https://blog.lxde.org/tag/menu-cache/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.ttuegel ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})

From b9ba33feba13c14c20821e1c4166545dd81bcd54 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 11:07:54 +0200
Subject: [PATCH 028/111] menu-cache: 1.1.0 -> 1.1.1

---
 pkgs/by-name/me/menu-cache/package.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix
index 80c3a52db9ae..34e522e6f797 100644
--- a/pkgs/by-name/me/menu-cache/package.nix
+++ b/pkgs/by-name/me/menu-cache/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   glib,
   pkg-config,
   libfm-extra,
@@ -12,25 +11,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "menu-cache";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "menu-cache";
     tag = finalAttrs.version;
-    hash = "sha256-UPSBAoDjI4nwyDsGK5yIrAR03WhGMSxv1IePSQ3SzxE=";
+    hash = "sha256-5Vp2btrflimy+Hq+3MLpic/quZMJ3uwsMq12G7s4DGI=";
   };
 
-  patches = [
-    # Pull patch pending upstream inclusion for -fno-common toolchain support:
-    #   https://github.com/lxde/menu-cache/pull/19
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch";
-      sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

From 536fb0739327136cf02f1fe04b1ab754e0cb3f08 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 11:17:21 +0200
Subject: [PATCH 029/111] lxde.lxmenu-data: change upstream source

---
 .../lxde/core/lxmenu-data/default.nix         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix
index a53885f33ed7..7021a8b2acfb 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data/default.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix
@@ -1,20 +1,30 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   intltool,
+  pkg-config,
+  glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxmenu-data";
   version = "0.1.5";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
-    sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxmenu-data";
+    tag = finalAttrs.version;
+    hash = "sha256-gWuhE6U33gAzlp21PGZ9qzC3bwi1nXO+WNMNj5xB6SE=";
   };
 
-  nativeBuildInputs = [ intltool ];
+  nativeBuildInputs = [
+    autoreconfHook
+    intltool
+    pkg-config
+    glib
+  ];
 
   meta = {
     homepage = "https://lxde.org/";
@@ -22,4 +32,4 @@ stdenv.mkDerivation rec {
     description = "Freedesktop.org desktop menus for LXDE";
     platforms = lib.platforms.linux;
   };
-}
+})

From fd0e9bfac685c4c041e92d4ee64616632765c51d Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 23 Aug 2025 11:20:12 +0200
Subject: [PATCH 030/111] lxde.lxmenu-data: 0.1.5 -> 0.1.6

---
 pkgs/desktops/lxde/core/lxmenu-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix
index 7021a8b2acfb..a1679bd8a700 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data/default.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxmenu-data";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxmenu-data";
     tag = finalAttrs.version;
-    hash = "sha256-gWuhE6U33gAzlp21PGZ9qzC3bwi1nXO+WNMNj5xB6SE=";
+    hash = "sha256-5QdQ+7nzj7wDrfdt4GT8VW4+sHgZdE7h3cReY2pmcak=";
   };
 
   nativeBuildInputs = [

From 7d92766509bac98d1e07ed65dab41666a7cf4396 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 24 Aug 2025 00:52:25 +0200
Subject: [PATCH 031/111] lxde.lxsession: 0.5.5 -> 0.5.6

---
 pkgs/desktops/lxde/core/lxsession/default.nix | 49 +++++++------------
 .../repect-xml-catalog-file-var.patch         | 13 +++++
 .../core/lxsession/xmlcatalog_patch.patch     | 23 ---------
 3 files changed, 32 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch
 delete mode 100644 pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch

diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix
index ab6b77429d9a..2395e96c45db 100644
--- a/pkgs/desktops/lxde/core/lxsession/default.nix
+++ b/pkgs/desktops/lxde/core/lxsession/default.nix
@@ -1,10 +1,8 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   fetchFromGitHub,
-  autoconf,
-  automake,
+  autoreconfHook,
   docbook_xml_dtd_412,
   docbook_xsl,
   intltool,
@@ -18,39 +16,26 @@
   vala,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxsession";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxsession";
-    rev = version;
-    sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d";
+    tag = finalAttrs.version;
+    hash = "sha256-3RnRF4oMCtZbIraHVqEPnkviAkELq7uYqyHY0uCf/lU=";
   };
 
-  patches = [
-    ./xmlcatalog_patch.patch
-
-    # lxsession compilation is broken upstream as of GCC 14
-    # https://sourceforge.net/p/lxde/bugs/973/
-    (fetchpatch {
-      name = "0001-Fix-build-on-GCC-14.patch";
-      url = "https://sourceforge.net/p/lxde/bugs/973/attachment/0001-Fix-build-on-GCC-14.patch";
-      hash = "sha256-lxF3HZy5uLK7Cfu8W1A03syZf7OWXpHiU2Fk+xBl39g=";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoconf
-    automake
-    docbook_xml_dtd_412
-    docbook_xsl
+    autoreconfHook
     intltool
     libxml2
     libxslt
     pkg-config
     wrapGAppsHook3
+    docbook_xml_dtd_412
+    docbook_xsl
   ];
 
   buildInputs = [
@@ -64,16 +49,20 @@ stdenv.mkDerivation rec {
     "--enable-man"
     "--disable-buildin-clipboard"
     "--disable-buildin-polkit"
-    "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
   ];
 
-  preConfigure = "./autogen.sh";
+  postPatch = ''
+    mkdir -p m4
+  '';
 
-  meta = with lib; {
+  patches = [ ./repect-xml-catalog-file-var.patch ];
+
+  meta = {
     homepage = "https://wiki.lxde.org/en/LXSession";
     description = "Classic LXDE session manager";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.shamilton ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.shamilton ];
+    platforms = lib.platforms.linux;
+    mainProgram = "lxsession";
   };
-}
+})
diff --git a/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch b/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch
new file mode 100644
index 000000000000..330bdcb72550
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4	2025-08-24 00:39:08.807857027 +0200
++++ b/acinclude.m4	2025-08-24 00:49:23.043780737 +0200
+@@ -40,8 +40,8 @@
+ [
+   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+-  if $jh_found_xmlcatalog && \
+-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++  # empty argument forces libxml to use XML_CATALOG_FILES variable
++  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+     AC_MSG_RESULT([found])
+     ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch b/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch
deleted file mode 100644
index 644518a6eb2a..000000000000
--- a/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --color -ur a/configure.ac b/configure.ac
---- a/configure.ac	2021-01-18 12:39:19.556844678 +0100
-+++ b/configure.ac	2021-01-18 17:26:47.989410501 +0100
-@@ -167,18 +167,7 @@
- AM_GLIB_GNU_GETTEXT
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
- 
--if test x"$enable_man" = x"yes"; then
--	AC_PATH_PROG([XSLTPROC], [xsltproc])
--	if test -z "$XSLTPROC"; then
--		enable_man=no
--	fi
--
--	dnl check for DocBook DTD and stylesheets in the local catalog.
--	JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
--		[DocBook XML DTD V4.1.2], [], enable_man=no)
--	JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
--		[DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)
--fi
-+AC_PATH_PROG([XSLTPROC], [xsltproc])
- 
- AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno")
- 

From 5089eee572708d31674643e1dbd2b6c77b5dce57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Sir=C3=A9n?=
 <33450373+Jaakkonen@users.noreply.github.com>
Date: Wed, 27 Aug 2025 18:25:35 +0300
Subject: [PATCH 032/111] pdm: use tag instead of rev for overwritten
 resolvelib version

Resolvelib currently uses `tag` for its version.
---
 pkgs/by-name/pd/pdm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index c561562a50d8..3f7c847cfd00 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -15,7 +15,7 @@ let
       resolvelib = super.resolvelib.overridePythonAttrs (old: rec {
         version = "1.1.0";
         src = old.src.override {
-          rev = version;
+          tag = version;
           hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
         };
       });

From 34b9180a4d43d694040ef6caa5d8c9a1b37b50c9 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 27 Aug 2025 19:31:01 +0200
Subject: [PATCH 033/111] visidata: migrate to by-name

---
 .../vi/visidata/package.nix}                  | 159 +++++++-----------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 63 insertions(+), 98 deletions(-)
 rename pkgs/{applications/misc/visidata/default.nix => by-name/vi/visidata/package.nix} (60%)

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/by-name/vi/visidata/package.nix
similarity index 60%
rename from pkgs/applications/misc/visidata/default.nix
rename to pkgs/by-name/vi/visidata/package.nix
index 0abc8a4d6cc7..ef923e097cd0 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/by-name/vi/visidata/package.nix
@@ -1,55 +1,17 @@
 {
-  stdenv,
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  # python requirements
-  beautifulsoup4,
-  boto3,
-  faker,
-  fonttools,
-  h5py,
-  importlib-metadata,
-  lxml,
-  matplotlib,
-  numpy,
-  odfpy,
-  openpyxl,
-  pandas,
-  pdfminer-six,
-  praw,
-  psutil,
-  psycopg2,
-  pyarrow,
-  pyshp,
-  pypng,
-  msgpack,
-  brotli,
-  python-dateutil,
-  pyyaml,
-  requests,
-  seaborn,
-  setuptools,
-  sh,
-  tabulate,
-  urllib3,
-  vobject,
-  wcwidth,
-  xlrd,
-  xlwt,
-  zstandard,
-  zulip,
   # other
   gitMinimal,
   withPcap ? true,
-  dpkt,
-  dnslib,
   withXclip ? stdenv.hostPlatform.isLinux,
   xclip,
   testers,
   visidata,
+  stdenv,
 }:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "visidata";
   version = "3.2";
   format = "setuptools";
@@ -61,64 +23,69 @@ buildPythonApplication rec {
     hash = "sha256-kOg9OypWNGStNYFctPIwzVa1CsZBySY2IpA3eDrS7eY=";
   };
 
-  propagatedBuildInputs = [
-    # from visidata/requirements.txt
-    # packages not (yet) present in nixpkgs are commented
-    python-dateutil
-    pandas
-    requests
-    lxml
-    openpyxl
-    xlrd
-    xlwt
-    h5py
-    psycopg2
-    boto3
-    pyshp
-    #mapbox-vector-tile
-    pypng
-    #pyconll
-    msgpack
-    brotli
-    #fecfile
-    fonttools
-    #sas7bdat
-    #xport
-    #savReaderWriter
-    pyyaml
-    #namestand
-    #datapackage
-    pdfminer-six
-    #tabula
-    vobject
-    tabulate
-    wcwidth
-    zstandard
-    odfpy
-    urllib3
-    pyarrow
-    seaborn
-    matplotlib
-    sh
-    psutil
-    numpy
+  propagatedBuildInputs =
+    with python3Packages;
+    [
+      # from visidata/requirements.txt
+      # packages not (yet) present in nixpkgs are commented
+      python-dateutil
+      pandas
+      requests
+      lxml
+      openpyxl
+      xlrd
+      xlwt
+      h5py
+      psycopg2
+      boto3
+      pyshp
+      #mapbox-vector-tile
+      pypng
+      #pyconll
+      msgpack
+      brotli
+      #fecfile
+      fonttools
+      #sas7bdat
+      #xport
+      #savReaderWriter
+      pyyaml
+      #namestand
+      #datapackage
+      pdfminer-six
+      #tabula
+      vobject
+      tabulate
+      wcwidth
+      zstandard
+      odfpy
+      urllib3
+      pyarrow
+      seaborn
+      matplotlib
+      sh
+      psutil
+      numpy
 
-    #requests_cache
-    beautifulsoup4
+      #requests_cache
+      beautifulsoup4
 
-    faker
-    praw
-    zulip
-    #pyairtable
+      faker
+      praw
+      zulip
+      #pyairtable
 
-    setuptools
-    importlib-metadata
-  ]
-  ++ lib.optionals withPcap [
-    dpkt
-    dnslib
-  ]
-  ++ lib.optional withXclip xclip;
+      setuptools
+      importlib-metadata
+    ]
+    ++ lib.optionals withPcap (
+      with python3Packages;
+      [
+        dpkt
+        dnslib
+      ]
+    )
+    ++ lib.optional withXclip xclip;
 
   nativeCheckInputs = [
     gitMinimal
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 780faa072ac8..68ee3210537b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4383,8 +4383,6 @@ with pkgs;
 
   vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { };
 
-  visidata = python3Packages.callPackage ../applications/misc/visidata { };
-
   vkbasalt = callPackage ../tools/graphics/vkbasalt {
     vkbasalt32 = pkgsi686Linux.vkbasalt;
   };

From db1c469ba9bebe3b50bc8d818169050d8e267421 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 25 Aug 2025 18:14:00 -0700
Subject: [PATCH 034/111] =?UTF-8?q?dprint:=20Fix=20build=20failure=20with?=
 =?UTF-8?q?=20Rust=20=E2=89=A5=201.89.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/dp/dprint/package.nix          |   8 +-
 pkgs/by-name/dp/dprint/upgrade-wasmer.patch | 161 ++++++++++++++++++++
 2 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/dp/dprint/upgrade-wasmer.patch

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 88e4c321e238..feb40041f445 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -24,7 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
   };
 
-  cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4=";
+  cargoPatches = [
+    # Upgrade wasmer to 6.1.0-rc.3 to fix build failure with Rust ≥ 1.89.0
+    # https://github.com/dprint/dprint/pull/1021
+    ./upgrade-wasmer.patch
+  ];
+
+  cargoHash = "sha256-RUWyR1Yr9G2xBMigDa9+LQyaU5on85xkRQYTLH9JOPg=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/dp/dprint/upgrade-wasmer.patch b/pkgs/by-name/dp/dprint/upgrade-wasmer.patch
new file mode 100644
index 000000000000..6c92628aebd2
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/upgrade-wasmer.patch
@@ -0,0 +1,161 @@
+From 379cf407bfc07380dad24aefb2db40f6852f32ed Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Mon, 25 Aug 2025 18:01:57 -0700
+Subject: [PATCH] Upgrade wasmer to 6.1.0-rc.3
+
+Signed-off-by: Anders Kaseorg <andersk@mit.edu>
+---
+ Cargo.lock               | 41 ++++++++++++++++++++--------------------
+ crates/dprint/Cargo.toml |  4 ++--
+ 2 files changed, 22 insertions(+), 23 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 9a1bc870..bff2c81b 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -455,9 +455,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+ 
+ [[package]]
+ name = "corosensei"
+-version = "0.2.1"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437"
++checksum = "5d1ea1c2a2f898d2a6ff149587b8a04f41ee708d248c723f01ac2f0f01edc0b3"
+ dependencies = [
+  "autocfg",
+  "cfg-if",
+@@ -776,18 +776,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "derive_more"
+-version = "1.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
++checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+ dependencies = [
+  "derive_more-impl",
+ ]
+ 
+ [[package]]
+ name = "derive_more-impl"
+-version = "1.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
++checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -3256,16 +3256,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmer"
+-version = "6.0.1"
++version = "6.1.0-rc.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f25dccc6251837449135914ee1978731c2c3df9fc727088eb7e098736c0f15d1"
++checksum = "1e588d83a5ac7eb5e6af54ac4d34183442e4dd2a7358d2a11793b17c03b7df0b"
+ dependencies = [
+  "bindgen",
+  "bytes",
+  "cfg-if",
+  "cmake",
+- "derive_more 1.0.0",
+- "idna_adapter",
++ "derive_more 2.0.1",
+  "indexmap",
+  "js-sys",
+  "more-asserts",
+@@ -3278,7 +3277,6 @@ dependencies = [
+  "target-lexicon",
+  "thiserror 1.0.61",
+  "tracing",
+- "ureq",
+  "wasm-bindgen",
+  "wasmer-compiler",
+  "wasmer-compiler-cranelift",
+@@ -3292,9 +3290,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmer-compiler"
+-version = "6.0.1"
++version = "6.1.0-rc.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6f35baeb0d5b20710b5b9c59477dbf813b1ac53da33ee46cb22f8c4190e3986e"
++checksum = "c9542eb21b9a0f7811101e26e40e360a9ac02d093e3089c8fa62dfa102478edb"
+ dependencies = [
+  "backtrace",
+  "bytes",
+@@ -3323,9 +3321,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmer-compiler-cranelift"
+-version = "6.0.1"
++version = "6.1.0-rc.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6d657a96003ce3f54a3cbbf681fcd782b983f9362c97cfbbe243cbf66790e004"
++checksum = "a69f548bcccd4791b2647e0d748eb8ddd4d0856233778867c8b0db3781a82ca1"
+ dependencies = [
+  "cranelift-codegen",
+  "cranelift-entity",
+@@ -3343,9 +3341,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmer-derive"
+-version = "6.0.1"
++version = "6.1.0-rc.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "62b57be80a67de03c2a02d697bfd763e097546b11f0020cf9930ebaa4f8cf965"
++checksum = "8db532c73814748214276f878b8382a8885769fdd86d0bee2792c438b0d28c62"
+ dependencies = [
+  "proc-macro-error2",
+  "proc-macro2",
+@@ -3355,9 +3353,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmer-types"
+-version = "6.0.1"
++version = "6.1.0-rc.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1b8424d15f5c19a8df972fc9367d75ba3b87af63b279208d50a32e9a298d944b"
++checksum = "81b900743ecb272e8e8a760a42e069f19d158d9fd03c6ac256026407bdc91833"
+ dependencies = [
+  "bytecheck 0.6.11",
+  "enum-iterator",
+@@ -3375,9 +3373,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasmer-vm"
+-version = "6.0.1"
++version = "6.1.0-rc.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "faabfffefc6fc350bb5b07301f05ba604a18c3d2d97c6354183f15792577056d"
++checksum = "40956bcf167d5bed1a940649f638e2d610e5a066863b4ab6c1ab1341fef97a9a"
+ dependencies = [
+  "backtrace",
+  "cc",
+@@ -3394,6 +3392,7 @@ dependencies = [
+  "memoffset",
+  "more-asserts",
+  "region",
++ "rustversion",
+  "scopeguard",
+  "thiserror 1.0.61",
+  "wasmer-types",
+diff --git a/crates/dprint/Cargo.toml b/crates/dprint/Cargo.toml
+index 44d107d4..af733e83 100644
+--- a/crates/dprint/Cargo.toml
++++ b/crates/dprint/Cargo.toml
+@@ -58,8 +58,8 @@ webpki-roots = "=0.26.7"
+ # patch version increases of rkyv may cause panics when deserializing
+ # data serialized with older versions
+ rkyv = "=0.8.10"
+-wasmer = "=6.0.1"
+-wasmer-compiler = "=6.0.1"
++wasmer = "=6.1.0-rc.3"
++wasmer-compiler = "=6.1.0-rc.3"
+ 
+ [target.'cfg(windows)'.dependencies]
+ winreg = "=0.55.0"

From a56ed509d57a55ea6d5d2d6f1e54a862b382f288 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 17:41:30 +0000
Subject: [PATCH 035/111] python3Packages.yara-x: 0.15.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix
index 701ba5dad028..72799b762d41 100644
--- a/pkgs/development/python-modules/yara-x/default.nix
+++ b/pkgs/development/python-modules/yara-x/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "yara-x";
-  version = "0.15.0";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,14 +18,14 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${version}";
-    hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM=";
+    hash = "sha256-YZmhwHA6PnQb3QXhbWK8cbV0CScbiD5k+HceDcV6iCI=";
   };
 
   buildAndTestSubdir = "py";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src version;
-    hash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY=";
+    hash = "sha256-8LofNTLa3a2dDH72T54HJR/+qArXt+X6OMJIQwmjQIQ=";
   };
 
   nativeBuildInputs = [

From c7b139fe23bdc8caca59aecb61c3490c65d4c568 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 23:50:20 +0000
Subject: [PATCH 036/111] libretro-shaders-slang: 0-unstable-2025-08-14 ->
 0-unstable-2025-08-26

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

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index fbb2db132742..5a904afae721 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-08-14";
+  version = "0-unstable-2025-08-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "69e3dbb8947e749156ff1f70e32c88f3c37e6793";
-    hash = "sha256-C+qO/B3Lb8vtQUV3u6ZqiVZlg2prytR+9IbTnvyQGMg=";
+    rev = "c9303dcc4d11fe5d37db9ef9a24c8eab4087c0c3";
+    hash = "sha256-k/th5Ze/x48mTFZxEsSWCE4STnMSFXl3I0uMVmdMSxc=";
   };
 
   dontConfigure = true;

From 676c3b592e8e71f26f12b0feec73368e621d798f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 03:13:30 +0000
Subject: [PATCH 037/111] tile38: 1.36.0 -> 1.36.1

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

diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix
index b35432d91348..5fd0424d0965 100644
--- a/pkgs/by-name/ti/tile38/package.nix
+++ b/pkgs/by-name/ti/tile38/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tile38";
-  version = "1.36.0";
+  version = "1.36.1";
 
   src = fetchFromGitHub {
     owner = "tidwall";
     repo = "tile38";
     tag = version;
-    hash = "sha256-FJ1I82ECCit6FV0F5VfY5xa6qCEqZo47KdnY0vwRGzg=";
+    hash = "sha256-65zUbnnksLCWCsOjO8xzyhJ2IKhPg6tttywvApzf7mw=";
   };
 
-  vendorHash = "sha256-hpqH/+MlXPz3NZ0ooyWwf1Rg2UeKW49xQ0KbCFIi7jc=";
+  vendorHash = "sha256-J8kWsbU8onvXeVLGGBX9P6hYuGy50fG+m1nFg6phBMk=";
 
   subPackages = [
     "cmd/tile38-cli"

From a804db4435c95084b6dc89f876452beb64719244 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 04:33:02 +0000
Subject: [PATCH 038/111] discord: 0.0.104 -> 0.0.107

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index a9b27084feca..cf639b34ae8c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.104";
+        stable = "0.0.107";
         ptb = "0.0.156";
         canary = "0.0.745";
         development = "0.0.84";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac=";
+        hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 4db8ccb60dd60d395c31ad1c0b6bb42dae600205 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 10:44:50 +0000
Subject: [PATCH 039/111] python3Packages.llama-index-readers-file: 0.5.0 ->
 0.5.2

---
 .../python-modules/llama-index-readers-file/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix
index 8c055851158a..028cf5eb648d 100644
--- a/pkgs/development/python-modules/llama-index-readers-file/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-file";
-  version = "0.5.0";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_file";
     inherit version;
-    hash = "sha256-8yRhe/xNmzITbSX/U1G5K8C1aaKWFz7iqFkcH4hu/ww=";
+    hash = "sha256-BJ2XGsTJNu2/SDKRW6cSjP7o9erUNSZnkrce3Yf1MFw=";
   };
 
   pythonRelaxDeps = [

From 1b9949e9afaeaa44fb41c586f2087bffc26b1c92 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 29 Aug 2025 15:05:31 +0200
Subject: [PATCH 040/111] python3Packages.tokenizers: 0.21.4 -> 0.22.0

Diff: https://github.com/huggingface/tokenizers/compare/v0.21.4...v0.22.0

Changelog: https://github.com/huggingface/tokenizers/releases/tag/v0.22.0
---
 .../python-modules/tokenizers/default.nix     | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index 724fcc3df3af..d307f6edae15 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -21,6 +21,7 @@
   # tests
   datasets,
   numpy,
+  pytest-asyncio,
   pytestCheckHook,
   requests,
   tiktoken,
@@ -75,14 +76,14 @@ let
 in
 buildPythonPackage rec {
   pname = "tokenizers";
-  version = "0.21.4";
+  version = "0.22.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "tokenizers";
     tag = "v${version}";
-    hash = "sha256-HJUycrNDpy2FOYi6aZ76orLewZCuLC1MoJ57peYJqvI=";
+    hash = "sha256-HTJQ5nPkOsVqYzcsm0GLflX+teqDsrpIb5nf5pa7Gpc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -92,7 +93,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-0olujhOOO/BAH4JvnmXd1kE7T/sp5Vr3Z3P2X2jhZKs=";
+    hash = "sha256-X9tsn4gPg7Ih/8NNiCBllgcZgUR/tok+mwCJE53Z/8g=";
   };
 
   sourceRoot = "${src.name}/bindings/python";
@@ -117,6 +118,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     datasets
     numpy
+    pytest-asyncio
     pytestCheckHook
     requests
     tiktoken
@@ -138,6 +140,23 @@ buildPythonPackage rec {
     "test_splitting"
     "TestTrainFromIterators"
 
+    # Require downloading from huggingface
+    # huggingface_hub.errors.LocalEntryNotFoundError
+    "test_async_methods_existence"
+    "test_basic_encoding"
+    "test_concurrency"
+    "test_decode"
+    "test_decode_skip_special_tokens"
+    "test_decode_stream_fallback"
+    "test_encode"
+    "test_error_handling"
+    "test_large_batch"
+    "test_numpy_inputs"
+    "test_performance_comparison"
+    "test_various_input_formats"
+    "test_with_special_tokens"
+    "test_with_truncation_padding"
+
     # Those tests require more data
     "test_from_pretrained"
     "test_from_pretrained_revision"

From 08855e77a8e2b4cfece0fec2b8aa4b0529eee858 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 14:02:43 +0000
Subject: [PATCH 041/111] python3Packages.dnfile: 0.16.4 -> 0.17.0

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

diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix
index 4edf3e8ba16b..106c3bbb3028 100644
--- a/pkgs/development/python-modules/dnfile/default.nix
+++ b/pkgs/development/python-modules/dnfile/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dnfile";
-  version = "0.16.4";
+  version = "0.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "malwarefrank";
     repo = "dnfile";
     tag = "v${version}";
-    hash = "sha256-xizjWY+ByGDOI7HyzT5U4vqmPT2woU7z/3eV0KXDb8Y=";
+    hash = "sha256-JiJ7qvBP0SDGMynQuu2AyCwHU9aDI7Pq5/Z9IiWPWng=";
     fetchSubmodules = true;
   };
 

From a5ae7b9504471317986edeaab080b5e608c08a5a Mon Sep 17 00:00:00 2001
From: Dominic Wrege <dominic.wrege001@stud.fh-dortmund.de>
Date: Fri, 29 Aug 2025 16:14:39 +0200
Subject: [PATCH 042/111] librewolf-unwrapped: 142.0-1 -> 142.0.1-1

---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index ac3afeac899e..c247bac2ebed 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "142.0-1",
+  "packageVersion": "142.0.1-1",
   "source": {
-    "rev": "142.0-1",
-    "hash": "sha256-/bn9xeDxnJCQol/E8rhS8RVhpUj7UN+QScSIzLFnZ/o="
+    "rev": "142.0.1-1",
+    "hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c="
   },
   "firefox": {
-    "version": "142.0",
-    "hash": "sha512-sMHHZgg6MKkrd9zxalhNn7NBzYEdIcOjTaTNDXFP1q3HO2CAktZgWGl7xFYvqsxEhZFT5J/9624U4Fnlny6iRg=="
+    "version": "142.0.1",
+    "hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ=="
   }
 }

From a5917ce0d7c790eb7276b1680b72fb293099db60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 15:22:02 +0000
Subject: [PATCH 043/111] python3Packages.pygitguardian: 1.24.0 -> 1.25.0

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

diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index c759e67bbf07..2c5468f77363 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pygitguardian";
-  version = "1.24.0";
+  version = "1.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "GitGuardian";
     repo = "py-gitguardian";
     tag = "v${version}";
-    hash = "sha256-9Zk2XpMS8WhCOGYwtUgsjWKbUhmtKOgVWyqskLJ8DOw=";
+    hash = "sha256-XcmLaEnQ5cUTd71xvgvdS418RGOzpKydUDoSdVC/mgo=";
   };
 
   pythonRelaxDeps = [

From d0c34e3286568700c51723e82673e48134945171 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 16:00:43 +0000
Subject: [PATCH 044/111] python3Packages.mscerts: 2025.6.27 -> 2025.8.29

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

diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix
index ea6ceec821fb..da2095ec25de 100644
--- a/pkgs/development/python-modules/mscerts/default.nix
+++ b/pkgs/development/python-modules/mscerts/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mscerts";
-  version = "2025.6.27";
+  version = "2025.8.29";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "ralphje";
     repo = "mscerts";
     tag = version;
-    hash = "sha256-By0gVlsVjgBREBGUOZjnKE9HTHC+zLZ4kUKIcN7/eKY=";
+    hash = "sha256-K7U4dbhH3yWElSKRhU9mHU4W+Hdc6Vb9kf/TE4EJs8c=";
   };
 
   build-system = [ setuptools ];

From 4b06c0af17538bc8110d745601806bac6c092f97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 16:22:12 +0000
Subject: [PATCH 045/111] rekor-cli: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix
index e28edd4be66a..21b5b4273d91 100644
--- a/pkgs/tools/security/rekor/default.nix
+++ b/pkgs/tools/security/rekor/default.nix
@@ -14,13 +14,13 @@ let
     }:
     buildGoModule rec {
       inherit pname;
-      version = "1.4.0";
+      version = "1.4.1";
 
       src = fetchFromGitHub {
         owner = "sigstore";
         repo = "rekor";
         rev = "v${version}";
-        hash = "sha256-uGPjeBnai1QP/U9uu4wVMUVjd8Nx1sl4r83xrOdEoF0=";
+        hash = "sha256-qn65d2bG8flSlMXG5TiMrNAVX8emv4ymsGs516TKFWU=";
         # populate values that require us to use git. By doing this in postFetch we
         # can delete .git afterwards and maintain better reproducibility of the src.
         leaveDotGit = true;
@@ -33,7 +33,7 @@ let
         '';
       };
 
-      vendorHash = "sha256-lHaRabQzeh69GXQc3Spe1mLi7zyGSjhICH3ZENMJUfI=";
+      vendorHash = "sha256-lHzBpCisojRk6adWq+vZsvGqXQ22IzqO3bJa3foaWIA=";
 
       nativeBuildInputs = [ installShellFiles ];
 

From 81d4426bcf0feaff34c300f66523d8018bcfcdab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 17:35:05 +0000
Subject: [PATCH 046/111] python3Packages.datrie: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix
index c76e36e6b21f..2d8b72098220 100644
--- a/pkgs/development/python-modules/datrie/default.nix
+++ b/pkgs/development/python-modules/datrie/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "datrie";
-  version = "0.8.2";
+  version = "0.8.3";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0=";
+    hash = "sha256-6gIa1MiovxTginHHhypiKqOZpRD5gSloJQkcfKBDboA=";
   };
 
   postPatch = ''

From fc5ac6f3aeb1f2f352b2ec128e72663c9b2b8783 Mon Sep 17 00:00:00 2001
From: Mohamed Laradji <mlaradji@proton.me>
Date: Sun, 24 Aug 2025 10:09:40 -0400
Subject: [PATCH 047/111] python3Packages.pyipv8: 3.0.0 ->
 3.0.2197-unstable-2025-07-29

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

diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix
index cca3f6fef912..55e65a97679a 100644
--- a/pkgs/development/python-modules/pyipv8/default.nix
+++ b/pkgs/development/python-modules/pyipv8/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  fetchFromGitHub,
   cryptography,
   libnacl,
   aiohttp,
@@ -16,12 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyipv8";
-  version = "3.0.0";
+  version = "3.0.2197-unstable-2025-07-29";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-e8HoKKA1s93LbmvHs7gJqmCcuZZ9REenBwxKJFR6wjM=";
+  src = fetchFromGitHub {
+    owner = "tribler";
+    repo = "py-ipv8";
+    rev = "db39b85f4c28880dee24d1b59d8eae8ca8b9c03d";
+    hash = "sha256-VIcBPzpK8Cdaz/dRp9QK/MtK41jm8rs/pxnLS716FNM=";
   };
 
   propagatedBuildInputs = [

From 148297d3322537d0c7ac54d944af8b1f3fce6057 Mon Sep 17 00:00:00 2001
From: Mohamed Laradji <mlaradji@proton.me>
Date: Sun, 24 Aug 2025 10:09:44 -0400
Subject: [PATCH 048/111] python3Packages.ipv8-rust-tunnels: init at 0.1.33

---
 .../ipv8-rust-tunnels/default.nix             | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/ipv8-rust-tunnels/default.nix

diff --git a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
new file mode 100644
index 000000000000..657d58c7cc4d
--- /dev/null
+++ b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchPypi,
+  buildPythonPackage,
+}:
+
+buildPythonPackage rec {
+  pname = "ipv8-rust-tunnels";
+  version = "0.1.33";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "ipv8_rust_tunnels";
+    hash = "sha256-LwQL/u+h6mwCo207OxSk9YKxuLuxXQhh07rSWrNFh7w=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-NwYLez9NFgS0GBXrcNrKJKV+s4HIHM8jHXfmkgya03M=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  meta = with lib; {
+    description = "A set of performance enhancements to the TunnelCommunity, the anonymization layer used in IPv8 and Tribler";
+    homepage = "https://github.com/Tribler/ipv8-rust-tunnels";
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ mlaradji ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb1701b3f7d8..3d743f3ab6b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7153,6 +7153,8 @@ self: super: with self; {
 
   iptools = callPackage ../development/python-modules/iptools { };
 
+  ipv8-rust-tunnels = callPackage ../development/python-modules/ipv8-rust-tunnels { };
+
   ipwhl = callPackage ../development/python-modules/ipwhl { };
 
   ipwhois = callPackage ../development/python-modules/ipwhois { };

From df3bc53260769d50cc5c64198d7cd7350f9029c1 Mon Sep 17 00:00:00 2001
From: Mohamed Laradji <mlaradji@proton.me>
Date: Sun, 24 Aug 2025 10:09:47 -0400
Subject: [PATCH 049/111] tribler: 7.14.0 -> 8.2.3

---
 pkgs/by-name/tr/tribler/package.nix          | 234 ++++++++++---------
 pkgs/by-name/tr/tribler/startupwmclass.patch |   9 -
 2 files changed, 129 insertions(+), 114 deletions(-)
 delete mode 100644 pkgs/by-name/tr/tribler/startupwmclass.patch

diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix
index a503f1e4cb05..8fcbc3aa3ff2 100644
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -1,136 +1,160 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchPypi,
-  python311,
+  python312,
   makeWrapper,
-  libtorrent-rasterbar-1_2_x,
-  qt5,
   nix-update-script,
-  boost186,
+  fetchFromGitHub,
+  rustPlatform,
+  buildNpmPackage,
+  nodejs_24,
+  wrapGAppsHook3,
+  libappindicator-gtk3,
 }:
-
 let
-  # libtorrent-rasterbar-1_2_x requires python311 and boost 1.86
-  python3 = python311.override {
-    packageOverrides = final: prev: {
-      boost = boost186;
-    };
+  version = "8.2.3";
+  python3 = python312;
+  nodejs = nodejs_24;
+
+  src = fetchFromGitHub {
+    owner = "tribler";
+    repo = "Tribler";
+    tag = "v${version}";
+    hash = "sha256-yThl3HhPtwi/pK5Rcr2ClVLY8uCnIyfvdc53A8gjKDg=";
   };
-  libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
+
+  tribler-webui = buildNpmPackage {
+    inherit nodejs version;
+    pname = "tribler-webui";
+    src = "${src}/src/tribler/ui";
+    npmDepsHash = "sha256-bgRwhqP6/NMPFbZks31IZtVGV9wzFFU6qSgyLvdarlY=";
+
+    # The prepack script runs the build script, which we'd rather do in the build phase.
+    npmPackFlags = [ "--ignore-scripts" ];
+
+    NODE_OPTIONS = "--openssl-legacy-provider";
+
+    dontNpmBuild = true;
+    dontNpmInstall = true;
+
+    installPhase = ''
+      mkdir -pv $out
+      cp -prvd ./* $out/
+      cd $out
+      npm install
+      npm run build
+    '';
+  };
+
 in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tribler";
-  version = "7.14.0";
 
-  src = fetchurl {
-    url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";
-  };
+python3.pkgs.buildPythonApplication {
+  inherit version src;
+  name = "tribler";
+  pyproject = true;
 
-  patches = [
-    ./startupwmclass.patch
+  build-system = with python3.pkgs; [
+    setuptools
   ];
 
-  nativeBuildInputs = [
-    python3.pkgs.wrapPython
-    makeWrapper
-    # we had a "copy" of this in tribler's makeWrapper
-    # but it went out of date and broke, so please just use it directly
-    qt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [ python3.pkgs.python ];
-
-  pythonPath = [
-    libtorrent
-  ]
-  ++ (with python3.pkgs; [
-    # requirements-core.txt
-    aiohttp
-    aiohttp-apispec
-    anyio
-    chardet
-    configobj
-    cryptography
-    decorator
-    faker
-    libnacl
-    lz4
-    marshmallow
-    netifaces
-    networkx
-    pony
-    psutil
-    pyasn1
-    pydantic_1
-    pyopenssl
-    pyyaml
-    sentry-sdk
-    service-identity
-    yappi
-    yarl
-    bitarray
-    filelock
-    (pyipv8.overrideAttrs (p: rec {
-      version = "2.10.0";
-      src = fetchPypi {
-        inherit (p) pname;
-        inherit version;
-        hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
-      };
-    }))
-    file-read-backwards
-    brotli
-    human-readable
+  dependencies = with python3.pkgs; [
     # requirements.txt
+    bitarray
+    configobj
+    pyipv8
+    ipv8-rust-tunnels
+    libtorrent-rasterbar
+    lz4
     pillow
-    pyqt5
-    pyqt5-sip
-    pyqtgraph
-    pyqtwebengine
-  ]);
+    pony
+    pystray
+  ];
 
-  installPhase = ''
-    mkdir -pv $out
-    # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
-    wrapPythonPrograms
-    cp -prvd ./* $out/
-    makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
-        --set _TRIBLERPATH "$out/src" \
-        --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
-        --set NO_AT_BRIDGE 1 \
-        --chdir "$out/src" \
-        --add-flags "-O $out/src/run_tribler.py"
+  buildInputs = with python3.pkgs; [
+    # setup.py requirements
+    pygobject3
+    setuptools
+    # sphinx requirements
+    sphinxHook
+    sphinx
+    sphinx-autoapi
+    sphinx-rtd-theme
+    astroid
+    # tray icon deps
+    wrapGAppsHook3
+    libappindicator-gtk3
+    # test phase requirements
+    pytestCheckHook
 
-    mkdir -p $out/share/applications $out/share/icons
-    cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/
-    cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
-    mkdir -p $out/share/copyright/tribler
-    mv $out/LICENSE $out/share/copyright/tribler
+  ];
+
+  outputs = [
+    "out"
+  ];
+
+  buildPhase = ''
+          # fix the entrypoint
+          substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"'
+          substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():'
+
+          # copy the built webui
+          rm -r src/tribler/ui
+          ln -s ${tribler-webui} src/tribler/ui
+
+          # build the docs
+    # FIXME:      make doc SPHINXBUILD=${lib.getExe' python3.pkgs.sphinx "sphinx-build"}
+
+          # build the wheel
+          substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:"
+          export GITHUB_TAG=v${version}
+          python3 build/debian/update_metainfo.py
+          python3 build/setup.py bdist_wheel
+
+        runHook pytestCheckHook
+
+          # build the docs
+        runHook sphinxHook
   '';
 
-  shellHook = ''
-    wrapPythonPrograms || true
-    export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms)
-    export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH
-    export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"
+  postInstall = ''
+    ln -s ${tribler-webui} $out/lib/python3.12/site-packages/tribler/ui
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ libappindicator-gtk3 ]}"
+    )
+  '';
+
+  postFixup = ''
+    runHook wrapGAppsHook3
+  '';
+
+  disabledTests = [
+    "test_request_for_version"
+    "test_establish_connection"
+    "test_tracker_test_error_resolve"
+    "test_get_default_fallback"
+    "test_get_default_fallback_half_tree"
+    "test_get_set_explicit"
+  ];
+
+  disabledTestPaths = [
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
+    description = "Decentralized P2P filesharing client based on the Bittorrent protocol";
     mainProgram = "tribler";
     homepage = "https://www.tribler.org/";
-    changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.lgpl21Plus;
+    changelog = "https://github.com/Tribler/tribler/releases/tag/v${version}";
+    license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
-      xvapx
-
       mkg20001
+      mlaradji
+      xvapx
     ];
     platforms = lib.platforms.linux;
   };
-})
+}
diff --git a/pkgs/by-name/tr/tribler/startupwmclass.patch b/pkgs/by-name/tr/tribler/startupwmclass.patch
deleted file mode 100644
index ce1ec9e4a59a..000000000000
--- a/pkgs/by-name/tr/tribler/startupwmclass.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
-index b0472a18d..0e0be14f3 100644
---- a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
-+++ b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
-@@ -7,3 +7,4 @@ Terminal=false
- Type=Application
- Categories=Application;Network;P2P
- MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;application/x-bittorrent
-+StartupWMClass=Tribler

From 3831d5829e27c917cfb1d19fa58e62938a08a5c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 19:20:12 +0000
Subject: [PATCH 050/111] pgmodeler: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix
index acf174617c5a..d076d7493aaa 100644
--- a/pkgs/by-name/pg/pgmodeler/package.nix
+++ b/pkgs/by-name/pg/pgmodeler/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmodeler";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
     rev = "v${version}";
-    sha256 = "sha256-q0XoShp+XERvyERLxi9uh//dNxVEtfL+UY9uVKqX4fI=";
+    sha256 = "sha256-DIyqUewP8q9O6O/v82a2DNgyrBffWkBmyhBm3pA1qVY=";
   };
 
   nativeBuildInputs = [

From b5ae714e83b7ed06996c623ffe5906f17093aa5c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 29 Aug 2025 22:04:56 +0200
Subject: [PATCH 051/111] python313Packages.dnfile: modernize

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

diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix
index 106c3bbb3028..4279f0ea4859 100644
--- a/pkgs/development/python-modules/dnfile/default.nix
+++ b/pkgs/development/python-modules/dnfile/default.nix
@@ -34,8 +34,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to parse .NET executable files";
     homepage = "https://github.com/malwarefrank/dnfile";
-    changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/malwarefrank/dnfile/blob/${src.tag}/HISTORY.rst";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 60ce2a62acb5f5358f3f9bec1b20fe01721d825e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Fri, 29 Aug 2025 20:42:00 +0200
Subject: [PATCH 052/111] python3Packages.aiohttp-apispec: disable tests as
 they are broken

---
 .../python-modules/aiohttp-apispec/default.nix     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix
index ec0b6391daa4..55584cea286c 100644
--- a/pkgs/development/python-modules/aiohttp-apispec/default.nix
+++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix
@@ -27,11 +27,15 @@ buildPythonPackage rec {
     hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU=";
   };
 
-  postPatch = ''
-    substituteInPlace tests/conftest.py \
-      --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \
-      --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete'
-  '';
+  doCheck = false;
+
+  /*
+    postPatch = ''
+      substituteInPlace tests/conftest.py \
+        --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \
+        --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete'
+    '';
+  */
 
   build-system = [ setuptools ];
 

From 82d2631e1c03e7bc8507e786bdb0e34b61c0d968 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 29 Aug 2025 22:11:52 +0200
Subject: [PATCH 053/111] nixos/postgresql-backup: add pgdumpAllOptions

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../services/backup/postgresql-backup.nix        | 16 ++++++++++++++--
 nixos/tests/postgresql/postgresql.nix            |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index b05435b4db36..fb2c90f8b2e0 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -124,7 +124,19 @@ in
         type = lib.types.separatedString " ";
         default = "-C";
         description = ''
-          Command line options for pg_dump or pg_dumpall.
+          Command line options for pg_dump. This options is not used if
+          `config.services.postgresqlBackup.backupAll` is enabled. Note that
+          config.services.postgresqlBackup.backupAll is also active, when no
+          databases where specified.
+        '';
+      };
+
+      pgdumpAllOptions = lib.mkOption {
+        type = lib.types.separatedString " ";
+        default = "";
+        description = ''
+          Command line options for pg_dumpall. This options is not used if
+          `config.services.postgresqlBackup.backupAll` is disabled.
         '';
       };
 
@@ -175,7 +187,7 @@ in
       }
 
       (lib.mkIf cfg.backupAll {
-        systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
+        systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpAllOptions}";
       })
 
       (lib.mkIf (!cfg.backupAll) {
diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix
index a1ea9b8a9028..ce3fb640ae92 100644
--- a/nixos/tests/postgresql/postgresql.nix
+++ b/nixos/tests/postgresql/postgresql.nix
@@ -66,6 +66,7 @@ let
             enable = true;
             databases = lib.optional (!backupAll) "postgres";
             pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+            pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
           };
         };
 

From 3dc3043c54f3f2e0e0b8f2e47d22708114593399 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 01:49:42 -0400
Subject: [PATCH 054/111] virt-top: modernize

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

diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 2a29b0db8b2a..04844d214c67 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -44,16 +44,16 @@ stdenv.mkDerivation rec {
     ++ [ libxml2 ];
 
   prePatch = ''
-    substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
-    substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
+    substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
+    substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Top-like utility for showing stats of virtualized domains";
     homepage = "https://people.redhat.com/~rjones/virt-top/";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "virt-top";
   };
 }

From 5365b3cdd936e130889b2b39909c84dcfaed7912 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sat, 30 Aug 2025 05:51:34 +0800
Subject: [PATCH 055/111] gatus: 5.19.0 -> 5.23.2

---
 nixos/modules/services/monitoring/gatus.nix | 3 ++-
 nixos/tests/gatus.nix                       | 2 +-
 pkgs/by-name/ga/gatus/package.nix           | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/gatus.nix b/nixos/modules/services/monitoring/gatus.nix
index 5954f5bd7a20..eb459ddb61ae 100644
--- a/nixos/modules/services/monitoring/gatus.nix
+++ b/nixos/modules/services/monitoring/gatus.nix
@@ -105,7 +105,8 @@ in
   config = mkIf cfg.enable {
     systemd.services.gatus = {
       description = "Automated developer-oriented status page";
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
+      requires = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
diff --git a/nixos/tests/gatus.nix b/nixos/tests/gatus.nix
index 5bb146540fba..8f679226f067 100644
--- a/nixos/tests/gatus.nix
+++ b/nixos/tests/gatus.nix
@@ -29,6 +29,6 @@
 
   testScript = ''
     machine.wait_for_unit("gatus.service")
-    machine.succeed("curl -s http://localhost:8080/metrics | grep go_info")
+    machine.wait_until_succeeds("curl -s http://localhost:8080/metrics | grep go_info", timeout=60)
   '';
 }
diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index e06c56be4ee9..ed68d6f467e5 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.19.0";
+  version = "5.23.2";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-Jw7OdFGSZgxy52fICURc313ONsmI9Qlsf75aS0LUB9s=";
+    hash = "sha256-b/UQwwyspOKrW9mRoq0zJZ41lNLM+XvGFlpxz+9ZMco=";
   };
 
-  vendorHash = "sha256-CofmAYsRp0bya+q/eFJkWV9tGfhg37UxDFR9vpCKYls=";
+  vendorHash = "sha256-jMNsd7AiWG8vhUW9cLs5Ha2wmdw9SHjSDXIypvCKYqk=";
 
   subPackages = [ "." ];
 

From fe3010b5adeace64e5f524bd0d61c6cc0592b77c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 23:11:20 +0000
Subject: [PATCH 056/111] python3Packages.spsdk-pyocd: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/spsdk-pyocd/default.nix b/pkgs/development/python-modules/spsdk-pyocd/default.nix
index ef16cf229f66..1a034344701f 100644
--- a/pkgs/development/python-modules/spsdk-pyocd/default.nix
+++ b/pkgs/development/python-modules/spsdk-pyocd/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "spsdk-pyocd";
-  version = "0.3.2";
+  version = "0.3.3";
   pyproject = true;
 
   # Latest tag missing on GitHub
   src = fetchPypi {
     pname = "spsdk_pyocd";
     inherit version;
-    hash = "sha256-OcRGYZ1U5jQyRv2OSKwS3uJpvRQRW6Fbm/rDxlzyxPg=";
+    hash = "sha256-Uu5QbvDd2U9evZiY2Gg4kSPRMGpFBXpxwYVgsa5M/SI=";
   };
 
   build-system = [

From aa4f265f16b65cde4b88ffa4aad59c1a2fdfc389 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 29 Aug 2025 18:33:19 -0500
Subject: [PATCH 057/111] vimPlugins: resolve github repository redirects

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/vim-plugin-names      | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 4d43348ad785..584970d814af 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -626,49 +626,49 @@ https://github.com/lsig/messenger.nvim/,HEAD,
 https://github.com/xero/miasma.nvim/,,
 https://github.com/dasupradyumna/midnight.nvim/,,
 https://github.com/hadronized/mind.nvim/,HEAD,
-https://github.com/echasnovski/mini-git/,HEAD,
-https://github.com/echasnovski/mini.ai/,HEAD,
-https://github.com/echasnovski/mini.align/,HEAD,
-https://github.com/echasnovski/mini.animate/,HEAD,
-https://github.com/echasnovski/mini.base16/,HEAD,
-https://github.com/echasnovski/mini.basics/,HEAD,
-https://github.com/echasnovski/mini.bracketed/,HEAD,
-https://github.com/echasnovski/mini.bufremove/,HEAD,
-https://github.com/echasnovski/mini.clue/,HEAD,
-https://github.com/echasnovski/mini.colors/,HEAD,
-https://github.com/echasnovski/mini.comment/,HEAD,
-https://github.com/echasnovski/mini.completion/,HEAD,
-https://github.com/echasnovski/mini.cursorword/,HEAD,
-https://github.com/echasnovski/mini.deps/,HEAD,
-https://github.com/echasnovski/mini.diff/,HEAD,
-https://github.com/echasnovski/mini.doc/,HEAD,
-https://github.com/echasnovski/mini.extra/,HEAD,
-https://github.com/echasnovski/mini.files/,HEAD,
-https://github.com/echasnovski/mini.fuzzy/,HEAD,
-https://github.com/echasnovski/mini.hipatterns/,HEAD,
-https://github.com/echasnovski/mini.hues/,HEAD,
-https://github.com/echasnovski/mini.icons/,HEAD,
-https://github.com/echasnovski/mini.indentscope/,HEAD,
-https://github.com/echasnovski/mini.jump/,HEAD,
-https://github.com/echasnovski/mini.jump2d/,HEAD,
-https://github.com/echasnovski/mini.keymap/,HEAD,
-https://github.com/echasnovski/mini.map/,HEAD,
-https://github.com/echasnovski/mini.misc/,HEAD,
-https://github.com/echasnovski/mini.move/,HEAD,
-https://github.com/echasnovski/mini.notify/,HEAD,
-https://github.com/echasnovski/mini.nvim/,,
-https://github.com/echasnovski/mini.operators/,HEAD,
-https://github.com/echasnovski/mini.pairs/,HEAD,
-https://github.com/echasnovski/mini.pick/,HEAD,
-https://github.com/echasnovski/mini.sessions/,HEAD,
-https://github.com/echasnovski/mini.snippets/,HEAD,
-https://github.com/echasnovski/mini.splitjoin/,HEAD,
-https://github.com/echasnovski/mini.starter/,HEAD,
-https://github.com/echasnovski/mini.statusline/,HEAD,
-https://github.com/echasnovski/mini.surround/,HEAD,
-https://github.com/echasnovski/mini.tabline/,HEAD,
-https://github.com/echasnovski/mini.trailspace/,HEAD,
-https://github.com/echasnovski/mini.visits/,HEAD,
+https://github.com/nvim-mini/mini-git/,HEAD,
+https://github.com/nvim-mini/mini.ai/,HEAD,
+https://github.com/nvim-mini/mini.align/,HEAD,
+https://github.com/nvim-mini/mini.animate/,HEAD,
+https://github.com/nvim-mini/mini.base16/,HEAD,
+https://github.com/nvim-mini/mini.basics/,HEAD,
+https://github.com/nvim-mini/mini.bracketed/,HEAD,
+https://github.com/nvim-mini/mini.bufremove/,HEAD,
+https://github.com/nvim-mini/mini.clue/,HEAD,
+https://github.com/nvim-mini/mini.colors/,HEAD,
+https://github.com/nvim-mini/mini.comment/,HEAD,
+https://github.com/nvim-mini/mini.completion/,HEAD,
+https://github.com/nvim-mini/mini.cursorword/,HEAD,
+https://github.com/nvim-mini/mini.deps/,HEAD,
+https://github.com/nvim-mini/mini.diff/,HEAD,
+https://github.com/nvim-mini/mini.doc/,HEAD,
+https://github.com/nvim-mini/mini.extra/,HEAD,
+https://github.com/nvim-mini/mini.files/,HEAD,
+https://github.com/nvim-mini/mini.fuzzy/,HEAD,
+https://github.com/nvim-mini/mini.hipatterns/,HEAD,
+https://github.com/nvim-mini/mini.hues/,HEAD,
+https://github.com/nvim-mini/mini.icons/,HEAD,
+https://github.com/nvim-mini/mini.indentscope/,HEAD,
+https://github.com/nvim-mini/mini.jump/,HEAD,
+https://github.com/nvim-mini/mini.jump2d/,HEAD,
+https://github.com/nvim-mini/mini.keymap/,HEAD,
+https://github.com/nvim-mini/mini.map/,HEAD,
+https://github.com/nvim-mini/mini.misc/,HEAD,
+https://github.com/nvim-mini/mini.move/,HEAD,
+https://github.com/nvim-mini/mini.notify/,HEAD,
+https://github.com/nvim-mini/mini.nvim/,,
+https://github.com/nvim-mini/mini.operators/,HEAD,
+https://github.com/nvim-mini/mini.pairs/,HEAD,
+https://github.com/nvim-mini/mini.pick/,HEAD,
+https://github.com/nvim-mini/mini.sessions/,HEAD,
+https://github.com/nvim-mini/mini.snippets/,HEAD,
+https://github.com/nvim-mini/mini.splitjoin/,HEAD,
+https://github.com/nvim-mini/mini.starter/,HEAD,
+https://github.com/nvim-mini/mini.statusline/,HEAD,
+https://github.com/nvim-mini/mini.surround/,HEAD,
+https://github.com/nvim-mini/mini.tabline/,HEAD,
+https://github.com/nvim-mini/mini.trailspace/,HEAD,
+https://github.com/nvim-mini/mini.visits/,HEAD,
 https://github.com/wfxr/minimap.vim/,,
 https://github.com/milanglacier/minuet-ai.nvim/,HEAD,
 https://github.com/jghauser/mkdir.nvim/,main,

From 45d2d5f8d61127deaa771f1e88ba28372e8ddbb7 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Fri, 29 Aug 2025 19:48:52 -0400
Subject: [PATCH 058/111] openscad: fix application icon

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

diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index 5f9b6378b196..a4256d035061 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -74,6 +74,16 @@ stdenv.mkDerivation rec {
       url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch";
       hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4=";
     })
+    (fetchpatch {
+      name = "fix-application-icon-not-shown-on-wayland.patch";
+      url = "https://github.com/openscad/openscad/commit/5ea83e5117f5f3ac2197c63db69f523721b8fa85.patch";
+      hash = "sha256-nfeUv0R+J95fyqnVC0HNeBVZnxVoisY1pcdII82qUSU=";
+
+      # upstream's formatting conventions changed between 2021 and this patch
+      postFetch = ''
+        sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\)  /\1\t/' "$out"
+      '';
+    })
   ];
 
   postPatch = ''

From c12460edc8ce4f066fcaccecd2bcbef7debc232f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 29 Aug 2025 18:33:21 -0500
Subject: [PATCH 059/111] vimPlugins: update on 2025-08-29

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 1110 ++++++++---------
 .../editors/vim/plugins/overrides.nix         |    2 +-
 .../patches/openscad.nvim/program_paths.patch |   22 +-
 3 files changed, 558 insertions(+), 576 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 6836e95fe52e..b2ed1a32188e 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -74,12 +74,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-08-19";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "f7bb32dbbe2ff5e26f5033e2142b5920cf427236";
-      sha256 = "0cdilfh4964vqwb7m24hzgwy7jp6fxriskd7k3a7ajh8yc0kmr8i";
+      rev = "ae2f5932983f42d54bee9ff803b5ab157b145787";
+      sha256 = "1c003qq0linw4v03gl7n0jy33i3vrp6blhmffh3rsr7795bl7y6b";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -399,12 +399,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-08-21";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "21a54161a87ab38b85d8b1eb52cc86c973a5fafe";
-      sha256 = "1l26mm5dki4qvmz2jfai2pfbwknbp018yh5vi2nh0za9hc7nk655";
+      rev = "8e74c08998fd786239caba373344f4e4601e21fe";
+      sha256 = "0lgczxz99h578bkav5p9bnb5w6vddma4zs9ipq14v6cgviax1mpv";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -660,12 +660,12 @@ final: prev: {
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2025-08-21";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "a5f3055f9d628ca0f4c74a0df07b029d2a74760c";
-      sha256 = "1h1bj6wj5zdpgqw2dg4q95fnac9m3is15kdvhpzxw4vb06iz56i2";
+      rev = "c7cbbad40c2065fccfd1f1863bb2c08180c0533d";
+      sha256 = "01bzgwsx4v3y5l2hy4k6j7pma9azjcx4hnrr1sc4l27m1lklyqnx";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -1194,12 +1194,12 @@ final: prev: {
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2025-08-20";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "8cda7244a02f1304664889a78194604587ffc772";
-      sha256 = "0n7cgkca18ml1ms663zyjrpba2rfxqycq22m8vlr88piqkflwwlx";
+      rev = "3b5d8947cf16ac582ef00443ede4cdd3dfa23af9";
+      sha256 = "0sskfdw4jpzx2ixp7m2ii6vl1x302d5aclwwhz4k9dxm7yglvqi4";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.hydraPlatforms = [ ];
@@ -1416,12 +1416,12 @@ final: prev: {
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "2025-08-08";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "13a8a258da6ca87ce46014084063d5b846afd3bc";
-      sha256 = "0pyc28l5p794jzsxg4zcnmknpfvh9s3pr8078ypl14ig0milii2d";
+      rev = "0094095ed60aa55f7148bc1e783b0156f3e7f4f8";
+      sha256 = "0mlqz2yv8hypkfx8ij4fqv1m8sjd52rq4r8n3qq416y1nr9yfzib";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
     meta.hydraPlatforms = [ ];
@@ -1689,12 +1689,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "da53e523ca28bdc4aedda5cfcac7aec6120779da";
-      sha256 = "0113cfi5iy9xwxzcl78djia94ymp6zzw3bfjaj6hwri30qq3xl9k";
+      rev = "b035188bc6d8bcbf86c49ac230ee0bbadca7f7fb";
+      sha256 = "1fmlsfnkyiakx7alap0vdr6shwwjd1afpkajjyn31w8bykhmmm9i";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2183,12 +2183,12 @@ final: prev: {
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "2025-08-11";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "447fe7629bb5d5baca6f6099f3568484d149aa51";
-      sha256 = "1jdqsc1myq9mrsziix3w5g0l2g7rdv6lphx99w7svb97br8ifs29";
+      rev = "88e07c6bff838a5bda2f461e9c1122b79ff0829f";
+      sha256 = "0m0xhkjqnfxm9l0kvpr2dnr4in35rifibygnrg08005g5yi5k0ji";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2950,12 +2950,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-08-21";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "0e8e1cbb731f420b5d3a41bae6b712b4911273a0";
-      sha256 = "16ni09frbrh54li62xchfgiqrbq64aphq6afb902bb69bnf9827d";
+      rev = "89425920ef943a20e56072665f4be33d8f320ddf";
+      sha256 = "1h7bhzpw3kahhakdd5jj6v9w8xk4jln94lqg916crl2llhzh6cmv";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3002,12 +3002,12 @@ final: prev: {
 
   codecompanion-history-nvim = buildVimPlugin {
     pname = "codecompanion-history.nvim";
-    version = "2025-08-21";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "ravitemer";
       repo = "codecompanion-history.nvim";
-      rev = "44a4a3fbe62427fbe0b5b513b5ac6c976986fdfc";
-      sha256 = "0jsc6x2x1zj3ksbpfvkvkvnlza38qdnyb4a3xfnx3r21pybb7ssh";
+      rev = "b9f1afb77f1a8805e686f89ac38338a9ca588579";
+      sha256 = "1q54q5zmxv6ad106rgk5bp0d3mmlyly2f15nk7xk058rgc159l0k";
     };
     meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3019,8 +3019,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "c34e49676dd9bd44c9a18588167cdc0a31077dbd";
-      sha256 = "0nmfrfjhs2l0m2cmgqgmsnc0irr1d8fv8xm6zglkdadppf0bm4s3";
+      rev = "6bc1f9f6d9f4ac71545b4883caf93181cadf6146";
+      sha256 = "0ahg114lylb3f24l3mnhk8alwjsqy4b4yhrn5la8n25148hy62cd";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3080,12 +3080,12 @@ final: prev: {
 
   colorful-winsep-nvim = buildVimPlugin {
     pname = "colorful-winsep.nvim";
-    version = "2025-08-20";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "nvim-zh";
       repo = "colorful-winsep.nvim";
-      rev = "b8e72a231daf2a199bbc319364adcfc4d8b18e9f";
-      sha256 = "1fsbwgyrivxach2hh5msr23m16r14db4g53azha1flrn27vsmkyr";
+      rev = "5cce948992866514c744a66cb754a0e025fa95e9";
+      sha256 = "0i2yng9wj5bwmbswm55z4rf6g6s9msajn6d56jgrxrima2fn7yk3";
     };
     meta.homepage = "https://github.com/nvim-zh/colorful-winsep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3314,12 +3314,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-08-20";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "9ddab4e14c44196d393a72b958b4da6dab99ecef";
-      sha256 = "1m0s9ff49bikqspg0w3nhwbb7i7q65bm9spjvrxs39v06hhk5m6p";
+      rev = "b4aab989db276993ea5dcb78872be494ce546521";
+      sha256 = "1637cpq5167dm4s2llc8w0y2sicqxn9gcq0p003x1mwb3m5wxm4g";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3328,12 +3328,12 @@ final: prev: {
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2025-08-17";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "91980ec7de78dcbca23b2044da1686778311cc6e";
-      sha256 = "018yhrcwinl09fzj5nw849qzrh9a9b9zxfx1bdjbm88l38w2f4r6";
+      rev = "f360f1427a02d2e6e59b2b2d4c7f9a8038f465d8";
+      sha256 = "1r6m11am1csa1wsr5wg590sy9sbb1csrhjr18lh596mx8zh0a76z";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3367,12 +3367,12 @@ final: prev: {
 
   contextfiles-nvim = buildVimPlugin {
     pname = "contextfiles.nvim";
-    version = "2025-07-13";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "banjo";
       repo = "contextfiles.nvim";
-      rev = "d87da7901bbc18ee27d72cc7d4e43f3f2c41efa9";
-      sha256 = "0nmhdllwxx4157w84krsavaxzhb1z8ay8ln31ayi50ar62m5sii7";
+      rev = "f4a01aa465f7deeedb257266d47ef1849dd9b08b";
+      sha256 = "10wzq2m0znj1x6jwv9ywcq4snplzilvp9sgaja2k91zlzjkvrzdl";
     };
     meta.homepage = "https://github.com/banjo/contextfiles.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3406,12 +3406,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "f7bacd90f571c2aef2be4d136a0d811b2d7930cf";
-      sha256 = "18n5ikwwrrwrwv8vn6513c1h12lhd2cpiwlhax00s44zdbh7y3gi";
+      rev = "e73fe7c43c68aeb84fbeed12ee6cc60a29e78fbb";
+      sha256 = "1zxfqd2w3xr63z66aj28jk1qjfm86f60bsk9dkdda694rr0v4mhb";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3549,12 +3549,12 @@ final: prev: {
 
   crates-nvim = buildVimPlugin {
     pname = "crates.nvim";
-    version = "2025-08-06";
+    version = "2025-08-23";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "crates.nvim";
-      rev = "a49df0f70171adc77704eac70dd2c0d179065933";
-      sha256 = "0g3rzy7nsa8p300sp2jzlxf573g1l5wprxwajqkb29kbdpbh93bg";
+      rev = "ac9fa498a9edb96dc3056724ff69d5f40b898453";
+      sha256 = "10hc28r9k4syay1pir24mk6kjj96llilqkyz8ch6rjmxyi7r5ycd";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3705,12 +3705,12 @@ final: prev: {
 
   cyberdream-nvim = buildVimPlugin {
     pname = "cyberdream.nvim";
-    version = "2025-08-09";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "scottmckendry";
       repo = "cyberdream.nvim";
-      rev = "b154ec7e18558a34a0a6b6ad9a9ed6ca97aa41cf";
-      sha256 = "0298a09afl0p40v5ywx90h1w3bvkqxc7i0s5fnw87iasj128dcia";
+      rev = "89fd0b94040923597e2530ffcb2e887bd7c75d76";
+      sha256 = "19w47qj2y04dbfbijv9v9fvil6z3kr8ym1l9b00k4g5nq90apz8g";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3887,12 +3887,12 @@ final: prev: {
 
   ddc-ui-pum = buildVimPlugin {
     pname = "ddc-ui-pum";
-    version = "2025-04-07";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-ui-pum";
-      rev = "79df4ac4bf16cb69b358b5b2eedfeab2b69d0eb0";
-      sha256 = "0vj03zbma1rsr3xm80cfp613xckc3y5y01mbsplr87vqa40r0gz5";
+      rev = "f7f334380e18af42297468b3cf696794bbfa2652";
+      sha256 = "070af7x08d5cvhnlwgirw8cr803wbicgqwm0dr7dpl2mmqmmy3ci";
     };
     meta.homepage = "https://github.com/Shougo/ddc-ui-pum/";
     meta.hydraPlatforms = [ ];
@@ -3900,12 +3900,12 @@ final: prev: {
 
   ddc-vim = buildVimPlugin {
     pname = "ddc.vim";
-    version = "2025-08-08";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc.vim";
-      rev = "206c28876b4501db45b66318f658856c2fd14a1c";
-      sha256 = "088siyyirnw970xy0zrkrplmz9kb4cfa0157v63h20250pcsg949";
+      rev = "b8a12a1b2cef1eec6e754b88764f165611f973cc";
+      sha256 = "13l9nz0q1rm8fkals3jra8vdnxwaz6y0pamix3vdmbjg96nf1kij";
     };
     meta.homepage = "https://github.com/Shougo/ddc.vim/";
     meta.hydraPlatforms = [ ];
@@ -3926,12 +3926,12 @@ final: prev: {
 
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
-    version = "2025-08-01";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "debugprint.nvim";
-      rev = "2f28d5b0773b350c69587d236d1db475985fac58";
-      sha256 = "0nxid6siq33sa7nd3gs6g02j9blsyq8wydnhd9yx800qp88knbr4";
+      rev = "91525630d048ca146892de423b33e8cf060b5a0d";
+      sha256 = "114b83qm4zfkij69xd9zda7i9zxlv0w5nnhah3cqghx6gwfi29dm";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4056,12 +4056,12 @@ final: prev: {
 
   denops-vim = buildVimPlugin {
     pname = "denops.vim";
-    version = "2025-08-12";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "vim-denops";
       repo = "denops.vim";
-      rev = "b0ee649d8767d46f8f9ae7c49425dce969f2c0c8";
-      sha256 = "17pk37rwzvg4c61acj96486f4brs75lj0s8x08rl85ww8jh651jf";
+      rev = "a278b8342459e4687f24d4d575d72ff593326cee";
+      sha256 = "1k1zcqf88z6yxxwvs0mjcharmykqis57jh505s37xaff2zvmb114";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
     meta.hydraPlatforms = [ ];
@@ -4578,12 +4578,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-08-19";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "d23d2fdcffea11d18ef160672e81c9d63a9a78fa";
-      sha256 = "1m1078avhff392s6d3v75v7924iccn8zv2gd72kjbzsdip3c62sv";
+      rev = "270d5ba1f45ad64e1874760fe27b6bda0984da52";
+      sha256 = "1655dxca9kr3j4k65bh9ws1piqwn9i5xazdmkl8rbfvvck0xb19r";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4696,12 +4696,12 @@ final: prev: {
 
   elixir-tools-nvim = buildVimPlugin {
     pname = "elixir-tools.nvim";
-    version = "2025-06-20";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "elixir-tools";
       repo = "elixir-tools.nvim";
-      rev = "b13c67398ee62531e1a4a53b95347a80eacefe6b";
-      sha256 = "0hbz7yjspynba3vn9pxxfahk3ygnx1b46g8z40jakc1ivmhqg0c6";
+      rev = "2b3dc7be1b9eea766bf6d75f519b05bd902e0c3a";
+      sha256 = "0wzbv75a9r2v4i0fk5ddkc8lcqjw3lx20ikrxgbadh2rqs5v5gab";
     };
     meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4892,12 +4892,12 @@ final: prev: {
 
   fastaction-nvim = buildVimPlugin {
     pname = "fastaction.nvim";
-    version = "2025-06-15";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "Chaitanyabsprip";
       repo = "fastaction.nvim";
-      rev = "9bf0c368565023914c120562473dc5a5c179ee8c";
-      sha256 = "12fb8av6q0y2ii23lx7rqln15syqhdxjrf9459jbm9dqjqrm6m9n";
+      rev = "b147d91727cb35be4f722f17e7d4ed5b4a5801d8";
+      sha256 = "0brks0ia2z6ahwqg5xad5h53552qm68c7w25d5gry0inlfr39bdx";
     };
     meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5022,12 +5022,12 @@ final: prev: {
 
   firenvim = buildVimPlugin {
     pname = "firenvim";
-    version = "2025-07-22";
+    version = "2025-08-23";
     src = fetchFromGitHub {
       owner = "glacambre";
       repo = "firenvim";
-      rev = "c927486daff6d1eb8a0d61fd9e264bc1bf5f2c36";
-      sha256 = "01aahplvi2zvpvziqzwcbd3xj0zx8a8sp3cj2bhdvg3vyzl3rdjf";
+      rev = "0c3b81444944ed51e9eb50b158b71ee26b611575";
+      sha256 = "0dd5y08fqf5pn9ppfbwmx4whw37yiazjhsakvp6f84v6hi4xhx6p";
     };
     meta.homepage = "https://github.com/glacambre/firenvim/";
     meta.hydraPlatforms = [ ];
@@ -5219,12 +5219,12 @@ final: prev: {
 
   fortune-nvim = buildVimPlugin {
     pname = "fortune.nvim";
-    version = "2024-07-18";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "rubiin";
       repo = "fortune.nvim";
-      rev = "29a99fbf887a2d48693f1eaa1893f84cde60af54";
-      sha256 = "0kyi2pl5d1h7ycxsdvqdyg5zmjfxj7jpx7lk3bf2d14wvnvcwpb4";
+      rev = "c5ad74c2eec74c6938ce813241ca1061ab1392eb";
+      sha256 = "0vhwczrgczikc16vl0w66zyg3wz9j1m85cln9qh9y0hsxdd5ipbh";
     };
     meta.homepage = "https://github.com/rubiin/fortune.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5661,12 +5661,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-08-05";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "3279d15d146ab2eae6ad9bc930f3c8fc62a3697b";
-      sha256 = "1aj9dvdd31f1vvvrkwv7ys9mrf3kc9w14wxq0gvnycg6aphdp7g3";
+      rev = "9382e23d46eea94e08da0b56d8a416461fdb294d";
+      sha256 = "1y65ggswxv8l678ilpas9swaf5ay1xpqiccwabs7f5vzjf4c80nj";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5778,12 +5778,12 @@ final: prev: {
 
   gruber-darker-nvim = buildVimPlugin {
     pname = "gruber-darker.nvim";
-    version = "2024-01-08";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "blazkowolf";
       repo = "gruber-darker.nvim";
-      rev = "a2dda61d9c1225e16951a51d6b89795b0ac35cd6";
-      sha256 = "1sxnprl27svdf4wp38abbywjbipr15mzmx53hg5w0jz1vj0kdjvl";
+      rev = "b22e1bbf06dd604d7d3483823d63103b86ebe942";
+      sha256 = "0id7g797mvf7k7hfp3pfi19cbqjjg2ksk1dijsda76sjf2c07hs0";
     };
     meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5882,12 +5882,12 @@ final: prev: {
 
   guard-collection = buildVimPlugin {
     pname = "guard-collection";
-    version = "2025-05-29";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard-collection";
-      rev = "7e87ae9c3758221ec6dbd24bb44ee8ff400f3940";
-      sha256 = "0c89kl6by26s8i57x4cqrj2g274jy4kcqpj2g5s2576prxiyqkwl";
+      rev = "2fbf8449609ce522c36050e4e27235575c2d5439";
+      sha256 = "01xbpd4nm4c1gcxg5yqyk7g4d1fbdzkyc1x1m6ba7laq7cf15zql";
     };
     meta.homepage = "https://github.com/nvimdev/guard-collection/";
     meta.hydraPlatforms = [ ];
@@ -5895,12 +5895,12 @@ final: prev: {
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2025-08-20";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "b16aa1d92c8adac7d63c442b31498761ec09bdd9";
-      sha256 = "0jfpyf93fjc76bjx6dkp1mq628c5p3azn9i3jk9i67z8g79ykmf1";
+      rev = "5127d963f5f5eff6306078e662124df9d88766fa";
+      sha256 = "0www7hdqgcj015gb9xbhv1awk4rzixcqijsq78cjmirajciy7zwd";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6026,12 +6026,12 @@ final: prev: {
 
   haskell-snippets-nvim = buildVimPlugin {
     pname = "haskell-snippets.nvim";
-    version = "2025-03-17";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "mrcjkb";
       repo = "haskell-snippets.nvim";
-      rev = "27ac316463b9807496cd03e65289d3e79aa23528";
-      sha256 = "1z49df35vzccq5jnckbmrsfpr8g6cjiq020jbwprzj8hrb769bqh";
+      rev = "13f3671a34862a16fd7ecea1562207429acbab15";
+      sha256 = "0ih4hfvgam8gk4khljg2jjbayxahjlbrn6b4vqxipg0jby6iiddy";
     };
     meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6248,12 +6248,12 @@ final: prev: {
 
   hop-nvim = buildVimPlugin {
     pname = "hop.nvim";
-    version = "2025-08-06";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "smoka7";
       repo = "hop.nvim";
-      rev = "2254e0b3c8054b9ee661c9be3cb201d4b3384d8e";
-      sha256 = "085k2vyslaq0grxl87s1qn1k9dp0wp3fi7k4zmnmxw9rv8wngvw2";
+      rev = "707049feaca9ae65abb3696eff9aefc7879e66aa";
+      sha256 = "0xzxl1mkdp1zyg9m97h2mhvb98fwwd21h5ki7jlhkb8cl294lx40";
     };
     meta.homepage = "https://github.com/smoka7/hop.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6716,12 +6716,12 @@ final: prev: {
 
   jedi-vim = buildVimPlugin {
     pname = "jedi-vim";
-    version = "2024-12-27";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "344814c214391368674813e3a11143448e73e749";
-      sha256 = "149sm7hshnckap1bwngvy9lypxh8lhsg17ihqwhdrp3k7p8vrgs6";
+      rev = "9679051ad40e9aebdca80681abacbf49313e9b89";
+      sha256 = "0246b2p0l49mhgxfq9kwcph3mwhrvny5zdxkgk8flx7pvpabdkn6";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -6847,12 +6847,12 @@ final: prev: {
 
   kanagawa-paper-nvim = buildVimPlugin {
     pname = "kanagawa-paper.nvim";
-    version = "2025-08-19";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "thesimonho";
       repo = "kanagawa-paper.nvim";
-      rev = "6fca75ee0de76f5c9964aab89de6ac7bd4df5e2f";
-      sha256 = "0vkm0j4yml86cqrbf4f2w1ynz2a3chszjxjpgla6ln725cv1v1cz";
+      rev = "6621e6fd146146b67daee092e23f1ad6c92935c5";
+      sha256 = "06rwilxf49k050n4bz9iq3al8wq7if1ggyl2yrf8w3h6n72w83di";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6964,12 +6964,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-08-19";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "1695bdfc87e2af737bec034cd4cd2d11098a22fd";
-      sha256 = "0ghvd9kgg9ir29sxa3pjcl7a0b4yg5njxkp9y6zmazbdczpsq2rf";
+      rev = "cfe40c33636ab0f53f1edd3dbda37f4298298797";
+      sha256 = "0zqhaqi6d7by4mavr00jbfd5gvqfcfdxcc4zm6ib1k1r83y2cj36";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -7082,12 +7082,12 @@ final: prev: {
 
   lazydocker-nvim = buildVimPlugin {
     pname = "lazydocker.nvim";
-    version = "2025-06-25";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "crnvl96";
       repo = "lazydocker.nvim";
-      rev = "495fbbbdb22d48f2649a4b58c432f58c7981e3e2";
-      sha256 = "006chxck2asaymmd8xh0g9fd5h2bvq1p0s8dn16b1zakp8rvq7zq";
+      rev = "b69ff84a6223de39d34a150b980d3b9ef19549fb";
+      sha256 = "15ac2pm5qy9p274qhd0ndl3q6849pq63lpamjdsvqvficmc99ii8";
     };
     meta.homepage = "https://github.com/crnvl96/lazydocker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7121,12 +7121,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-08-21";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "62623347cdd5a27a73436c24eb9b4745ea207630";
-      sha256 = "0m17w3v91chsasxff8h6dp8w3g1ji58caxc89r01g3dhsj2s5bx4";
+      rev = "76da8fc9f3d2ac975dd3ada7704f4c56984a914c";
+      sha256 = "1zf4kybca39a8sj68f7lcyi16bl1w7yg4m2m2584s5n1f0x9znng";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7160,12 +7160,12 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2025-08-15";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f";
-      sha256 = "0nnbdzxgk4fq955wrzlgrg6slqrpmsm5mq5h30i0d2xp6ipkvh2m";
+      rev = "e9cb442c0614a7e8185608f639e10c54e53bb083";
+      sha256 = "1zqvgpslrw9gjd1grz0b8cpzi0i0gbcaljypx7h6yzf55mm0vn94";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7173,12 +7173,12 @@ final: prev: {
 
   leetcode-nvim = buildVimPlugin {
     pname = "leetcode.nvim";
-    version = "2025-07-21";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "kawre";
       repo = "leetcode.nvim";
-      rev = "422b6beb4a64eca0524fbff94edd9550c156afc5";
-      sha256 = "0by4graq6bwnipssxrdrp9d22jf5g93srv10ghd8y35f370q9nlv";
+      rev = "10f63d67201f6e988467485e6cf32d08176fcad2";
+      sha256 = "1b3acblmg1xjyzbvlyf7qqm73ilgsr14dz9cgj0xfad5yq9mliha";
     };
     meta.homepage = "https://github.com/kawre/leetcode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7212,12 +7212,12 @@ final: prev: {
 
   lensline-nvim = buildVimPlugin {
     pname = "lensline.nvim";
-    version = "2025-08-28";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "oribarilan";
       repo = "lensline.nvim";
-      rev = "e057fe1845d58ca52967c8805eb6ff8f4d16f3d7";
-      sha256 = "0ckwyvj6764npn836cjva7mmifzcnhz73a03kmq7p18r81sbrqgj";
+      rev = "a641d430e8deba186b747a32630cea37d4275d32";
+      sha256 = "1d9jf4pyi9i24cx3mrdy835bwzj17mphhzzrchf1bfhi0dlkfpkr";
     };
     meta.homepage = "https://github.com/oribarilan/lensline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7537,12 +7537,12 @@ final: prev: {
 
   live-rename-nvim = buildVimPlugin {
     pname = "live-rename.nvim";
-    version = "2025-06-23";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "live-rename.nvim";
-      rev = "78fcdb4072c6b1a8e909872f9a971b2f2b642d1e";
-      sha256 = "0g0yirjvlzjy7v6lpzwphn87h3mgs33l3pa3sw9np36lhk9ww6g4";
+      rev = "44340587e7b67a86c5a4855ac8eb9ac5178bed69";
+      sha256 = "1zgihfp8js41kz9nzd4dv1zbdxxfm6xhyqch4b1mw4mxk5n46gcs";
     };
     meta.homepage = "https://github.com/saecki/live-rename.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7563,12 +7563,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "2025-08-20";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "1b4a03fbf0d1c7aeaa10c390065751a9503de436";
-      sha256 = "0nzsp6mjxsazmgzdbx1kgbavhk55pypvfxl2pm6y69qkhf3swcwz";
+      rev = "6aff02aafa9719e487d7c0fd91cdfb91f27b6d91";
+      sha256 = "0892p6jaaifh8q56hdk88cq9pgamjd098rrfxzmv9v95iwpzylcf";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.hydraPlatforms = [ ];
@@ -7940,12 +7940,12 @@ final: prev: {
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-08-19";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "2fddeef5755f434a24bc452b0666f1ffd9882dae";
-      sha256 = "1i207rdln8r8pd3kwminjh3brz0qpi67z9a36pa3mh3nygdnp7d9";
+      rev = "9c7761f4446c23cfc8e9b8b1ba980a1a7fd1c94a";
+      sha256 = "0ap2h1qkjsc4488njjwkj3hsxacy9iq25gvvsjaks0s8mmgd2yss";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -7954,12 +7954,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2025-08-18";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "1ec4da522fa49dcecee8d190efda273464dd2192";
-      sha256 = "11sij20d2ancsbf7iygkfx14sw7i717gpy126bplgf107482xdbq";
+      rev = "5e085efe67fccb13372d54331d849219662a7e93";
+      sha256 = "0wzjr7144094bzvihp70nmprq5yznrrp9hhgbn498h9g8xdm6rsl";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8162,560 +8162,560 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "1cd4f021a05c29acd4ab511c0981da14217daf38";
-      sha256 = "045f24n8b3f1ilhhanm1m0sfr0yjprxp5a8ykyjrqc4lwh3v1jwv";
+      rev = "45a26d032d8703f280c69c2ed9fb4e1bfc8f24f9";
+      sha256 = "0q65whb7hw1cill7dkf88m095m27j09ld8zf8rzfvy0xhp64rzlk";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.ai/";
+    meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.align";
-      rev = "0202e1662a7a03a95cefd6851795ceae5e87b9b3";
-      sha256 = "0yzwryx5y4v3838b1g2b6xnj6cg824iww4dxvlr0jmbqd3m23lf5";
+      rev = "ab6777ca0fdfe8e4cfe931e3b0b5d98c719c3c1d";
+      sha256 = "0j3xzfjrk430lx6l2l1wqi76pjnf0qn78xan722cpj9wy7vlvsds";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.align/";
+    meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.animate";
-      rev = "8a3f27183b38d2f255e3f5fc0df42c072f8339df";
-      sha256 = "0zq5m24192hpkv03w65cw9famfc48n4dcqmsj1n2xhd4lynjhbrb";
+      rev = "37df15e199da3edc0b36647967cc04bf80175183";
+      sha256 = "1xn0chs9s63m7gyq7a023nlxd30wcslkg0295dyh0n1q9d6rw56c";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.animate/";
+    meta.homepage = "https://github.com/nvim-mini/mini.animate/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.base16";
-      rev = "ecd277e6204fc0411f070150081f40529dcf280c";
-      sha256 = "08v2rlb2jzbza30n66rb19bgh9y6a8vk7jfq6mzi9dxb4f7a85sl";
+      rev = "f4aa0d75c8bd0c4a4296f5f28b537040bcd18d3e";
+      sha256 = "1n5abk7z06gh6q3ij2bk1ikxjayx52iyz2i4m67ara5w2n2g5n9v";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.base16/";
+    meta.homepage = "https://github.com/nvim-mini/mini.base16/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.basics";
-      rev = "540c80d579e366a7c11d2b5cf3ecde009dbd125f";
-      sha256 = "1zcysmzywibn8hsd098jj31hn2xdjisfchdd9ywmmhaxzg48djsm";
+      rev = "76bf1343dc0ff70348f7cd6f1c4900b1d6f75a08";
+      sha256 = "0ffvvql0j1wn7s6m93ph9wpis27dvxl106x9afaz3ynj20ls08gj";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.basics/";
+    meta.homepage = "https://github.com/nvim-mini/mini.basics/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.bracketed";
-      rev = "4a005a6e5aad58230b69f0f59df2cbb8b1c2e643";
-      sha256 = "0wg24cq6064c45p3sf022d54gmwwvi8354k2sbp09h19s797bpbx";
+      rev = "672b4e2fe9222fd4d5a104ff23217801bae37046";
+      sha256 = "19sqhv68yn214md95wkd3jg632smp7ny4nb3zbmn43ksyiaxmi9h";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.bracketed/";
+    meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.bufremove";
-      rev = "a1bbb2af40f7773c8cee9e364aac4a724b5c10de";
-      sha256 = "1xz9x5bd72cg4f56ngb6lr00cb468q84nm383fyzvwyxj99nw2b9";
+      rev = "e60941ab23eb0679f0da0e92ac0b572425756dc2";
+      sha256 = "03jj3lxykdl7dlblv90h1hym91ww5mz24wsr9jqi535acakajn3x";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.bufremove/";
+    meta.homepage = "https://github.com/nvim-mini/mini.bufremove/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "2025-08-19";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "21fc8ad164e82da22665e94948d44a4727d6980a";
-      sha256 = "1g1sqk3kdp7y74ds0fkh3c07whd58w3ccl0glay7mwfbf802ji1w";
+      rev = "2d361459de6a5fd7ea20a14ee4b95c6caec383b9";
+      sha256 = "14gpvrcvwdr59vqmzs1ma6iylb23cr8dwcy5xv5cmbdiiz1sb1lp";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.clue/";
+    meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.colors";
-      rev = "dd4209469024b249cf9dfed851fd85ad3467ccd3";
-      sha256 = "0zppf2j94v19bvlkhaixx9vj4w3c574v0nycha9y2zy48ac1x6dy";
+      rev = "3ec0d1bb6d82ec5f2275dfb58690ee22a2e59316";
+      sha256 = "1w720qrjmv0gmw2irlsvlwyq5zni2ncafxb7im6brgf84nbhpcxc";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.colors/";
+    meta.homepage = "https://github.com/nvim-mini/mini.colors/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.comment";
-      rev = "871746069a28e35d04a66f88bc0e6831779ccc40";
-      sha256 = "051gfmd82m2ghf6am6q5bdsjda2wghy5pwn7gyxc1fahh9d9gakf";
+      rev = "a9474da9175b27a5c32ee712433c23b9b0f7f139";
+      sha256 = "1xjdhasqrli8gx89hhzm7zhcccnfr2irh5bldxkvvhydb3m74mar";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.comment/";
+    meta.homepage = "https://github.com/nvim-mini/mini.comment/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-08-17";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "b635036d3fe5ea6f4450358a02e376612b628ac4";
-      sha256 = "1awppnng3lab5vx7wbdc2hxr62586ria9yw96wja5c8rd281wajd";
+      rev = "d121b158b557c61d6762999af9dca5c19c538f20";
+      sha256 = "0vlzz1nn7d09fxfq3nmzqdqqvyw5asp8q4j67vqfxhwrq08ih6ca";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.completion/";
+    meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.cursorword";
-      rev = "52834085b4ad175a050343cd96c4517def711cc5";
-      sha256 = "1bb2s65z6wk0mq8xbiy6f9hh97rg20nbsgjbpkbjvzn75p22krja";
+      rev = "84c82f8040a75445f1f39a0d36f4d0d0fe0bee92";
+      sha256 = "1bwln3dlwpk9f0wa631jqkbqa1pc8is8ra35z1i742vls92b5ma5";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.cursorword/";
+    meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.deps";
-      rev = "2953b2089591a49a70e0a88194dbb47fb0e4635c";
-      sha256 = "0hkh1p45bsvcbfzzfnbl633yffwkg7lspj8dmimgv3sg1s4awsvp";
+      rev = "694331a00cdbf15b0a3f7ec2c9b49b2a9879835e";
+      sha256 = "0q29rvjl4y3ydbg0hlhns9wr3sqyy8frypyg7c3lprykxzab4jgn";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.deps/";
+    meta.homepage = "https://github.com/nvim-mini/mini.deps/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "f573bd2ae2eb225ea2f125126b8869e04bcaf231";
-      sha256 = "0rlah6kwv9xw244b1xhkdz1hg10zq2zidnlvnxjl7ckn9qxq908p";
+      rev = "7077b636d642fcd5cd48554e187a251883239660";
+      sha256 = "1kj1gwpdmnv0fwydfyi93bfqxghrgha1221pds3ki16f1zrm3d78";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.diff/";
+    meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.doc";
-      rev = "dc336167b203f7405ce7a27d879a90fd9a4ba241";
-      sha256 = "17akjcvps4adzp3ag04i11gdwxhk10qhlqlacy3yx8ks2l8jsibh";
+      rev = "476a05cde8320bbbc5ac3d58ecde88106d457eea";
+      sha256 = "14hwyva1d8g5gqwyfpvm6s7d8zklfyn57g7gl2pg1zscr7q0f66y";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.doc/";
+    meta.homepage = "https://github.com/nvim-mini/mini.doc/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "2025-08-21";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "b77a21a3c8c2a8815d8e8cf9f4d5fbac4c876197";
-      sha256 = "0d4m6yhga756js73hxg3vz9kpj5myc6kxgc3i0n6ia6znfcmj5wj";
+      rev = "a4ea6fc035906b1e9494f6e249ca387b57e8308f";
+      sha256 = "0n2kq7qk3qzpph8jwm9jzr1b6rl00wl01w2xvln9sq0118lqk532";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.extra/";
+    meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.files";
-      rev = "5b9431cf5c69b8e69e5a67d2d12338a3ac2e1541";
-      sha256 = "1y32wk17hlpv17q3yrjx4cfywi9svxxpmzy1qdzqxdkddrzya3sc";
+      rev = "34a730a6bdb09c3e6755fe34b20a78a5d81d21c4";
+      sha256 = "1r3dzpg3wl41aqif4gvm8445vj0wbzgzj8ab94g3qqzagash4pj3";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.files/";
+    meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.fuzzy";
-      rev = "f270c05a0afcb4e87044f7cd01af187497f30c4d";
-      sha256 = "0jvvbwva2csadr4hhbmbcw0hzj16rrpbnh1ibhzsnalws8bn5mh7";
+      rev = "cb2f359471c2cb1cf2aa997552a28e4748d4c2bc";
+      sha256 = "168np3jky78gz98l0sq3iwxkgqlg77vp0ki0602x4iijw1ghzw6c";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.fuzzy/";
+    meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "2025-08-12";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini-git";
-      rev = "689bb78921e34d621df8dc1733337b2c3c39a786";
-      sha256 = "0i16saficymszk64yjb2mgxij58za6kk6bgkvwkm70bscv9yj9iz";
+      rev = "1948d4290105d4c52b8c1d5da5b748c402f6fdff";
+      sha256 = "14zjrs6wh43x5dxnhdrsmfv19rq743bxlqvgaag54mn48029wmsc";
     };
-    meta.homepage = "https://github.com/echasnovski/mini-git/";
+    meta.homepage = "https://github.com/nvim-mini/mini-git/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.hipatterns";
-      rev = "2b78f3d475d60ea1793a6d595ff65a0db9ac3a67";
-      sha256 = "1vn4pz7ibd4ll97xrvqvl8swr88dzr9gbq5zc4ssfixrqfssb22w";
+      rev = "96d07d32a0db0d8d8a10c83a964ec557cca005e7";
+      sha256 = "1lmdi790xcg7jpz6swfl9siray8gbx8wz638vzxa9b0s6wkwa2ab";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.hipatterns/";
+    meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-08-15";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "44a1df43693f82821650ff99f9812a32c276b30c";
-      sha256 = "1nrgsxg7g7kc5ii21k2j70455hrq1ys3i16nqs98nfg3x1l3gdij";
+      rev = "a067598176acfa754ba032c1526f53220249690a";
+      sha256 = "0wx6aira4m3w8459jx6pi1d3f3npldyw23z1xa3wppivz7j9wdjd";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.hues/";
+    meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "2025-07-24";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c";
-      sha256 = "07zlbmisc8c4wj36mdnk7wlwb0qfd38zpjdkqazjzb5lfzh9hf9m";
+      rev = "f9a177c11daa7829389b7b6eaaec8b8a5c47052d";
+      sha256 = "028zvjc7wyqw51jbj5r5llfkq5223wxga6qwb16ns9s71cflpgh6";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.icons/";
+    meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "f1567c6f46c250b22f4ad1b847a042464742b11d";
-      sha256 = "0mbwy8ww0cxx4g5l7hipnxsgwzvmr6wxsap0dz6y4fy1g4jcw6cw";
+      rev = "9d9490c172a4718d7d1f20eaae668a28f160c2d7";
+      sha256 = "1rz56q0adi50d9rmwr4ydqv97jxgxgarhdrach4dvsmz1f3bh9d2";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.indentscope/";
+    meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "5fd3bc5a97f3487c65b34475033ca8fccf297500";
-      sha256 = "0ai4pl9cx8p57qja2ixf3294hdrj0j30pkh0gymd7jw992dqkp6s";
+      rev = "bb5895c9ae4d25fd95c0431ece2bb8f5e3909911";
+      sha256 = "0w0i4lcvxzjmniib076nm3yvkjn70xr21iiys8r3y57q1m3iw9f1";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.jump/";
+    meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "7a1b72251bf841bd8feb3e54e3e61c2883bc29ae";
-      sha256 = "0ydavxi9ryxllky3y7whv62dm8b4h5545w1kzgk3b3bfss4zq1rj";
+      rev = "3710fcdfbbff539e245e16ff14f2d95ffc2fb631";
+      sha256 = "0jxdhqim5zhsynd32xn8yj3p3i9qlw693r779yzmfadm5szncvp1";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.jump2d/";
+    meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.keymap";
-      rev = "99557a5b87b4f73856b847d17920af6a1e1d84b7";
-      sha256 = "1llcjkg4lzxabnphzlvnbqsz5s38l90g0nhc78pgk1nq4963fqjp";
+      rev = "c894a1c9a6508bc667583bfff19f634bc6b8a4af";
+      sha256 = "1h5y3zvmhi0w18aakhdjqda16ncv2fi76ymjcw7hcd5xqp3fciq4";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.keymap/";
+    meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.map";
-      rev = "94ce1694e7b7a3940fc507ab25f061deb9c8179c";
-      sha256 = "0rfhkijxvb40wvb6abvpdq1s34xki2s36clml5lprg0v880qv75l";
+      rev = "fe1ffddf80aadfdd312add16a1b4a882c5e0ffaa";
+      sha256 = "17rdj52lilpn16r8k2w8m5lwz8p380kzwc0gzpv747wrj0q5v90v";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.map/";
+    meta.homepage = "https://github.com/nvim-mini/mini.map/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "2025-08-19";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "6b1525c853c1f6008601ce474ad4e5b787047ca4";
-      sha256 = "05vkfmxcaxmr6wwnnc7is3f2mp8synrjffcj9dzm1w8i8ps5hmxn";
+      rev = "b48a5527e26e3d1840be317e52b1f3db5c364f35";
+      sha256 = "0gbv9nnl027lkqmp9jlrawbzi437gbxf52d7kgw4h1qg7lp5ccjx";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.misc/";
+    meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.move";
-      rev = "819e90c3e113a3c826c3003ec07073f1e0677ea0";
-      sha256 = "1dbflx3im6605vxhk3q8mqgsh89gs1q50x5vngl08knsv2vmm16a";
+      rev = "710ff226e31a3b9dd7e14bc9e2993f24d653df20";
+      sha256 = "0db5csmpi0rly8flh6rp2js6l9s1f28nygmlv3fa284igm5471sa";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.move/";
+    meta.homepage = "https://github.com/nvim-mini/mini.move/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.notify";
-      rev = "e18f9fc783c7a26fab9c8a094d97dc768e56f558";
-      sha256 = "0qvh5wy1acrilkzin16n2xnpsr5vydxajln0r2y2xbq9wix42vn6";
+      rev = "f109564e1db7893bc500e52ebf6a06b85e14a705";
+      sha256 = "006xx213lz22lqj150yabf8zq4n1mc33cyaw4q69dscm09iwnhvr";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.notify/";
+    meta.homepage = "https://github.com/nvim-mini/mini.notify/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "e38547768b2e12bdd48b16b8cfdca2e3b7543e22";
-      sha256 = "1dc4i9lhnhn2mcq77znzim8zc12bj1k4vbln236anjhr8xyycif0";
+      rev = "b5bae7dd5802b47bb03babfb374fdfdab02b9d8b";
+      sha256 = "00rpjd3m2l4abnqnhhk9w3p46ggswja0v96y7g0i7hbk5sy9il78";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
+    meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "2025-08-12";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.operators";
-      rev = "e72b5afec4c339aebd601a56e9ae3ef13d2f5d1a";
-      sha256 = "1i7iph3vj0xd607fxk9cbhxyfgi7yvqlg5crmlkqbfrh2xmgxxy9";
+      rev = "57c9daf96e0278ebac07bc57fe2f60cf360e5eea";
+      sha256 = "0x8vm0fzvvw3d46ygdw45cbsfkawzflcpva6gdcd0q70iak7lnyv";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.operators/";
+    meta.homepage = "https://github.com/nvim-mini/mini.operators/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.pairs";
-      rev = "1e1ca3f60f58d4050bf814902b472eec9963a5dd";
-      sha256 = "1zwvywy9pbskip3nckbymkkrl19mvdz8ax0ixcnnavk6567v5hh5";
+      rev = "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a";
+      sha256 = "1q7blg6cigv3lh5y0yymv4swr6gbb9r1vdi45fk26pigvm2bkdvd";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.pairs/";
+    meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2025-08-02";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "82ec629ca108c7b96b8b9bb733d235b39e137690";
-      sha256 = "1n9wg6v5wrxnk8x6l33k7949fp20ygr07xkyix8zk7hfyqbg9927";
+      rev = "51680e9d67bdf657209aaef4117a4dcc61e8428c";
+      sha256 = "0nsmjliz26c3rp6yp0b67w2d3w1nvy12gixj9ilpx3jnm5zwbw45";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.pick/";
+    meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "2025-07-22";
+    version = "2025-08-29";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.sessions";
-      rev = "8b01c6cd257450b34a07fc0b3f05226020a94c75";
-      sha256 = "1y9k63ac5i7mjqk1gazrm9w7avppbhc8cl5084d3rv7f4pgzn6cq";
+      rev = "f590f6973fd7ae675a84743ab90a53dcdc36136d";
+      sha256 = "00s3rvx67kmldzydb6j6s9w7va5ghwwq5ixv4m0xkvpsa24gbar4";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.sessions/";
+    meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "2025-08-12";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "752765aa04185d499e4f43506c434602eeb04e33";
-      sha256 = "0b124ll40sshx97xb8lq63lci8fp6m296vh01654d848r30scaqw";
+      rev = "c5e2d0aae10a299fd92834b6d68916c9c7ba14f2";
+      sha256 = "0k9915ilqfwv927njr9gmpni7i2r77ij1m2jci281l1dpn12wn28";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.snippets/";
+    meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.splitjoin";
-      rev = "51909e9883ab206f5a92deb9ca685317387586a4";
-      sha256 = "1rrpy2vf6dzxvrk4px4185zx5ci30d62hc7j5mqifv2br5gdlh0r";
+      rev = "93b14b5e8e8107b77724b09763dcd6de58626af7";
+      sha256 = "044naw7clk0ck522n35nmbhbz8l9jd2qda10lwdg0yinjfl8khf9";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.splitjoin/";
+    meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.starter";
-      rev = "aa1f05d40e59ddc652a7333a05e707bd9233b9d0";
-      sha256 = "18y5k17vdlq1k93pnv7l7pd96g72zv4hp9q0fa4kh2r7ljn7zm7n";
+      rev = "98e3ca7fa53fa7c011df576c22c52c7501eca245";
+      sha256 = "16zx527acv13cj0ba4m9g6ya414a92hzbldbb99gnpbb96m6vhfd";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.starter/";
+    meta.homepage = "https://github.com/nvim-mini/mini.starter/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.statusline";
-      rev = "f6917f4da995d64edf3728b1302dbd5d4561c912";
-      sha256 = "17jvy7986d0f49cwq233aclwnq0zp8dhjdq3v66iijkg16kdrfq7";
+      rev = "3c86b8a1cb67e347e91815b21662c28fd52ac144";
+      sha256 = "092sl18f2n0wq6wy3jmbb5ap1wpcxj2wn3hv0880mqw1vv9x52pw";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.statusline/";
+    meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "2025-08-12";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "7a8606333affe7ce637a0ba91bbafc46fc42bfa0";
-      sha256 = "0znr2s0kq2lvfrgy2232wzhil2x71iv2pqigcfj47c4w0jhz86mc";
+      rev = "953fb53aa1d0b2ae4506d35fff0e0e7afc8ceb8d";
+      sha256 = "0g48c5wi0mgpyyi1430dqsb6176vrd87xzgzmm2ibafhq14aqdjs";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.surround/";
+    meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.tabline";
-      rev = "c7bbf3e85ac1901bf170c7398ccdada8e4ea05b0";
-      sha256 = "1l7aqxpc6ni6gkdqpp05w2pbsgj16f7ir9m9cd0qqwi3hjgm9cxq";
+      rev = "033deb2f3e1f7eca6e4619da6e7facc9334c9658";
+      sha256 = "0mnwcpywj5fq49qv5r1v8sd2n7c29y02jmpl4dlvcz7qgfmc4j9q";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.tabline/";
+    meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
-    version = "2025-07-22";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.trailspace";
-      rev = "3d570d015d63ad6d3f8a90f12c6b544c2400cea9";
-      sha256 = "1xvrrnl4wkxhr4dsaii8ps96w88cdfmpgy1da23kpb0y3wxyjjf4";
+      rev = "eb0756101087e941b22447c7564b79948a13f4d1";
+      sha256 = "12ivcqzkjs97g0pplfy0csr97f7avc7zqa9br8z7rg87vvfgi3kb";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.trailspace/";
+    meta.homepage = "https://github.com/nvim-mini/mini.trailspace/";
     meta.hydraPlatforms = [ ];
   };
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "2025-08-16";
+    version = "2025-08-28";
     src = fetchFromGitHub {
-      owner = "echasnovski";
+      owner = "nvim-mini";
       repo = "mini.visits";
-      rev = "065a8b3e7f1b7059c4c748a54034b6a113d91fe8";
-      sha256 = "01fgxzr5p0hpdx18vv7y4zqyvqh9ad3lvjabfkd0nkc7wz216nzk";
+      rev = "1ca5282c51c77ecd236ae3c123b5d7fbc6adf057";
+      sha256 = "0nkw5511cgmlh98p3vyczcfz0bksqf8w6w25pypiar3ddg20aa1k";
     };
-    meta.homepage = "https://github.com/echasnovski/mini.visits/";
+    meta.homepage = "https://github.com/nvim-mini/mini.visits/";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8825,12 +8825,12 @@ final: prev: {
 
   molten-nvim = buildVimPlugin {
     pname = "molten-nvim";
-    version = "2025-08-17";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "benlubas";
       repo = "molten-nvim";
-      rev = "2f8a97d347d9dae08dea0d674c0852b05141ee09";
-      sha256 = "09h51wvaqh5ryxkns8rbrhjc1mrqqi3bc40sxvzpg6slafxdi0hp";
+      rev = "4e1c9997cb53b9d3236c5d6462d80119250ed5b7";
+      sha256 = "0zyxaspflmj884ww0haava7na605lzbi482svsilgb7n0qfp1rq9";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
     meta.hydraPlatforms = [ ];
@@ -8890,12 +8890,12 @@ final: prev: {
 
   multicursor-nvim = buildVimPlugin {
     pname = "multicursor.nvim";
-    version = "2025-05-29";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "jake-stewart";
       repo = "multicursor.nvim";
-      rev = "6fba38bccf45cfb681f4ff6098f886213f299a34";
-      sha256 = "1d3lsxg9kmn4622nacn2ycg56ca3skazjaar0smc61v1asa8jhrm";
+      rev = "35af2f31faf616f1b73a369cb4f695063b1ede03";
+      sha256 = "1026k0ag6l74ai9ypygzk6bjbbfxc6c7j3jffvlxl2ff588vz11m";
     };
     meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9202,12 +9202,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-08-17";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "bbeda076c8a2e7d16614287cd70239f577e5bf55";
-      sha256 = "1705g7qkg3nm8gr8k7x44mjalm5dj5h2ww5qfspsapr2fj25fp0p";
+      rev = "f1deac7ecec88c28a250d890ba7bb35843e69cbd";
+      sha256 = "1n1a6cmy3h7m33v1f8cfjplnr6rw0qxh27v117i8f66v5p9hqlj4";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9228,12 +9228,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-08-20";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "48a2208cf74af1b4a2ed14b75435690e2925d262";
-      sha256 = "1k6i88gh32b421yxfwj928sin9l94xq1d7hlpprn7r850mgj5hd2";
+      rev = "d2455d8e9a6dc8133c0b5db6df391f408217a950";
+      sha256 = "1z2p2cbl59iq78bpci6g4nh4lyyqz14mmc745im53hpr77nwmhwv";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9306,12 +9306,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-08-19";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "aec66c46c132a019296e9e73a2ef6d753bf15563";
-      sha256 = "0vsk7kzl0s0915h69anvpa22ahjd32z830pvkass5wfkgj90vb1m";
+      rev = "4046f747739cf7e7b9aada447f3edc59c947b111";
+      sha256 = "1angqm8mi9z9k8qqp9c0lnw40a2zz3fmpca0xidvgjd3n3xdiis2";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9489,12 +9489,12 @@ final: prev: {
 
   neotest-ctest = buildVimPlugin {
     pname = "neotest-ctest";
-    version = "2025-08-03";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "orjangj";
       repo = "neotest-ctest";
-      rev = "d8e1f389e98d89cd3845bd83e8d1568802580297";
-      sha256 = "05zsyx0clqfp8d719zmgyx1rqsi612xd424a2b1c60gpq811flz2";
+      rev = "1677a4dc83383de44ee7729f0bdf626874aa1712";
+      sha256 = "0psa473022sc9hihx14wlqk5vqcb9ghxv152axiwzszn43yf6czz";
     };
     meta.homepage = "https://github.com/orjangj/neotest-ctest/";
     meta.hydraPlatforms = [ ];
@@ -9581,12 +9581,12 @@ final: prev: {
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-08-19";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "e892eeb585f8bb041eb50e9fc58d6d48f62c3717";
-      sha256 = "0d7qkh3531ifwwywn746vc338dzcw3x6yj3b88shc41n283s4vr3";
+      rev = "54a82ecf9413473a366b364e4e73da7cab35cef2";
+      sha256 = "1a377ypq3cr5w50nn24gljhyj0ll1brasa3039mkbqicrdzr26sh";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9621,12 +9621,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-08-18";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "c9166b6793e95a9ec3046c39fb2f017c1865dd26";
-      sha256 = "19k71s819bka3j7ni9yiz8mwn1w4m1jnd4mvn7vg0zfhvz4xl116";
+      rev = "258687b21ab613da003f0f03f89fb777c1a5930a";
+      sha256 = "0zl309ha6p22p7qsg42gma6fc1hyy7wq26jwvnf8a3bnlsdf14c4";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9647,12 +9647,12 @@ final: prev: {
 
   neotest-jest = buildVimPlugin {
     pname = "neotest-jest";
-    version = "2025-08-02";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-jest";
-      rev = "46ccc50273838f0b48e3c4814c1c46c0ccfe9edf";
-      sha256 = "0nydhlxd96lagbjmbfrjj1mvn99dkhwamn01wlhm6kx6flj0863q";
+      rev = "a119da28ad8c1481a2751044291c4494549d5f5c";
+      sha256 = "05a5hpn7g696k3kzcdyxk6lpq42fyvrxs99ja8c7pk6b950dzb6c";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
     meta.hydraPlatforms = [ ];
@@ -9673,12 +9673,12 @@ final: prev: {
 
   neotest-mocha = buildVimPlugin {
     pname = "neotest-mocha";
-    version = "2024-07-30";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "adrigzr";
       repo = "neotest-mocha";
-      rev = "8239023d299a692784176f202f6a4a5e0a698ad2";
-      sha256 = "sha256-Fbe7xuu5Qy6GXKsvQbVcE5oG7dgKjghuX470V7sjmqA=";
+      rev = "726283d3e963f4a1448a6555c87b74552d443257";
+      sha256 = "0jfvwd0dgmh7c688flr59mbzb26217d3sj53jl2ryd1mv8m63jk5";
     };
     meta.homepage = "https://github.com/adrigzr/neotest-mocha/";
     meta.hydraPlatforms = [ ];
@@ -9998,12 +9998,12 @@ final: prev: {
 
   nfnl = buildVimPlugin {
     pname = "nfnl";
-    version = "2025-08-17";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "nfnl";
-      rev = "eb30d38bffcd7e8f67f3d208a5d3e4cf2d844e12";
-      sha256 = "1y5s1j6dxy2wrkhv45rzs4a6242fcvyvq0xby3n9v28k4sw44b1f";
+      rev = "66409b6186a9e313f60f4690b0f46fa2da1ee476";
+      sha256 = "1zgwcbqlq38bq9lbjr61lm2gkrgw2zym97p5kdwfz9bn5gljjcw5";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
     meta.hydraPlatforms = [ ];
@@ -10115,12 +10115,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-08-21";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "d64b7088f257c3bd38bb6b9ef5be00d7a710c5d1";
-      sha256 = "0ai0xfqx8gk8qgqx259aavn1nad1593cycrcwgdihrhdjcrysdhj";
+      rev = "03939913a6b5e59ddf1842c4121ddb2587e2f939";
+      sha256 = "0wb7wkfpyd7r5crkvqf30nj98npi1k4lzk4b2fpyqsh0k5dmm4cn";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10154,12 +10154,12 @@ final: prev: {
 
   no-neck-pain-nvim = buildVimPlugin {
     pname = "no-neck-pain.nvim";
-    version = "2025-07-20";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "shortcuts";
       repo = "no-neck-pain.nvim";
-      rev = "7bf83d3cfc8f6a120734f4254bbb87928756bea0";
-      sha256 = "14bp8ksw3v3dw28nakxkhmzxvbwrn7kwnzpwx2zxxf1vn45az0cm";
+      rev = "76ccd195fb2195ae1b9b9f0d539c517fa3f8a2b9";
+      sha256 = "0f2wqd0i6sadvzzpbil0avi5sl6nzl7b57p5am2qf2m413lrzafc";
     };
     meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10193,12 +10193,12 @@ final: prev: {
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "2025-08-05";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "5fcb73913a9290f78097e34420fe0e6130c5c33c";
-      sha256 = "1z08ic5c8hknkqyivkpc4jvdqsispml0zllfnxhw59iyr48irw99";
+      rev = "53ec77181d96494b9dc9457110dd62dc623cc78d";
+      sha256 = "0z4wcbrxv955cmw6inrsg8iml2bjp0sfxx604hk582081yc2q9dp";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10310,12 +10310,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2025-08-08";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "af4407decaf6528cb21a7b0fd8925664c8e573c0";
-      sha256 = "1r41jvjsx89jrjcc438wjlll8hjc0zm4fs2gs91fb7ch7r20p3sp";
+      rev = "093b92b0491d1ae34c146696b3ab4682a9c5aaa9";
+      sha256 = "1gwhdc8bhcpkkwm4il3i67746d735640gl6al89wk01kyf7b2mn5";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.hydraPlatforms = [ ];
@@ -10544,12 +10544,12 @@ final: prev: {
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-08-19";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "f777d1d20ed50c2f312e286892c062d9c2f1c6fe";
-      sha256 = "1jqfmfsgyzfy4b5889sw6z40j59pywsgbiy5pw302r9pwwdizjyi";
+      rev = "968f89f8aac11b6bdbfc942c71d3436658c1435f";
+      sha256 = "11bcv5pgq59q8r26vr8k0vscvzhp9msmhvirw9fhynfz435qnxln";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -10596,12 +10596,12 @@ final: prev: {
 
   nvim-dap-python = buildVimPlugin {
     pname = "nvim-dap-python";
-    version = "2025-08-21";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap-python";
-      rev = "679762ea611a37803090b5acb79fcc367a2d35b0";
-      sha256 = "0n3qm932sr9x82b8xnvi34k9ai7jwqsqbqdysyv857gyh66mfsqv";
+      rev = "030385d03363988370adaa5cf21fa465daddb088";
+      sha256 = "15m68aymsh9s3insv3ivhzbsg1h9f5y2a570ihr90j9vccaspyl0";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/";
     meta.hydraPlatforms = [ ];
@@ -10648,12 +10648,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-08-19";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "e7dd190b7ef9c620e251d537b6404026d1d7d978";
-      sha256 = "05nwp0wi1lqc0pwvwrb6gxg377k7hr4pr0v6bfgh4qv9q3hsfig2";
+      rev = "efb540a4439f98dd32b5e89485def02fcc7b6f6d";
+      sha256 = "1z4afy1qb9s1nr8cbnl7zyyhnkrvcxcrvjzvsal8lhi9wxhk2ivm";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -10700,12 +10700,12 @@ final: prev: {
 
   nvim-early-retirement = buildVimPlugin {
     pname = "nvim-early-retirement";
-    version = "2025-08-19";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-early-retirement";
-      rev = "ef9fc0267da4204432ab7bf3ab9df359874cfeb6";
-      sha256 = "14jhgpgqnkiryc4xccn99bwgqjcmhjly172nj3dfpjw2lizmkkzp";
+      rev = "1a5b09db3874f9e2c5b3f332b372c8cc972370f8";
+      sha256 = "15493nz9f56rd5d30mdy9igjcrml1hwcf203dj90hfhnmpdpx3ml";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/";
     meta.hydraPlatforms = [ ];
@@ -10765,12 +10765,12 @@ final: prev: {
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2025-08-18";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "ff9cb27e2edfcde26ecd738c0f2ea835b1201b7e";
-      sha256 = "1mknj2bg1hy17q4k2jfzlkndfsjdygaw755imzmm92vsq4fby3np";
+      rev = "0fccd6f547d954607083b66d08043b8ed54dee7a";
+      sha256 = "1w62hfcnr1i53s99mg6hgfllas59pp4x1y708ywq583mffz1wqqm";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -10934,12 +10934,12 @@ final: prev: {
 
   nvim-jdtls = buildVimPlugin {
     pname = "nvim-jdtls";
-    version = "2025-06-13";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "4d77ff02063cf88963d5cf10683ab1fd15d072de";
-      sha256 = "16sdq2ymrdnbm8667yairfji3md0w6c34qhssgahwb867185akzl";
+      rev = "8eee2302598bad61c5674dc04d7e93cfd85f46f6";
+      sha256 = "02hbiml5i6fw7cb3v7434jppvygl4rjngrf29ls2ridd1wqy6hlr";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
     meta.hydraPlatforms = [ ];
@@ -11025,12 +11025,12 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-08-21";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "ee04d481d4e6089892c2fb2ad8924b1a053591e1";
-      sha256 = "033qp7az1jgqplz2wglqimhydf33ajkkymgx2c44y79q8sw0lww4";
+      rev = "f126af5345c7472e9a0cdbe1d1a29209be72c4c4";
+      sha256 = "1qaxgsvbqn006q3lks7qcmlrrhc0i83fpbmrkr5nphc81xgjzlw4";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -11077,12 +11077,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "0e268f5e0a398e77b2188aa94472b63daaa793b8";
-      sha256 = "01n863qsly6cvsjpcyy495pp7ds180flslz14ysb92i83jphml48";
+      rev = "408cf07b97535825cca6f1afa908d98348712ba6";
+      sha256 = "1cf5b0wr89s6byxakvk5g5ch2cfn1x0m4x6yk1ig822ynp3scwnx";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11259,12 +11259,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "2025-08-19";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "5da8ffca21f303e53114ed6e5e1adc0827adf8e9";
-      sha256 = "0pjxczb3vqdxra9bw5wxg5h1lcijbyp36vsbfzg47av4b8v40njz";
+      rev = "44290197c47801b91ea569f1f6d8de8ce8693adb";
+      sha256 = "1qf0cddakxwq1jv3dkpdkl1w64j88qg03mgax18667j6hd6km2bz";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.hydraPlatforms = [ ];
@@ -11285,12 +11285,12 @@ final: prev: {
 
   nvim-paredit = buildVimPlugin {
     pname = "nvim-paredit";
-    version = "2025-07-21";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "julienvincent";
       repo = "nvim-paredit";
-      rev = "86ef02ec249b41471545f07f1baa21615a9ba8fa";
-      sha256 = "1msz4x23cq85vigj3njn7cinm8d0zbayb993wim8akmpzp7n24ci";
+      rev = "b6ba636874a3115d944e35746444724240568aca";
+      sha256 = "1q6sj4wl38v5px8px7lb5qa2kchac7bchqn6x6hgmycfb3lr45lx";
     };
     meta.homepage = "https://github.com/julienvincent/nvim-paredit/";
     meta.hydraPlatforms = [ ];
@@ -11376,12 +11376,12 @@ final: prev: {
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2025-08-18";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "b12256e1c3e717cc980adb16eb64232971f131f8";
-      sha256 = "0854nrdpniakf5i9xn07748395k3milsdgj7x6qzrlsh8w4pcic3";
+      rev = "8da3f01652b73712dc624c72fcdc537fb1b327b9";
+      sha256 = "1jrq2rsa1vw3zdpvwdykr8rcn33s7f8hkgcm4479m9yzfcwpj4yg";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -11389,12 +11389,12 @@ final: prev: {
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2025-08-02";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "d11c2ba40f7530d50534f977798054d25a95a8db";
-      sha256 = "1id9flz427a57hq72anxk540hziigrikcz3p2vjvabby2b2l8zq0";
+      rev = "1c65649b35e69539fc39edf801b1455686698ede";
+      sha256 = "0i0l080axwjy4ksxvfq18bv4r7ax52yrijv4l8a4kqmr0xvihfid";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -11493,12 +11493,12 @@ final: prev: {
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2025-08-18";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "a619b0d2799ae89b460a6461af74170b583193e5";
-      sha256 = "0s39qzf43gbqazx7hlnf8fxj17apmm03i9wdyvv1pppg3d06cz76";
+      rev = "53ba761cd40c1d683e8477d138ff03cd7e6e384a";
+      sha256 = "02n0i7ifdy7gy6j05ihpi1vlx0l89fwvxv0azhmln6sga0dcd1ji";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
     meta.hydraPlatforms = [ ];
@@ -11506,12 +11506,12 @@ final: prev: {
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2025-08-18";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "d56752df477ebd808cb82cea2fc68cf7455abb21";
-      sha256 = "0j2gqmkwrkpyyv7qpvyvpazz009jb5s1kvjb1bqi9gn6bg0s9dbw";
+      rev = "a868c256c861044beb9794b4dd126480dcdfbdad";
+      sha256 = "01cw6paim1jv2wvjdb3r7qawfnbsnkiibpp9hc1zz53pbi3wzcmi";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -11558,12 +11558,12 @@ final: prev: {
 
   nvim-tinygit = buildVimPlugin {
     pname = "nvim-tinygit";
-    version = "2025-08-18";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-tinygit";
-      rev = "b8d4d7a12427db58c774ac6807edd005b2bae71c";
-      sha256 = "0z0wjw5ds3b361mp1lvl3r2c8mcfk64fw8cfdqvv4bjmc5r93yp5";
+      rev = "bd38f10c10a29c08099a731ec098d1a42ecd4777";
+      sha256 = "13rzzs63c4ff8sw9wala2gdcym85s5f0qdj2v4mcq76f2b7sjxkw";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/";
     meta.hydraPlatforms = [ ];
@@ -11571,12 +11571,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2025-08-20";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "f4fa6ebd3cbfa299fb554766c56b2f7cc1233f27";
-      sha256 = "1z87vv5davz9jc3bqi90lrr4dxn5sdqjs45i7har8cmr8v5786d5";
+      rev = "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e";
+      sha256 = "087138m2536k9w1h0avd5gvyaaq0diszs52z7pkxy9zgvw6rv3z1";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.hydraPlatforms = [ ];
@@ -11779,12 +11779,12 @@ final: prev: {
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2025-08-19";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "8f0634188a607071a9a21b264a7f9b09f5fc5724";
-      sha256 = "059wdcwkc4hka37fmxh10idgmjifsds0c0yaqkm0f4f123z8jh81";
+      rev = "8fc1d6493880db6244e8ae8de0cbdd25daf6eb80";
+      sha256 = "07b7vx974hvgrp6jcgfjf3by3yzpdcrl77xl3x33r7qy2k2acclf";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -11935,12 +11935,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "e7818ca1f469dc90a3d7aef886531da11ffbe254";
-      sha256 = "0ygvmg7xqxdbnfc40sl3xvcysnd8mxks2ri034pxic2ad3z6z8ga";
+      rev = "d8027c1847c116ce257ebde4d50805b07397a5d3";
+      sha256 = "1z4sl3wzwj9h36a13sc8qgxbskmarnwkhfgnz18mh9nal7lmzxzl";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12169,12 +12169,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "2025-08-21";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "NickvanDyke";
       repo = "opencode.nvim";
-      rev = "e4bc3f05d71f12b6296125802512a08a69126d54";
-      sha256 = "1kqnv9vrd02lbdc7l6kfbca0pccjp6ybcxxrf1ig49slwrl9zhkm";
+      rev = "2fce982fc8080849afbe3db2ee4229ae9104af30";
+      sha256 = "0599rijkm352326z5w1f7rdy9i03n2gs429vn6l5w9zd55v90a21";
     };
     meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12195,12 +12195,12 @@ final: prev: {
 
   openscad-nvim = buildVimPlugin {
     pname = "openscad.nvim";
-    version = "2025-04-04";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "salkin-mada";
       repo = "openscad.nvim";
-      rev = "b78108a0a50c254d0964c790a1bd21ec5ec386ef";
-      sha256 = "19rzgs859nn02c779r66xkgq1dgshcm04kg035srnjmjqbipm7ps";
+      rev = "99d0fe6b4b1f5f0e8f749ebc64b5c3ad950d7e8f";
+      sha256 = "141ys44qrvbl88q9ikqj6frd3q69fkama66rly6cq4x7zzicdd4d";
     };
     meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12208,12 +12208,12 @@ final: prev: {
 
   org-roam-nvim = buildVimPlugin {
     pname = "org-roam.nvim";
-    version = "2025-08-12";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "chipsenkbeil";
       repo = "org-roam.nvim";
-      rev = "e49b3bbce929a8f89042e1e251d37e9936dadc75";
-      sha256 = "1igvhx7bacb0003n7h2pipj2hlz70ps3lczpy2zfy2ivr9vlwpxa";
+      rev = "c48c6d1d2c73d5eefe3700b3c43937525bd5a741";
+      sha256 = "0hf1jkphsb93h72hcag9skwcr3c2jnchsgi7y1bqgsgiwdb1vylk";
     };
     meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12365,12 +12365,12 @@ final: prev: {
 
   papercolor-theme-slim = buildVimPlugin {
     pname = "papercolor-theme-slim";
-    version = "2025-06-02";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "pappasam";
       repo = "papercolor-theme-slim";
-      rev = "41338b61dd1ff8a12a711c7de355f1e48353c1d8";
-      sha256 = "1npa7kfgxraw11mlsb9r55s6cy9hx0dsqw0mdmds30kl0m1wdvxg";
+      rev = "48eb45ea2a50707e716306257e6233a15c20322c";
+      sha256 = "0ss9mc8m8v31ipn32impfdfps0kc2didgwcb2cn0qi5v8w555flc";
     };
     meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/";
     meta.hydraPlatforms = [ ];
@@ -12417,12 +12417,12 @@ final: prev: {
 
   pckr-nvim = buildVimPlugin {
     pname = "pckr.nvim";
-    version = "2025-06-11";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "pckr.nvim";
-      rev = "dcc0e2766d7a3a1911287fef7060ac07908cf376";
-      sha256 = "1230zv396bfx962a5zmq5ng3bhzfqq76bcad1imc3gm99ihvnmin";
+      rev = "aefa551d01615ca5bd98237a22c6ca47064f8b3c";
+      sha256 = "12a5ks7m2hcxsz6akqfk7rk8sj12c0mhgxjdakj52l38ki1di69h";
     };
     meta.homepage = "https://github.com/lewis6991/pckr.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12769,12 +12769,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      rev = "1328b1b445824d31bf8c5c810860103dac40c2dc";
-      sha256 = "0y06gykqqh0qmkfq96cjxsg9w344w9iqidvfzgbcayp3mwlb3i69";
+      rev = "67f14f9d489f9c7da1a4e50ac00dd99ab36fc4d5";
+      sha256 = "1mg4dhcr3ya72ba3992rcydd83f07im3xsiyqq31b5jx6sf02yd5";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12913,12 +12913,12 @@ final: prev: {
 
   quarto-nvim = buildVimPlugin {
     pname = "quarto-nvim";
-    version = "2025-04-10";
+    version = "2025-08-23";
     src = fetchFromGitHub {
       owner = "quarto-dev";
       repo = "quarto-nvim";
-      rev = "5325af3731ac9840b308791f08ad660958d76163";
-      sha256 = "1vjam2g4nknqhnzz3x8qp2qbp6km8m7hs72qc459swpz6kvn2csv";
+      rev = "0e9491509b38efbd83d3f41dbfacc7fc4bd40191";
+      sha256 = "1vdlmmwbzw42hwk9x1dwrpk4012bwk7rymqaqaqh5f2zcwxhrhcb";
     };
     meta.homepage = "https://github.com/quarto-dev/quarto-nvim/";
     meta.hydraPlatforms = [ ];
@@ -12939,12 +12939,12 @@ final: prev: {
 
   quicker-nvim = buildVimPlugin {
     pname = "quicker.nvim";
-    version = "2025-05-15";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "quicker.nvim";
-      rev = "51d3926f183c2d98fbc237cc237ae0926839af3a";
-      sha256 = "0h6i5043g90hnxdf5gibld20bcfvi2sdld6y6bpzja0axkxsc6jm";
+      rev = "6b88ca4d70e35df877d9564beba83f00ba0c3133";
+      sha256 = "0kjqm5x3p1nsiqp0h8xvaia3x2z7mgp8j6hz2dm89sn443lrjqjq";
     };
     meta.homepage = "https://github.com/stevearc/quicker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13160,12 +13160,12 @@ final: prev: {
 
   remote-nvim-nvim = buildVimPlugin {
     pname = "remote-nvim.nvim";
-    version = "2025-08-21";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "amitds1997";
       repo = "remote-nvim.nvim";
-      rev = "f0e271b84e6d820f1a2abf7f57bfb391e45d1b6c";
-      sha256 = "153zxm31xfc1bmq2qarc1h6yrbh813lp1nac24cjya4y55irhxd1";
+      rev = "9992c2fb8bf4f11aca2c8be8db286b506f92efcb";
+      sha256 = "1svyb1hv66x0arzkcdh8kbyv8g4ihy52j2n2w9qxmwac1v2dmr61";
     };
     meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13199,12 +13199,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-08-21";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "c4ff9acddcf0f79b3187393319adb5cac5865bd3";
-      sha256 = "0hvi2hq81i3lvv5wdkijdh2hxl4fxpgyknx0mp3w11729w3kwjk4";
+      rev = "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd";
+      sha256 = "02bhhrc571vkmsm0rj4s9vzmfjx65dadas9dg11y618pzgbac8sc";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13317,12 +13317,12 @@ final: prev: {
 
   rose-pine = buildVimPlugin {
     pname = "rose-pine";
-    version = "2025-07-18";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "72befaffeac38db7bdd49e0549eaa2c4806dd878";
-      sha256 = "05f61gwsbppc14j6cabi30qrgj43i7sgal9r8b3qz7s5mcwaz0jx";
+      rev = "72a04c4065345b51b56aed4859ea1d884f734097";
+      sha256 = "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
     meta.hydraPlatforms = [ ];
@@ -13708,12 +13708,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-08-15";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "dcdb68cf610e76573434f8cd21b37327d28cc8c4";
-      sha256 = "1xaj1zrzzax0m120zn0qpf6qjf28vrwn7v76gwkc3iyjxh1z0543";
+      rev = "1ac316e6ea719843fd80716d1105613c98632af1";
+      sha256 = "1zg1awqafs4c7f52qkjnh42h51882m2wj7i5m11wd2cxmj5ya3ym";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13864,12 +13864,12 @@ final: prev: {
 
   sort-nvim = buildVimPlugin {
     pname = "sort.nvim";
-    version = "2025-08-15";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "sQVe";
       repo = "sort.nvim";
-      rev = "939f3f55536dbdaf68e9c9a37609d0ce9ba383c0";
-      sha256 = "1a4cg7s4vj14xdy84c3zg64ghr79h8jgak1q68878c7rkw50sd9h";
+      rev = "bb92140e1b96d62339bd5ab5b6df1eecca0d5da6";
+      sha256 = "1q5akxh1vngq8pr5c5113fa4lmhccmwr38drn164wi10zcm5dl9g";
     };
     meta.homepage = "https://github.com/sQVe/sort.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15458,12 +15458,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-07-31";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "357f8e11bd4a6e0a7bb3a4e49bfe9e1ed91e55f8";
-      sha256 = "0kzwv6dizakbfz3h75qnbz66isy4a8yaajdz50xp15ig1ps400c7";
+      rev = "4b268cdd9d9b4bc6b06760dcf883734de84bfcd3";
+      sha256 = "0pzzz0a72vnssdypisb4s8v55llx21gzzww51xadsbfah1c3nkcj";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15497,12 +15497,12 @@ final: prev: {
 
   triptych-nvim = buildVimPlugin {
     pname = "triptych.nvim";
-    version = "2025-05-18";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "simonmclean";
       repo = "triptych.nvim";
-      rev = "3ee33448571ce7f32dc1017635af7ce94ecbc1b4";
-      sha256 = "0rnxmgk5s95ppxskn9csdvyip3bnr6bzvs94visbm8lqjijs3sng";
+      rev = "f30e48d8861adc69de01d65099d7b8922fb34f54";
+      sha256 = "1ra5h9jcja6g8p8jrvwc4ypk26ql16lxagh7sl0p3p0aq90l8a1n";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/simonmclean/triptych.nvim/";
@@ -15732,12 +15732,12 @@ final: prev: {
 
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
-    version = "2025-08-17";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "altermo";
       repo = "ultimate-autopair.nvim";
-      rev = "e65731d50c548c020f3961bb42071671f0fa923c";
-      sha256 = "1japs52c9q6x0fk8dzrsy5mkv81dxwhs0h24yj4k9mnna17yc6qg";
+      rev = "2479d645ab96b968dd1bf15930f74b3682448466";
+      sha256 = "1bmjjs5x88p4yacy27a2l0rlx7vcfbjg7z2xp0vv9jrdsix86yaa";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15823,12 +15823,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-08-19";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "c9c45fc5241b48c333e9b8101f85039bdfe1dc46";
-      sha256 = "1glqzw4y3p13nsdlv5jyx78am3p4h0nidij0z1gk0p4q5cfwsw45";
+      rev = "e1b98c8608fcce3c79c8e09f9d3e507175c9ac56";
+      sha256 = "0zhp3s0nr0pjzm2r5ry45cdig24wddlzfx2c31x43pc2j2l4s4xi";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -15927,12 +15927,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2025-08-20";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "vague2k";
       repo = "vague.nvim";
-      rev = "6c44ca64a7efc89bb86f501602e6ddd51bc92b3a";
-      sha256 = "02r0wy9db7dlbynv9hqmwpf3mdilwvx1x4g1wdi2vgmf339ynwb7";
+      rev = "f3620ef32fe8b756398d8dbed60166b2af6ea796";
+      sha256 = "19bh34wg3320w3v9njp00r3pr5xf97gsglh5rygfpv7v05r03wnk";
     };
     meta.homepage = "https://github.com/vague2k/vague.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15966,12 +15966,12 @@ final: prev: {
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "2025-07-24";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "57d24bebbeaac26970e87935bc7ff2b19d94e877";
-      sha256 = "1i6adrban6psqgaizd48syk5hzai5apry7zzc15lv2q1060b3mlw";
+      rev = "efeded48a0dedbcf6fa5c4caadc385f4a908b4e0";
+      sha256 = "0x63qrq5gqrpfm96mg9bjdf41bf3qzwnagwabawqxl49s0lga4hi";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.hydraPlatforms = [ ];
@@ -17201,12 +17201,12 @@ final: prev: {
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2025-06-02";
+    version = "2025-08-24";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "2900a1617b3df1a48683d872eadbe1101146a49a";
-      sha256 = "070x8c82a29ik68qy71j6dbznakc5vzr2b3kyicaiindbqavcbgv";
+      rev = "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373";
+      sha256 = "014hzw3fh7v9zp3i6s1rv11i0gg8wv1qz4acs9nmwlmyir400jz9";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
     meta.hydraPlatforms = [ ];
@@ -17968,12 +17968,12 @@ final: prev: {
 
   vim-gitgutter = buildVimPlugin {
     pname = "vim-gitgutter";
-    version = "2025-05-26";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "85ca3a087204e3a32cb2faa5d9d0451524e08720";
-      sha256 = "0prwv82rg95h1pvvf5vfz8dq0raa3mb1cla5r5101hpzz39pdr5x";
+      rev = "488c0555e47e2aabe273c635f7dd233e985311a6";
+      sha256 = "0h010qpqphkrh42r6p0avf5wplfdddc9vk4aq2xsnv5zn56nkbqj";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
     meta.hydraPlatforms = [ ];
@@ -18059,11 +18059,11 @@ final: prev: {
 
   vim-graphql = buildVimPlugin {
     pname = "vim-graphql";
-    version = "2025-05-25";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "jparise";
       repo = "vim-graphql";
-      rev = "3583ea204e5d51529a56c9e9aecf4bfd9cfc6120";
+      rev = "c3ff332820a758553d691cf8cc228623c9b02326";
       sha256 = "1mkvgzn0khjqj32hyasbh4jv6zzqy2i9kcwh72dv6ig99wjz9wf1";
     };
     meta.homepage = "https://github.com/jparise/vim-graphql/";
@@ -18124,12 +18124,12 @@ final: prev: {
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "2025-08-18";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "0016f249614b4aee33a2556efb29d7299bd5cf0f";
-      sha256 = "0iv7krz4li40a9096ql09zlb7lq3wzr10d3a1vi97jxkdzwsxgp6";
+      rev = "ec1e5f752c68d0faff962494b37d779c2308180f";
+      sha256 = "1rbzlvv9hp5z7ggal320dwy8khzcb0fah15cbj342j7vfnnkp47k";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
     meta.hydraPlatforms = [ ];
@@ -19140,12 +19140,12 @@ final: prev: {
 
   vim-matchup = buildVimPlugin {
     pname = "vim-matchup";
-    version = "2025-08-14";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "704c9d98e686836ae1c4b6c4ea5b057ecf5fbbca";
-      sha256 = "0r6k5hyr2a99q9k93b1qvj726hcvzyg6l6wwk7irgdixamqx8039";
+      rev = "347c890d51ae8e63239e92c935d2297c94975538";
+      sha256 = "0djrx32hhkvhj3im7b4q1kaini7zj0vbgcaj9c5gcnswplfpwc9p";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
     meta.hydraPlatforms = [ ];
@@ -19881,12 +19881,12 @@ final: prev: {
 
   vim-polyglot = buildVimPlugin {
     pname = "vim-polyglot";
-    version = "2024-12-04";
+    version = "2025-08-27";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "f5393cfee07aeb666f4d75f9b3a83163862fb094";
-      sha256 = "05navypzrz1ck1vmf60rnmscisxy7gfi3ic749vqmr7prmdbavp6";
+      rev = "f061eddb7cdcc614c8406847b2bfb53099832a4e";
+      sha256 = "03vn7zhdx55f8fi843v5d6jfascrs4yy6sjdx7rmaw9n2w553hhr";
     };
     meta.homepage = "https://github.com/sheerun/vim-polyglot/";
     meta.hydraPlatforms = [ ];
@@ -19985,12 +19985,12 @@ final: prev: {
 
   vim-prosession = buildVimPlugin {
     pname = "vim-prosession";
-    version = "2024-06-13";
+    version = "2025-08-22";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-prosession";
-      rev = "4b8323d4e9b74afe9132a34b2d7ea6cfa9461550";
-      sha256 = "0xhbqphjldw5ygxmblx9r2zgbda1dgc2h0py6h05ss43cdvzikwa";
+      rev = "df3677ac974a08b054915db461bf5fd4599da103";
+      sha256 = "0mbgnbhrvmq6rccbwfsx0bv0rym9hjsnfkd4sgclcjwmgpsnk1sk";
     };
     meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
     meta.hydraPlatforms = [ ];
@@ -20427,12 +20427,12 @@ final: prev: {
 
   vim-signify = buildVimPlugin {
     pname = "vim-signify";
-    version = "2025-07-28";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "54346382be614ef5934cbbe204fd58ba3247a84d";
-      sha256 = "0gqi64rw1zcrgs96gmbgg1xjwp25izam02m1qjd7g07p5x25hzc1";
+      rev = "1a94c4124cd7d5b2f73352f7be38c14bd7441350";
+      sha256 = "007cfd11mbr30zq3v2q2p3s6614whisdzg3kc0gsbgrryyx23mv3";
     };
     meta.homepage = "https://github.com/mhinz/vim-signify/";
     meta.hydraPlatforms = [ ];
@@ -20492,12 +20492,12 @@ final: prev: {
 
   vim-slime = buildVimPlugin {
     pname = "vim-slime";
-    version = "2025-04-22";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "jpalardy";
       repo = "vim-slime";
-      rev = "507107dd24c9b85721fa589462fd5068e0f70266";
-      sha256 = "0vpn8dfxzc5f2scc1ydl25fk4rxbnv849z00h1abzh73ysa3mpaq";
+      rev = "67b24bf93cff3ac39db94694a7aefcdb3f44b927";
+      sha256 = "1x2z8arn6zkmilq75qs3l66qdvgay28zi85q0i1q0zxl365nhl16";
     };
     meta.homepage = "https://github.com/jpalardy/vim-slime/";
     meta.hydraPlatforms = [ ];
@@ -20674,12 +20674,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-08-20";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "77bf035687275b503a624360738796fe0e0c5177";
-      sha256 = "0ampix9ajrz570778k8qvyq9yq6wfvchz6blpqkviahviiwsjcz3";
+      rev = "c01f43e276aa32ce26a746fa858e26b9b8d815d7";
+      sha256 = "00x39581pfjlcgdw97vb89w8ghmyhj2yvib3fpkb2yjc57nj0lx7";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -20687,12 +20687,12 @@ final: prev: {
 
   vim-splunk = buildVimPlugin {
     pname = "vim-splunk";
-    version = "2024-08-10";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "yorokobi";
       repo = "vim-splunk";
-      rev = "827cdf8d9f6940eea146e6571a1086ed7a4061eb";
-      sha256 = "08f5c14ic4mr039by2ml9xf6b2l2rylgjj5q3m7gj29n7mn1zzc7";
+      rev = "b6306fc0105caa3ff9d8a2bb0a858a691a98a4af";
+      sha256 = "084zqx5d5mw5z8njd5yyf7kn0m36sax5mcx1vwhmxgmxh0zhv9vi";
     };
     meta.homepage = "https://github.com/yorokobi/vim-splunk/";
     meta.hydraPlatforms = [ ];
@@ -20948,12 +20948,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "2025-08-20";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "35f286da462d544a78810b7606778d3467ef4369";
-      sha256 = "06wj34s05zwfifjw5a96nva0v0w7ml19g4040ybs0iibcibh6dl0";
+      rev = "8c76f6c0953edaa13a37c29ac9c6a7bb56ddce89";
+      sha256 = "0qs7dikmilcwp7hsjwscy2h7msqbiz64lqq9wv0c4fh8g4n4p1nh";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.hydraPlatforms = [ ];
@@ -21052,12 +21052,12 @@ final: prev: {
 
   vim-themis = buildVimPlugin {
     pname = "vim-themis";
-    version = "2024-04-06";
+    version = "2025-08-29";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "c1f4d465ce7dd23735513551b5c4c918d9c1bab1";
-      sha256 = "1vzwjpn3jr3ayal2pjr2qb36mal2pa8szbf83nqzb2awa1lv1ds1";
+      rev = "355c34b1bff03a8fd3744e3ad2dd0627c0692716";
+      sha256 = "0rarfik723i2fb5fzbk69hlw20khazw6bfr34hlkvkyljfksdpv7";
     };
     meta.homepage = "https://github.com/thinca/vim-themis/";
     meta.hydraPlatforms = [ ];
@@ -21403,12 +21403,12 @@ final: prev: {
 
   vim-wakatime = buildVimPlugin {
     pname = "vim-wakatime";
-    version = "2025-07-27";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "3403495670f0ee08887401a28f8430dc4ac67429";
-      sha256 = "09f6il3ydxli829klnk0whn0rrcnc7ps7dgfxmikyk1s4hq38k5x";
+      rev = "ecba6015dd9a8c7657583efcdcd95c362e5ed20b";
+      sha256 = "11k33nivca1v8p3x34ga9sd62jxzg34ggk1vxrr6hv4by0c8pm05";
     };
     meta.homepage = "https://github.com/wakatime/vim-wakatime/";
     meta.hydraPlatforms = [ ];
@@ -21754,12 +21754,12 @@ final: prev: {
 
   vimspector = buildVimPlugin {
     pname = "vimspector";
-    version = "2025-07-24";
+    version = "2025-08-26";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "a1ee02d4e5df05d411e93740465db1177ba42b4c";
-      sha256 = "18dlc58r3i9wwfra4838jixlv4hcs7sqjss2x6i6zicwx3p54ph7";
+      rev = "cc01dc81a5bef35c8073da2bae2b2b0f70652e90";
+      sha256 = "1jyknd284jjjpnbyahdw5j02xwjdxnnfpxs51dpzp38hd9gn8pxs";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -21768,12 +21768,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-08-17";
+    version = "2025-08-23";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "c74d9927d9ac2fd24f965634ab56fc5d3c0a60a7";
-      sha256 = "0pjy088rf3j3jrbia8wpxhb6d8vdqkbc3niyb5mrnd6fczxd7iiz";
+      rev = "dc90feacb86f7b85b0b791d8073eefc769a23725";
+      sha256 = "07vm6nwd31zv19yifbfc61mpxyhdc378dz6b90b9lzm1lcc07waw";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -22302,12 +22302,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-08-21";
+    version = "2025-08-28";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "f3c747e616651ff97d31373a335c8479bab2af2a";
-      sha256 = "19i0hpg9kj0i1s7qq3a5spbf4hygi79ms383h3jhp5cyg794ik1d";
+      rev = "12409d3288683fa1836a022cc86431c1f0e3c093";
+      sha256 = "0ppbcibfdswg7ndwc17ikwj63cnyf4xmih365g03isd7grs72c6y";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22497,12 +22497,12 @@ final: prev: {
 
   zoxide-vim = buildVimPlugin {
     pname = "zoxide.vim";
-    version = "2023-10-23";
+    version = "2025-08-25";
     src = fetchFromGitHub {
       owner = "nanotee";
       repo = "zoxide.vim";
-      rev = "b1e70b6fc1682a83929aee63680d2b43456fe9a5";
-      sha256 = "025rqfs0n2ryi7xwzpq5h2r7jhvxbrb2gjp6fqa072hapgqr0igb";
+      rev = "520d1abeb71ba42989a842251f8ba5c46be89aab";
+      sha256 = "11nga7l5zc8m57y3d85016p0zxw6zywn9fcnyxjarfw5998s5ll9";
     };
     meta.homepage = "https://github.com/nanotee/zoxide.vim/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index cea9ccf904a8..aaaf7e3c9491 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -190,6 +190,7 @@ in
     checkInputs = with self; [
       lualine-nvim
       telescope-nvim
+      fzf-lua
     ];
   };
 
@@ -2902,7 +2903,6 @@ in
       (replaceVars ./patches/openscad.nvim/program_paths.patch {
         htop = lib.getExe htop;
         openscad = lib.getExe openscad;
-        zathura = lib.getExe zathura;
       })
     ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch
index c3b1368577f3..1773fed655ae 100644
--- a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch
@@ -2,18 +2,9 @@ diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.v
 index d6d4b4c..9853877 100644
 --- a/autoload/health/openscad_nvim.vim
 +++ b/autoload/health/openscad_nvim.vim
-@@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort
- endfunction
- 
- function! s:check_zathura_installed() abort
--	if !executable('zathura')
-+	if !executable('@zathura@')
- 		call v:lua.vim.health.error('has(zathura)','install zathura')
- 	else
- 		call v:lua.vim.health.ok("zathura is installed")
 @@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort
  endfunction
- 
+
  function! s:check_htop_installed() abort
 -	if !executable('htop')
 +	if !executable('@htop@')
@@ -24,15 +15,6 @@ diff --git a/lua/openscad.lua b/lua/openscad.lua
 index 0a26d08..1264989 100644
 --- a/lua/openscad.lua
 +++ b/lua/openscad.lua
-@@ -101,7 +101,7 @@ end
- 
- function M.manual()
-     local path = U.openscad_nvim_root_dir .. U.path_sep .. "help_source" .. U.path_sep .. "openscad-manual.pdf"
--    api.nvim_command('silent !zathura --fork '  .. path)
-+    api.nvim_command('silent !@zathura@ --fork '  .. path)
- end
- 
- function M.help()
 @@ -126,7 +126,7 @@ function M.exec_openscad()
  		jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename
  	else
@@ -40,5 +22,5 @@ index 0a26d08..1264989 100644
 -		jobCommand = 'openscad ' .. filename
 +		jobCommand = '@openscad@ ' .. filename
  	end
- 
+
  	vim.fn.jobstart(jobCommand)

From 4701c90768d9892021c57f220e6ed41adcbd039f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 29 Aug 2025 18:52:56 -0500
Subject: [PATCH 060/111] vimPlugins.nvim-treesitter: update grammars

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/nvim-treesitter/generated.nix | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index e38a3a9eb3a8..9d11c97f8483 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -66,12 +66,12 @@
   };
   arduino = buildGrammar {
     language = "arduino";
-    version = "0.0.0+rev=3b5ddcd";
+    version = "0.0.0+rev=2f0c122";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-arduino";
-      rev = "3b5ddcdbcac43c6084358d3d14a30e10e2d36b88";
-      hash = "sha256-qoVN/84BbuvhTb+WuwmTtNGqf9mKelViHMIVjMqyvG4=";
+      rev = "2f0c1223c50aa4b754136db544204c6fc99ffc77";
+      hash = "sha256-t0EtibjsMJpiTbwhkgZGv9lUdpI6gg2VoSEUDXswEMA=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
   };
@@ -652,12 +652,12 @@
   };
   elixir = buildGrammar {
     language = "elixir";
-    version = "0.0.0+rev=b848e63";
+    version = "0.0.0+rev=d24cece";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "tree-sitter-elixir";
-      rev = "b848e63e9f2a68accff0332392f07582c046295a";
-      hash = "sha256-kMsGDHFGBclpyk9n01JJsoqInEWLEcyIUSgcWJ2Jpzk=";
+      rev = "d24cecee673c4c770f797bac6f87ae4b6d7ddec5";
+      hash = "sha256-nSXXMPneL/sTdkpcsxUz73DiXVuNxVHnf8b2LTbAUs8=";
     };
     meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
   };
@@ -1413,12 +1413,12 @@
   };
   inko = buildGrammar {
     language = "inko";
-    version = "0.0.0+rev=f58a87a";
+    version = "0.0.0+rev=74cbd0f";
     src = fetchFromGitHub {
       owner = "inko-lang";
       repo = "tree-sitter-inko";
-      rev = "f58a87ac4dc6a7955c64c9e4408fbd693e804686";
-      hash = "sha256-hZdbF9lw7fR5K8UfUaESS7/c4v9u7vEcSylEEbc6//4=";
+      rev = "74cbd0f69053b4a9ad4fed8831dee983ec7e4990";
+      hash = "sha256-nrhouUE2vjHiTlLquCJf2IUF3vy9vlBL6LuAmeKcB8M=";
     };
     meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
   };
@@ -1457,12 +1457,12 @@
   };
   javadoc = buildGrammar {
     language = "javadoc";
-    version = "0.0.0+rev=77afe93";
+    version = "0.0.0+rev=384952d";
     src = fetchFromGitHub {
       owner = "rmuir";
       repo = "tree-sitter-javadoc";
-      rev = "77afe93bc6fc10f2cf4935857b8e055b2a47bb94";
-      hash = "sha256-HkhVHPYe+IgVkRlJu72Y+3eNZnPPpDqs6UJ0ej0PZrI=";
+      rev = "384952d91ebc176fcf8f1933dff93b9c32430911";
+      hash = "sha256-IH1LUPO+18vDC83jcrC0DihTYt6aXV1w/u0iTm5jgK4=";
     };
     meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
   };
@@ -1735,12 +1735,12 @@
   };
   llvm = buildGrammar {
     language = "llvm";
-    version = "0.0.0+rev=470886d";
+    version = "0.0.0+rev=2914786";
     src = fetchFromGitHub {
       owner = "benwilliamgraham";
       repo = "tree-sitter-llvm";
-      rev = "470886ddd635e0ee48a4cb169e33d0c6d9bff32e";
-      hash = "sha256-1Fv1r644UfHXC4x4mbMetC0ThroYHwYDtKTSX3Nd4fo=";
+      rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
+      hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
     };
     meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
   };
@@ -1880,12 +1880,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=b209a18";
+    version = "0.0.0+rev=09666ce";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "b209a18d1a0f440acd3a85b6d633dac2660114e1";
-      hash = "sha256-aAfrn3my/qfEy9uK/WPCxSefBOsekJ+rT04K9UmDVvs=";
+      rev = "09666cead2c001cbbfc82b395007f6d8158113a5";
+      hash = "sha256-toH/pG8CKI4UFdBQqkgIer5tfpIWkWoCP+fU0OByxQg=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2104,12 +2104,12 @@
   };
   perl = buildGrammar {
     language = "perl";
-    version = "0.0.0+rev=e95676f";
+    version = "0.0.0+rev=0c24d00";
     src = fetchFromGitHub {
       owner = "tree-sitter-perl";
       repo = "tree-sitter-perl";
-      rev = "e95676fa54559c71f15ad73e871c1e44db8a9b05";
-      hash = "sha256-VABlYn+OwgR+aD6dFI1bxa/JhwHV0KigsAcug3gze1c=";
+      rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a";
+      hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A=";
     };
     meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
   };
@@ -2927,12 +2927,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=0daae52";
+    version = "0.0.0+rev=8cb16ba";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "0daae5239bd9366dda0c28c7540d7503b0c104d4";
-      hash = "sha256-dfH7/i/xnjQRMAhzNPkDMhre+lR+pJ/s8aDxXhPqyic=";
+      rev = "8cb16babb0c66b6512d6aeb4cbc37ed90641d980";
+      hash = "sha256-lLZqyqVEUCn9z++9lPnrK8R2uDvht5v+5Y8KOZDgPs0=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3365,12 +3365,12 @@
   };
   vhdl = buildGrammar {
     language = "vhdl";
-    version = "0.0.0+rev=73ff9d3";
+    version = "0.0.0+rev=02523d7";
     src = fetchFromGitHub {
       owner = "jpt13653903";
       repo = "tree-sitter-vhdl";
-      rev = "73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7";
-      hash = "sha256-8Fp/x3TC+bq4nJdbeVdBrnz7QnBSD1sc5CC0TRh0mGc=";
+      rev = "02523d7fb0321344c19c1f3f4ec6b83424c7d6c8";
+      hash = "sha256-TI1R2L8/9QwpKuTz18ayOeGXqRhYgbd0X6Rpj8kgsfw=";
     };
     meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
   };
@@ -3498,12 +3498,12 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=6113943";
+    version = "0.0.0+rev=f40778f";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "6113943ab0847a307f3f3c38ff91d9cdfce9d0d9";
-      hash = "sha256-ZqJvLw475e/5KBcJzx0w+aPbGCIAFfdig9cpZ5oaat8=";
+      rev = "f40778ff42f2119aebacd46d4b6d785a4181a9ba";
+      hash = "sha256-9vqVBsErlbFXzTd7QmMItd5GW2F9kE04HQFjq/vtrTc=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };
@@ -3564,12 +3564,12 @@
   };
   ziggy = buildGrammar {
     language = "ziggy";
-    version = "0.0.0+rev=e95c85c";
+    version = "0.0.0+rev=4353b20";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "ziggy";
-      rev = "e95c85cb58773c43e9d94c0b9422ae84697e68a1";
-      hash = "sha256-6vqUPY/fpGuM1K4HfgpL/dRy7Na6fJ/t+Pe/12b1wqE=";
+      rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901";
+      hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4=";
     };
     location = "tree-sitter-ziggy";
     meta.homepage = "https://github.com/kristoff-it/ziggy";

From 2513b4f3878c0701442a7eef54befcf3b455a903 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 00:05:30 +0000
Subject: [PATCH 061/111] python3Packages.millheater: 012.2 -> 0.12.5

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

diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix
index 0a36ae615300..9be5871e551d 100644
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "millheater";
-  version = "012.2";
+  version = "0.12.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pymill";
     tag = version; # https://github.com/Danielhiversen/pymill/issues/87
-    hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E=";
+    hash = "sha256-DGMG6LabfKGmQ6MDm/skqeQuOhSlr1ssZ2Z7fItzOt0=";
   };
 
   build-system = [ setuptools ];

From 604f22e0304b679e96edd9f47cbbfc4d513a3751 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Sat, 30 Aug 2025 01:26:28 +0000
Subject: [PATCH 062/111] zed-editor: 0.201.6 -> 0.201.8

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.201.8
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 14dc685172c4..3c91d8bfea8c 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.201.6";
+  version = "0.201.8";
 
   outputs = [
     "out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d1B04N5KS34ghUHOhStkCMZZosQe2yG2cu88KVxujKY=";
+    hash = "sha256-y7pWGdq7r675JnBFQwcB4QLn/0aFxpkwK7CjX0Ox+lk=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
     '';
 
-  cargoHash = "sha256-npuNvJUN9ENNB1G8kwcz8dRdFoLBJ/UgQHd+9ojW8PI=";
+  cargoHash = "sha256-20pOYcodc2jflxibY0I0+SSC1FTxB8Jw03kcihCnBOY=";
 
   nativeBuildInputs = [
     cmake

From c8452306d7c66c27b32f1bf6674504fc8f2e1540 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 30 Aug 2025 10:28:08 +0900
Subject: [PATCH 063/111] python3Packages.rubicon-objc: fix build

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

diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix
index cab1a5684b8d..d1349b7e9a40 100644
--- a/pkgs/development/python-modules/rubicon-objc/default.nix
+++ b/pkgs/development/python-modules/rubicon-objc/default.nix
@@ -23,9 +23,8 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==75.7.0" "setuptools" \
-      --replace-fail "setuptools_scm==8.1.0" "setuptools_scm"
+    sed -i 's/"setuptools==.*"/"setuptools"/' pyproject.toml
+    sed -i 's/"setuptools_scm==.*"/"setuptools_scm"/' pyproject.toml
   '';
 
   build-system = [

From f2f3b63550e9a898fea1ef6406bbec91f91f7f9f Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 30 Aug 2025 10:28:28 +0900
Subject: [PATCH 064/111] python3Packages.rubicon-objc: 0.5.1 -> 0.5.2

Diff: https://github.com/beeware/rubicon-objc/compare/v0.5.1...v0.5.2

Changelog: https://github.com/beeware/rubicon-objc/releases/tag/v0.5.2
---
 pkgs/development/python-modules/rubicon-objc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix
index d1349b7e9a40..4e9d1775a0c2 100644
--- a/pkgs/development/python-modules/rubicon-objc/default.nix
+++ b/pkgs/development/python-modules/rubicon-objc/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "rubicon-objc";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "beeware";
     repo = "rubicon-objc";
     tag = "v${version}";
-    hash = "sha256-HnPp7VUrcTfkl5XdXYasydMqxhp7eb7r5RW/7yRWmko=";
+    hash = "sha256-ahlsY4eU9n+BRexE4wNVXMcgSiGW7pU25zJif9lGTUs=";
   };
 
   postPatch = ''

From 064cb56bd6a6c40867007914f82ef82cdb624b17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 02:03:34 +0000
Subject: [PATCH 065/111] proxify: 0.0.15 -> 0.0.16

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

diff --git a/pkgs/by-name/pr/proxify/package.nix b/pkgs/by-name/pr/proxify/package.nix
index 1a313caa2423..178e6d37f64f 100644
--- a/pkgs/by-name/pr/proxify/package.nix
+++ b/pkgs/by-name/pr/proxify/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "proxify";
-  version = "0.0.15";
+  version = "0.0.16";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "proxify";
     tag = "v${version}";
-    hash = "sha256-vAI8LKdBmujH7zidXADc8bMLXaFMjT965hR+PVZVeNw=";
+    hash = "sha256-CctbeKMf4+E+Fh/0hWLwHdTTsAavkiJ2ziMumY/+oF8=";
   };
 
-  vendorHash = "sha256-eGcCc83napjt0VBhpDiHWn7+ew77XparDJ9uyjF353w=";
+  vendorHash = "sha256-7bOnLv2IJ9tysvZm33wBeMHvdSBDg1ii/QXv2n1wqxw=";
 
   meta = {
     description = "Proxy tool for HTTP/HTTPS traffic capture";

From b0648f7ff58fd9832eaa105a3b22f0a127203748 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Fri, 29 Aug 2025 21:22:29 -0500
Subject: [PATCH 066/111] libnl-tiny: correct license to GPLv2

---
 pkgs/by-name/li/libnl-tiny/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix
index 84d9210328e6..9e4e635715bc 100644
--- a/pkgs/by-name/li/libnl-tiny/package.nix
+++ b/pkgs/by-name/li/libnl-tiny/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Tiny OpenWrt fork of libnl";
     homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary";
-    license = licenses.isc;
+    license = licenses.gpl2Only;
     maintainers = with maintainers; [ mkg20001 ];
     platforms = platforms.linux;
   };

From bdb0f63c2bf5d2a0b2279aec50147ba0d9f02aef Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Fri, 29 Aug 2025 21:18:10 -0500
Subject: [PATCH 067/111] libnl-tiny: 2023-12-05 -> 2025-03-19

---
 pkgs/by-name/li/libnl-tiny/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix
index 9e4e635715bc..8310d4d75672 100644
--- a/pkgs/by-name/li/libnl-tiny/package.nix
+++ b/pkgs/by-name/li/libnl-tiny/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation {
   pname = "libnl-tiny";
-  version = "unstable-2023-12-05";
+  version = "0-unstable-2025-03-19";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libnl-tiny.git";
-    rev = "965c4bf49658342ced0bd6e7cb069571b4a1ddff";
-    hash = "sha256-kegTV7FXMERW7vjRZo/Xp4cbSBZmynBgge2lK71Fx94=";
+    rev = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e";
+    hash = "sha256-j5oIEbWqVWd7rNpCMm9+WZwud43uTGeHG81lmzQOoeY=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,10 @@ stdenv.mkDerivation {
     description = "Tiny OpenWrt fork of libnl";
     homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ mkg20001 ];
+    maintainers = with maintainers; [
+      mkg20001
+      dvn0
+    ];
     platforms = platforms.linux;
   };
 }

From 0f869a64c4a259edd3c9be0cb75df5aaba479fa5 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Fri, 29 Aug 2025 21:24:17 -0500
Subject: [PATCH 068/111] libnl-tiny: drop unused build input

---
 pkgs/by-name/li/libnl-tiny/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix
index 8310d4d75672..f0fefcc64767 100644
--- a/pkgs/by-name/li/libnl-tiny/package.nix
+++ b/pkgs/by-name/li/libnl-tiny/package.nix
@@ -3,7 +3,6 @@
   lib,
   fetchgit,
   cmake,
-  pkg-config,
 }:
 
 stdenv.mkDerivation {
@@ -18,7 +17,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    pkg-config
   ];
 
   preConfigure = ''

From 0ec79da0b9e590cc415d016799146a0d7c265319 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Fri, 29 Aug 2025 21:12:00 -0500
Subject: [PATCH 069/111] libubox: 2024-12-19 -> 2025-07-23

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

diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix
index f186fbc82412..86aef1036258 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/pkgs/development/libraries/libubox/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation {
   pname = "libubox";
-  version = "0-unstable-2024-12-19";
+  version = "0-unstable-2025-07-23";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libubox.git";
-    rev = "3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a";
-    hash = "sha256-rACcvyMhksw5A+Tkn6XiTqz1DHK23YKRHL7j3CEccr4=";
+    rev = "49056d178f42da98048a5d4c23f83a6f6bc6dd80";
+    hash = "sha256-sk5r18M0hJ+8CrC2G/rb+XqUmUGer2VBrVbuReHj1dM=";
   };
 
   cmakeFlags = [
@@ -56,6 +56,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [
       fpletz
       mkg20001
+      dvn0
     ];
     mainProgram = "jshn";
     platforms = platforms.all;

From e379076e2dbc61b917d294fe158149cdbafe58ca Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 28 Aug 2025 20:03:27 -0700
Subject: [PATCH 070/111] python3Packages.pyosoenergyapi: init at 1.2.4

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

diff --git a/pkgs/development/python-modules/pyosoenergyapi/default.nix b/pkgs/development/python-modules/pyosoenergyapi/default.nix
new file mode 100644
index 000000000000..243c3abb483d
--- /dev/null
+++ b/pkgs/development/python-modules/pyosoenergyapi/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  loguru,
+  numpy,
+  setuptools,
+  unasync,
+  urllib3,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyosoenergyapi";
+  version = "1.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "osohotwateriot";
+    repo = "apyosohotwaterapi";
+    tag = version;
+    hash = "sha256-hpbmiSOLawKVSh7BGV70bRi45HCDKmdxEEhCOdJuIww=";
+  };
+
+  build-system = [
+    setuptools
+    unasync
+    writableTmpDirAsHomeHook
+  ];
+
+  dependencies = [
+    aiohttp
+    loguru
+    numpy
+    urllib3
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyosoenergyapi" ];
+
+  meta = {
+    description = "Python library to interface with the OSO Energy API";
+    homepage = "https://github.com/osohotwateriot/apyosohotwaterapi";
+    changelog = "https://github.com/osohotwateriot/apyosohotwaterapi/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 540f3546f9ba..d6c4432e01fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13588,6 +13588,8 @@ self: super: with self; {
 
   pyosmium = callPackage ../development/python-modules/pyosmium { inherit (pkgs) lz4; };
 
+  pyosoenergyapi = callPackage ../development/python-modules/pyosoenergyapi { };
+
   pyosohotwaterapi = callPackage ../development/python-modules/pyosohotwaterapi { };
 
   pyotb = callPackage ../development/python-modules/pyotb { };

From cdbc2fd8d5bb44d1460991a792a3f3a4077ccb89 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 28 Aug 2025 20:04:12 -0700
Subject: [PATCH 071/111] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a570436a8ba2..00ee13815ed8 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4319,7 +4319,8 @@
       ];
     "osoenergy" =
       ps: with ps; [
-      ]; # missing inputs: pyosoenergyapi
+        pyosoenergyapi
+      ];
     "osramlightify" =
       ps: with ps; [
         lightify
@@ -7530,6 +7531,7 @@
     "opnsense"
     "opower"
     "oralb"
+    "osoenergy"
     "otbr"
     "otp"
     "ourgroceries"

From 1ec2dbd41d05bccbde2e26447eba1c29f9a045ed Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 30 Aug 2025 10:35:37 +0800
Subject: [PATCH 072/111] firefox-beta: build in cuda release

---
 pkgs/top-level/release-cuda.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index e87cd289e7a1..5dfc7ce01212 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -88,6 +88,8 @@ let
       ffmpeg-full = linux;
       firefox = linux;
       firefox-unwrapped = linux;
+      firefox-beta = linux;
+      firefox-beta-unwrapped = linux;
       gimp = linux;
       gimp3 = linux;
       gpu-screen-recorder = linux;

From 27fdf1c411495ca39ac2cb365c23b3009ee79371 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 03:32:35 +0000
Subject: [PATCH 073/111] mieru: 3.19.0 -> 3.19.1

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 4fe19a5d8103..141dd691f232 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.19.0";
+  version = "3.19.1";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-0kOYAtPFIXHg/CNoPxdRot9zTfEQ2uD0wBFFBW5h2ZA=";
+    hash = "sha256-x8rddxjhmHw7J7majt4qdkXRPsfm8SATFsMxN2stN14=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From 0971f49d21eff6bdae828eb0b3eb38fdcd30fc67 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Fri, 29 Aug 2025 07:33:18 +0200
Subject: [PATCH 074/111] gemini-cli: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index da14a4b2898a..419a6f6b817b 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8=";
+    hash = "sha256-ykNgtHtH+PPCycRn9j1lc8UIEHqYj54l0MTeVz6OhsQ=";
   };
 
   patches = [
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
     ./restore-missing-dependencies-fields.patch
   ];
 
-  npmDepsHash = "sha256-i4Z/zM4jRf9Orisu0xHHa3yJsDjYSmHieF2WIKU/1iY=";
+  npmDepsHash = "sha256-gpNt581BHDA12s+3nm95UOYHjoa7Nfe46vgPwFr7ZOU=";
 
   preConfigure = ''
     mkdir -p packages/generated

From de74f9caf0854a9ee8c39774cf4521870fa1f44a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 30 Aug 2025 09:29:43 +0300
Subject: [PATCH 075/111] Revert "stdenv: Add CPE fields to meta"

---
 doc/redirects.json                            |  15 --
 doc/stdenv/meta.chapter.md                    |  71 -------
 lib/meta.nix                                  | 189 +-----------------
 .../networking/sync/rsync/default.nix         |   5 -
 pkgs/by-name/he/hello/package.nix             |   1 -
 .../development/compilers/gcc/common/meta.nix |   1 -
 pkgs/development/compilers/gcc/default.nix    |   1 -
 .../compilers/llvm/common/common-let.nix      |   2 -
 .../linux/kernel/manual-config.nix            |   7 -
 pkgs/shells/bash/5.nix                        |  10 -
 pkgs/stdenv/generic/check-meta.nix            |  63 ------
 11 files changed, 1 insertion(+), 364 deletions(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index 91f98a064f6f..7b0841c639b7 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -225,12 +225,6 @@
   "sec-language-cosmic": [
     "index.html#sec-language-cosmic"
   ],
-  "sec-meta-identifiers": [
-    "index.html#sec-meta-identifiers"
-  ],
-  "sec-meta-identifiers-cpe": [
-    "index.html#sec-meta-identifiers-cpe"
-  ],
   "sec-modify-via-packageOverrides": [
     "index.html#sec-modify-via-packageOverrides"
   ],
@@ -628,15 +622,6 @@
   "typst-package-scope-and-usage": [
     "index.html#typst-package-scope-and-usage"
   ],
-  "var-meta-identifiers-cpe": [
-    "index.html#var-meta-identifiers-cpe"
-  ],
-  "var-meta-identifiers-cpeParts": [
-    "index.html#var-meta-identifiers-cpeParts"
-  ],
-  "var-meta-identifiers-possibleCPEs": [
-    "index.html#var-meta-identifiers-possibleCPEs"
-  ],
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index 947009869ff1..6f092d406126 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -248,74 +248,3 @@ Code to be executed on a peripheral device or embedded controller, built by a th
 ### `lib.sourceTypes.binaryBytecode` {#lib.sourceTypes.binaryBytecode}
 
 Code to run on a VM interpreter or JIT compiled into bytecode by a third party. This includes packages which download Java `.jar` files from another source.
-
-## Software identifiers {#sec-meta-identifiers}
-
-Package's `meta.identifiers` attribute specifies information about software identifiers associated with this package. Software identifiers are used, for example:
-* to generate Software Bill of Materials (SBOM) that lists all components used to build the software, which can later be used to perform vulnerability or license analysis of the resulting software;
-* to lookup software in different vulnerability databases or report new vulnerabilities to them.
-
-Overriding the default `meta.identifiers` attribute is optional, but it is recommended to fill in pieces to help tools mentioned above get precise data.
-For example, we could get automatic notifications about potential vulnerabilities for users in the future.
-All identifiers specified in `meta.identifiers` are expected to be unambiguous and valid.
-
-`meta.identifiers` contains `v1` attribute which is an attribute set that guarantees backward compatibility of its constituents. Right now it contains copies of all other attributes in `meta.identifiers`.
-
-### CPE {#sec-meta-identifiers-cpe}
-
-Common Platform Enumeration (CPE) is a specification maintained by NIST as part of the Security Content Automation Protocol (SCAP). It is used to identify software in National Vulnerabilities Database (NVD, https://nvd.nist.gov) and other vulnerability databases.
-
-Current version of CPE 2.3 consists of 13 parts:
-
-```
-cpe:2.3:a:<vendor>:<product>:<version>:<update>:<edition>:<language>:<sw_edition>:<target_sw>:<target_hw>:<other>
-```
-
-Some of them are as follows:
-
-* *CPE version* - current version of CPE is `2.3`
-* *part* - usually in Nixpkgs `a` for "application", can also be `o` for "operating system" or `h` for "hardware"
-* *vendor* - can point to the source of the package, or to Nixpkgs itself
-* *product* - name of the package
-* *version* - version of the package
-* *update* - name of the latest update, can be a patch version for semantically versioned packages
-* *edition* - any additional specification about the version
-
-You can find information about all of these attributes in the [official specification](https://csrc.nist.gov/projects/security-content-automation-protocol/specifications/cpe/naming) (heading 5.3.3, pages 11-13).
-
-Any fields that don't have a value are set to either `-` if the value is not available or `*` when the field can match any value.
-
-For example, for glibc 2.40.1 CPE would be `cpe:2.3:a:gnu:glibc:2.40:1:*:*:*:*:*:*`.
-
-#### `meta.identifiers.cpeParts` {#var-meta-identifiers-cpeParts}
-
-This attribute contains an attribute set of all parts of the CPE for this package. Most of the parts default to `*` (match any value), with some exceptions:
-
-* `part` defaults to `a` (application), can also be set to `o` for operating systems, for example, Linux kernel, or to `h` for hardware
-* `vendor` cannot be deduced from other sources, so it must be specified by the package author
-* `product` defaults to provided derivation's `pname` attribute and must be provided explicitly if `pname` is missing
-* `version` and `update` have no defaults and should be specified explicitly or using helper functions, when missing, `cpe` attribute will be empty, and all possible guesses using helper functions will be in `possibleCPEs` attribute.
-
-It is up to the package author to make sure all parts are correct and match expected values in [NVD dictionary](https://nvd.nist.gov/products/cpe). Unknown values can be skipped, which would leave them with the default value of `*`.
-
-Following functions help with filling out `version` and `update` fields:
-
-* [`lib.meta.cpeFullVersionWithVendor`](#function-library-lib.meta.cpeFullVersionWithVendor)
-* [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor)
-
-For many packages to make CPE available it should be enough to specify only:
-
-```nix
-{
-  # ...
-  meta.identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor vendor version;
-}
-```
-
-#### `meta.identifiers.cpe` {#var-meta-identifiers-cpe}
-
-A readonly attribute that concatenates all CPE parts in one string.
-
-#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}
-
-A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.
diff --git a/lib/meta.nix b/lib/meta.nix
index cf48a700b23a..ee234d94489b 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -15,12 +15,7 @@ let
     assertMsg
     ;
   inherit (lib.attrsets) mapAttrs' filterAttrs;
-  inherit (builtins)
-    isString
-    match
-    typeOf
-    elemAt
-    ;
+  inherit (builtins) isString match typeOf;
 
 in
 rec {
@@ -489,186 +484,4 @@ rec {
     assert assertMsg (match ".*/.*" y == null)
       "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead.";
     "${getBin x}/bin/${y}";
-
-  /**
-    Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` and `version` to the output, and sets `update` to `*`.
-
-    # Inputs
-
-    `vendor`
-
-    : package's vendor
-
-    `version`
-
-    : package's version
-
-    # Type
-
-    ```
-    cpeFullVersionWithVendor :: string -> string -> AttrSet
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.meta.cpeFullVersionWithVendor` usage example
-
-    ```nix
-    lib.meta.cpeFullVersionWithVendor "gnu" "1.2.3"
-    => {
-      vendor = "gnu";
-      version = "1.2.3";
-      update = "*";
-    }
-    ```
-
-    :::
-    :::{.example}
-    ## `lib.meta.cpeFullVersionWithVendor` usage in derivations
-
-    ```nix
-    mkDerivation rec {
-      version = "1.2.3";
-      # ...
-      meta = {
-        # ...
-        identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version;
-      };
-    }
-    ```
-    :::
-  */
-  cpeFullVersionWithVendor = vendor: version: {
-    inherit vendor version;
-    update = "*";
-  };
-
-  /**
-    Alternate version of [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor).
-    If `cpePatchVersionInUpdateWithVendor` succeeds, returns an attribute set with `success` set to `true` and `value` set to the result.
-    Otherwise, `success` is set to `false` and `error` is set to the string representation of the error.
-
-    # Inputs
-
-    `vendor`
-
-    : package's vendor
-
-    `version`
-
-    : package's version
-
-    # Type
-
-    ```
-    tryCPEPatchVersionInUpdateWithVendor :: string -> string -> AttrSet
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.meta.tryCPEPatchVersionInUpdateWithVendor` usage example
-
-    ```nix
-    lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "1.2.3"
-    => {
-      success = true;
-      value = {
-        vendor = "gnu";
-        version = "1.2";
-        update = "3";
-      };
-    }
-    ```
-
-    :::
-    :::{.example}
-    ## `lib.meta.cpePatchVersionInUpdateWithVendor` error example
-
-    ```nix
-    lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "5.3p0"
-    => {
-      success = false;
-      error = "version 5.3p0 doesn't match regex `([0-9]+\\.[0-9]+)\\.([0-9]+)`";
-    }
-    ```
-
-    :::
-  */
-  tryCPEPatchVersionInUpdateWithVendor =
-    vendor: version:
-    let
-      regex = "([0-9]+\\.[0-9]+)\\.([0-9]+)";
-      # we have to call toString here in case version is an attrset with __toString attribute
-      versionMatch = builtins.match regex (toString version);
-    in
-    if versionMatch == null then
-      {
-        success = false;
-        error = "version ${version} doesn't match regex `${regex}`";
-      }
-    else
-      {
-        success = true;
-        value = {
-          inherit vendor;
-          version = elemAt versionMatch 0;
-          update = elemAt versionMatch 1;
-        };
-      };
-
-  /**
-    Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` to the result. When `version` matches `X.Y.Z` where all parts are numerical, sets `version` and `update` fields to `X.Y` and `Z`. Throws an error if the version doesn't match the expected template.
-
-    # Inputs
-
-    `vendor`
-
-    : package's vendor
-
-    `version`
-
-    : package's version
-
-    # Type
-
-    ```
-    cpePatchVersionInUpdateWithVendor :: string -> string -> AttrSet
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.meta.cpePatchVersionInUpdateWithVendor` usage example
-
-    ```nix
-    lib.meta.cpePatchVersionInUpdateWithVendor "gnu" "1.2.3"
-    => {
-      vendor = "gnu";
-      version = "1.2";
-      update = "3";
-    }
-    ```
-
-    :::
-    :::{.example}
-    ## `lib.meta.cpePatchVersionInUpdateWithVendor` usage in derivations
-
-    ```nix
-    mkDerivation rec {
-      version = "1.2.3";
-      # ...
-      meta = {
-        # ...
-        identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor "gnu" version;
-      };
-    }
-    ```
-
-    :::
-  */
-  cpePatchVersionInUpdateWithVendor =
-    vendor: version:
-    let
-      result = tryCPEPatchVersionInUpdateWithVendor vendor version;
-    in
-    if result.success then result.value else throw result.error;
 }
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index c965c62a8f4b..6d486e5040fe 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -85,10 +85,5 @@ stdenv.mkDerivation rec {
       ivan
     ];
     platforms = platforms.unix;
-    identifiers.cpeParts = {
-      vendor = "samba";
-      inherit version;
-      update = "-";
-    };
   };
 }
diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix
index bbcce772a3aa..4e12ff39093e 100644
--- a/pkgs/by-name/he/hello/package.nix
+++ b/pkgs/by-name/he/hello/package.nix
@@ -55,6 +55,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ stv0g ];
     mainProgram = "hello";
     platforms = lib.platforms.all;
-    identifiers.cpeParts.vendor = "gnu";
   };
 })
diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix
index e0325feafbe8..c69f9956ddfc 100644
--- a/pkgs/development/compilers/gcc/common/meta.nix
+++ b/pkgs/development/compilers/gcc/common/meta.nix
@@ -30,5 +30,4 @@ in
   teams = [ teams.gcc ];
   mainProgram = "${targetPrefix}gcc";
 
-  identifiers.cpeParts.vendor = "gnu";
 }
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index a79cfed28598..3e78d7946b5d 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -419,7 +419,6 @@ pipe
           platforms
           teams
           mainProgram
-          identifiers
           ;
       };
     }
diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix
index 800f2000e68c..1a17e39a0690 100644
--- a/pkgs/development/compilers/llvm/common/common-let.nix
+++ b/pkgs/development/compilers/llvm/common/common-let.nix
@@ -34,8 +34,6 @@ rec {
       ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv
       ++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k
       ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64;
-
-    identifiers.cpeParts.vendor = "llvm";
   };
 
   releaseInfo =
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index af99e2995c07..38eda04ecb77 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -540,13 +540,6 @@ lib.makeOverridable (
             ]
             ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
           timeout = 14400; # 4 hours
-          identifiers.cpeParts = {
-            part = "o";
-            vendor = "linux";
-            product = "linux_kernel";
-            inherit version;
-            update = "*";
-          };
         }
         // extraMeta;
       };
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index bb26bcd77336..424769a4a5c1 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -183,15 +183,5 @@ lib.warnIf (withDocs != null)
       badPlatforms = [ lib.systems.inspect.patterns.isMinGW ];
       maintainers = [ ];
       mainProgram = "bash";
-      identifiers.cpeParts =
-        let
-          versionSplit = lib.split "p" version;
-        in
-        {
-          vendor = "gnu";
-          product = "bash";
-          version = lib.elemAt versionSplit 0;
-          update = lib.elemAt versionSplit 2;
-        };
     };
   }
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 66cf070c5268..3a42ab4f15aa 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -11,7 +11,6 @@ let
   inherit (lib)
     all
     attrNames
-    attrValues
     concatMapStrings
     concatMapStringsSep
     concatStrings
@@ -38,8 +37,6 @@ let
 
   inherit (lib.meta)
     availableOn
-    cpeFullVersionWithVendor
-    tryCPEPatchVersionInUpdateWithVendor
     ;
 
   inherit (lib.generators)
@@ -440,8 +437,6 @@ let
       # Used for the original location of the maintainer and team attributes to assist with pings.
       maintainersPosition = any;
       teamsPosition = any;
-
-      identifiers = attrs;
     };
 
   checkMetaAttr =
@@ -575,19 +570,6 @@ let
     else
       validYes;
 
-  # Helper functions and declarations to handle identifiers, extracted to reduce allocations
-  hasAllCPEParts = cpeParts: !any isNull (attrValues cpeParts);
-  makeCPE =
-    cpeParts:
-    "cpe:2.3:${cpeParts.part}:${cpeParts.vendor}:${cpeParts.product}:${cpeParts.version}:${cpeParts.update}:${cpeParts.edition}:${cpeParts.sw_edition}:${cpeParts.target_sw}:${cpeParts.target_hw}:${cpeParts.language}:${cpeParts.other}";
-  possibleCPEPartsFuns = [
-    (vendor: version: {
-      success = true;
-      value = cpeFullVersionWithVendor vendor version;
-    })
-    tryCPEPatchVersionInUpdateWithVendor
-  ];
-
   # The meta attribute is passed in the resulting attribute set,
   # but it's not part of the actual derivation, i.e., it's not
   # passed to the builder and is not a dependency.  But since we
@@ -652,51 +634,6 @@ let
       maintainers =
         attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
 
-      identifiers =
-        let
-          defaultCPEParts = {
-            part = "a";
-            vendor = null;
-            product = attrs.pname or null;
-            version = null;
-            update = null;
-            edition = "*";
-            sw_edition = "*";
-            target_sw = "*";
-            target_hw = "*";
-            language = "*";
-            other = "*";
-          };
-
-          cpeParts = defaultCPEParts // attrs.meta.identifiers.cpeParts or { };
-          cpe = if hasAllCPEParts cpeParts then makeCPE cpeParts else null;
-
-          possibleCPEs =
-            if cpe != null then
-              [ { inherit cpeParts cpe; } ]
-            else if attrs.meta.identifiers.cpeParts.vendor or null == null || attrs.version or null == null then
-              [ ]
-            else
-              concatMap (
-                f:
-                let
-                  result = f attrs.meta.identifiers.cpeParts.vendor attrs.version;
-                  # Note that attrs.meta.identifiers.cpeParts at this point can include defaults with user overrides.
-                  # Since we can't split them apart, user overrides don't apply to possibleCPEs.
-                  guessedParts = cpeParts // result.value;
-                in
-                optional (result.success && (hasAllCPEParts guessedParts)) {
-                  cpeParts = guessedParts;
-                  cpe = (makeCPE guessedParts);
-                }
-              ) possibleCPEPartsFuns;
-          v1 = { inherit cpeParts cpe possibleCPEs; };
-        in
-        v1
-        // {
-          inherit v1;
-        };
-
       # Expose the result of the checks for everyone to see.
       unfree = hasUnfreeLicense attrs;
       broken = isMarkedBroken attrs;

From 9dd0bee7269951ce70cc413f2b09817f33376eb0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 30 Aug 2025 09:57:44 +0300
Subject: [PATCH 076/111] gamescope: 3.16.14.2 -> 3.16.15

Diff: https://github.com/ValveSoftware/gamescope/compare/3.16.14.2...3.16.15
---
 pkgs/by-name/ga/gamescope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 5432341d60e7..47dd74f38ba3 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -49,14 +49,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.16.14.2";
+  version = "3.16.15";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-l8SK8LQmFK0KeWxag7CX2lnME+HOvGpn4s3FqUNsK1Q=";
+    hash = "sha256-/JMk1ZzcVDdgvTYC+HQL09CiFDmQYWcu6/uDNgYDfdM=";
   };
 
   patches = [

From 360003df84a378f8569aa56f4877e2d7f161e60d Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Wed, 27 Aug 2025 21:58:08 -0400
Subject: [PATCH 077/111] tageditor: switch to using Qt6

---
 pkgs/by-name/ta/tageditor/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index de03722f3c4e..e781976b018d 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -7,8 +7,8 @@
   cpp-utilities,
   mp4v2,
   libid3tag,
-  libsForQt5,
-  qt5,
+  kdePackages,
+  qt6,
   tagparser,
 }:
 
@@ -26,21 +26,26 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     cmake
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     mp4v2
     libid3tag
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtwebengine
     cpp-utilities
-    libsForQt5.qtutilities
+    kdePackages.qtutilities
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtwebengine
     tagparser
   ];
 
+  cmakeFlags = [
+    "-DQT_PACKAGE_PREFIX=Qt6"
+    "-DQt6_DIR=${qt6.qtbase}/lib/cmake/Qt6"
+    "-DQt6WebEngineWidgets_DIR=${qt6.qtwebengine}/lib/cmake/Qt6WebEngineWidgets"
+  ];
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications
     mv $out/bin/*.app $out/Applications

From 329379cd71dd3ea553208437378778059da26414 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 30 Aug 2025 09:38:28 +0200
Subject: [PATCH 078/111] vkd3d: 1.15 -> 1.17

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

diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index 13e31f9fcb14..5ca791c4bac5 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -4,6 +4,7 @@
   bison,
   fetchFromGitLab,
   flex,
+  perlPackages,
   pkg-config,
   spirv-headers,
   stdenv,
@@ -14,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkd3d";
-  version = "1.15";
+  version = "1.17";
 
   src = fetchFromGitLab {
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "vkd3d";
-    rev = "vkd3d-${finalAttrs.version}";
-    hash = "sha256-EzXsYi9wC+JdMYE77cIeO2lV+fY4ViQM3+KcAJFv9tU=";
+    tag = "vkd3d-${finalAttrs.version}";
+    hash = "sha256-jxQ9L1GL4j3P5/nb79qAXQp8/IStOWmiK/vvbFxeg1k=";
   };
 
   outputs = [
@@ -34,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     bison
     flex
+    perlPackages.perl
+    perlPackages.JSON
     pkg-config
     wine
   ];

From e2b5ec05b97533e37cbf7b41e6c1a55aa8d70783 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 30 Aug 2025 09:50:24 +0200
Subject: [PATCH 079/111] vkd3d: add liberodark to maintainers

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

diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index 5ca791c4bac5..28c81fcb2010 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ lgpl21Plus ];
     mainProgram = "vkd3d-compiler";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     inherit (wine.meta) platforms;
   };
 })

From 87b221a848fbc902c37881c7efcd930ad72f0ffd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 07:55:16 +0000
Subject: [PATCH 080/111] python3Packages.argos-translate-files: 1.4.0 -> 1.4.1

---
 .../python-modules/argos-translate-files/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix
index c0917a76e03c..522ddeabbe35 100644
--- a/pkgs/development/python-modules/argos-translate-files/default.nix
+++ b/pkgs/development/python-modules/argos-translate-files/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "argos-translate-files";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vKnPL0xgyJ1vYtB2AgnKv4BqigSiFYmIm5HBq4hQ7nI=";
+    hash = "sha256-9ufNuExfyW3gr8+pIpp6Ie03e0hE4l3l3kk6EiVH0x8=";
   };
 
   build-system = [ setuptools ];

From df87bc3814fab351c6649f126d551a8999831947 Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Sat, 30 Aug 2025 16:01:17 +0800
Subject: [PATCH 081/111] linuxPackages_latest.prl-tools: 20.4.1-55996 -> 
 26.0.0-57238

---
 .../virtualisation/parallels-guest.nix        | 16 +-------
 .../linux/prl-tools/autostart.desktop         |  8 ----
 pkgs/os-specific/linux/prl-tools/default.nix  |  6 +--
 pkgs/os-specific/linux/prl-tools/update.sh    | 41 ++++++++++++-------
 4 files changed, 30 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/prl-tools/autostart.desktop

diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 862d606dea64..a0918900f442 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 
@@ -55,11 +54,8 @@ in
     boot.extraModulePackages = [ prl-tools ];
 
     boot.kernelModules = [
-      "prl_fs"
-      "prl_fs_freeze"
       "prl_tg"
-    ]
-    ++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier";
+    ];
 
     services.timesyncd.enable = false;
 
@@ -114,15 +110,6 @@ in
           WorkingDirectory = "${prl-tools}/bin";
         };
       };
-      prlsga = {
-        description = "Parallels Shared Guest Applications Tool";
-        wantedBy = [ "graphical-session.target" ];
-        path = [ prl-tools ];
-        serviceConfig = {
-          ExecStart = "${prl-tools}/bin/prlsga";
-          WorkingDirectory = "${prl-tools}/bin";
-        };
-      };
       prlshprof = {
         description = "Parallels Shared Profile Tool";
         wantedBy = [ "graphical-session.target" ];
@@ -133,6 +120,5 @@ in
         };
       };
     };
-
   };
 }
diff --git a/pkgs/os-specific/linux/prl-tools/autostart.desktop b/pkgs/os-specific/linux/prl-tools/autostart.desktop
deleted file mode 100644
index b8eb27fdd992..000000000000
--- a/pkgs/os-specific/linux/prl-tools/autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=@version@
-Encoding=UTF-8
-Name=@description@
-Type=Application
-Exec=@exec@
-X-KDE-autostart-phase=1
-GenericName[en_US]=
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 120a14a37107..aa100b3d222b 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -43,13 +43,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "20.4.1-55996";
+  version = "26.0.0-57238";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-CEyP8YZPLzjVAAjOaUqwQ4Ilzk9ybAtTTZUGZbSRrKQ=";
+    hash = "sha256-UuQGW1qYLGVLqAzApPKBqfOZdS23mCPsID4D0HATHNw=";
   };
 
   hardeningDisable = [
@@ -118,9 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     ( # kernel modules
       cd kmods
       mkdir -p $out/lib/modules/${kernelVersion}/extra
-      cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra
       cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra
-      ${lib.optionalString stdenv.hostPlatform.isAarch64 "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"}
     )
 
     ( # tools
diff --git a/pkgs/os-specific/linux/prl-tools/update.sh b/pkgs/os-specific/linux/prl-tools/update.sh
index a720ca8856db..c6999c494d01 100755
--- a/pkgs/os-specific/linux/prl-tools/update.sh
+++ b/pkgs/os-specific/linux/prl-tools/update.sh
@@ -6,23 +6,36 @@ set -eu -o pipefail
 nixpkgs="$(git rev-parse --show-toplevel)"
 path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix"
 
-# Currently this script only supports Parallels 20
+# Currently this script only supports Parallels 26
 # Please change the knowledge base url after each major release
-kb_url="https://kb.parallels.com/en/130212"
+kb_url="https://kb.parallels.com/en/131014"
 content="$(curl -s "$kb_url")"
 
-# Parse HTML content and retrieve og:description for header metadata
-description=$(echo "$content" | xmllint --recover --html --xpath 'string(//meta[@property="og:description"]/@content)' - 2>/dev/null)
-regex='[^0-9]+([0-9]+\.[0-9]+\.[0-9]+)[^\(]+\(([0-9]+)\)'
-if [[ $description =~ $regex ]]; then
-    version="${BASH_REMATCH[1]}-${BASH_REMATCH[2]}"
-    echo "Found latest version: $version"
-else
-    echo "Failed to extract version from $kb_url" >&2
-    echo "Retrived description: $description" >&2
-    exit 1
+# Extract all version/build pairs and select the latest (by semver, then build)
+# Prefer the article content; fallback to whole body text
+article_text="$(echo "$content" | xmllint --recover --html --xpath 'string(//div[@id="article-content"])' - 2>/dev/null || true)"
+if [[ -z "${article_text:-}" ]]; then
+  article_text="$(echo "$content" | xmllint --recover --html --xpath 'string(//body)' - 2>/dev/null || echo "$content")"
 fi
 
+# Find all "X.Y.Z (BUILD)" occurrences like "20.4.1 (55996)"
+mapfile -t candidates < <(echo "$article_text" \
+  | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+[[:space:]]*\(([0-9]+)\)' \
+  | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)[[:space:]]*\(([0-9]+)\)/\1 \2/' \
+  | sort -u)
+
+if [[ ${#candidates[@]} -eq 0 ]]; then
+  echo "Failed to extract any version from $kb_url" >&2
+  exit 1
+fi
+
+# Sort by version then build and pick the highest
+latest_pair="$(printf '%s\n' "${candidates[@]}" | sort -V -k1,1 -k2,2n | tail -n1)"
+latest_ver="$(awk '{print $1}' <<< "$latest_pair")"
+latest_build="$(awk '{print $2}' <<< "$latest_pair")"
+version="${latest_ver}-${latest_build}"
+echo "Found latest version: $version"
+
 # Extract and compare current version
 old_version="$(grep -o 'version = ".*"' "$path" | awk -F'"' '{print $2}')"
 if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then
@@ -31,9 +44,9 @@ if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then
 fi
 
 # Update version and hash
-major_version=$(echo $version | cut -d. -f1)
+major_version="$(echo "$version" | cut -d. -f1)"
 dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg"
-sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')"
+sha256="$(nix store prefetch-file "$dmg_url" --json | jq -r '.hash')"
 sed -i -e "s,version = \"$old_version\",version = \"$version\"," \
     -e "s,hash = \"sha256-.*\",hash = \"$sha256\"," "$path"
 

From d6cff4d8805ec72b04824662a77f71e4887e2df5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 30 Aug 2025 10:20:43 +0200
Subject: [PATCH 082/111] python3Packages.ansible-runner: skip failing tests

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

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index b094970f2bdd..760a30469aad 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -17,6 +17,7 @@
   importlib-metadata,
 
   # tests
+  addBinToPathHook,
   ansible-core,
   glibcLocales,
   mock,
@@ -26,6 +27,7 @@
   pytest-xdist,
   pytestCheckHook,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -60,6 +62,7 @@ buildPythonPackage rec {
   ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
   nativeCheckInputs = [
+    addBinToPathHook
     ansible-core # required to place ansible CLI onto the PATH in tests
     glibcLocales
     mock
@@ -69,12 +72,11 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     versionCheckHook
+    writableTmpDirAsHomeHook
   ];
   versionCheckProgramArg = "--version";
 
   preCheck = ''
-    export HOME=$(mktemp -d)
-    export PATH="$PATH:$out/bin";
     # avoid coverage flags
     rm pytest.ini
   '';
@@ -90,8 +92,10 @@ buildPythonPackage rec {
     # Assertion error
     "test_callback_plugin_censoring_does_not_overwrite"
     "test_get_role_list"
+    "test_include_role_events"
     "test_include_role_from_collection_events"
     "test_module_level_no_log"
+    "test_output_when_given_invalid_playbook"
     "test_resolved_actions"
   ];
 

From 06ca02eba3b386b6efaff0467ad22214c02149f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 08:21:12 +0000
Subject: [PATCH 083/111] koboldcpp: 1.98 -> 1.98.1

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

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index bbdadfaf7234..8069cd12f86e 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.98";
+  version = "1.98.1";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw=";
+    hash = "sha256-CJM97DRSIq2d3X6aR096+9QwBeI4kQNzxufdSoEydco=";
   };
 
   enableParallelBuilding = true;

From f879ac45475389051647225f436b9b84f96096f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 09:15:52 +0000
Subject: [PATCH 084/111] qownnotes: 25.8.4 -> 25.8.7

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 7319dde4af42..3265160fe9fe 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -18,11 +18,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.8.4";
+  version = "25.8.7";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6DrwdimHuCLcmSiOGghvJajowbhWh8arnL/iPPxfopQ=";
+    hash = "sha256-OBLFdJAiBleymmWVDYIu7zeMNDU++HAlyPJi5qSoRO4=";
   };
 
   nativeBuildInputs = [

From 9904c241417e489fe060590696dbbf0b625f5014 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 30 Aug 2025 11:37:14 +0200
Subject: [PATCH 085/111] python3Packages.transformers: 4.55.4 -> 4.56.0

Diff: https://github.com/huggingface/transformers/compare/v4.55.4...v4.56.0

Changelog: https://github.com/huggingface/transformers/releases/tag/v4.56.0
---
 pkgs/development/python-modules/transformers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 6783c86c8fc8..774867251ee3 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -59,14 +59,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.55.4";
+  version = "4.56.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-gBVFIX4wSfWVWPc0dAC9aGGjNdBhUaOfyU3C+wDr6GY=";
+    hash = "sha256-gM9kGID1lR7wN9Nxlq4h0GtI3QuJxkRVxQAsYbW8ok0=";
   };
 
   build-system = [ setuptools ];

From 036b471cb6bc50b3ae59f699a812aea4799c75ab Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Sat, 30 Aug 2025 16:40:19 +0700
Subject: [PATCH 086/111] python3Packages.syne-tune: init at 0.14.2

---
 .../python-modules/syne-tune/default.nix      | 146 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 148 insertions(+)
 create mode 100644 pkgs/development/python-modules/syne-tune/default.nix

diff --git a/pkgs/development/python-modules/syne-tune/default.nix b/pkgs/development/python-modules/syne-tune/default.nix
new file mode 100644
index 000000000000..00058a4ae46d
--- /dev/null
+++ b/pkgs/development/python-modules/syne-tune/default.nix
@@ -0,0 +1,146 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  dill,
+  numpy,
+  pandas,
+  sortedcontainers,
+  typing-extensions,
+
+  # optional-dependencies
+  autograd,
+  botorch,
+  # configspace,
+  fastparquet,
+  h5py,
+  huggingface-hub,
+  matplotlib,
+  onnxruntime,
+  pymoo,
+  pyyaml,
+  scikit-learn,
+  scipy,
+  # smac,
+  statsmodels,
+  swig,
+  xgboost,
+  # yahpo-gym,
+
+  # tests
+  pytestCheckHook,
+  pytest-timeout,
+  ray,
+  writableTmpDirAsHomeHook,
+}:
+buildPythonPackage rec {
+  pname = "syne-tune";
+  version = "0.14.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "syne-tune";
+    repo = "syne-tune";
+    tag = "v${version}";
+    hash = "sha256-51QyfJ0XOcXTeE95YOhtUmhat23joaEYvUnk7hYfksY=";
+  };
+
+  postPatch = ''
+    substituteInPlace syne_tune/optimizer/schedulers/synchronous/hyperband.py \
+     --replace-fail 'metric_val=np.NAN' 'metric_val=np.nan'
+    substituteInPlace syne_tune/optimizer/schedulers/synchronous/dehb.py \
+     --replace-fail 'result_failed.metric_val = np.NAN' 'result_failed.metric_val = np.nan'
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  dependencies = [
+    dill
+    numpy
+    pandas
+    sortedcontainers
+    typing-extensions
+  ];
+
+  optional-dependencies = lib.fix (self: {
+    blackbox-repository = [
+      fastparquet
+      h5py
+      huggingface-hub
+      numpy
+      pandas
+      scikit-learn
+      xgboost
+    ];
+    bore = [
+      scikit-learn
+      xgboost
+    ];
+    botorch = [ botorch ];
+    gpsearchers = [
+      autograd
+      scipy
+    ];
+    kde = [ statsmodels ];
+    moo = [
+      pymoo
+      scipy
+    ];
+    sklearn = [ scikit-learn ];
+    # smac = [ smac swig ]; # smac unavailable on nixpkgs
+    visual = [ matplotlib ];
+    # yahpo = [ configspace onnxruntime pandas pyyaml yahpo-gym ]; # yahpo-gym unavailable on nixpkgs
+  });
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-timeout
+    ray
+    writableTmpDirAsHomeHook
+  ]
+  ++ ray.optional-dependencies.tune
+  ++ optional-dependencies.blackbox-repository
+  ++ optional-dependencies.bore
+  ++ optional-dependencies.botorch
+  ++ optional-dependencies.gpsearchers
+  ++ optional-dependencies.kde
+  ++ optional-dependencies.sklearn;
+
+  disabledTests = [
+    # NameError: name 'HV' is not defined
+    # these require pkg `pymoo` and adding `pymoo` raises:
+    # setuptools.errors.PackageDiscoveryError: Multiple top-level packages discovered in a flat-layout: ['cma', 'notebooks'].
+    "test_append_hypervolume_indicator"
+    "test_hypervolume"
+    "test_hypervolume_progress"
+    "test_hypervolume_simple"
+  ];
+
+  disabledTestPaths = [
+    # legacy test
+    "tst/schedulers/test_legacy_schedulers_api.py"
+  ];
+
+  pythonImportsCheck = [
+    "syne_tune"
+  ];
+
+  meta = {
+    description = "Large scale asynchronous hyperparameter and architecture optimization library";
+    homepage = "https://github.com/syne-tune/syne-tune";
+    changelog = "https://github.com/syne-tune/syne-tune/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ daspk04 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f45c475922e..bd6c516449d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17740,6 +17740,8 @@ self: super: with self; {
     }
   );
 
+  syne-tune = callPackage ../development/python-modules/syne-tune { };
+
   synergy = callPackage ../development/python-modules/synergy { };
 
   synology-srm = callPackage ../development/python-modules/synology-srm { };

From 8c5f803260b721588fda776a178735b3a7e9f422 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 00:27:15 +0000
Subject: [PATCH 087/111] duply: 2.5.5 -> 2.5.6

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

diff --git a/pkgs/by-name/du/duply/package.nix b/pkgs/by-name/du/duply/package.nix
index d3157d64781e..89f0ca4fcce3 100644
--- a/pkgs/by-name/du/duply/package.nix
+++ b/pkgs/by-name/du/duply/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "duply";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz";
-    hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU=";
+    hash = "sha256-DSSnjfbcgWIuWaA+4h7d/0HqpDoXqkJOyGapYX4rtP0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a9e6d32575c643f7818d0d7744858813fb787803 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 30 Aug 2025 12:19:57 +0200
Subject: [PATCH 088/111] python3Packages.sentence-transformers: skip failing
 tests

---
 .../python-modules/sentence-transformers/default.nix          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 4872c23b0d31..178e75aae18d 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -104,6 +104,10 @@ buildPythonPackage rec {
     # Assertion error: Sparse operations take too long
     # (namely, load-sensitive test)
     "test_performance_with_large_vectors"
+
+    # NameError: name 'ParallelismConfig' is not defined
+    "test_hf_argument_parser"
+    "test_hf_argument_parser_incorrect_string_arguments"
   ];
 
   disabledTestPaths = [

From 8f5fbd1ea9753e3d2346058a0407bb484a90f44b Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sat, 30 Aug 2025 12:59:29 +0200
Subject: [PATCH 089/111] pluginupdate.py: normalize input for filtering
 plugins

Replacing `.` with `-`
---
 maintainers/scripts/pluginupdate-py/pluginupdate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/maintainers/scripts/pluginupdate-py/pluginupdate.py
index e3a4c44ede7e..c65a27b16cd7 100644
--- a/maintainers/scripts/pluginupdate-py/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate-py/pluginupdate.py
@@ -504,13 +504,14 @@ class Editor:
         )
         _prefetch = functools.partial(prefetch, cache=cache)
 
+        to_update_for_filter = [x.replace(".", "-") for x in to_update]
         plugins_to_update = (
             current_plugin_specs
             if len(to_update) == 0
             else [
                 description
                 for description in current_plugin_specs
-                if self.filter_plugins_to_update(description, to_update)
+                if self.filter_plugins_to_update(description, to_update_for_filter)
             ]
         )
 

From ac5f21a0ad4950f7a42ae9a90c9f59c05297d670 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 30 Aug 2025 18:59:53 +0800
Subject: [PATCH 090/111] luau: 0.688 -> 0.689 (#438465)

---
 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 843c368f7282..77322466aaed 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.688";
+  version = "0.689";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-JrJoFSKvy9EqsJ7jdthLmnzQqZPIsVt9aixwaWbLp8Q=";
+    hash = "sha256-ZHALILdIJHYovSdUJk2KZIG0u/vdCAROzFd7U3pqWIk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4282b58e5f6cbd8cc797e2b7bc5d3ac9151c05fe Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 30 Aug 2025 14:00:38 +0300
Subject: [PATCH 091/111] pulumi: 3.190.0 -> 3.192.0 (#438505)

* python3Packages.pulumi: update for protobuf5 and fix tests

* pulumi: 3.190.0 -> 3.192.0
---
 pkgs/by-name/pu/pulumi/package.nix            | 23 +++++++++++--------
 .../pu/pulumi/plugins/pulumi-go/package.nix   |  2 +-
 .../pulumi/plugins/pulumi-nodejs/package.nix  |  2 +-
 .../pulumi/plugins/pulumi-python/package.nix  |  2 +-
 .../python-modules/pulumi/default.nix         | 14 ++++++++---
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix
index 088bb4e1a1f4..e981ff31fedc 100644
--- a/pkgs/by-name/pu/pulumi/package.nix
+++ b/pkgs/by-name/pu/pulumi/package.nix
@@ -17,18 +17,18 @@
 }:
 buildGoModule rec {
   pname = "pulumi";
-  version = "3.190.0";
+  version = "3.192.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumi";
     tag = "v${version}";
-    hash = "sha256-n4YjJJZNPRjvR5WuDO3+bCvKxDrmK7VBbS6E6RP0C84=";
+    hash = "sha256-rcDXC+xlUa67afuXvmEv8UNsYWBvQQ0P4httdtdcrh4=";
     # Some tests rely on checkout directory name
     name = "pulumi";
   };
 
-  vendorHash = "sha256-ewVZNgnW7JbX0VOU14Ipo7EBkj8evOoXWjf9yLOmJF8=";
+  vendorHash = "sha256-BaFw8EnPd2GPA/p9wm8XpVy/iE8gqbteRnMQC8Z4NHQ=";
 
   sourceRoot = "${src.name}/pkg";
 
@@ -68,6 +68,10 @@ buildGoModule rec {
         # Seems to require TTY.
         "TestProgressEvents"
 
+        # Flaky; upstream “fixed” it by increasing timeout.
+        # https://github.com/pulumi/pulumi/pull/20116
+        "TestAnalyzerCancellation"
+
         # Tries to clone repo: https://github.com/pulumi/test-repo.git
         "TestValidateRelativeDirectory"
         "TestRepoLookup"
@@ -83,6 +87,8 @@ buildGoModule rec {
         "TestPulumiNewWithoutTemplateSupport"
         "TestGeneratingProjectWithAIPromptSucceeds"
         "TestPulumiNewWithRegistryTemplates"
+        "TestRunNewYesNoTemplate"
+        "TestRunNewYesWithTemplate"
 
         # Connects to https://api.pulumi.com/…
         "TestGetLatestPluginIncludedVersion"
@@ -156,18 +162,17 @@ buildGoModule rec {
         version = "v${version}";
         command = "PULUMI_SKIP_UPDATE_CHECK=1 pulumi version";
       };
+
       # Test building packages that reuse our version and src.
       inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python;
-      # Pulumi currently requires protobuf4, but Nixpkgs defaults to a newer
-      # version. Test that we can actually build the package with protobuf4.
-      # https://github.com/pulumi/pulumi/issues/16828
-      # https://github.com/NixOS/nixpkgs/issues/351751#issuecomment-2462163436
-      pythonPackage =
+      pythonPackage = python3Packages.pulumi;
+      pythonPackageProtobuf5 =
         (python3Packages.overrideScope (
           final: _: {
-            protobuf = final.protobuf4;
+            protobuf = final.protobuf5;
           }
         )).pulumi;
+
       pulumiTestHookShellcheck = testers.shellcheck {
         name = "pulumi-test-hook-shellcheck";
         src = ./extra/pulumi-test-hook.sh;
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
index 4632c8353e82..1958b04eeb03 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/go/pulumi-language-go";
 
-  vendorHash = "sha256-SfnGZyHuhgj277DrRqr8TkKE+ZwnPKBFu/7EcPS4OhE=";
+  vendorHash = "sha256-jwsdMSLDn2PNJFIIVhqwBLH7acFTOFLPgVNMKbI5DZE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
index 862436c760dc..af7be805670f 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs";
 
-  vendorHash = "sha256-Mf/SsRRDlm/TuSOksLV8f7H7xiT6fkHWyH6fJFo5fCc=";
+  vendorHash = "sha256-Q5Pk2f3EAiM4oit1vhc+PMEuMxdbrKAue3e0pnrZw2c=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
index 4672f754ed1e..dfda8bf7764b 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python";
 
-  vendorHash = "sha256-cpmB1Vmi8JAh+OKzoZ/x/AxB4uxH95laSo0uBGrj3FQ=";
+  vendorHash = "sha256-BfkjDesPdPDV2uILYaMJFIvaEBKT15ukwaReAL3yziw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix
index b0bf59d45c62..1d14aa2d186d 100644
--- a/pkgs/development/python-modules/pulumi/default.nix
+++ b/pkgs/development/python-modules/pulumi/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage {
   ];
 
   pythonRelaxDeps = [
+    "protobuf"
     "grpcio"
     "pip"
     "semver"
@@ -66,11 +67,20 @@ buildPythonPackage {
     pulumi-python
   ];
 
+  disabledTestPaths = [
+    # TODO: remove disabledTestPaths once the test is fixed upstream.
+    # https://github.com/pulumi/pulumi/pull/19080#discussion_r2309611222
+    "lib/test/provider/experimental/test_property_value.py::test_nesting"
+  ];
+
   # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L10-L11
   # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L16
   installCheckPhase = ''
     runHook preInstallCheck
-    ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test
+    declare -a _disabledTestPathsArray
+    concatTo _disabledTestPathsArray disabledTestPaths
+    ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test \
+      "''${_disabledTestPathsArray[@]/#/--deselect=}"
     pushd lib/test_with_mocks
     ${python.executable} -m pytest --junit-xml=
     popd
@@ -86,8 +96,6 @@ buildPythonPackage {
     description = "Modern Infrastructure as Code. Any cloud, any language";
     homepage = "https://www.pulumi.com";
     license = lib.licenses.asl20;
-    # https://github.com/pulumi/pulumi/issues/16828
-    broken = lib.versionAtLeast protobuf.version "5";
     maintainers = with lib.maintainers; [
       teto
       tie

From ae0f69acb9b6e05e4fc96be66b783a1cb8d1f028 Mon Sep 17 00:00:00 2001
From: yunfachi <yunfachi@gmail.com>
Date: Fri, 8 Aug 2025 10:39:10 +0000
Subject: [PATCH 092/111] nixos/plymouth: use system.nixos.distroName in
 nixosBreezePlymouth

---
 nixos/modules/system/boot/plymouth.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 3e93bf0433a7..d2cdc2fcee1b 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -20,7 +20,7 @@ let
   nixosBreezePlymouth = pkgs.kdePackages.breeze-plymouth.override {
     logoFile = cfg.logo;
     logoName = "nixos";
-    osName = "NixOS";
+    osName = config.system.nixos.distroName;
     osVersion = config.system.nixos.release;
   };
 

From 828fa957ddfa18c8605d8ff8c57bb7a506ffd47e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 12:43:17 +0000
Subject: [PATCH 093/111] panoply: 5.6.2 -> 5.7.0

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

diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix
index b8bbdba8e308..6b614993012e 100644
--- a/pkgs/by-name/pa/panoply/package.nix
+++ b/pkgs/by-name/pa/panoply/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "panoply";
-  version = "5.6.2";
+  version = "5.7.0";
 
   src = fetchurl {
     url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
-    hash = "sha256-DxQjIUv2Gkb3VnaorphMDTo+GlM/NoCZ6y/ogHSs07c=";
+    hash = "sha256-R3hzqYytQ0k2dhmJAOIKy+zbEYQ6et/q3b0NEQkAGt4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0368011b1018dcf0c992534f562074deb3df992b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 30 Aug 2025 14:55:44 +0200
Subject: [PATCH 094/111] nixf-diagnose: add update script

To allow running locally:

```
nix-shell maintainers/scripts/update.nix --argstr package nixf-diagnose
```
---
 pkgs/by-name/ni/nixf-diagnose/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix
index 6cb833755301..6da4a83c4144 100644
--- a/pkgs/by-name/ni/nixf-diagnose/package.nix
+++ b/pkgs/by-name/ni/nixf-diagnose/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   nixf,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -20,6 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "CLI wrapper for nixf-tidy with fancy diagnostic output";
     mainProgram = "nixf-diagnose";

From ab82350f9c3fceb2b5c7c5a7a743fa72208e3b00 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 30 Aug 2025 14:57:06 +0200
Subject: [PATCH 095/111] nixf-diagnose: 0.1.2 -> 0.1.3

Changes:
https://github.com/inclyc/nixf-diagnose/compare/0.1.2...0.1.3
---
 pkgs/by-name/ni/nixf-diagnose/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix
index 6da4a83c4144..52f6f55ce003 100644
--- a/pkgs/by-name/ni/nixf-diagnose/package.nix
+++ b/pkgs/by-name/ni/nixf-diagnose/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixf-diagnose";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "inclyc";
     repo = "nixf-diagnose";
     tag = finalAttrs.version;
-    hash = "sha256-gkeU3EwAl9810eRRp5/ddf1h0qpV6FrBBdntNBpBtsM=";
+    hash = "sha256-8kcA2/ZMREKtXUM5rlAWRQL/C8+JNocZegq2ZHqbiSA=";
   };
 
   env.NIXF_TIDY_PATH = lib.getExe nixf;
 
-  cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg=";
+  cargoHash = "sha256-9rWQfoaMXFs83cYHtJPL0ogA9hPh7q3mK1DG4Q4CCq0=";
 
   passthru.updateScript = nix-update-script { };
 

From 1898fb4be4cc634fa60939683d05574dce436528 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Thu, 28 Aug 2025 08:01:29 +0100
Subject: [PATCH 096/111] buildArmTrustedFirmware: use lib.extendMkDerivation

By switching to `lib.extendMkDerivation`, users can use the "finalAttrs"
style when constructing their ATF builds. In addition, move
buildArmTrustedFirmware to its own callPackage'd file, which allows for
all arguments used to construct `buildArmTrustedFirmware` to be easily
overridable. This was previously difficult and cumbersome to do due to
the buildArmTrustedFirmware enclosing the function arguments in
`pkgs/misc/arm-trusted-firmware/default.nix`, but not being available on
the package-set to override said arguments.
---
 .../build-arm-trusted-firmware.nix            | 128 ++++++++++
 pkgs/misc/arm-trusted-firmware/default.nix    | 218 ++++--------------
 pkgs/top-level/all-packages.nix               |   5 +-
 3 files changed, 178 insertions(+), 173 deletions(-)
 create mode 100644 pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix

diff --git a/pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix b/pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix
new file mode 100644
index 000000000000..7abff55f986d
--- /dev/null
+++ b/pkgs/misc/arm-trusted-firmware/build-arm-trusted-firmware.nix
@@ -0,0 +1,128 @@
+{
+  buildPackages,
+  fetchFromGitHub,
+  lib,
+  openssl,
+  pkgsCross,
+  stdenv,
+
+  # Warning: this blob (hdcp.bin) runs on the main CPU (not the GPU) at
+  # privilege level EL3, which is above both the kernel and the
+  # hypervisor.
+  #
+  # This parameter applies only to platforms which are believed to use
+  # hdcp.bin. On all other platforms, or if unfreeIncludeHDCPBlob=false,
+  # hdcp.bin will be deleted before building.
+  unfreeIncludeHDCPBlob ? true,
+}:
+
+lib.extendMkDerivation {
+  constructDrv = stdenv.mkDerivation;
+
+  excludeDrvArgNames = [ "extraMeta" ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      filesToInstall,
+      installDir ? "$out",
+      platform ? null,
+      platformCanUseHDCPBlob ? false, # set this to true if the platform is able to use hdcp.bin
+      ...
+    }@args:
+
+    # delete hdcp.bin if either: the platform is thought to
+    # not need it or unfreeIncludeHDCPBlob is false
+    let
+      deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob;
+    in
+    {
+      pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
+      version = args.version or "2.13.0";
+
+      src =
+        args.src or (fetchFromGitHub {
+          owner = "ARM-software";
+          repo = "arm-trusted-firmware";
+          tag = "v${finalAttrs.version}";
+          hash = "sha256-rxm5RCjT/MyMCTxiEC8jQeFMrCggrb2DRbs/qDPXb20=";
+        });
+
+      patches =
+        lib.optionals deleteHDCPBlobBeforeBuild [
+          # this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch
+          ./remove-hdcp-blob.patch
+        ]
+        ++ args.patches or [ ];
+
+      postPatch =
+        lib.optionalString deleteHDCPBlobBeforeBuild ''
+          rm plat/rockchip/rk3399/drivers/dp/hdcp.bin
+        ''
+        + args.postPatch or "";
+
+      depsBuildBuild = [ buildPackages.stdenv.cc ] ++ args.depsBuildBuild or [ ];
+
+      nativeBuildInputs = [
+        pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399
+        openssl # For fiptool
+      ]
+      ++ args.nativeBuildInputs or [ ];
+
+      # Make the new toolchain guessing (from 2.11+) happy
+      # https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22
+      rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy";
+
+      buildInputs = [ openssl ] ++ args.buildInputs or [ ];
+
+      makeFlags = [
+        "HOSTCC=$(CC_FOR_BUILD)"
+        "M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}"
+        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+        # Make the new toolchain guessing (from 2.11+) happy
+        "CC=${stdenv.cc.targetPrefix}cc"
+        "LD=${stdenv.cc.targetPrefix}cc"
+        "AS=${stdenv.cc.targetPrefix}cc"
+        "OC=${stdenv.cc.targetPrefix}objcopy"
+        "OD=${stdenv.cc.targetPrefix}objdump"
+        # Passing OpenSSL path according to docs/design/trusted-board-boot-build.rst
+        "OPENSSL_DIR=${openssl}"
+      ]
+      ++ (lib.optional (platform != null) "PLAT=${platform}")
+      ++ args.makeFlags or [ ]
+      ++ (lib.warnIf (args ? extraMakeFlags)
+        "buildArmTrustedFirmware now accepts `makeFlags`, please switch from using `extraMakeFlags` to `makeFlags`"
+        args.extraMakeFlags or [ ]
+      );
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p ${installDir}
+        cp ${lib.concatStringsSep " " filesToInstall} ${installDir}
+
+        runHook postInstall
+      '';
+
+      hardeningDisable = [ "all" ];
+      dontStrip = true;
+
+      # breaks secondary CPU bringup on at least RK3588, maybe others
+      env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
+
+      meta = {
+        homepage = "https://github.com/ARM-software/arm-trusted-firmware";
+        description = "Reference implementation of secure world software for ARMv8-A";
+        license = [
+          lib.licenses.bsd3
+        ]
+        ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ lib.licenses.unfreeRedistributable ];
+        maintainers = [ lib.maintainers.lopsided98 ];
+      }
+      // (args.meta or { })
+      // (lib.warnIf (args ? extraMeta)
+        "buildArmTrustedFirmware now accepts `meta`, please switch from using `extraMeta` to `meta`"
+        args.extraMeta or { }
+      );
+    };
+}
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 93888011ba8a..c11bc93585c6 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -1,134 +1,8 @@
+{ buildArmTrustedFirmware, stdenv }:
+
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchFromGitLab,
-  openssl,
-  pkgsCross,
-  buildPackages,
-
-  # Warning: this blob (hdcp.bin) runs on the main CPU (not the GPU) at
-  # privilege level EL3, which is above both the kernel and the
-  # hypervisor.
-  #
-  # This parameter applies only to platforms which are believed to use
-  # hdcp.bin. On all other platforms, or if unfreeIncludeHDCPBlob=false,
-  # hdcp.bin will be deleted before building.
-  unfreeIncludeHDCPBlob ? true,
-}:
-
-let
-  buildArmTrustedFirmware = lib.makeOverridable (
-    {
-      filesToInstall,
-      installDir ? "$out",
-      platform ? null,
-      platformCanUseHDCPBlob ? false, # set this to true if the platform is able to use hdcp.bin
-      extraMakeFlags ? [ ],
-      extraMeta ? { },
-      ...
-    }@args:
-
-    # delete hdcp.bin if either: the platform is thought to
-    # not need it or unfreeIncludeHDCPBlob is false
-    let
-      deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob;
-    in
-
-    stdenv.mkDerivation (
-      rec {
-
-        pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
-        version = "2.13.0";
-
-        src = fetchFromGitHub {
-          owner = "ARM-software";
-          repo = "arm-trusted-firmware";
-          tag = "v${version}";
-          hash = "sha256-rxm5RCjT/MyMCTxiEC8jQeFMrCggrb2DRbs/qDPXb20=";
-        };
-
-        patches = lib.optionals deleteHDCPBlobBeforeBuild [
-          # this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch
-          ./remove-hdcp-blob.patch
-        ];
-
-        postPatch = lib.optionalString deleteHDCPBlobBeforeBuild ''
-          rm plat/rockchip/rk3399/drivers/dp/hdcp.bin
-        '';
-
-        depsBuildBuild = [ buildPackages.stdenv.cc ];
-
-        nativeBuildInputs = [
-          pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399
-          openssl # For fiptool
-        ];
-
-        # Make the new toolchain guessing (from 2.11+) happy
-        # https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22
-        rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy";
-
-        buildInputs = [ openssl ];
-
-        makeFlags = [
-          "HOSTCC=$(CC_FOR_BUILD)"
-          "M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}"
-          "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-          # Make the new toolchain guessing (from 2.11+) happy
-          "CC=${stdenv.cc.targetPrefix}cc"
-          "LD=${stdenv.cc.targetPrefix}cc"
-          "AS=${stdenv.cc.targetPrefix}cc"
-          "OC=${stdenv.cc.targetPrefix}objcopy"
-          "OD=${stdenv.cc.targetPrefix}objdump"
-          # Passing OpenSSL path according to docs/design/trusted-board-boot-build.rst
-          "OPENSSL_DIR=${openssl}"
-        ]
-        ++ (lib.optional (platform != null) "PLAT=${platform}")
-        ++ extraMakeFlags;
-
-        installPhase = ''
-          runHook preInstall
-
-          mkdir -p ${installDir}
-          cp ${lib.concatStringsSep " " filesToInstall} ${installDir}
-
-          runHook postInstall
-        '';
-
-        hardeningDisable = [ "all" ];
-        dontStrip = true;
-
-        # breaks secondary CPU bringup on at least RK3588, maybe others
-        env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
-
-        meta =
-          with lib;
-          {
-            homepage = "https://github.com/ARM-software/arm-trusted-firmware";
-            description = "Reference implementation of secure world software for ARMv8-A";
-            license = [
-              licenses.bsd3
-            ]
-            ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ];
-            maintainers = with maintainers; [ lopsided98 ];
-          }
-          // extraMeta;
-      }
-      // builtins.removeAttrs args [ "extraMeta" ]
-    )
-  );
-
-in
-{
-  inherit buildArmTrustedFirmware;
-
   armTrustedFirmwareTools = buildArmTrustedFirmware {
-    # Normally, arm-trusted-firmware builds the build tools for buildPlatform
-    # using CC_FOR_BUILD (or as it calls it HOSTCC). Since want to build them
-    # for the hostPlatform here, we trick it by overriding the HOSTCC setting
-    # and, to be safe, remove CC_FOR_BUILD from the environment.
-    depsBuildBuild = [ ];
-    extraMakeFlags = [
+    makeFlags = [
       "HOSTCC=${stdenv.cc.targetPrefix}gcc"
       "fiptool"
       "certtool"
@@ -143,67 +17,67 @@ in
     '';
   };
 
-  armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
+  armTrustedFirmwareAllwinner = buildArmTrustedFirmware (finalAttrs: {
     platform = "sun50i_a64";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31.bin" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ];
+  });
 
-  armTrustedFirmwareAllwinnerH616 = buildArmTrustedFirmware rec {
+  armTrustedFirmwareAllwinnerH616 = buildArmTrustedFirmware (finalAttrs: {
     platform = "sun50i_h616";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31.bin" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ];
+  });
 
-  armTrustedFirmwareAllwinnerH6 = buildArmTrustedFirmware rec {
+  armTrustedFirmwareAllwinnerH6 = buildArmTrustedFirmware (finalAttrs: {
     platform = "sun50i_h6";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31.bin" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ];
+  });
 
-  armTrustedFirmwareQemu = buildArmTrustedFirmware rec {
+  armTrustedFirmwareQemu = buildArmTrustedFirmware (finalAttrs: {
     platform = "qemu";
-    extraMeta.platforms = [ "aarch64-linux" ];
+    meta.platforms = [ "aarch64-linux" ];
     filesToInstall = [
-      "build/${platform}/release/bl1.bin"
-      "build/${platform}/release/bl2.bin"
-      "build/${platform}/release/bl31.bin"
+      "build/${finalAttrs.platform}/release/bl1.bin"
+      "build/${finalAttrs.platform}/release/bl2.bin"
+      "build/${finalAttrs.platform}/release/bl31.bin"
     ];
-  };
+  });
 
-  armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec {
-    extraMakeFlags = [ "bl31" ];
+  armTrustedFirmwareRK3328 = buildArmTrustedFirmware (finalAttrs: {
+    makeFlags = [ "bl31" ];
     platform = "rk3328";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ];
+  });
 
-  armTrustedFirmwareRK3399 = buildArmTrustedFirmware rec {
-    extraMakeFlags = [ "bl31" ];
+  armTrustedFirmwareRK3399 = buildArmTrustedFirmware (finalAttrs: {
+    makeFlags = [ "bl31" ];
     platform = "rk3399";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ];
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ];
     platformCanUseHDCPBlob = true;
-  };
+  });
 
-  armTrustedFirmwareRK3568 = buildArmTrustedFirmware rec {
-    extraMakeFlags = [ "bl31" ];
+  armTrustedFirmwareRK3568 = buildArmTrustedFirmware (finalAttrs: {
+    makeFlags = [ "bl31" ];
     platform = "rk3568";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ];
+  });
 
-  armTrustedFirmwareRK3588 = buildArmTrustedFirmware rec {
-    extraMakeFlags = [ "bl31" ];
+  armTrustedFirmwareRK3588 = buildArmTrustedFirmware (finalAttrs: {
+    makeFlags = [ "bl31" ];
     platform = "rk3588";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31/bl31.elf" ];
+  });
 
-  armTrustedFirmwareS905 = buildArmTrustedFirmware rec {
-    extraMakeFlags = [ "bl31" ];
+  armTrustedFirmwareS905 = buildArmTrustedFirmware (finalAttrs: {
+    makeFlags = [ "bl31" ];
     platform = "gxbb";
-    extraMeta.platforms = [ "aarch64-linux" ];
-    filesToInstall = [ "build/${platform}/release/bl31.bin" ];
-  };
+    meta.platforms = [ "aarch64-linux" ];
+    filesToInstall = [ "build/${finalAttrs.platform}/release/bl31.bin" ];
+  });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe5094154213..50e15e2c2dc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10379,9 +10379,12 @@ with pkgs;
     fftw = fftwFloat;
   };
 
+  buildArmTrustedFirmware =
+    callPackage ../misc/arm-trusted-firmware/build-arm-trusted-firmware.nix
+      { };
+
   arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { };
   inherit (arm-trusted-firmware)
-    buildArmTrustedFirmware
     armTrustedFirmwareTools
     armTrustedFirmwareAllwinner
     armTrustedFirmwareAllwinnerH616

From 36b01f623e962c9da88d8fa2de9db3df61541701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 30 Aug 2025 09:10:56 -0400
Subject: [PATCH 097/111] nixos/cups-pdf: fix settings type

---
 nixos/modules/services/printing/cups-pdf.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/printing/cups-pdf.nix b/nixos/modules/services/printing/cups-pdf.nix
index ccb5f4963e9c..25c5fb8a89b1 100644
--- a/nixos/modules/services/printing/cups-pdf.nix
+++ b/nixos/modules/services/printing/cups-pdf.nix
@@ -42,12 +42,14 @@ let
   instanceSettings = name: {
     freeformType =
       with lib.types;
-      nullOr (oneOf [
-        int
-        str
-        path
-        package
-      ]);
+      attrsOf (
+        nullOr (oneOf [
+          int
+          str
+          path
+          package
+        ])
+      );
     # override defaults:
     # inject instance name into paths,
     # also avoid conflicts between user names and special dirs

From c9febd4b93200a53861e05580a57ee602045b2cb Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Sat, 30 Aug 2025 16:57:27 +0200
Subject: [PATCH 098/111] niri: 25.05.1 -> 25.08

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

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 52dee4964bcd..64f143858e7b 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -27,13 +27,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "niri";
-  version = "25.05.1";
+  version = "25.08";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=";
+    hash = "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=";
   };
 
   outputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/bin' "$out/bin"
   '';
 
-  cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs=";
+  cargoHash = "sha256-lR0emU2sOnlncN00z6DwDIE2ljI+D2xoKqG3rS45xG0=";
 
   strictDeps = true;
 
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall = ''
     install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
-    mv wiki $doc/share/doc/niri/wiki
+    mv docs/wiki $doc/share/doc/niri/wiki
 
     install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
   ''
@@ -122,6 +122,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     NIRI_BUILD_COMMIT = "Nixpkgs";
   };
 
+  checkFlags = [ "--skip=::egl" ];
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   doInstallCheck = true;

From 23b46d910185f39f95a86a193ac4babdae251758 Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Wed, 27 Aug 2025 03:15:50 -0400
Subject: [PATCH 099/111] maintainers: add Notarin

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d072e72875e8..cc267594de8f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18588,6 +18588,14 @@
     githubId = 30374463;
     name = "Michal S.";
   };
+  Notarin = {
+    name = "Notarin Steele";
+    email = "424c414e4b@gmail.com";
+    github = "Notarin";
+    githubId = 25104390;
+    keys = [ { fingerprint = "4E15 9433 48D9 7BA7 E8B8  B0FF C38F D346 AE36 36FB"; } ];
+    matrix = "@notarin:matrix.org";
+  };
   NotAShelf = {
     name = "NotAShelf";
     email = "raf@notashelf.dev";

From 64c843885c6e3a754750b4c4d81d7d5f421f6239 Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Wed, 27 Aug 2025 03:19:01 -0400
Subject: [PATCH 100/111] hayabusa: add Notarin as maintainer

Notarin is the upstream developer of hayabusa.
---
 pkgs/by-name/ha/hayabusa/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix
index fc777a4bb048..adb90bcb7062 100644
--- a/pkgs/by-name/ha/hayabusa/package.nix
+++ b/pkgs/by-name/ha/hayabusa/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
     description = "Swift rust fetch program";
     homepage = "https://github.com/notarin/hayabusa";
     license = lib.licenses.cc-by-nc-nd-40;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ Notarin ];
     mainProgram = "hayabusa";
     platforms = lib.platforms.linux;
   };

From cf2425f5f23dd77f9b2979acc518421356303d3f Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Wed, 27 Aug 2025 03:20:21 -0400
Subject: [PATCH 101/111] hayabusa: correct license

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

diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix
index adb90bcb7062..f4fe76e84a9e 100644
--- a/pkgs/by-name/ha/hayabusa/package.nix
+++ b/pkgs/by-name/ha/hayabusa/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Swift rust fetch program";
     homepage = "https://github.com/notarin/hayabusa";
-    license = lib.licenses.cc-by-nc-nd-40;
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ Notarin ];
     mainProgram = "hayabusa";
     platforms = lib.platforms.linux;

From 9c1b34afceacec0cb31bd1620484d71eb23e54d2 Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Wed, 27 Aug 2025 03:20:39 -0400
Subject: [PATCH 102/111] hayabusa: switched version tracking to tags

Co-authored-by: langsjo <104687438+langsjo@users.noreply.github.com>
---
 pkgs/by-name/ha/hayabusa/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix
index f4fe76e84a9e..08c4bb54e3d1 100644
--- a/pkgs/by-name/ha/hayabusa/package.nix
+++ b/pkgs/by-name/ha/hayabusa/package.nix
@@ -7,14 +7,14 @@
   vulkan-loader,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hayabusa";
-  version = "unstable-2023-11-29";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "notarin";
     repo = "hayabusa";
-    rev = "1d6b8cfd301d60ff9f6946970b51818c036083b0";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-w9vXC7L7IP4QLPFS1IgPOKSm7fT7W0R+NsHTdAfIupg=";
   };
 
@@ -48,4 +48,4 @@ rustPlatform.buildRustPackage {
     mainProgram = "hayabusa";
     platforms = lib.platforms.linux;
   };
-}
+})

From 6d1db4e3fc93d16b69652f27dd05c44b04ba0667 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Tue, 26 Aug 2025 15:59:13 +0800
Subject: [PATCH 103/111] clipcat: fix build

---
 pkgs/by-name/cl/clipcat/dummy.patch | 14 ++++++++++++++
 pkgs/by-name/cl/clipcat/package.nix | 12 ++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/cl/clipcat/dummy.patch

diff --git a/pkgs/by-name/cl/clipcat/dummy.patch b/pkgs/by-name/cl/clipcat/dummy.patch
new file mode 100644
index 000000000000..4fdc3d60526a
--- /dev/null
+++ b/pkgs/by-name/cl/clipcat/dummy.patch
@@ -0,0 +1,14 @@
+diff --git a/crates/server/src/notification/dummy.rs b/crates/server/src/notification/dummy.rs
+index f85dda0..7489f22 100644
+--- a/crates/server/src/notification/dummy.rs
++++ b/crates/server/src/notification/dummy.rs
+@@ -1,6 +1,9 @@
++#[cfg(test)]
+ use crate::notification::traits;
+ 
++#[cfg(test)]
+ #[derive(Clone, Copy, Debug, Default)]
+ pub struct Notification {}
+ 
++#[cfg(test)]
+ impl traits::Notification for Notification {}
diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix
index 56e2e87e051f..2b674db07e8f 100644
--- a/pkgs/by-name/cl/clipcat/package.nix
+++ b/pkgs/by-name/cl/clipcat/package.nix
@@ -5,6 +5,7 @@
   rustPlatform,
   protobuf,
   installShellFiles,
+  writableTmpDirAsHomeHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,9 +21,20 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ=";
 
+  patches = [
+    # Fix compilation errors caused by stricter restrictions on unused code in Rust 1.89.
+    # TODO: remove this patch after upstream fix it.
+    ./dummy.patch
+  ];
+
   nativeBuildInputs = [
     protobuf
     installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fix following error on darwin:
+    # objc/notify.h:1:9: fatal error: could not build module 'Cocoa'
+    writableTmpDirAsHomeHook
   ];
 
   checkFlags = [

From 56d32fd2ce6cfd9b5789653cb5944c52e21b8ae1 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Mon, 25 Aug 2025 22:04:25 +0200
Subject: [PATCH 104/111] glab: 1.65.0 -> 1.67.0

https://gitlab.com/gitlab-org/cli/-/releases/v1.67.0
https://gitlab.com/gitlab-org/cli/-/releases/v1.66.0

Diff: https://gitlab.com/gitlab-org/cli/-/compare/v1.65.0...v1.67.0
---
 pkgs/by-name/gl/glab/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 98f7be5ff5b2..d72d3373e8f5 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.65.0";
+  version = "1.67.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LqcUrF1CkNshsZBl9PdYByQKzMr5lWw5+BwCXs+yml0=";
+    hash = "sha256-d0pElHlfElqnlXbbAaIGzLtWpuAdIOVfdmTD6+2nNX4=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-2lC55LaMOrDy8F+IOqB4aujYlKKgpJmhZw6kl2yN/GM=";
+  vendorHash = "sha256-/nFdlC1gg08vEGuiq9qoUar8EGuYddxvTvFuGxQKnYA=";
 
   ldflags = [
     "-s"

From 603ff7ec484d7c7018907fd4a3904857bad27d2d Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Mon, 25 Aug 2025 22:05:16 +0200
Subject: [PATCH 105/111] glab: add anthonyroussel to maintainers

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

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index d72d3373e8f5..940c787492ef 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -85,6 +85,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       freezeboy
       luftmensch-luftmensch
+      anthonyroussel
     ];
     mainProgram = "glab";
   };

From 1a3410501fc689fd4fccb9b7c0ac624944dda472 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 15:35:24 +0000
Subject: [PATCH 106/111] owi: 0.2-unstable-2025-08-18 ->
 0.2-unstable-2025-08-22

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

diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index 968af0d915b8..0f392f07c814 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -15,14 +15,14 @@ let
 in
 ocamlPackages.buildDunePackage rec {
   pname = "owi";
-  version = "0.2-unstable-2025-08-18";
+  version = "0.2-unstable-2025-08-22";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "40c6434ecdb0cf7248b98670526e18dc007b425b";
+    rev = "daad8163dec12abc8fe7f3384adc37e51f0994e9";
     fetchSubmodules = true;
-    hash = "sha256-N/DO3vml7vzOjPi81LPOL+ZuI8CewAhANM9j4nuRbyU=";
+    hash = "sha256-C28YoUbovSEk9/RW0iYWNVB7/ETlDnY+vPTfQZPOerE=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From 566b38d4acd2ad4f02b164a924e0db07bcb7b0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 30 Aug 2025 18:00:00 +0200
Subject: [PATCH 107/111] doc/redirects.json: amend mismerge from the parent
 commit

---
 doc/redirects.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index ebfcf755d016..eb2904ce9c7b 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -625,9 +625,9 @@
   "typst-package-scope-and-usage": [
     "index.html#typst-package-scope-and-usage"
   ],
-  ],
   "var-go-buildTestBinaries": [
     "index.html#var-go-buildTestBinaries"
+  ],
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],

From e068fffb76342c9461727b00b71835f007d6b627 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Sat, 23 Aug 2025 13:32:12 +0300
Subject: [PATCH 108/111] tree-sitter-grammars.tree-sitter-go-template: init

---
 .../tools/parsing/tree-sitter/grammars/default.nix |  1 +
 .../grammars/tree-sitter-go-template.json          | 14 ++++++++++++++
 .../tools/parsing/tree-sitter/update.nix           |  4 ++++
 pkgs/top-level/python-packages.nix                 |  1 +
 4 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 4769ff0013db..b16e98289a50 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -37,6 +37,7 @@
   tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json;
   tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json;
   tree-sitter-go = lib.importJSON ./tree-sitter-go.json;
+  tree-sitter-go-template = lib.importJSON ./tree-sitter-go-template.json;
   tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json;
   tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json;
   tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
new file mode 100644
index 000000000000..4032f124945d
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
@@ -0,0 +1,14 @@
+{
+  "url": "https://github.com/ngalaiko/tree-sitter-go-template",
+  "rev": "5f19a36bb1eebb30454e277b222b278ceafed0dd",
+  "date": "2025-01-29T18:19:22Z",
+  "path": "/nix/store/lcgn1hzzsf5jhliy7454lxx7phkmrjfb-tree-sitter-go-template",
+  "sha256": "1nm9ybwb4if6g7cs911i6msb3q2f1plbl70k2y4icbxk2p57k5ka",
+  "hash": "sha256-apZ5yhWzLxaJFxMcuugNTuCxdDUxhKTZecZFsvjyqdo=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "fetchTags": false,
+  "leaveDotGit": false,
+  "rootDir": ""
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index e2d3192611cb..2a499434aa6f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -344,6 +344,10 @@ let
       orga = "blessanabraham";
       repo = "tree-sitter-gemini";
     };
+    "tree-sitter-go-template" = {
+      orga = "ngalaiko";
+      repo = "tree-sitter-go-template";
+    };
     "tree-sitter-godot-resource" = {
       orga = "prestonknopp";
       repo = "tree-sitter-godot-resource";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bff0f1a6d500..388b111ae1cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18416,6 +18416,7 @@ self: super: with self; {
         lib.filterAttrs (
           name: value:
           !(builtins.elem name [
+            "tree-sitter-go-template"
             "tree-sitter-sql"
             "tree-sitter-templ"
           ])

From 8227a08ab1f8ec93247d24913874ccef595ad8db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 16:57:03 +0000
Subject: [PATCH 109/111] androidStudioPackages.canary: 2025.1.4.1 ->
 2025.1.4.3

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d3578652ff79..a97608cba5be 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4=";
   };
   latestVersion = {
-    version = "2025.1.4.1"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 1"
-    sha256Hash = "sha256-OGnBf0LrfbN7WpO9skT8+ltAeKejyqHobxFvrzLp3EY=";
+    version = "2025.1.4.3"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 3"
+    sha256Hash = "sha256-YYacdZ7YdmmrTSsKtCfmSSrrZV+/GGPK34KnlO0+aKQ=";
   };
 in
 {

From d0e83189d26b2846e7774abcffb2455ad5afed6b Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 30 Aug 2025 19:50:16 +0200
Subject: [PATCH 110/111] fastnetmon-advanced: 2.0.371 -> 2.0.372 (#436727)

Changelog: https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v2.0.372
---
 pkgs/by-name/fa/fastnetmon-advanced/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix
index 3b510c25507b..851c19015a20 100644
--- a/pkgs/by-name/fa/fastnetmon-advanced/package.nix
+++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fastnetmon-advanced";
-  version = "2.0.371";
+  version = "2.0.372";
 
   src = fetchurl {
     url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
-    hash = "sha256-/qCUeo/2AYIT9Yl6QjoTBPfmg8Lk2efDU5Axv4JU+t8=";
+    hash = "sha256-FwYAbTBkk+AciDVxTIimswsB0M3gbzKX+03PD0fLMsY=";
   };
 
   nativeBuildInputs = [

From 8fa7c7ad4c13dd85474498bf1b557ff7b4e0b93e Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Sat, 30 Aug 2025 21:48:46 +0800
Subject: [PATCH 111/111] python3Packages:opensearch-py: fix build by
 cherrypicking upstream fix commit

---
 .../python-modules/opensearch-py/default.nix         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix
index ec066248dde8..9da3f6d21d44 100644
--- a/pkgs/development/python-modules/opensearch-py/default.nix
+++ b/pkgs/development/python-modules/opensearch-py/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -40,6 +41,15 @@ buildPythonPackage rec {
     hash = "sha256-IAEh+rB26Zqv7j5g2YIRZRCAtFbBngoh+w8Z4e2bY+M=";
   };
 
+  patches = [
+    # Remove delete event_loop fixture to fix test with pytest-asyncio 1.x
+    (fetchpatch {
+      name = "remove-delete-event-loop-fixture.patch";
+      url = "https://github.com/opensearch-project/opensearch-py/commit/2f9eeaad3f7bd38518b23a59659ccf02fff19577.patch";
+      hash = "sha256-ljg9GiXPOokrIRS+gF+W9DnZ71AzH8WmLeb3G7rLeK8=";
+    })
+  ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [
@@ -83,7 +93,7 @@ buildPythonPackage rec {
     "test_basicauth_in_request_session"
     "test_callable_in_request_session"
   ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Flaky tests: OSError: [Errno 48] Address already in use
     "test_redirect_failure_when_allow_redirect_false"
     "test_redirect_success_when_allow_redirect_true"