From ec10410e38ac7808946f5ab009e352d2b3c4544a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 12:03:01 +0000
Subject: [PATCH 01/63] cargo-tarpaulin: 0.36.0 -> 0.37.0

(cherry picked from commit 765d8b639152af6f2642c2eafab1258096512921)
---
 pkgs/by-name/ca/cargo-tarpaulin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 500a392dcd7b..81118bd6fdd6 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tarpaulin";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     tag = finalAttrs.version;
-    hash = "sha256-qd0PmCCUmd9Y4kUei+hZoc+rIYYZMf0s2ml9IoHtXX8=";
+    hash = "sha256-8LD4huR6xcksxkxF3Axoh5tx3FQgzE8nYVSpeSdY7us=";
   };
 
-  cargoHash = "sha256-EJTzITwwLEMVWdLdSE+A9D3Deh501561rxrlsqzmRKs=";
+  cargoHash = "sha256-FH0skHQ0eR9qgoCqDqO+NZZLzBw8U/ijNUupTYexIGI=";
 
   nativeBuildInputs = [
     pkg-config

From 059bab18cc54d44e5e54d1505d26ef7ec4e7d9dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 12:04:22 +0000
Subject: [PATCH 02/63] cargo-release: 1.1.2 -> 1.1.3

(cherry picked from commit 08fb0cb20d3f218b6817ca12c08a72626bd52333)
---
 pkgs/by-name/ca/cargo-release/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index cd45c51a4715..5f9f688ce43b 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-release";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "cargo-release";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xil5k+AyJHpDLVvSbtPJOuADRXvdLrHLlC7GRSE4z4s=";
+    hash = "sha256-5fe+iIPZAKi8aQW2PfanO7U2d70Oc3KvL/RZTV9/ZU8=";
   };
 
-  cargoHash = "sha256-WLDRJQvzkL1FxD0eXsJmH5wh9QkReaQBBxe7ZFQMWUM=";
+  cargoHash = "sha256-abTQuKpVcjorr6RQ1t9sAzqvS39XT6lg4fALAqO68YI=";
 
   nativeBuildInputs = [
     pkg-config

From 14a02161e3a39ba83ea675191952ba0f42fb276f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 01:31:50 +0000
Subject: [PATCH 03/63] rust-petname: 3.0.0 -> 3.1.0

(cherry picked from commit 6e83d7c6fa34b9b3c40f9432354fdd1288cec4e5)
---
 pkgs/by-name/ru/rust-petname/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix
index 19c808ccace1..11491fa6e44c 100644
--- a/pkgs/by-name/ru/rust-petname/package.nix
+++ b/pkgs/by-name/ru/rust-petname/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rust-petname";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchCrate {
     inherit (finalAttrs) version;
     crateName = "petname";
-    hash = "sha256-RKOW0SDRlMRPlsmWvk+teB14Tdf3tgrP35Glvn/wJBE=";
+    hash = "sha256-p5sGxGYzvc1b8Ch8MBwluMVFyu2Z8IIqhJzt68o90HQ=";
   };
 
-  cargoHash = "sha256-LMlfYVL6Hk+b7v6qvz0Y1y2awxvcH35+vCvBMvCUEv4=";
+  cargoHash = "sha256-7+LATYCokoh27sZkIWZ5eW4n1HZSB5fDvQKBeyObCgE=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 3d3d108236154836a90c78a85186a7a11673d784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 18:48:26 +0000
Subject: [PATCH 04/63] openvpn3: 27 -> 27.1

(cherry picked from commit cb7be403c8c89bc290dcb411c8f0e4de854c9feb)
---
 pkgs/by-name/op/openvpn3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index 1e02705d6a55..6fa76e6e2ff3 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -37,13 +37,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openvpn3";
-  version = "27";
+  version = "27.1";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "openvpn3-linux";
     tag = "v${version}";
-    hash = "sha256-H+QF0Z1IUKx2U0+V7KHaAd/AKbuJEKLIwqyK2srD8DM=";
+    hash = "sha256-Egt6lVcvlmxnABw4v0cdROQzVdkA3DgOGGCSgl+QFdM=";
     # `openvpn3-core` is a submodule.
     # TODO: make it into a separate package
     fetchSubmodules = true;

From bf916527d009db764f2433ff9af2b096d49414af Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 14 Jul 2026 21:46:46 +0200
Subject: [PATCH 05/63] openbao: 2.5.5 -> 2.6.0

https://github.com/openbao/openbao/releases/tag/v2.6.0

diff: https://github.com/openbao/openbao/compare/v2.5.5...v2.6.0
(cherry picked from commit 21a09f0493401fe64922f79b1f4708e9967abd4d)
---
 pkgs/by-name/op/openbao/package.nix |  6 ++--
 pkgs/by-name/op/openbao/ui.nix      | 50 +++++++++++++----------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 2ca7c101dd8b..68348dc22ae7 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.5.5";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-75Rm9EGkvUKJ05d55bboPAE+Nm/GLLgH1TqDrExkJO0=";
+    hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
   };
 
-  vendorHash = "sha256-3d3g6f0O7X+aedYCfLbqLNuITKNQuxZkApWTTKSk7lA=";
+  vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index 0a6e634e2b5e..44b2c4e1a377 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -1,50 +1,46 @@
 {
   stdenvNoCC,
   openbao,
-  yarn-berry_3,
-  nodejs_22,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  pnpm_10,
+  # https://github.com/openbao/openbao/issues/731
+  nodejs-slim_22,
 }:
 let
-
-  yarn = yarn-berry_3.override { nodejs = nodejs_22; };
-
+  nodejs-slim = nodejs-slim_22;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = openbao.pname + "-ui";
   inherit (openbao) version src;
   sourceRoot = "${finalAttrs.src.name}/ui";
 
-  offlineCache = yarn.fetchYarnBerryDeps {
-    inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg=";
-  };
-
   nativeBuildInputs = [
-    yarn.yarnBerryConfigHook
-    nodejs_22
-    yarn
+    pnpmConfigHook
+    pnpmBuildHook
+    pnpm
+    nodejs-slim
   ];
 
-  env.YARN_ENABLE_SCRIPTS = 0;
-
-  preConfigure = ''
-    printYarnErrors() {
-      cat /build/*.log
-    }
-    failureHooks+=(printYarnErrors)
-  '';
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-9Q5celZSwMgSS8qcj8sDH/JLv48lgDMOylANvXSnhsU=";
+  };
 
   postConfigure = ''
     substituteInPlace .ember-cli \
       --replace-fail "../http/web_ui" "$out"
   '';
 
-  buildPhase = ''
-    runHook preBuild
-    yarn run ember build --environment=production
-    runHook postBuild
-  '';
-
   dontInstall = true;
 
   meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // {

From d48770d8ab5e1e6d9c7987eea8f791dd018d186f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 14 Jul 2026 23:48:09 +0200
Subject: [PATCH 06/63] gitea: 1.26.4 -> 1.27

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.27.0
Diff: https://github.com/go-gitea/gitea/compare/v1.26.4...v1.27.0
(cherry picked from commit bd73e09597f5ea15382d270ab28093d627203e01)
---
 pkgs/by-name/gi/gitea/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index dfae5dbc37ec..1191c645692f 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -13,14 +13,14 @@
   openssh,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm_10,
+  pnpm_11,
   stdenv,
   sqliteSupport ? true,
   nixosTests,
 }:
 
 let
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 
   frontend = stdenv.mkDerivation (finalAttrs: {
     pname = "gitea-frontend";
@@ -30,7 +30,7 @@ let
       inherit (finalAttrs) pname version src;
       inherit pnpm;
       fetcherVersion = 4;
-      hash = "sha256-FroVRhNzCLtbW9Z0s6xr4l0mIX+hY4KOomZAhPILWlY=";
+      hash = "sha256-VAXSj+AYV6uEdCAD/sEzeydqn4cqNL+ITfrGq41jaLI=";
     };
 
     nativeBuildInputs = [
@@ -53,18 +53,18 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "gitea";
-  version = "1.26.4";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xfLhiQMygYKgSMrvmH2V/LIMeaA4ovOeUDT4RUwhvgo=";
+    hash = "sha256-Pn1V4U43d4lTKRO7AftgKDDWls2z+3IeZgPBaKZlbow=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-VyzfBZnxnubNIdf+xwLav4W4DgapcLLKN1aKrZ9NbDg=";
+  vendorHash = "sha256-YRBMGWKIZgMxOXaXG2bIBj1XzkhSwiMyfRy+yQGw+Bo=";
 
   outputs = [
     "out"
@@ -79,14 +79,14 @@ buildGoModule (finalAttrs: {
   overrideModAttrs = _: {
     postPatch = ''
       substituteInPlace go.mod \
-        --replace-fail "go 1.26.3" "go 1.26"
+        --replace-fail "go 1.26.4" "go 1.26.0"
     '';
   };
 
   postPatch = ''
     substituteInPlace modules/setting/server.go --subst-var data
     substituteInPlace go.mod \
-      --replace-fail "go 1.26.3" "go 1.26"
+      --replace-fail "go 1.26.4" "go 1.26.0"
   '';
 
   subPackages = [ "." ];
@@ -112,6 +112,7 @@ buildGoModule (finalAttrs: {
     mkdir -p $out
     cp -R ./options/locale $out/locale
 
+    mv $out/bin/gitea{.dev,}
     wrapProgram $out/bin/gitea \
       --prefix PATH : ${
         lib.makeBinPath [

From 89d25182bf24e19fa1b87693b9e2fb8d0e002daf Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Mon, 13 Jul 2026 11:57:28 -0400
Subject: [PATCH 07/63] veilid: 0.5.5 -> 0.5.6

(cherry picked from commit 2bbe55bd12dee87d1da4a1f6b69c145e7397b289)
---
 pkgs/by-name/ve/veilid/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 207124d7dae9..55674e3a1b11 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "veilid";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = "veilid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-14jRIs2iE5JH1ZmC/1DGcg6cejsnmhUTkquXNmOEuQA=";
+    hash = "sha256-SBFCfIYfOicbUviIZMBXbfW1CESguEFLge6ssmYqm+A=";
   };
 
-  cargoHash = "sha256-xuIw/RRKydanStS7dw1jK96bgEH0U5TDbayaBZq/OCg=";
+  cargoHash = "sha256-Rtk9ba/nwaL5oCsKZsFxCy3qUnq8vVrmllzYlgV0FDU=";
 
   nativeBuildInputs = [
     capnproto

From 4d707697ab226550a30ed5862fd850a7ff0b8e38 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 22 May 2026 15:32:17 -0600
Subject: [PATCH 08/63] ntfs3g: modernize, adopt, stop using fuse2

Co-authored-by: Guillaume Girol <symphorien+git@xlumurb.eu>

(cherry picked from commit d6c26643937fd1f94bf42d097a5e7bab254cfe58)
---
 pkgs/by-name/nt/ntfs3g/package.nix | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix
index 7bda93b3c434..8b4aa462b4e9 100644
--- a/pkgs/by-name/nt/ntfs3g/package.nix
+++ b/pkgs/by-name/nt/ntfs3g/package.nix
@@ -8,14 +8,13 @@
   mount,
   libuuid,
   kmod,
-  macfuse-stubs,
   crypto ? false,
   libgcrypt,
+  macfuse-stubs,
   gnutls,
-  fuse,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ntfs3g";
   version = "2026.2.25";
 
@@ -29,19 +28,19 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tuxera";
     repo = "ntfs-3g";
-    rev = version;
-    sha256 = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c=";
+    tag = finalAttrs.version;
+    hash = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c=";
   };
 
   buildInputs = [
     gettext
     libuuid
-    fuse
   ]
   ++ lib.optionals crypto [
     gnutls
     libgcrypt
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs ];
 
   # Note: libgcrypt is listed here non-optionally because its m4 macros are
   # being used in ntfs-3g's configure.ac.
@@ -65,12 +64,17 @@ stdenv.mkDerivation rec {
     "--enable-xattr-mappings"
     "--${if crypto then "enable" else "disable"}-crypto"
     "--enable-extras"
-    "--with-mount-helper=${mount}/bin/mount"
-    "--with-umount-helper=${mount}/bin/umount"
-    "--with-fuse=external"
+    "--with-mount-helper=${lib.getExe' mount "mount"}"
+    "--with-umount-helper=${lib.getExe' mount "umount"}"
+
+    # Use bundled FUSE as fuse2 is being deprecated
+    # https://github.com/tuxera/ntfs-3g/issues/54#issuecomment-3058178016
+    # Darwin doesn't support internal FUSE, so we use the external macFUSE stubs instead.
+    # https://github.com/tuxera/ntfs-3g/issues/8#issuecomment-920700418
+    "--with-fuse=${if stdenv.hostPlatform.isLinux then "internal" else "external"}"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "--with-modprobe-helper=${kmod}/bin/modprobe"
+    "--with-modprobe-helper=${lib.getExe' kmod "modprobe"}"
   ];
 
   postInstall = ''
@@ -83,7 +87,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/tuxera/ntfs-3g";
     description = "FUSE-based NTFS driver with full write support";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.ryand56 ];
     mainProgram = "ntfs-3g";
     platforms = with lib.platforms; darwin ++ linux;
     license = with lib.licenses; [
@@ -91,4 +95,4 @@ stdenv.mkDerivation rec {
       lgpl2Plus # fuse-lite
     ];
   };
-}
+})

From 7ed1391ca515700dce269877f329c0ea3195f0e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 19:28:30 +0000
Subject: [PATCH 09/63] ntfs3g: 2026.2.25 -> 2026.7.7

(cherry picked from commit a07849623d5cab9be2d17567468a68d8fdf3d18f)
---
 pkgs/by-name/nt/ntfs3g/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix
index 8b4aa462b4e9..3c7d25a6d49a 100644
--- a/pkgs/by-name/nt/ntfs3g/package.nix
+++ b/pkgs/by-name/nt/ntfs3g/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ntfs3g";
-  version = "2026.2.25";
+  version = "2026.7.7";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "tuxera";
     repo = "ntfs-3g";
     tag = finalAttrs.version;
-    hash = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c=";
+    hash = "sha256-7Z3rMOHBwrWqkxeksic3+Z+WvwJy2ra9rRxGjESsd04=";
   };
 
   buildInputs = [

From 9f6e241dbd2edcc9289623549120ad7be44e2b56 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 17 Jul 2026 02:06:29 +0200
Subject: [PATCH 10/63] [release-26.05] gerrit: 3.13.6 -> 3.13.8

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index adf149804c93..38edf2be48e0 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gerrit";
-  version = "3.13.6";
+  version = "3.13.8";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war";
-    hash = "sha256-nGKl5KNundR+FkiQ5CO/qBezOSNAHDHcPsssm1lZAhk=";
+    hash = "sha256-7/S+SuXItnBabW0e5h/n9tezhW5sV/Ix8CmEOdx9EYA=";
   };
 
   buildCommand = ''

From 198c711c6263c8fc57eb5b0434dd84afcd7ae43e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 15 Jul 2026 13:54:23 +0000
Subject: [PATCH 11/63] virtualbox: 7.2.10 -> 7.2.12

(cherry picked from commit a2e6f3c14657ed9d92955181d82eb0132c14fd2a)
---
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 pkgs/applications/virtualization/virtualbox/extpack.nix       | 4 ++--
 .../virtualization/virtualbox/guest-additions-iso/default.nix | 2 +-
 .../virtualization/virtualbox/guest-additions/default.nix     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index df980cf270fe..b846a1ed31aa 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -72,9 +72,9 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.2.10";
+  virtualboxVersion = "7.2.12";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "203a02e3c33ed02fdd75211a58bc9e77c9a8042ad4fa91ddc2914afbd2d67125";
+  virtualboxSha256 = "64a4843677e42010e7799e951883fbbefc56bf2bc162e4970edea04f142f8b25";
 
   kvmPatchVboxVersion = "7.2.6";
   kvmPatchVersion = "20260201";
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 7ec6e79e8924..c8580a091e6a 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl rec {
   pname = "virtualbox-extpack";
-  version = "7.2.10";
+  version = "7.2.12";
   name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack";
   url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
   sha256 =
@@ -13,7 +13,7 @@ fetchurl rec {
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
     let
-      value = "87f03161e5b6b1ecfa0024f795eefdb68abc46aa9689f67bb69e7db4ef9033dd";
+      value = "ac461d67462e06a9e16e8b96623c1b1a8c692c7f78e3566584b47e2d2e533f76";
     in
     assert (builtins.stringLength value) == 64;
     value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index 1744c85fe349..a1abd7a1b18f 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl {
   url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
-  sha256 = "306b1dea6022647bde19424816b995714fa5815ff7bdf00f6a015bf8af0839e7";
+  sha256 = "ae55a8a3b3934785a3a622f63483806e3228112eba57f86ca932958199b8f61b";
   meta = {
     description = "Guest additions ISO for VirtualBox";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index fbdba6e91b7a..fa4725a69a20 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -18,9 +18,9 @@
   libx11,
 }:
 let
-  virtualboxVersion = "7.2.10";
+  virtualboxVersion = "7.2.12";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "203a02e3c33ed02fdd75211a58bc9e77c9a8042ad4fa91ddc2914afbd2d67125";
+  virtualboxSha256 = "64a4843677e42010e7799e951883fbbefc56bf2bc162e4970edea04f142f8b25";
 
   platform =
     if stdenv.hostPlatform.isAarch64 then

From f4ceab5eb59e3af26def41646bb3d43992ce04c6 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Thu, 9 Jul 2026 20:28:14 +0200
Subject: [PATCH 12/63] wordpress_7_0: 7.0 -> 7.0.1

Announcement: https://wordpress.org/news/2026/07/wordpress-7-0-1-maintenance-release/
Changelog: https://make.wordpress.org/core/2026/07/01/wordpress-7-0-1-rc1-is-now-available/
(cherry picked from commit e7d35f9d19719140d4e20e619912a82ca811dce7)
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 5074569acb15..73782cf6c499 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -14,7 +14,7 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
     hash = "sha256-22EK2fVJ4Ku1rz49XGcpxY2HRDllTN8K/qQlsuqJXzU=";
   };
   wordpress_7_0 = {
-    version = "7.0";
-    hash = "sha256-UwyP3rFvsK/9tT63J7agS7jRZmIcIAKeOJyrsBoPqSE=";
+    version = "7.0.1";
+    hash = "sha256-3BBZLam1gMdSVjKFDgzO03GxMIGFOsKa/pO11bsA25g=";
   };
 }

From f9824d1ef6fe8f54515368c76b515e5be28cdca0 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Fri, 17 Jul 2026 21:32:42 +0200
Subject: [PATCH 13/63] wordpress_7_0: 7.0.1 -> 7.0.2

Fixes (high-severity) security vulnerabilities, of which a SQL injection into RCE.
Announcement: https://wordpress.org/news/2026/07/wordpress-7-0-2-release/

(cherry picked from commit 41b3e45366acbe2d5ac9fad8379908625677d3db)
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 73782cf6c499..4f1491c2ae6f 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -14,7 +14,7 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
     hash = "sha256-22EK2fVJ4Ku1rz49XGcpxY2HRDllTN8K/qQlsuqJXzU=";
   };
   wordpress_7_0 = {
-    version = "7.0.1";
-    hash = "sha256-3BBZLam1gMdSVjKFDgzO03GxMIGFOsKa/pO11bsA25g=";
+    version = "7.0.2";
+    hash = "sha256-1KTSGd6mTGxo5i8v/D8zHFR1UQJG1sRPYftS83fSlbk=";
   };
 }

From 7749f9a5a724960e6d97967be33fc228d325f8b3 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Fri, 17 Jul 2026 21:43:08 +0200
Subject: [PATCH 14/63] wordpress_6_9: 6.9.4 -> 6.9.5

Fixes (high-severity) security vulnerabilities, of which a SQL injection into RCE.
Announcement: https://wordpress.org/news/2026/07/wordpress-7-0-2-release/

(cherry picked from commit 9c0d4b89712bb5734925cb377aae3aa6b0df8fad)
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 4f1491c2ae6f..059b151d72ca 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -10,8 +10,8 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
     hash = "sha256-N/WVUQxI0W3t4L+lr6KcuK8S2/Dj00WyXElMFfjIHYE=";
   };
   wordpress_6_9 = {
-    version = "6.9.4";
-    hash = "sha256-22EK2fVJ4Ku1rz49XGcpxY2HRDllTN8K/qQlsuqJXzU=";
+    version = "6.9.5";
+    hash = "sha256-01h7VJpvXZDG5PQmj/xsI2cUY2Jc+ImiyBWnB86fXEE=";
   };
   wordpress_7_0 = {
     version = "7.0.2";

From 991846196c54b9efc03cc263b9fda36a3bff4f96 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Fri, 17 Jul 2026 21:44:05 +0200
Subject: [PATCH 15/63] wordpress_6_8: 6.8.5 -> 6.8.6

Fixes (high-severity) security vulnerabilities, of which a SQL injection into RCE.
Announcement: https://wordpress.org/news/2026/07/wordpress-7-0-2-release/

(cherry picked from commit 1228b953c8c9306ba21699cdc41def104551d55b)
---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 059b151d72ca..fe64e49ae09b 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -6,8 +6,8 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
     hash = "sha256-IS9B6kwjWLYLybmWG2Ym5+JAgFExMqhcEQsJJF2puXg=";
   };
   wordpress_6_8 = {
-    version = "6.8.5";
-    hash = "sha256-N/WVUQxI0W3t4L+lr6KcuK8S2/Dj00WyXElMFfjIHYE=";
+    version = "6.8.6";
+    hash = "sha256-ID5C12xn+GprUynX8WLS5dl9iJyv13yDxYbqMDPB8P4=";
   };
   wordpress_6_9 = {
     version = "6.9.5";

From d4961df2876dc080ffee595279ae872b6c616b8c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 30 Apr 2026 20:10:42 -0400
Subject: [PATCH 16/63] maddy: 0.8.2 -> 0.9.4

Diff: https://github.com/foxcpp/maddy/compare/v0.8.2...v0.9.4
(cherry picked from commit c33058f7c67b4a11ecda11d97078c1e539d73858)
---
 pkgs/by-name/ma/maddy/package.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ma/maddy/package.nix b/pkgs/by-name/ma/maddy/package.nix
index e8a523ecd06e..21a391e5a717 100644
--- a/pkgs/by-name/ma/maddy/package.nix
+++ b/pkgs/by-name/ma/maddy/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "maddy";
-  version = "0.8.2";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "foxcpp";
     repo = "maddy";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+tj2h1rAdr0SPgLGGzVf5sdFmhcwY76fkMm2P/gYFuo=";
+    sha256 = "sha256-U7czabdpOC+vb5ERFbbS5W4h7pOCwbEZuXbU/MXRvW4=";
   };
 
-  vendorHash = "sha256-+xsG7z2wSxoZ1vEJIDBtwDMiU7zKCtZOsYPUhv6HMpQ=";
+  vendorHash = "sha256-8dMS2kFlQ762u4Ifv1O1Capr8Jb7wsQuHSsJvHwa0j0=";
 
   tags = [ "libpam" ];
 
@@ -29,9 +29,14 @@ buildGoModule (finalAttrs: {
     "-s"
     "-w"
     "-X github.com/foxcpp/maddy.Version=${finalAttrs.version}"
+    "-X github.com/foxcpp/maddy.DefaultLibexecDirectory=/run/wrappers/bin"
   ];
 
-  subPackages = [ "cmd/maddy" ];
+  subPackages = [
+    "cmd/maddy"
+    "cmd/maddy-pam-helper"
+    "cmd/maddy-shadow-helper"
+  ];
 
   buildInputs = [ pam ];
 
@@ -49,15 +54,18 @@ buildGoModule (finalAttrs: {
 
     ln -s "$out/bin/maddy" "$out/bin/maddyctl"
 
+    mkdir -p "$out/libexec/maddy"
+    mv "$out/bin/maddy-pam-helper" "$out/bin/maddy-shadow-helper" "$out/libexec/maddy"
+
     mkdir -p $out/lib/systemd/system
 
     substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \
-      --replace "/usr/local/bin/maddy" "$out/bin/maddy" \
-      --replace "/bin/kill" "${coreutils}/bin/kill"
+      --replace-fail "/usr/local/bin/maddy" "$out/bin/maddy" \
+      --replace-fail "/bin/kill" "${coreutils}/bin/kill"
 
     substitute dist/systemd/maddy@.service $out/lib/systemd/system/maddy@.service \
-      --replace "/usr/local/bin/maddy" "$out/bin/maddy" \
-      --replace "/bin/kill" "${coreutils}/bin/kill"
+      --replace-fail "/usr/local/bin/maddy" "$out/bin/maddy" \
+      --replace-fail "/bin/kill" "${coreutils}/bin/kill"
   '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=strict-prototypes";
@@ -69,5 +77,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://maddy.email";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ nickcao ];
+    mainProgram = "maddy";
   };
 })

From 414facfd30557895ef923d2998cb90cf5312d5f8 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 25 May 2026 08:21:00 -0400
Subject: [PATCH 17/63] maddy: 0.9.4 -> 0.9.5

Diff: https://github.com/foxcpp/maddy/compare/v0.9.4...v0.9.5
(cherry picked from commit f2abedd11a7353624f40740d412ec8cbdf9ef91d)
---
 pkgs/by-name/ma/maddy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maddy/package.nix b/pkgs/by-name/ma/maddy/package.nix
index 21a391e5a717..6221bbf256dd 100644
--- a/pkgs/by-name/ma/maddy/package.nix
+++ b/pkgs/by-name/ma/maddy/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "maddy";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "foxcpp";
     repo = "maddy";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-U7czabdpOC+vb5ERFbbS5W4h7pOCwbEZuXbU/MXRvW4=";
+    sha256 = "sha256-Lt5uj7DCu6Tx47Xdzg+CjGN543LCj2x8ph+1wvD3GCQ=";
   };
 
   vendorHash = "sha256-8dMS2kFlQ762u4Ifv1O1Capr8Jb7wsQuHSsJvHwa0j0=";

From 894cee1e08191dc092b9e5c534883fa3e4dbebfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 16:09:48 +0000
Subject: [PATCH 18/63] filebrowser: 2.63.15 -> 2.63.18

(cherry picked from commit eef8a4246e493b8bb814ffcc74375e6818f20732)
---
 pkgs/by-name/fi/filebrowser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 661c0613291a..f5b9ef58148b 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "2.63.15";
+  version = "2.63.18";
 
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-O2USjwP1g+yDZpz0628YTRN2BUUnmjFvS+0qc6JU294=";
+    hash = "sha256-0j0i6bKKbyUi4O0wBT+xYjvywjRzAGd0/13Yh/dG5GA=";
   };
 
   frontend = buildNpmPackage rec {
@@ -59,7 +59,7 @@ buildGoModule {
   pname = "filebrowser";
   inherit version src;
 
-  vendorHash = "sha256-WXbXD75acK4woS7UC0G73pY48aGmp1l0spDc3sGYXMg=";
+  vendorHash = "sha256-BXw+fURCh1qNlwWo49aXIpSM339bV3Gwn9Ov8HLEVF0=";
 
   excludedPackages = [ "tools" ];
 

From e47bd08b06f5bce152238c1fe638e757b26e22fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:17:06 +0000
Subject: [PATCH 19/63] lubelogger: 1.6.8 -> 1.7.0

(cherry picked from commit a83fbfb6d9a312c697d1cf4c62d54bcbc577104b)
---
 pkgs/by-name/lu/lubelogger/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix
index 9acfee56e99d..9b860480c5a6 100644
--- a/pkgs/by-name/lu/lubelogger/package.nix
+++ b/pkgs/by-name/lu/lubelogger/package.nix
@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "lubelogger";
-  version = "1.6.8";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "hargata";
     repo = "lubelog";
     rev = "v${version}";
-    hash = "sha256-ePzR6TmByUBWGuOEg8WKMpvQT7qHGkZuBF8CkTwMtuY=";
+    hash = "sha256-I4GGlkEirqxiwIqczsCe9ns0ImOOalqg+pWKXx3o1Fo=";
   };
 
   projectFile = "CarCareTracker.sln";

From 839049de1b0f0285daeb724e3fc7923a6ae4620d Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sun, 12 Jul 2026 17:45:24 -0400
Subject: [PATCH 20/63] python3Package.albucore: fix build

pkg_resources is removed in setuptools 82 ([src][1])

  [1]: https://github.com/pypa/setuptools/blob/v82.0.0/NEWS.rst

(cherry picked from commit 8a4dad5b702587042978fa159394f5c18480b4e1)
---
 pkgs/development/python-modules/albucore/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index f1b98394fb77..8000174085d1 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -22,6 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        'from pkg_resources import DistributionNotFound, get_distribution' \
+        'from importlib.metadata import PackageNotFoundError as DistributionNotFound, distribution as get_distribution'
+  '';
+
   pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];

From 698fd8591433dd9d75df43a542d6aa62adcfa818 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sun, 12 Jul 2026 17:45:24 -0400
Subject: [PATCH 21/63] python3Package.albumentations: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- pkg_resources is removed in setuptools 82 ([src][1])
- test_blur was failing with “ValueError: The truth value of an array
  with more than one element is ambiguous”; converting sigma to float
  (from `numpy.float64`) resolves, see also [this issue][2]

[1]: https://github.com/pypa/setuptools/blob/v82.0.0/NEWS.rst
[2]: https://github.com/python-pillow/Pillow/issues/8911

(cherry picked from commit e6b482cc0bb9f7a72538f154b5572885a8146ede)
---
 .../python-modules/albumentations/default.nix         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix
index 0cf23c5bf18e..623187c8e1ec 100644
--- a/pkgs/development/python-modules/albumentations/default.nix
+++ b/pkgs/development/python-modules/albumentations/default.nix
@@ -44,6 +44,17 @@ buildPythonPackage rec {
     ./dont-check-for-updates.patch
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        'from pkg_resources import DistributionNotFound, get_distribution' \
+        'from importlib.metadata import PackageNotFoundError as DistributionNotFound, distribution as get_distribution'
+    substituteInPlace tests/test_blur.py \
+      --replace-fail \
+        '(ImageFilter.GaussianBlur(radius=sigma))' \
+        '(ImageFilter.GaussianBlur(radius=float(sigma)))'
+  '';
+
   pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];

From 08aabd98a7c1cdd3c7c441fa199849fd0f2758db Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 18 Jul 2026 17:56:55 -0400
Subject: [PATCH 22/63] river{,-classic}: mark aarch64-linux as a badPlatform

These both run out of memory (using >100GiB) while building.

See also https://hydra.nixos.org/build/337732450
and https://hydra.nixos.org/build/337732451.

(cherry picked from commit 19a52e1c29c23f34d4e71dadcd83616a1ad63859)
---
 pkgs/by-name/ri/river-classic/package.nix | 4 ++++
 pkgs/by-name/ri/river/package.nix         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix
index 74e6f2d6b834..bd6bac085614 100644
--- a/pkgs/by-name/ri/river-classic/package.nix
+++ b/pkgs/by-name/ri/river-classic/package.nix
@@ -104,5 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
       rodrgz
     ];
     platforms = lib.platforms.linux;
+    badPlatforms = [
+      # Runs out of memory (using > 100GiB) while building
+      "aarch64-linux"
+    ];
   };
 })
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 7e317651dba9..b6f492388d48 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -108,5 +108,9 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "river";
     platforms = lib.platforms.linux;
+    badPlatforms = [
+      # Runs out of memory (using > 100GiB) while building
+      "aarch64-linux"
+    ];
   };
 })

From 602379489c5fd59e218de5a64dbc64fb7a2abb17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 07:32:49 +0000
Subject: [PATCH 23/63] unityhub: 3.18.3 -> 3.19.1

(cherry picked from commit 034b8a07c38925d16f5a541aacfaaaff19b49a56)
---
 pkgs/by-name/un/unityhub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index ce2ce84f0844..71388456cc17 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.18.3";
+  version = "3.19.1";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb";
-    hash = "sha256-6Gjik6zIQMYoAr8jmMp3X6+Xu5fdcbh2Exd8eToSbto=";
+    hash = "sha256-PoWjyHBDsJPrGUBuTB2yXdLPu2gxrGn68flpy7fxC7Q=";
   };
 
   nativeBuildInputs = [

From 2cb483490dd90f8aed3bc9b0fa6f905be72f8b67 Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Thu, 16 Jul 2026 09:38:39 +0700
Subject: [PATCH 24/63] melos: fix melos failing outside a workspace

Assisted-by: Clause sonnet 5 High
(cherry picked from commit 63753f74808d7b1d0807072e6c059a6cd443fc86)
---
 pkgs/by-name/me/melos/add-generic-main.patch | 34 +++++++++++---------
 pkgs/by-name/me/melos/package.nix            |  2 ++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch
index 8e90ac427171..815f2163e7dc 100644
--- a/pkgs/by-name/me/melos/add-generic-main.patch
+++ b/pkgs/by-name/me/melos/add-generic-main.patch
@@ -1,8 +1,8 @@
 diff --git a/bin/melos.dart b/bin/melos.dart
-index 2476436..bd79fad 100644
+index 2476436..ee6adb0 100644
 --- a/packages/melos/bin/melos.dart
 +++ b/packages/melos/bin/melos.dart
-@@ -1,11 +1,72 @@
+@@ -1,11 +1,74 @@
  import 'package:cli_launcher/cli_launcher.dart';
  import 'package:melos/src/command_runner.dart';
 +import 'dart:io';
@@ -19,31 +19,29 @@ index 2476436..bd79fad 100644
 -);
 +final ExecutableName executableName = ExecutableName('melos');
 +
++// Substituted at build time to the package's install location in the
++// nix store (see preBuild in package.nix).
++const _globalPackageRoot = '__NIX_MELOS_PACKAGE_ROOT__';
++
 +Future<void> main(List<String> arguments) async {
-+  final workspaceRoot = _findLocalInstallation(Directory.current);
++  final localInstallation = _findLocalInstallation(Directory.current);
 +
-+  if (workspaceRoot == null) {
-+    print("Error: Could not find your work  ");
-+    return;
-+  }
-+
-+  melosEntryPoint(
++  await melosEntryPoint(
 +    arguments,
 +    LaunchContext(
 +      directory: Directory.current,
-+      localInstallation: ExecutableInstallation(
++      globalInstallation: ExecutableInstallation(
 +        name: executableName,
 +        isSelf: false,
-+        packageRoot: workspaceRoot,
++        packageRoot: Directory(_globalPackageRoot),
 +      ),
++      localInstallation: localInstallation,
 +    ),
 +  );
 +}
 +
 +// Stolen then simplified from https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L249
-+Directory? _findLocalInstallation(
-+  Directory start,
-+) {
++ExecutableInstallation? _findLocalInstallation(Directory start) {
 +  if (path.equals(start.path, start.parent.path)) {
 +    return null;
 +  }
@@ -72,12 +70,16 @@ index 2476436..bd79fad 100644
 +
 +    final isSelf = name == executableName.package;
 +
-+    if ((isSelf) ||
++    if (isSelf ||
 +        (dependencies != null &&
 +            dependencies.containsKey(executableName.package)) ||
 +        (devDependencies != null &&
 +            devDependencies.containsKey(executableName.package))) {
-+      return start;
++      return ExecutableInstallation(
++        name: executableName,
++        isSelf: isSelf,
++        packageRoot: start,
++      );
 +    }
 +  }
 +
diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix
index fffcfb13ef57..285d2ec7bf96 100644
--- a/pkgs/by-name/me/melos/package.nix
+++ b/pkgs/by-name/me/melos/package.nix
@@ -27,6 +27,8 @@ buildDartApplication (finalAttrs: {
       --replace-fail "final melosPackageFileUri = await Isolate.resolvePackageUri(melosPackageUri);" "return \"$out\";"
     substituteInPlace packages/melos/lib/src/common/utils.dart \
       --replace-fail "return p.normalize('\''${melosPackageFileUri!.toFilePath()}/../..');" " "
+    substituteInPlace packages/melos/bin/melos.dart \
+      --replace-fail "__NIX_MELOS_PACKAGE_ROOT__" "$out"
     mkdir --parents $out
     cp --recursive packages/melos/templates $out/
   '';

From 265db46113b7741669c6fa61b094a70eb5370996 Mon Sep 17 00:00:00 2001
From: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Date: Tue, 7 Jul 2026 21:15:27 +0200
Subject: [PATCH 25/63] calibre: 9.10.0 -> 9.11.0

(cherry picked from commit 5e4abac4b0b0d962df865161585f94365138a0d4)
---
 pkgs/by-name/ca/calibre/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index a0e277f5221a..3366415baac9 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -40,11 +40,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "9.10.0";
+  version = "9.11.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-U7iid8dm5sP7Xfsm+ikRn0oSm/j5qVS0I1qWPIowwwE=";
+    hash = "sha256-UNQuOzLsURb2sd8JlTf0vsrza/7ez59YG3Q/Edi2yzY=";
   };
 
   patches =
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
       (fetchpatch {
         name = "0007-Hardening-Qt-code-${debian-tag}.patch";
         url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${debian-tag}/debian/patches/hardening/0007-Hardening-Qt-code.patch";
-        hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U=";
+        hash = "sha256-/xXkxFJNRnjH8RmXcotrPI6rZ+I1ENjikl1eLU0NEjQ=";
       })
     ]
     ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;

From 19eb6d05a8c0a1acc014d66a2df2d162f44e816c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 06:04:50 +0000
Subject: [PATCH 26/63] rustywind: 0.24.3 -> 0.25.2

(cherry picked from commit e7dc8626a94add24c81f94c7c1276d923abbcad9)
---
 pkgs/by-name/ru/rustywind/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index c3026f881d1b..a48ee1a7133a 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustywind";
-  version = "0.24.3";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "avencera";
     repo = "rustywind";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qbOlU7kqVbB/sQg4b78CohOwQbraulZ8dRxeT+39rFk=";
+    hash = "sha256-PeYKBLTQ7/fmNuWtIQiqC47omrdGuIlB55OPxBQJQiM=";
   };
 
-  cargoHash = "sha256-eXTdPtcsWhsABZU6kRzZ6eF1VaabouZwLAFI9KpAx98=";
+  cargoHash = "sha256-76gC+nw/eV4j68O74XsJDaDFYAEdqZB9EzsRj5vdOvs=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From d1e3a38cdbae313668a5a4d52e175bd4793b6389 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:40:38 +0000
Subject: [PATCH 27/63] protoc-gen-grpc-java: 1.82.1 -> 1.82.2

(cherry picked from commit 80efe59cad9701779708c70a2006bab7fd3a3904)
---
 pkgs/by-name/pr/protoc-gen-grpc-java/data.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix
index 694bd75a468d..faeb16773810 100644
--- a/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix
+++ b/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix
@@ -1,14 +1,14 @@
 {
-  version = "1.82.1";
+  version = "1.82.2";
   hashes = {
-    linux-aarch_64 = "sha256-VTDKjBMzFj5CocdqK1EEIOBsdTIckXMrNGOlRyByCc8=";
-    linux-ppcle_64 = "sha256-/NCzmrhbTDaYhJBntW6n6yA5tvtsvdVldMlK7WfV6RY=";
-    linux-s390_64 = "sha256-Bk83rw8iGsniyNcivgQRjx/GOWB0kv4Wo01b4YTG0Pk=";
-    linux-x86_32 = "sha256-Ai7h2w1ZGWlS/tAdiT/dpd6wt3VM4rpPiQuv5rDbfCY=";
-    linux-x86_64 = "sha256-OnXRqIuP5E9KHVy48ixz+PzI1WOu2QV/9epISyLNry8=";
-    osx-aarch_64 = "sha256-hm3WySlSQu/J5rg8pWlpOStcPnODqn1b7pKL1N5CkSQ=";
-    osx-x86_64 = "sha256-hm3WySlSQu/J5rg8pWlpOStcPnODqn1b7pKL1N5CkSQ=";
-    windows-x86_32 = "sha256-CWZAubE98Aftf7Mjd2caROxsWSxS+JQGf4YB+FEwiwo=";
-    windows-x86_64 = "sha256-XmhjMhJ/djRizOkSh+i7PtZn2RL9jVV5PcBkgwpYw0o=";
+    linux-aarch_64 = "sha256-RVdT8rpH1WHd5vQb+o3BP81ipuwFZ/Bv8Hr8BC7shwA=";
+    linux-ppcle_64 = "sha256-Jcjpo21XWjCeCMcWmjM5tPtQYwd5JZ0pUsfFXMAF95Q=";
+    linux-s390_64 = "sha256-Oe9brWzFO1aP3xcVhR8Uq40nJFTzyxDAtp0+3ErynjI=";
+    linux-x86_32 = "sha256-AlnBc3VBeV+jMn6T0QFWurd+0hywSihi7snop81bO2E=";
+    linux-x86_64 = "sha256-5SKpbtVprxNAXhzqODcPZ+I7U81RSjELWQKQ71/lYF4=";
+    osx-aarch_64 = "sha256-LNFM4zTJiLO5XHWT/iaipbQWgN2HwyjNxTMps/XlzYo=";
+    osx-x86_64 = "sha256-LNFM4zTJiLO5XHWT/iaipbQWgN2HwyjNxTMps/XlzYo=";
+    windows-x86_32 = "sha256-yrbPXrPSn+iaI16zCPh1rteFh1Q18sQuR9UWo+xMToQ=";
+    windows-x86_64 = "sha256-vfdo65O6o8ctW+qVdcWuH5sQDXypn4ktNHMCv6uJ0gw=";
   };
 }

From e3659440cf62103466f8e00ac4e270d6bd7bc0ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 05:28:07 +0000
Subject: [PATCH 28/63] checkstyle: 13.7.0 -> 13.8.0

(cherry picked from commit f303f4588127b74344346015ac9ba6a7e0a74589)
---
 pkgs/by-name/ch/checkstyle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix
index acdc60aef140..e3134dd3c378 100644
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -8,17 +8,17 @@
 }:
 
 maven.buildMavenPackage (finalAttrs: {
-  version = "13.7.0";
+  version = "13.8.0";
   pname = "checkstyle";
 
   src = fetchFromGitHub {
     owner = "checkstyle";
     repo = "checkstyle";
     tag = "checkstyle-${finalAttrs.version}";
-    hash = "sha256-BrgjkqkVnLYMlouyopUoCTby2z4YWZl4UK7m3Ktm5bE=";
+    hash = "sha256-Nhn65Y6iz55wucAQ/DiF9VWm15O7m7+ZhOM+X4rIHGQ=";
   };
 
-  mvnHash = "sha256-IKO61ugVjF03zA6pCwYKmwMVx/Ogy8hrt70ArOUm0NA=";
+  mvnHash = "sha256-GhnxhSZX+plwQq9l4av6dqLEVp7HwT5aTVHKoTfaP8c=";
 
   nativeBuildInputs = [
     maven

From 5f43a5c34c4f5b156e4c2976bf8681843e2a1df1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 15:45:50 +0200
Subject: [PATCH 29/63] mailmanPackages.hyperkitty: backport mistune fix

(cherry picked from commit ac529af6b74c654c92031438214d425318e333ba)
---
 pkgs/servers/mail/mailman/hyperkitty.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index e4a7ba3ecda4..d4c93f3d1922 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -35,6 +35,12 @@ buildPythonPackage (finalAttrs: {
       url = "https://gitlab.com/mailman/hyperkitty/-/commit/e815be11752ac6a3e839b155f0c43808619c56b0.patch";
       hash = "sha256-fsJyNsh3l5iR9WgsiEsHlptkN+nlWoop0m2STyucDEc=";
     })
+    # Fix test with mistune >= 3.3
+    (fetchpatch {
+      url = "https://gitlab.com/mailman/hyperkitty/-/commit/7e8aa0150d8dcaef66039db3a0205dfd4160a265.patch";
+      excludes = [ "pyproject.toml" ];
+      hash = "sha256-BpjnLugUU0nyn3XN0zZ0eEeK0sFd64GOUaQsen6fFyw=";
+    })
   ];
 
   prePatch = ''

From 1f1f2481b1ad131507dd106f65a011a5b92c3ca6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 08:15:05 +0000
Subject: [PATCH 30/63] jackett: 0.24.2200 -> 0.24.2237

(cherry picked from commit c1c721d10d3d96250408ec8791884447dc9d15e3)
---
 pkgs/by-name/ja/jackett/deps.json   | 136 ++++++++++++++--------------
 pkgs/by-name/ja/jackett/package.nix |   4 +-
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/pkgs/by-name/ja/jackett/deps.json b/pkgs/by-name/ja/jackett/deps.json
index 0cac57b41576..e4951b5c71e3 100644
--- a/pkgs/by-name/ja/jackett/deps.json
+++ b/pkgs/by-name/ja/jackett/deps.json
@@ -6,8 +6,8 @@
   },
   {
     "pname": "AngleSharp",
-    "version": "1.4.0",
-    "hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0="
+    "version": "1.5.2",
+    "hash": "sha256-81rDtnwvR0SDXNNUnPirWIa782gwkgRlz1Fbzm2ywwc="
   },
   {
     "pname": "AngleSharp.Xml",
@@ -61,53 +61,53 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.Internal",
-    "version": "9.0.16",
-    "hash": "sha256-UwBbUhfCxg5B3llggin1UtoaGYdy9ifoYs1MT3WiIJw="
+    "version": "9.0.18",
+    "hash": "sha256-2sigYMwiq5w/E2EFTXf1D0IjWW4/1HQMH4HOYfYTYtw="
   },
   {
     "pname": "Microsoft.AspNetCore.DataProtection",
-    "version": "9.0.16",
-    "hash": "sha256-8bK7MDVhISTXmEFdcFcnJUleDaPAZkA8fWPAHV6XFeg="
+    "version": "9.0.18",
+    "hash": "sha256-wLswQ5CrFv93sZ1ZKhxUW1FrWH2KBp96GTqZrozuBVI="
   },
   {
     "pname": "Microsoft.AspNetCore.DataProtection.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-YSVo0oww1xoG7Hef+roLwGNX6dQs7ZG10f3Ij7w6z1w="
+    "version": "9.0.18",
+    "hash": "sha256-Rpas+cH+OSP80wwQ448h0rFUbUG74XJHNtQLL9fUcR4="
   },
   {
     "pname": "Microsoft.AspNetCore.Http",
-    "version": "2.3.9",
-    "hash": "sha256-XuOH9M6qd6XFz15TnWNnNCVd567B5BCb0wfl0Xoz5g4="
+    "version": "2.3.11",
+    "hash": "sha256-Wy+HphsrkH6r9ljPfQ+k1bgL/nsUKR5A9iCJ7DP33d4="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Abstractions",
-    "version": "2.3.0",
-    "hash": "sha256-NrAFzk5IcxmeRk3Zu+rLcq0+KKiAYfygJbAdIt2Zpfk="
+    "version": "2.3.10",
+    "hash": "sha256-TlgQug0JPR5vsFsxU0btpa4SbLSLLKZ2T8izyZpkZtM="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Features",
-    "version": "2.3.0",
-    "hash": "sha256-QkNFS3ScDLyt0XppATSogbF1raSQJN+wStcnAsSoUJw="
+    "version": "2.3.9",
+    "hash": "sha256-9VJKZ5adBKRrVp+XRWEQiazv9Q6jj7noT/X693djVgQ="
   },
   {
     "pname": "Microsoft.AspNetCore.JsonPatch",
-    "version": "9.0.16",
-    "hash": "sha256-+AxAcxXNHLrELpW0KZd54TGMqPwe2bYaxUwNS64F8oQ="
+    "version": "9.0.18",
+    "hash": "sha256-tKaK64BnFoj/J2DM4qSvO/zQ5alPLEasm6pr3+Tp3CM="
   },
   {
     "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
-    "version": "9.0.16",
-    "hash": "sha256-ephL6fJDFR+0rrebEH92IDpoMadJLef98L7mNKHTAUo="
+    "version": "9.0.18",
+    "hash": "sha256-jbOBm5T8ZlBhips96MI7u7JBLhNT/dX5eHjUQ6cw+dI="
   },
   {
     "pname": "Microsoft.AspNetCore.WebUtilities",
-    "version": "2.3.0",
-    "hash": "sha256-oJMEP44Q9ClhbyZUPtSb9jqQyJJ/dD4DHElRvkYpIOo="
+    "version": "2.3.10",
+    "hash": "sha256-XuHgYt83oinCBcCfY1FJa1PWj/t5kvg/YPse0DlYiUA="
   },
   {
     "pname": "Microsoft.AspNetCore.WebUtilities",
-    "version": "2.3.9",
-    "hash": "sha256-B5iIW0O5K11GELwd7dc96SYTmFkvINhdodBDcL14+/w="
+    "version": "2.3.11",
+    "hash": "sha256-HAGuLuTRLkTTcP9oqRpqPYQmIzQTecUWHI/UTAJ2iMY="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -126,8 +126,8 @@
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "9.0.16",
-    "hash": "sha256-kCHVu7LDlMXlvDvFo9C3zbISV2t52s+iZMpp0/JX3iw="
+    "version": "9.0.18",
+    "hash": "sha256-FscIiUzpg4lqoV4XU+qHKw1BipCPkC+twxRqcDDy4xo="
   },
   {
     "pname": "Microsoft.Bcl.TimeProvider",
@@ -146,8 +146,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.16",
-    "hash": "sha256-wfj9Vp3innwgJGToOyGqhW2lyFe4vG3KW51vMJjGGoU="
+    "version": "9.0.18",
+    "hash": "sha256-Th2ejKhzEMKV1FUoj+74zhJIg3jaFhWmtci2utqfIn8="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -156,8 +156,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-1968fW24KGyvpNU8gYIPEhXJVVusgCCBz4PkK9Rww0s="
+    "version": "9.0.18",
+    "hash": "sha256-e0ABlyKnPhqtd875N0d04E4bdYWe5MOHK7YZzFM9nnY="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -171,23 +171,23 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-jTzy4tazMmC7magGRhm86yd2a7+2vRYWrC0QoOoDMSQ="
+    "version": "9.0.18",
+    "hash": "sha256-xpAbVQ2HlbLiEETz+IHa0Sih68j0HARbUCk423SCdYg="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-U6ij4cMOc94qLfVxuPINg4/vqqbFcZgTuIC/c0RznTQ="
+    "version": "9.0.18",
+    "hash": "sha256-Or2ZUfYxYXZ7DrLYCPnkRhsKed4u0/ZElHrg65eovqY="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-T5LCT9yTrHvMaVP/4spQqCj27hXCbchTUdPMKKGBp3E="
+    "version": "9.0.18",
+    "hash": "sha256-SSERP6+GvZld+YjmGeAuwt6STik/aA8dR1v/7/kTiHo="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-u62QeQqAhJ0Pa5JnxXQIyOGkuQZnYYmo3ADTB9f6L9o="
+    "version": "9.0.18",
+    "hash": "sha256-VLWUfFSry5RZz+oA6xqaF751QiOQmHKQftDoFbiMzCs="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -201,8 +201,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.16",
-    "hash": "sha256-B5aTywrWdDbuAC5JBaueFtsA8VQAsejdMW9PSacELMM="
+    "version": "9.0.18",
+    "hash": "sha256-wIfMBf7I1KuDIOyAuIML1Y9cZWkxYUdM3PercoEmSUM="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
@@ -221,8 +221,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.16",
-    "hash": "sha256-GkwkNAO87zn4tzOX7Z0oSpBhjIgkhAx5ApnY/PP5q/0="
+    "version": "9.0.18",
+    "hash": "sha256-AqEIL9qf6OJ4nzZZ/GT/53nz4TQofShVrDQhru/RgZs="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -231,13 +231,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.16",
-    "hash": "sha256-UqBlK5n0ZV8PlvwbholkIB6OU8mkT8bLDUv74a8pq5Y="
+    "version": "9.0.18",
+    "hash": "sha256-4WejEhNikEJEmlYxjqM5DpAeGH5LiaK9TVtZIBU56ck="
   },
   {
     "pname": "Microsoft.Net.Http.Headers",
-    "version": "2.3.8",
-    "hash": "sha256-IgcqzFtv8NAmnb8uvr+lEKHWSehpK3eciCIZ/lcFyaI="
+    "version": "2.3.10",
+    "hash": "sha256-4LG06n+vo2bFpg9dQ9NSLvVf7rQfiD+k0FEq5S6tDsE="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
@@ -416,13 +416,13 @@
   },
   {
     "pname": "Polly",
-    "version": "8.6.6",
-    "hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
+    "version": "8.7.0",
+    "hash": "sha256-iMNusWW+4nuIvkNLUaoru23Roe9vpC140TOIHbLvewE="
   },
   {
     "pname": "Polly.Core",
-    "version": "8.6.6",
-    "hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
+    "version": "8.7.0",
+    "hash": "sha256-1AT4Xym9hn2Awgul9WErwXk2bBPN58P9XfRExrIPItg="
   },
   {
     "pname": "runtime.any.System.Collections",
@@ -716,8 +716,8 @@
   },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "9.0.16",
-    "hash": "sha256-5+BaoVjBFX0MoVDsUGqNs+Pu3oIrqksrnT9W7Eqgrww="
+    "version": "9.0.18",
+    "hash": "sha256-pJBU/x5x1qwEjtSjkuTwVB6z04gAxMPPXOSdUIgYe1M="
   },
   {
     "pname": "System.Diagnostics.Tools",
@@ -786,8 +786,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "9.0.16",
-    "hash": "sha256-ySSAdeOwjapOB53Fb3EU0QwLHw1pLCoP2NZ07E8rj7Q="
+    "version": "9.0.18",
+    "hash": "sha256-JacrrdrxR6u7aVjeJiSDOptqAV/f3rcszgz/WdCMBkg="
   },
   {
     "pname": "System.Linq",
@@ -971,8 +971,8 @@
   },
   {
     "pname": "System.Security.Cryptography.Pkcs",
-    "version": "9.0.16",
-    "hash": "sha256-4IJgqiBVvHqLXr2LEC/m2sz4Z1ugU3YECsJHN2jvXqU="
+    "version": "9.0.18",
+    "hash": "sha256-D16WfDikzmgkxmEspZqLa8m2UzyjgC3tivTAWCWZ87M="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
@@ -986,8 +986,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.16",
-    "hash": "sha256-dzULuNU8/MMI0iZ9k1vS9pU5tgiwn6e7vvzGyxNHZHA="
+    "version": "9.0.18",
+    "hash": "sha256-JfLdZjyzoRDHV2a6jGwq/xwuGy3T0XZNGB3zK9IAPBE="
   },
   {
     "pname": "System.Security.Cryptography.X509Certificates",
@@ -996,8 +996,8 @@
   },
   {
     "pname": "System.Security.Cryptography.Xml",
-    "version": "9.0.16",
-    "hash": "sha256-1KFc+NUWOLCVj+KzrWVcrcL9Ph1roZ5qJuCfetHvQ8Q="
+    "version": "9.0.18",
+    "hash": "sha256-OzwTTsPo8Gui1xs4+zlILwvZgbcxXJ97m3ejKqnebu4="
   },
   {
     "pname": "System.Security.Principal.Windows",
@@ -1011,8 +1011,8 @@
   },
   {
     "pname": "System.ServiceProcess.ServiceController",
-    "version": "9.0.16",
-    "hash": "sha256-s7mpGEfvvgw5PzpcQJpMtrPzezPUaeJ81vc0KBM9+/k="
+    "version": "9.0.18",
+    "hash": "sha256-LGttR/XVbEu/ZKz9Np0hTjP0t1TP/3lkQfGxWrhhT10="
   },
   {
     "pname": "System.Text.Encoding",
@@ -1021,8 +1021,8 @@
   },
   {
     "pname": "System.Text.Encoding.CodePages",
-    "version": "9.0.16",
-    "hash": "sha256-llRnK9hMkLkFYP1OLNAfsr7GuIRP2OmbzfrIfCz2xv8="
+    "version": "9.0.18",
+    "hash": "sha256-g5Ps501kdW4XXvSQrwb8qJq71I+P48+2T41uBkx42VA="
   },
   {
     "pname": "System.Text.Encoding.Extensions",
@@ -1036,13 +1036,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "9.0.16",
-    "hash": "sha256-Vo9mC4wgTNXc2DGUjhykVuuIJO8gpPTpYQJBsY0X5Rw="
+    "version": "9.0.18",
+    "hash": "sha256-DTjo1Iqkf8qIdwYPKKeddiiU78j/OCvrMITJ3vlPdhU="
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.16",
-    "hash": "sha256-GF3aOmsHlEjeWg/pkj1yFQktfd4PMNb2jKpMvUADOcQ="
+    "version": "9.0.18",
+    "hash": "sha256-tClFgkq64oP9F4UEZhi2SrvVCkgnOmjVn7p0sbpiwEw="
   },
   {
     "pname": "System.Text.RegularExpressions",
@@ -1096,7 +1096,7 @@
   },
   {
     "pname": "YamlDotNet",
-    "version": "16.3.0",
-    "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
+    "version": "18.1.0",
+    "hash": "sha256-Wf/mWt5nrZ2IYmf4d7Y0pFA2PLgblOGducpMNkYUFvY="
   }
 ]
diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix
index 1bf8590d5df0..c1fb3195e53b 100644
--- a/pkgs/by-name/ja/jackett/package.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -12,13 +12,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "jackett";
-  version = "0.24.2200";
+  version = "0.24.2237";
 
   src = fetchFromGitHub {
     owner = "jackett";
     repo = "jackett";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hmgv17zju1BnT6eapTUhY+3Do/lr2+Cu/ejlU0/vF/I=";
+    hash = "sha256-wlKfaVE69SQiA1GVxHWPAs5XOUv899E5NDVmI84/b7U=";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

From 65c199b910af5c0cd0a1859e50ac16a5fc30ead1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 12:37:15 +0000
Subject: [PATCH 31/63] forgejo-cli: 0.5.0 -> 0.6.0

(cherry picked from commit 2d2bc51aa1f8da07cae5f718db3ff0ab80d3a112)
---
 pkgs/by-name/fo/forgejo-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix
index dbbfd925bb2c..f505bf786d8f 100644
--- a/pkgs/by-name/fo/forgejo-cli/package.nix
+++ b/pkgs/by-name/fo/forgejo-cli/package.nix
@@ -13,16 +13,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "forgejo-cli";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromCodeberg {
     owner = "forgejo-contrib";
     repo = "forgejo-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6qouGcqNau2aCBPYpn0hFdm8QXL1WjZvnowK4aspe/Q=";
+    hash = "sha256-XG7IPfl5yLToDQ+P0JkMxhfqsGd3cGWYCNrmlFf9j2Y=";
   };
 
-  cargoHash = "sha256-UPDhPKC/x0ccfm7Df74PtCn+Zt9ShCxf9uB5TVaYV6Y=";
+  cargoHash = "sha256-+7WiOmYBjTMEsIGaqnMVTIHhzTpm8ObnljNXFnDazhI=";
 
   nativeBuildInputs = [
     pkg-config

From 3405842ff883b8dd290a9aca4ca1df110b48a728 Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun@sren.org>
Date: Wed, 15 Jul 2026 18:42:27 -0400
Subject: [PATCH 32/63] tinyauth: 5.0.7 -> 5.1.1

(cherry picked from commit a0e3766f7ba1bc43171dec55d24b4fecf7032201)
---
 pkgs/by-name/ti/tinyauth/package.nix | 62 ++++++++++++----------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ti/tinyauth/package.nix b/pkgs/by-name/ti/tinyauth/package.nix
index b70cf0f74a1c..82ef20f84070 100644
--- a/pkgs/by-name/ti/tinyauth/package.nix
+++ b/pkgs/by-name/ti/tinyauth/package.nix
@@ -3,23 +3,27 @@
   buildGoModule,
   fetchFromGitHub,
   stdenvNoCC,
-  bun,
+  nodejs-slim,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  pnpm_11,
+  fetchPnpmDeps,
   nixosTests,
   nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "tinyauth";
-  version = "5.0.7";
+  version = "5.1.1";
 
   src = fetchFromGitHub {
-    owner = "steveiliop56";
+    owner = "tinyauthapp";
     repo = "tinyauth";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VeII5jSNUJpGZgqons1o1fp6KXxDOBhSMciSqtQfaC4=";
+    hash = "sha256-leXqelsPCLixhxqJbL7aDgGIzj1KcZMnR/1UxRPa1bo=";
   };
 
-  vendorHash = "sha256-XP+kVfcDKWAvBdrvGjiTdWh7jNe6qiDsgVjPrFFPoDU=";
+  vendorHash = "sha256-rlMttXywppA39Vip6pIos4tY5434vvtN8dbhVn+S2Kg=";
 
   subPackages = [ "cmd/tinyauth" ];
 
@@ -27,8 +31,8 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/steveiliop56/tinyauth/internal/config.Version=v${finalAttrs.version}"
-    "-X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${finalAttrs.src.rev}"
+    "-X github.com/tinyauthapp/tinyauth/internal/model.Version=v${finalAttrs.version}"
+    "-X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${finalAttrs.src.rev}"
   ];
 
   preBuild = ''
@@ -38,46 +42,32 @@ buildGoModule (finalAttrs: {
   frontend = stdenvNoCC.mkDerivation {
     pname = "tinyauth-frontend";
     inherit (finalAttrs) version src;
-    sourceRoot = "${finalAttrs.src.name}/frontend";
-
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-      "GIT_PROXY_COMMAND"
-      "SOCKS_SERVER"
-    ];
 
     nativeBuildInputs = [
-      bun
+      nodejs-slim
+      pnpmConfigHook
+      pnpmBuildHook
+      pnpm_11
     ];
 
-    configurePhase = ''
-      runHook preConfigure
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      sourceRoot = "${finalAttrs.src.name}/frontend";
+      pnpm = pnpm_11;
+      fetcherVersion = 4;
+      hash = "sha256-WLPJ1ZH2mEoQKFa6F5TOmTfbcgN5lXKZZHHvgI4mMq4=";
+    };
 
-      bun install --no-progress --frozen-lockfile
-      substituteInPlace node_modules/.bin/{tsc,vite} \
-        --replace-fail "/usr/bin/env node" "${lib.getExe bun}"
-
-      runHook postConfigure
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      bun run build
-
-      runHook postBuild
-    '';
+    pnpmRoot = "frontend";
 
     installPhase = ''
       runHook preInstall
 
       mkdir -p $out/dist
-      cp -r dist $out
+      cp -r frontend/dist $out
 
       runHook postInstall
     '';
-
-    outputHashMode = "recursive";
-    outputHash = "sha256-FRACDa1akm+JnYIRwNXRcomzDIMCIAlJDbjMyS77sNA=";
   };
 
   passthru = {
@@ -95,8 +85,8 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Simple authentication middleware for web apps";
     homepage = "https://tinyauth.app";
-    changelog = "https://github.com/steveiliop56/tinyauth/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.gpl3Only;
+    changelog = "https://github.com/tinyauthapp/tinyauth/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
     mainProgram = "tinyauth";
     maintainers = with lib.maintainers; [
       shaunren

From a6d3d6964d90da8453b12898758c6dc362adbdbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 03:36:47 +0000
Subject: [PATCH 33/63] ghostfolio: 3.22.0 -> 3.29.0

(cherry picked from commit e3c72c88d3112ea78be9226a7938d6c2be4ce7e1)
---
 pkgs/by-name/gh/ghostfolio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 8e3553840b3f..19d8af496cb4 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "ghostfolio";
-  version = "3.22.0";
+  version = "3.29.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = finalAttrs.version;
-    hash = "sha256-zKXq6juvxaPJ7h/2HDzh7lREFj0ni5HsAyhEbZ09K3M=";
+    hash = "sha256-fmYE942D91beGxCnJ5Kc8fdLbsgu9/VWe+9Gd/dMYIs=";
     # 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;
@@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: {
     '';
   };
 
-  npmDepsHash = "sha256-r/LaDTd4TvoPll2w0It0cVOBniMnlZf1jg5mL9wII7I=";
+  npmDepsHash = "sha256-DqPCKW5axDToe0iboe9MF6ea4TNif3Oo5jOzWlMnQas=";
 
   postPatch = ''
     substituteInPlace replace.build.mjs \

From 5c146096fe466bc8f76e9214db3ab8a77a23ea8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 09:58:17 +0000
Subject: [PATCH 34/63] nezha-theme-user: 2.4.0 -> 2.4.2

(cherry picked from commit 80f00642e0cad742c1a855634ee7337919e9ddab)
---
 pkgs/by-name/ne/nezha-theme-user/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix
index ab249772459c..291081db0722 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-user/package.nix
@@ -13,13 +13,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "nezha-theme-user";
-  version = "2.4.0";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "hamster1963";
     repo = "nezha-dash-v2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ikrRkYrJnTRaBk3u6Ju0csRW9K3Udydh/JFTi/GxVOs=";
+    hash = "sha256-n1q9mjheW2J500mEPhBaGHuMAEVtddxXCyLC+Au/8Ts=";
   };
 
   postPatch = ''
@@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-5lzMFY+PYHSQTWSewfLaspgeRq5PwWnU0ZzHYPzSMwE=";
+    hash = "sha256-OPI4xMOJA5TJ1XAAFqawXPUQePgNKe2ES+g2MsIstFo=";
   };
   npmConfigHook = pnpmConfigHook;
 

From c8c8294c07aab5b4bdaeee901f9b9e4b0786e207 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 08:29:15 +0000
Subject: [PATCH 35/63] lockbook-desktop: 26.7.4 -> 26.7.16

(cherry picked from commit d2e3cbf2757bf60d21129239663ceb892f1ee3fc)
---
 pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index 977b507059fa..d68cd95826b9 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lockbook-desktop";
-  version = "26.7.4";
+  version = "26.7.16";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = finalAttrs.version;
-    hash = "sha256-gwpobBTugTTTtd/mWVoyiU0E/NjWCTfMnMF0reWLKrA=";
+    hash = "sha256-/aZNHeE0bfW5bYOFEboWUMIl0b4FbkdOKXxMEPUqJF0=";
   };
 
-  cargoHash = "sha256-EH3uIjz2M+Ytkx/gD0gwslUrDVPvm5+hwOGoDtAdblg=";
+  cargoHash = "sha256-1cbsmCHNEiN0qxSa+5v5I1/WpFuVgAWuNfMERFviSmU=";
 
   nativeBuildInputs = [
     pkg-config

From 051301cbb25b359f1a102c708a772dcc6b271df1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Jul 2026 22:16:33 +0000
Subject: [PATCH 36/63] freerdp: 3.29.0 -> 3.30.0

(cherry picked from commit ab1881b74ab9e694dd6ff2662c2c98cfde601b29)
---
 pkgs/by-name/fr/freerdp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index ec44e94242d8..f104a5949b54 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -70,13 +70,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.29.0";
+  version = "3.30.0";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     tag = finalAttrs.version;
-    hash = "sha256-LTRV1vRTMR8015iFXZIEjz6ApN5kg1+T2nGZWJ873zY=";
+    hash = "sha256-Fy7TB7cRHXB86deb86eg05Cwf9SHU0C/Qnfj5Ylmjug=";
   };
 
   postPatch = ''

From 40139b73b9316456340cc1e04c939920f508e3b0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 18 Jul 2026 15:01:46 -0400
Subject: [PATCH 37/63] forgejo-runner: 12.13.0 -> 12.13.1

Changelog: https://code.forgejo.org/forgejo/runner/releases/tag/v12.13.1
(cherry picked from commit 3ea33d855253089dc58e26880d7db45da37dde22)
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index ccd14b90f46f..dbe9e1dad928 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -55,14 +55,14 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "forgejo-runner";
-  version = "12.13.0";
+  version = "12.13.1";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wrHZ4vgWNw0tbcNpZesU5SoV2gqle1MJcPjj6lNMwOw=";
+    hash = "sha256-f2YVcb2bq1//A0SX1bfLLkGfp04REHgzg8o3dsN1Kh0=";
   };
 
   vendorHash = "sha256-du7fXehcxZ70Lsr5VCkz646G0Us/XwM4Sl98HXimoao=";

From 61292a1fbbdf44a6430d28a966a94f3d6fc959a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 08:53:23 +0000
Subject: [PATCH 38/63] pakku: 1.3.3 -> 1.5.0

(cherry picked from commit aef3427eef4b92c18c099489d0591ee80448c675)
---
 pkgs/by-name/pa/pakku/deps.json   | 40 +++++++++++++++++++++++++++----
 pkgs/by-name/pa/pakku/package.nix |  4 ++--
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pa/pakku/deps.json b/pkgs/by-name/pa/pakku/deps.json
index 5bc45841cef9..75d05b078a22 100644
--- a/pkgs/by-name/pa/pakku/deps.json
+++ b/pkgs/by-name/pa/pakku/deps.json
@@ -116,6 +116,10 @@
    "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=",
    "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs="
   },
+  "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.15.2": {
+   "module": "sha256-0Ga2zxP7At6QakypJq++2xeMezk1nY0IVjsJpO/Q6ak=",
+   "pom": "sha256-pet+cRIEiBVIUCiK/RgAUnciMxIrvVw+CkF46V+l5c8="
+  },
   "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": {
    "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=",
    "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=",
@@ -129,6 +133,9 @@
   "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": {
    "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw="
   },
+  "com/fasterxml/jackson/module#jackson-modules-base/2.15.2": {
+   "pom": "sha256-+yZ+dP9pfME6aGKUG0kboMwmvQcElfTROAsDuT9Z4C4="
+  },
   "com/fasterxml/jackson/module#jackson-modules-java8/2.15.2": {
    "pom": "sha256-ySmc8tVgUfC2f+PPsl95GF5xcTyAkON/4xjA3TpTgI8="
   },
@@ -398,6 +405,11 @@
   "com/sun/activation#all/1.2.1": {
    "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U="
   },
+  "com/unascribed#flexver-java/1.1.1": {
+   "jar": "sha256-nXzGYBryUAzV7nDqf1lqGqhH1LUQLUAf8nlXLDc9vZk=",
+   "module": "sha256-xCOalAnovlGsxQdNmpUCYApjvcAKNdbueFeh+hiOUJ4=",
+   "pom": "sha256-LWXDx852CPHiZWLd9arhpD9Ga8NiB5QZsJbJOimS1Cw="
+  },
   "commons-codec#commons-codec/1.11": {
    "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
    "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
@@ -814,12 +826,12 @@
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.3.202401111512-r": {
-   "pom": "sha256-h/d52RwFAmJDm6CAf856MyW22N1+hlZdC8WnEGpLnMk="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.4.202507202350-r": {
+   "pom": "sha256-ofTD23jt+2sRCmRKiSzCne6uUKwJD17tg/HEw52DhPw="
   },
-  "org/eclipse/jgit#org.eclipse.jgit/5.13.3.202401111512-r": {
-   "jar": "sha256-2st0wosIm8N4+MKh3NpREMIPUhJPWgIK7yaE1w738bs=",
-   "pom": "sha256-inan72s3SAx8/Uq8iDiX91KCUWeS/wt6qJnbJ/hXlt8="
+  "org/eclipse/jgit#org.eclipse.jgit/5.13.4.202507202350-r": {
+   "jar": "sha256-dN9VjyCw7PuqvnU77qhLdMS3BCtL/xyxxlQoKiPLG8U=",
+   "pom": "sha256-R6R5qzJlOREtb/xpV0BaLZyHqaXMYP3i2Q9FKISkdiA="
   },
   "org/freemarker#freemarker/2.3.32": {
    "jar": "sha256-BNZewb3mzqIONJXV5475ard02ZNkNIYdMlS9iOfpT5I=",
@@ -1195,6 +1207,24 @@
    "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=",
    "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.1": {
+   "jar": "sha256-rD9FbJ4lw/wBVC3CCGVdBYPNN7X3LDWFYme3S9FmSrY=",
+   "module": "sha256-1Vy3uqS9VxhXovsAlq2pCDkpDPbzlw3hyGo3SusjhYI=",
+   "pom": "sha256-TvSo5xgZYDxXlcn4ejrRwLktoq61ANQ7TdfkHn6EoYk="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.9.0": {
+   "module": "sha256-4jZL61QHILPBF5V4UzedSuIiBYrYj3OirHMCbINvg58=",
+   "pom": "sha256-6AjygQsda5Tejk3JcY31vTPuva2j/b8vfuz6/VaYK/0="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.1": {
+   "module": "sha256-AkvK55oMK20YsLqRTJ9d4UW7+8nckZ8nD4lbLj34cVU=",
+   "pom": "sha256-ZpLE67CEkFdBfJclBfYjCNOoV62m66JGnTM40HX6JXM="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.9.0": {
+   "jar": "sha256-ufBgNxh2X+n5O0oTkZitolTxHHvxjkjJlimjpzzigdE=",
+   "module": "sha256-Ol84cAsqTrKQ41B6Dj5PnMC9Y+cMyn8V6RHb83xPRMo=",
+   "pom": "sha256-5rSq4UN1DLG2TgOX1LltxhNbpqssM3OG31TfDZjN8SE="
+  },
   "org/jetbrains/kotlinx#kotlinx-datetime-jvm/0.6.1": {
    "jar": "sha256-vJSw/LRGR0LwLPVKPo2557FBoaBSyo3a9mKmCv+iFTA=",
    "module": "sha256-TD6ZN/gsqoqCxB/jzmCve4CsgIIV2JEpoAiRqh17G08=",
diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix
index 8b7556dc3cc2..fd14e03d28da 100644
--- a/pkgs/by-name/pa/pakku/package.nix
+++ b/pkgs/by-name/pa/pakku/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pakku";
-  version = "1.3.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "juraj-hrivnak";
     repo = "Pakku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iCBD9al7TbueG2kwkI6qzZT2Rixm1OanNBz1MuLapXI=";
+    hash = "sha256-80WXrokdknNc4Xk8IQtLei52ZCaDV44qNesQ6dhR4p0=";
   };
 
   gradleBuildTask = "jvmJar";

From e2ae50636540e41d54348203400b57a89e3b957c Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Sun, 19 Jul 2026 12:16:36 -0400
Subject: [PATCH 39/63] veilid: 0.5.6 -> 0.5.7

(cherry picked from commit 4add54119e13fc28400956015caebc06dd692aff)
---
 pkgs/by-name/ve/veilid/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 55674e3a1b11..71973bcba1d6 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "veilid";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = "veilid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SBFCfIYfOicbUviIZMBXbfW1CESguEFLge6ssmYqm+A=";
+    hash = "sha256-tl7K7yn+wdXlc3Gw4MbdCUY6vhI38hAuwdV1RfkORbQ=";
   };
 
-  cargoHash = "sha256-Rtk9ba/nwaL5oCsKZsFxCy3qUnq8vVrmllzYlgV0FDU=";
+  cargoHash = "sha256-a48+kCpsYjql+IGf3l0t4RXkthbc2mxqu9zCaeRPaR4=";
 
   nativeBuildInputs = [
     capnproto

From bf854334751c20a592d0c377e6bcef64c34536a6 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Mon, 13 Jul 2026 13:49:57 +0300
Subject: [PATCH 40/63] feishin: 1.13.0 -> 1.15.0

(cherry picked from commit aff80617db77df43ca189f01beab29b77a8526df)
---
 pkgs/by-name/fe/feishin/package.nix | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index ba20d7cc33bd..774e22e3ca14 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -4,11 +4,11 @@
   buildNpmPackage,
   fetchFromGitHub,
   electron_41,
-  dart-sass,
   mpv-unwrapped,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm_10,
+  pnpm_11,
+  nodejs-slim_latest,
   darwin,
   actool,
   copyDesktopItems,
@@ -18,16 +18,19 @@
 }:
 let
   pname = "feishin";
-  version = "1.13.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
     tag = "v${version}";
-    hash = "sha256-v6dWzEB1+IK4bHmDo8Rr5e0Xi3OWKcm+UPBmBiSfdZ0=";
+    hash = "sha256-Lu1vxZg8n+3zkvvJxyD/yw6RIfv1DHCuMdlSPxSc4cE=";
   };
 
   electron = electron_41;
+
+  # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
+  pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };
 in
 buildNpmPackage {
   inherit pname version;
@@ -43,18 +46,18 @@ buildNpmPackage {
   pnpmDeps = fetchPnpmDeps {
     inherit
       pname
+      pnpm
       version
       src
       ;
-    pnpm = pnpm_10;
-    fetcherVersion = 3;
-    hash = "sha256-zNOGJ24G0xcgsGK4DmbBm7d1PHTp7IJS+RTALGRtfDg=";
+    fetcherVersion = 4;
+    hash = "sha256-9uG0AxIBAmuIPywg3p9fFCXmRvM9zDLhWfluSLRnUXY=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   nativeBuildInputs = [
-    pnpm_10
+    pnpm
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && !webVersion) [ copyDesktopItems ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && !webVersion) [
@@ -68,15 +71,6 @@ buildNpmPackage {
       --replace-fail '"postinstall": "electron-builder install-app-deps",' ""
   '';
 
-  preBuild = ''
-    rm -r node_modules/.pnpm/sass-embedded-*
-
-    test -d node_modules/.pnpm/sass-embedded@*
-    dir="$(echo node_modules/.pnpm/sass-embedded@*)/node_modules/sass-embedded/dist/lib/src/vendor/dart-sass"
-    mkdir -p "$dir"
-    ln -s ${dart-sass}/bin/dart-sass "$dir"/sass
-  '';
-
   postBuild = lib.optionalString (!webVersion) ''
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist

From 8a132a9b43c4883c273235ea0675328fa36bbc8a Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sat, 18 Jul 2026 20:36:32 +0200
Subject: [PATCH 41/63] upiano: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
(cherry picked from commit 176a4e9bc335431cf70d005bf42667fe0cd7f52e)
---
 pkgs/by-name/up/upiano/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix
index fed28acd9e07..7119a508594d 100644
--- a/pkgs/by-name/up/upiano/package.nix
+++ b/pkgs/by-name/up/upiano/package.nix
@@ -39,7 +39,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Piano in your terminal";
     homepage = "https://github.com/eliasdorneles/upiano";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
     mainProgram = "upiano";
   };
 })

From bd539cf70c1dcc785153d071e2ade1e48cb39087 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 17:53:24 +0000
Subject: [PATCH 42/63] archon-lite: 9.3.172 -> 9.4.36

(cherry picked from commit f54df095479861765490319b51041fdb11ea8ae5)
---
 pkgs/by-name/ar/archon-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/archon-lite/package.nix b/pkgs/by-name/ar/archon-lite/package.nix
index d5177c4a810d..adc73facd7ad 100644
--- a/pkgs/by-name/ar/archon-lite/package.nix
+++ b/pkgs/by-name/ar/archon-lite/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "archon-lite";
-  version = "9.3.172";
+  version = "9.4.36";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${version}/archon-lite-v${version}.AppImage";
-    hash = "sha256-Jl1/40jtdG9acb2SSef4G91hs/b1UdOp6gPnoGPnQ60=";
+    hash = "sha256-th48nSDIi2iugtiqjgkI7/QZtBq+BRQjRs1pKweDArI=";
   };
 
   extracted = appimageTools.extractType2 { inherit pname version src; };

From 77c668ae2db89f7bfd1eee5b6790f5fab036a168 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 14:27:50 +0200
Subject: [PATCH 43/63] tilt: 0.37.3 -> 0.37.5

https://github.com/tilt-dev/tilt/releases/tag/v0.37.4
https://github.com/tilt-dev/tilt/releases/tag/v0.37.5

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
(cherry picked from commit 50a76acaf9e42c4a6e3c1f6abb9cd05f77128598)
---
 pkgs/by-name/ti/tilt/assets.nix  | 2 +-
 pkgs/by-name/ti/tilt/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
index a167d1a57773..61b5cfccc096 100644
--- a/pkgs/by-name/ti/tilt/assets.nix
+++ b/pkgs/by-name/ti/tilt/assets.nix
@@ -77,7 +77,7 @@ stdenvNoCC.mkDerivation {
     dontInstall = true;
 
     outputHashAlgo = "sha256";
-    outputHash = "sha256-3P42xJ1tBVRpe1hNDy4ax9bUmiaPnSZolTGmsKpzYUA=";
+    outputHash = "sha256-nPbIFUBbbgaFpKBky5FXFBopZd4IxvTGbYXfC3SfaUE=";
     outputHashMode = "recursive";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index 0a2872f88f13..c041b515d910 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -9,13 +9,13 @@ let
       running in development environment and try to serve assets from the
       source tree, which is not there once build completes.
     */
-    version = "0.37.3";
+    version = "0.37.5";
 
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
       tag = "v${version}";
-      hash = "sha256-gJQ9ECGsJ4VBASxmNewOhA3zLl7YjMm5GRDuAefmFYE=";
+      hash = "sha256-aa5ZPheqRZDgcIuuI/tXRHxMtB2RH0yITwvA2SMN9Ec=";
     };
   };
 

From bfdfcd493c95e86298b11b7ba32a4d054ba0b63c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 10 Jul 2026 16:32:27 -0500
Subject: [PATCH 44/63] vigra: move args out of top-level

(cherry picked from commit d0fd6f83bbd6b5f23899dbfd3ab9226741d3965b)
---
 pkgs/development/libraries/vigra/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 14760defa896..0ecdf55075c5 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -32,11 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     boost
     fftw
     fftwSinglePrec
-    hdf5
+    (hdf5.override {
+      apiVersion = "v110";
+    })
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3eb0e538a622..7d91d1df9a8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7145,9 +7145,7 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  vigra = callPackage ../development/libraries/vigra {
-    hdf5 = hdf5.override { apiVersion = "v110"; };
-  };
+  vigra = callPackage ../development/libraries/vigra { };
 
   vte-gtk4 = vte.override {
     gtkVersion = "4";

From d1f866861eb6b30d6019bb507e1282f91328491f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 10 Jul 2026 16:54:22 -0500
Subject: [PATCH 45/63] vigra: add strictDeps and structuredAttrs

(cherry picked from commit b80bfae8d11a9d91f282de7763d011976dd302de)
---
 pkgs/development/libraries/vigra/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 0ecdf55075c5..c095fbf53c01 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-pknZHHIIhjfOxdp+qCOOGvo0W5ByTHXRiIQzzN7Z6M4=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From a54d4d7aecfc27839432e10184a1bc3a069da3d8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 10 Jul 2026 16:58:25 -0500
Subject: [PATCH 46/63] vigra: migrate to by-bane

(cherry picked from commit a8c1bfc86cd7d2a8a76b068b5f623bd2a19472ea)
---
 .../vigra/default.nix => by-name/vi/vigra/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/vigra/default.nix => by-name/vi/vigra/package.nix} (100%)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/by-name/vi/vigra/package.nix
similarity index 100%
rename from pkgs/development/libraries/vigra/default.nix
rename to pkgs/by-name/vi/vigra/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d91d1df9a8d..a1f287dde8c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7145,8 +7145,6 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  vigra = callPackage ../development/libraries/vigra { };
-
   vte-gtk4 = vte.override {
     gtkVersion = "4";
   };

From 5583eb2649d8475c4cc04706e3a59524490790ec Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sun, 19 Jul 2026 20:14:48 +0200
Subject: [PATCH 47/63] tml: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
(cherry picked from commit 83d207ac9fceb26f2a3e2aea050537a10cfada4f)
---
 pkgs/by-name/tm/tml/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index 41700c789543..72aa80545ccc 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -28,6 +28,8 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/liamg/tml";
     changelog = "https://github.com/liamg/tml/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.unlicense;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
   };
 })

From 59698cc47f67b5a0910a6e9c945a83823388e8bd Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sun, 19 Jul 2026 20:20:15 +0200
Subject: [PATCH 48/63] unimap: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
(cherry picked from commit e0ad052d15ee915a6a5e1d25b8f383293048feb9)
---
 pkgs/by-name/un/unimap/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index a97d7f501f2d..d02ed9f5f80f 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -51,7 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/Edu4rdSHL/unimap";
     changelog = "https://github.com/Edu4rdSHL/unimap/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
     mainProgram = "unimap";
   };
 })

From 4d590af40e5c8c114df13231801d25852ba5b215 Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sun, 19 Jul 2026 20:28:38 +0200
Subject: [PATCH 49/63] timelimit: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
(cherry picked from commit 3435825c66ec487a9a2f727dce41627766dea07a)
---
 pkgs/by-name/ti/timelimit/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/timelimit/package.nix b/pkgs/by-name/ti/timelimit/package.nix
index b80ff791acc0..f68acb32c985 100644
--- a/pkgs/by-name/ti/timelimit/package.nix
+++ b/pkgs/by-name/ti/timelimit/package.nix
@@ -31,7 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://devel.ringlet.net/sysutils/timelimit/";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
     mainProgram = "timelimit";
   };
 })

From e87720ae43c38c40274849e34e1bd51a6474c736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C3=B6lfchen?= <w-lfchen@posteo.net>
Date: Sun, 19 Jul 2026 20:44:24 +0200
Subject: [PATCH 50/63] eww: remove rustc bootstrap

eww has not been on nightly for over two years now, this is not needed
anymore

(cherry picked from commit 58fee7f4f7524452cf0a04153c66c0b77b0dab40)
---
 pkgs/by-name/ew/eww/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 53fc9eea0f50..3b60609fb638 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -46,9 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoTestFlags = finalAttrs.cargoBuildFlags;
 
-  # requires unstable rust features
-  env.RUSTC_BOOTSTRAP = 1;
-
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd eww \
       --bash <($out/bin/eww shell-completions --shell bash) \

From a9855787eea2f8cb87b225a07c35ccd36aee43fe Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Sun, 19 Jul 2026 14:51:17 +0200
Subject: [PATCH 51/63] invidious: patch CVE-2026-58447

https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45

https://tracker.security.nixos.org/suggestions/by-id/10419/

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
(cherry picked from commit 4c54c8b8794c7a32970827d34d61974464a03bcf)
---
 pkgs/by-name/in/invidious/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 589f0e55d209..57d6250fee35 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -3,6 +3,7 @@
   callPackage,
   crystal,
   fetchFromGitHub,
+  fetchpatch2,
   librsvg,
   pkg-config,
   libxml2,
@@ -41,6 +42,15 @@ crystal.buildCrystalPackage rec {
     inherit (versions.invidious) hash;
   };
 
+  patches = [
+    # Remove with the first release containing this commit.
+    (fetchpatch2 {
+      name = "CVE-2026-58447.patch";
+      url = "https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45.patch?full_index=1";
+      hash = "sha256-0pf6eu0ckQ2gYHLr2tEDy+1dvAhVjepG26kuxuHbZl8=";
+    })
+  ];
+
   postPatch =
     let
       # Replacing by the value (templates) of the variables ensures that building

From b8beb48551e711e7a9da880737742b6b033f6541 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 18 Jul 2026 20:47:32 +0200
Subject: [PATCH 52/63] pnpm: 11.13.1 -> 11.15.0

https://github.com/pnpm/pnpm/releases/tag/v11.14.0
https://github.com/pnpm/pnpm/releases/tag/v11.15.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 4c06da3cb826720116e4cd82cf9e8b4e02441246)
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 2a5b23f83b81..1f286dd62ab8 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -53,8 +53,8 @@ let
       hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4=";
     };
     "11" = {
-      version = "11.13.1";
-      hash = "sha256-EAErV9I7lnO8U0Fo/1axrGVbpKJzf/N/bZ0ZpVFEr6o=";
+      version = "11.15.0";
+      hash = "sha256-dy+OAPcZr7viJQJxfPl0V4gEYw0C51frPeu8CKD4+Do=";
     };
   };
 

From b281320184f5b4a8ca4ed9c2fcd02b44464e6227 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Sun, 28 Jun 2026 18:29:21 +0100
Subject: [PATCH 53/63] texlive: make overlaying texlive.pkgs possible

(cherry picked from commit 3a768809c6b274da633246a4735ff9e63c200cd4)
---
 .../typesetting/tex/texlive/build-tex-env.nix | 18 ++++++------
 .../tex/texlive/combine-wrapper.nix           |  4 +--
 .../tools/typesetting/tex/texlive/default.nix | 16 ++++++-----
 .../tex/texlive/tlpdb-overrides.nix           | 28 +++++++++----------
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index dc98b0a64297..7cb7b5668850 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -1,6 +1,6 @@
 {
   # texlive package set
-  tl,
+  pkgs,
 
   tlpdbVersion,
 
@@ -55,7 +55,7 @@ lib.fix (
         # resolve dependencies of the packages that affect the runtime
         all =
           let
-            packages = ensurePkgSets (finalAttrs.passthru.requiredTeXPackages tl);
+            packages = ensurePkgSets (finalAttrs.passthru.requiredTeXPackages pkgs);
             runtime = builtins.partition (
               p:
               p.outputSpecified or false
@@ -72,7 +72,7 @@ lib.fix (
               inherit p;
               tlDeps =
                 if p ? tlDeps then
-                  (if builtins.isFunction p.tlDeps then p.tlDeps tl else ensurePkgSets p.tlDeps)
+                  (if builtins.isFunction p.tlDeps then p.tlDeps pkgs else ensurePkgSets p.tlDeps)
                 else
                   [ ];
             };
@@ -214,13 +214,13 @@ lib.fix (
 
         # mktexlsr
         nativeBuildInputs = [
-          tl.texlive-scripts # for mktexlsr.pl with --sort support
+          pkgs.texlive-scripts # for mktexlsr.pl with --sort support
           perl
         ];
 
         postBuild = # generate ls-R database
           ''
-            perl ${tl.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out"
+            perl ${pkgs.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out"
           '';
       };
 
@@ -269,7 +269,7 @@ lib.fix (
           + lib.concatMapStringsSep "\n - " (
             p:
             p.pname + (lib.optionalString (p.outputSpecified or false) " (${p.tlOutputName or p.outputName})")
-          ) (finalAttrs.passthru.requiredTeXPackages tl);
+          ) (finalAttrs.passthru.requiredTeXPackages pkgs);
       };
 
       # other outputs
@@ -479,9 +479,9 @@ lib.fix (
         nativeBuildInputs = [
           makeWrapper
           libfaketime
-          tl."texlive.infra" # mktexlsr
-          tl.texlive-scripts # fmtutil, updmap
-          tl.texlive-scripts-extra # texlinks
+          pkgs."texlive.infra" # mktexlsr
+          pkgs.texlive-scripts # fmtutil, updmap
+          pkgs.texlive-scripts-extra # texlinks
           perl
         ];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
index e0ed2bc8f1fa..2117f2a5d41f 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
@@ -2,7 +2,7 @@
 {
   lib,
   toTLPkgList,
-  tl,
+  pkgs,
   buildTeXEnv,
 }:
 args@{
@@ -49,7 +49,7 @@ let
         operator =
           { pkg, ... }:
           pkgListToSets (
-            if pkg ? tlDeps then if builtins.isFunction pkg.tlDeps then pkg.tlDeps tl else pkg.tlDeps else [ ]
+            if pkg ? tlDeps then if builtins.isFunction pkg.tlDeps then pkg.tlDeps pkgs else pkg.tlDeps else [ ]
           );
       }
     );
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 092d41f98e5e..397ac2a9e8bf 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -46,6 +46,7 @@
   nixfmt,
   luajit,
   texinfo,
+  texlive,
   # for bin.nix
   gnum4,
   jdk_headless,
@@ -73,7 +74,6 @@
   unzip,
   fetchFromGitHub,
   buildPackages,
-  texlive,
   zlib,
   libiconv,
   libpng,
@@ -99,6 +99,7 @@ let
   overriddenTlpdb =
     let
       overrides = import ./tlpdb-overrides.nix {
+        inherit (texlive) pkgs;
         inherit
           stdenv
           lib
@@ -106,7 +107,6 @@ let
           bin
           tlpdb
           tlpdbxz
-          tl
           installShellFiles
           coreutils
           findutils
@@ -226,13 +226,15 @@ let
         inherit mirrors pname;
         fixedHashes = fixedHashes."${pname}-${toString revision}${extraRevision}" or { };
       }
-      // lib.optionalAttrs (args ? deps) { deps = map (n: tl.${n} or bin.${n}) (args.deps or [ ]); }
+      // lib.optionalAttrs (args ? deps) {
+        deps = map (n: texlive.pkgs.${n} or bin.${n}) (args.deps or [ ]);
+      }
     )
   ) overriddenTlpdb;
 
   # function for creating a working environment
   buildTeXEnv = import ./build-tex-env.nix {
-    inherit tl;
+    inherit (texlive) pkgs;
     inherit tlpdbVersion;
     ghostscript = ghostscript_headless;
     inherit
@@ -260,7 +262,7 @@ let
       drvWithoutDeps = removeAttrs drv [ "tlDeps" ];
       drvWithDeps =
         if (drv ? tlDeps) then
-          drv // { tlDeps = if builtins.isFunction drv.tlDeps then drv.tlDeps tl else drv.tlDeps; }
+          drv // { tlDeps = if builtins.isFunction drv.tlDeps then drv.tlDeps texlive.pkgs else drv.tlDeps; }
         else
           drv;
     in
@@ -320,10 +322,10 @@ let
   # function for creating a working environment from a set of TL packages
   # now a legacy wrapper around buildTeXEnv
   combine = import ./combine-wrapper.nix {
+    inherit (texlive) pkgs;
     inherit
       buildTeXEnv
       lib
-      tl
       toTLPkgList
       ;
   };
@@ -667,7 +669,7 @@ allPkgLists
     bin
     // {
       # for backward compatibility
-      latexindent = tl.latexindent;
+      latexindent = texlive.pkgs.latexindent;
     };
 
   combine =
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
index 2eb1eec2366f..58131679d0a8 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
@@ -5,7 +5,7 @@
   tlpdb,
   bin,
   tlpdbxz,
-  tl,
+  pkgs,
   installShellFiles,
   coreutils,
   findutils,
@@ -253,9 +253,9 @@ lib.recursiveUpdate orig rec {
 
   context.binlinks = {
     context = "luametatex";
-    "context.lua" = tl.context.tex + "/scripts/context/lua/context.lua";
+    "context.lua" = pkgs.context.tex + "/scripts/context/lua/context.lua";
     mtxrun = "luametatex";
-    "mtxrun.lua" = tl.context.tex + "/scripts/context/lua/mtxrun.lua";
+    "mtxrun.lua" = pkgs.context.tex + "/scripts/context/lua/mtxrun.lua";
   };
 
   dvipdfmx.binlinks = {
@@ -269,10 +269,10 @@ lib.recursiveUpdate orig rec {
 
   # TODO: handle symlinks in bin.core
   ptex.binlinks = {
-    pbibtex = tl.uptex.out + "/bin/upbibtex";
-    pdvitype = tl.uptex.out + "/bin/updvitype";
-    ppltotf = tl.uptex.out + "/bin/uppltotf";
-    ptftopl = tl.uptex.out + "/bin/uptftopl";
+    pbibtex = pkgs.uptex.out + "/bin/upbibtex";
+    pdvitype = pkgs.uptex.out + "/bin/updvitype";
+    ppltotf = pkgs.uptex.out + "/bin/uppltotf";
+    ptftopl = pkgs.uptex.out + "/bin/uptftopl";
   };
 
   texdef.binlinks = {
@@ -281,7 +281,7 @@ lib.recursiveUpdate orig rec {
 
   texlive-scripts.binlinks = {
     mktexfmt = "fmtutil";
-    texhash = tl."texlive.infra".out + "/bin/mktexlsr";
+    texhash = pkgs."texlive.infra".out + "/bin/mktexlsr";
   };
 
   texlive-scripts-extra.binlinks = {
@@ -309,7 +309,7 @@ lib.recursiveUpdate orig rec {
   '';
 
   context-legacy.postFixup = ''
-    sed -i 's!File.dirname(\$0)!'"'"'${tl.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/*
+    sed -i 's!File.dirname(\$0)!'"'"'${pkgs.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/*
   '';
 
   cyrillic-bin.postFixup = ''
@@ -476,7 +476,7 @@ lib.recursiveUpdate orig rec {
 
   # find files in source container, fix incompatibilities with snobol4
   texaccents.postFixup = ''
-    sed -i '1s!$! -I${tl.texaccents.texsource}/source/support/texaccents!' "$out"/bin/*
+    sed -i '1s!$! -I${pkgs.texaccents.texsource}/source/support/texaccents!' "$out"/bin/*
   '';
   texaccents.postUnpack = ''
     if [[ -f "$out"/source/support/texaccents/grepl.inc ]] ; then
@@ -586,7 +586,7 @@ lib.recursiveUpdate orig rec {
         mkdir -p support/texdoc
         touch support/texdoc/NEWS
 
-        TEXMFCNF="${tl.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \
+        TEXMFCNF="${pkgs.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \
           "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \
           -c texlive_tlpdb=texlive.tlpdb -lM texdoc
 
@@ -596,7 +596,7 @@ lib.recursiveUpdate orig rec {
 
     # install zsh completion
     postFixup = ''
-      TEXMFCNF="${tl.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \
+      TEXMFCNF="${pkgs.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \
         texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc
       installShellCompletion --zsh "$TMPDIR"/_texdoc
     '';
@@ -618,7 +618,7 @@ lib.recursiveUpdate orig rec {
       coreutils
       gnused
       gnupg
-      tl.kpathsea
+      pkgs.kpathsea
       (perl.withPackages (ps: with ps; [ Tk ]))
     ];
 
@@ -631,7 +631,7 @@ lib.recursiveUpdate orig rec {
         lib.makeBinPath [
           coreutils
           gnused
-          tl.kpathsea
+          pkgs.kpathsea
         ]
       }''${PATH:+:$PATH}"' "$out"/bin/mktexlsr
     '';

From bf9a8699b745a4049fa1952c0cf3998b28c0b082 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 03:24:07 +0000
Subject: [PATCH 54/63] unityhub: 3.19.1 -> 3.19.5

(cherry picked from commit 39425bc3e82422198b3d46d98e6edbff00082110)
---
 pkgs/by-name/un/unityhub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index 71388456cc17..0574f1af4821 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.19.1";
+  version = "3.19.5";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb";
-    hash = "sha256-PoWjyHBDsJPrGUBuTB2yXdLPu2gxrGn68flpy7fxC7Q=";
+    hash = "sha256-WltXrcnOIJMcQVTFf/3tCPP/onQyhv3xTJ563WshJUA=";
   };
 
   nativeBuildInputs = [

From 03ec5fe9504ae0e316e7d1d9e1e57d4dab88ab96 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Jul 2026 10:04:15 +0200
Subject: [PATCH 55/63] =?UTF-8?q?ocamlPackages.resource-pooling:=201.2=20?=
 =?UTF-8?q?=E2=86=92=201.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8403e336442f6806f683223b2ef00ac0020197bb)
---
 .../ocaml-modules/resource-pooling/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/pkgs/development/ocaml-modules/resource-pooling/default.nix
index aef730c92adf..92d6749a65d0 100644
--- a/pkgs/development/ocaml-modules/resource-pooling/default.nix
+++ b/pkgs/development/ocaml-modules/resource-pooling/default.nix
@@ -2,28 +2,30 @@
   lib,
   fetchFromGitHub,
   buildDunePackage,
-  lwt_log,
+  logs,
+  lwt,
 }:
 
 buildDunePackage (finalAttrs: {
-  version = "1.2";
+  version = "1.3";
   pname = "resource-pooling";
 
-  minimalOCamlVersion = "4.06";
-
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "resource-pooling";
-    rev = finalAttrs.version;
-    sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w=";
+    tag = finalAttrs.version;
+    hash = "sha256-DkuFBPobl0HJ/n8N9u086oxiHe8s/KiwQ5pR5n8oKLc=";
   };
 
-  propagatedBuildInputs = [ lwt_log ];
+  propagatedBuildInputs = [
+    logs
+    lwt
+  ];
 
   doCheck = true;
 
   meta = {
-    inherit (finalAttrs.src.meta) homepage;
+    homepage = "https://github.com/ocsigen/resource-pooling/";
     description = "Library for pooling resources like connections, threads, or similar";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];

From 318296b916f35ec52ba7a358259bec09f2674468 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Jul 2026 11:02:37 +0200
Subject: [PATCH 56/63] =?UTF-8?q?ocamlPackages.melange:=207.0.0=20?=
 =?UTF-8?q?=E2=86=92=207.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 161281cef79a51e06b3713f9a55109697adfc763)
---
 pkgs/development/tools/ocaml/melange/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/ocaml/melange/default.nix b/pkgs/development/tools/ocaml/melange/default.nix
index ded48ecac77b..72bfbb821953 100644
--- a/pkgs/development/tools/ocaml/melange/default.nix
+++ b/pkgs/development/tools/ocaml/melange/default.nix
@@ -23,18 +23,18 @@ let
   versionHash =
     if lib.versionAtLeast ocaml.version "5.5" then
       {
-        version = "7.0.0-55";
-        hash = "sha256:f71d2910599c230506efe01f43e02d16d4468fdaea34b537e9e3dfd7383cdf56";
+        version = "7.0.1-55";
+        hash = "sha256:8377c0860da82528ebde16a0133f270c1a03de35036bd44bbd8cfb87070a7afb";
       }
     else if lib.versionAtLeast ocaml.version "5.4" then
       {
-        version = "7.0.0-54";
-        hash = "sha256:cb78172b329c1a0a1c120801d2b915c03c83d2027014ba88416e7cafc1251a7c";
+        version = "7.0.1-54";
+        hash = "sha256:49bf9d3dd10d0d7f58abe6755a40c246d36b5fbf6b5e189f2c634c47a9de7f33";
       }
     else if lib.versionAtLeast ocaml.version "5.3" then
       {
-        version = "7.0.0-53";
-        hash = "sha256:2b3d94a770d1ce7d9cf43a83c1e61e176b0a13b7472c166bb6856121b5bd6e64";
+        version = "7.0.1-53";
+        hash = "sha256:25177453269467832be7b6416f1104132265a3309b9098e6b5185b9c0df05150";
       }
     else if lib.versionAtLeast ocaml.version "5.2" then
       {

From d9c320d9a8b48408f11640384874aedcf0d1b4d6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Jul 2026 11:12:02 +0200
Subject: [PATCH 57/63] =?UTF-8?q?coqPackages.coq-hammer:=201.3.2=20?=
 =?UTF-8?q?=E2=86=92=201.3.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 188416183130c83cf1613a003ac7e5687abe17c0)
---
 pkgs/development/coq-modules/coq-hammer/tactics.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/coq-hammer/tactics.nix b/pkgs/development/coq-modules/coq-hammer/tactics.nix
index 873500147fba..92718c3f080d 100644
--- a/pkgs/development/coq-modules/coq-hammer/tactics.nix
+++ b/pkgs/development/coq-modules/coq-hammer/tactics.nix
@@ -13,7 +13,8 @@ let
   defaultVersion =
 
     lib.switch coq.coq-version [
-      (case "9.1" "1.3.2+9.1")
+      (case "9.2" "1.3.3+9.2")
+      (case "9.1" "1.3.3+9.1")
       (case "9.0" "1.3.2+9.0")
       (case "8.20" "1.3.2+8.20")
       (case "8.19" "1.3.2+8.19")
@@ -23,6 +24,8 @@ let
     ] null;
 
   release = {
+    "1.3.3+9.2".hash = "sha256-2KE0mXpGTvoJXLoWsDTHKGrXKF0y8XEUSCXUQ4q+0YA=";
+    "1.3.3+9.1".hash = "sha256-iDOZii/JMXqtVGvuh3I1R4YxjqWKcAwCLWTPYca2Dik=";
     "1.3.2+9.1".sha256 = "sha256-tf+Hrfv/ZrLXryTjJchvLfydxzjkXB2hbL7P280Clzw=";
     "1.3.2+9.0".sha256 = "sha256-/UHtK9fjpHTbra4/Cnsjt8fg1fvxx7U6kGjQPm15NwM=";
     "1.3.2+8.20".sha256 = "sha256-RuX2aInSjwebs/aEOoisNxqcIPqDA2kWehN9tFYqOx4=";

From 0a2a2981454e24039a8d19606345903af5459a7a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 16 Jul 2026 13:30:54 +0200
Subject: [PATCH 58/63] =?UTF-8?q?jasmin-compiler:=202026.03.1=20=E2=86=92?=
 =?UTF-8?q?=202026.03.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 07b3793e8c1ea33d7b843bf09dc3e252af6ec441)
---
 pkgs/by-name/ja/jasmin-compiler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
index acf734393ace..cbf548afa515 100644
--- a/pkgs/by-name/ja/jasmin-compiler/package.nix
+++ b/pkgs/by-name/ja/jasmin-compiler/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jasmin-compiler";
-  version = "2026.03.1";
+  version = "2026.03.2";
 
   src = fetchurl {
     url = "https://github.com/jasmin-lang/jasmin/releases/download/v${finalAttrs.version}/jasmin-compiler-v${finalAttrs.version}.tar.bz2";
-    hash = "sha256-eOn5KWNAPx7Z+VMm8mclUyxDlW8Q/MR9EayUxmojb1I=";
+    hash = "sha256-vGUy7SefQaq2xzxlyNfoay54gBqIDbQRp+vSN1V0Lc4=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From aba7b60b5e40a6e7c78d540da9d24d97efe06439 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 23:51:26 +0000
Subject: [PATCH 59/63] vim: 9.2.0389 -> 9.2.0541

(cherry picked from commit fea17e2a81c81a3a8141d23f4dc306d246db9487)
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 05ac73b9f13e..71848004202f 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -4,7 +4,7 @@
   stdenv,
 }:
 rec {
-  version = "9.2.0389";
+  version = "9.2.0541";
 
   outputs = [
     "out"
@@ -15,7 +15,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-shhdJn1bPJ/68a54UZMn1fla7P4tjVUN4DGLbx3ohOg=";
+    hash = "sha256-M2vdIAM3P2MZdcMvFX/3/fixliTosR06nvPIX7NXFNo=";
   };
 
   enableParallelBuilding = true;

From 8fa29ee0119ff9c42a7ec2b88e805cd6eb04a48c Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 19 Jul 2026 20:46:01 +0000
Subject: [PATCH 60/63] linux_xanmod: 6.18.38 -> 6.18.39

- Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.39-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.18.38-xanmod1..6.18.39-xanmod1?from_project_id=51590166

(cherry picked from commit 91ed43bf8158dbc5eb38854ad7f031bf116a000f)
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 1267c15608e5..634b614c97f6 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.18.38";
-      hash = "sha256-PJq69EQXiOJKgQnegxsEcJqAaL10G542Joh5dBrZN0I=";
+      version = "6.18.39";
+      hash = "sha256-Kg2p8MPTQT46nTGw0rP3SMS4BOnuBMXL8zertaC9Wcs=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From b1835d47157f77c93eaa408aa70c3de27b06a944 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 19 Jul 2026 20:48:22 +0000
Subject: [PATCH 61/63] linux_xanmod_latest: 7.1.3 -> 7.1.4

- Changelog: https://dl.xanmod.org/changelog/7.1/ChangeLog-7.1.4-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/7.1.3-xanmod1..7.1.4-xanmod1?from_project_id=51590166

(cherry picked from commit 86542bc61d714352aa0cd599f1d03173cb108dde)
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 634b614c97f6..23c6d7d8426b 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "7.1.3";
-      hash = "sha256-EvxKUWDp0KAKhYO4rZKKx22RCGOimzPm5epchME/pJ8=";
+      version = "7.1.4";
+      hash = "sha256-jHYReidaX4aufcpTeWxr/Lu0+W9yHL7SpF7mgjDSyxY=";
     };
   };
 

From 41390c904c820e6210dbccfed52060d14d64f134 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Fri, 17 Jul 2026 09:08:29 +0200
Subject: [PATCH 62/63] freetube: 0.24.1 -> 0.25.0

Changelog:
https://github.com/FreeTubeApp/FreeTube/releases/tag/v0.25.0-beta
Diff:
https://github.com/FreeTubeApp/FreeTube/compare/v0.24.1-beta...v0.25.0-beta
(cherry picked from commit 6dfe0a890fb281d8d424816de60caeff7bc55f4d)
---
 pkgs/by-name/fr/freetube/package.nix | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index 89da9140443b..efe62d5ca082 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -2,13 +2,14 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  fetchYarnDeps,
+  fetchPnpmDeps,
   replaceVars,
   makeDesktopItem,
 
   nodejs,
-  yarnConfigHook,
-  yarnBuildHook,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  pnpm_10,
   makeShellWrapper,
   copyDesktopItems,
   electron,
@@ -17,18 +18,22 @@
 }:
 let
   description = "Open Source YouTube app for privacy";
+  pnpm = pnpm_10;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.24.1";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-oo5ozdP3d82jY8OOYrt568MoSfPmwBoitdtgESiRMlE=";
+    hash = "sha256-oXa+3BXLVDTaLUzt0imgTtZ4/NywibFzul/y0wymnWk=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   # Darwin requires writable Electron dist
   postUnpack =
     if stdenvNoCC.hostPlatform.isDarwin then
@@ -48,15 +53,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ./targets.patch
   ];
 
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-9rO/XYfOf1TEQOpb5clCfdTiuDeynpnk6L4WpcIIWGk=";
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-xHlxmeMtMd9/ImheeMH1K22MC0zmIzzgAHXzK+tLnQc=";
   };
 
   nativeBuildInputs = [
     nodejs
-    yarnConfigHook
-    yarnBuildHook
+    pnpmConfigHook
+    pnpmBuildHook
+    pnpm
     makeShellWrapper
     copyDesktopItems
   ];

From 28c3a6c127100c7316446042dc4466051bc2f84e Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Mon, 20 Jul 2026 10:28:32 +0300
Subject: [PATCH 63/63] feishin: 1.15.0 -> 1.15.1

(cherry picked from commit 53adcb3bfcfd87be7038cb874e802449eac9c8c4)
---
 pkgs/by-name/fe/feishin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 774e22e3ca14..0ecd436e621c 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -18,13 +18,13 @@
 }:
 let
   pname = "feishin";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
     tag = "v${version}";
-    hash = "sha256-Lu1vxZg8n+3zkvvJxyD/yw6RIfv1DHCuMdlSPxSc4cE=";
+    hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw=";
   };
 
   electron = electron_41;