From f3a062f38fa84802d05149fdd8e3c1db141d9c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 17:02:00 +0000
Subject: [PATCH 01/42] python3Packages.opensfm: odm-4-unstable-2026-07-01 ->
 odm-4-unstable-2026-07-13

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

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index c1b4583a80c7..e26fdaeddaf2 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -53,15 +53,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opensfm";
-  version = "odm-4-unstable-2026-07-01";
+  version = "odm-4-unstable-2026-07-13";
   pyproject = true;
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mapillary";
     repo = "OpenSfM";
-    rev = "a677b6f0648ff3caf439aebbe9aad0ca8abc175b";
-    hash = "sha256-Bxpfaj87N2QxP/AczpP3fOl6G8ciMJq5jaaIn7oGR9g=";
+    rev = "238744cdf3b5d50149c50d136a87f7fea25ad5cd";
+    hash = "sha256-3T9wjuuN5AjM/MtSo3xGoHJcvXOI8Keyxcqv7BQavlw=";
   };
 
   patches = [

From 09058f4d2844723d7791fcc83f7480d4b2b61102 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 13 Jul 2026 23:25:30 -0400
Subject: [PATCH 02/42] prismlauncher: 11.0.2 -> 11.0.3

Diff: https://github.com/PrismLauncher/PrismLauncher/compare/11.0.2...11.0.3

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

diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index ded8fff6818d..b5ffa065ab24 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prismlauncher-unwrapped";
-  version = "11.0.2";
+  version = "11.0.3";
 
   src = fetchFromGitHub {
     owner = "PrismLauncher";
     repo = "PrismLauncher";
     tag = finalAttrs.version;
-    hash = "sha256-GvAfrZxQSlBnCJ59nvK87jDTVo60D8n25K42SokE1q8=";
+    hash = "sha256-0o31pLKnYY0mulLrZKzZtaTPzCviGsgCnEcBt0Y/aG4=";
   };
 
   postUnpack = ''

From 9a5ac23baa06068eff796c79ddf26853c8acae5a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 14 Jul 2026 17:03:12 +0200
Subject: [PATCH 03/42] python3Packages.opensfm: odm-4-unstable-2026-07-13 ->
 0.5.1-unstable-2026-07-13

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

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index e26fdaeddaf2..ce6e1ae10513 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -53,7 +53,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opensfm";
-  version = "odm-4-unstable-2026-07-13";
+  version = "0.5.1-unstable-2026-07-13";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -187,7 +187,10 @@ buildPythonPackage (finalAttrs: {
     );
 
     updateScript = nix-update-script {
-      extraArgs = [ "--version=branch" ];
+      extraArgs = [
+        "--version=branch"
+        "--version-regex=v(.*)"
+      ];
     };
   };
 

From 6d63426db06913d90b267de2960055f378d1f89a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:43:34 +0200
Subject: [PATCH 04/42] python3Packages.lazr-delegates: pin setuptools

Following upstream.

Link: https://git.launchpad.net/lazr.delegates/commit/?id=7d44413b9e14085b53d462fc842760853ef5042e
---
 pkgs/development/python-modules/lazr-delegates/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lazr-delegates/default.nix b/pkgs/development/python-modules/lazr-delegates/default.nix
index a2a922b8ddf2..6bc463c2fcc9 100644
--- a/pkgs/development/python-modules/lazr-delegates/default.nix
+++ b/pkgs/development/python-modules/lazr-delegates/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
+  setuptools_80,
   zope-interface,
   pytestCheckHook,
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ setuptools_80 ];
 
   dependencies = [ zope-interface ];
 

From a4cc46d2ffafb4c3ee3935cc654eac08f6cf4a05 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:47:53 +0200
Subject: [PATCH 05/42] python3Packages.lazr-config: pin setuptools

Upstream has done this for lazr.delegates so I'd expect them to do the
same thing here.
---
 pkgs/development/python-modules/lazr-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lazr-config/default.nix b/pkgs/development/python-modules/lazr-config/default.nix
index acde7d6b1c34..f510a34cc464 100644
--- a/pkgs/development/python-modules/lazr-config/default.nix
+++ b/pkgs/development/python-modules/lazr-config/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchgit,
-  setuptools,
+  setuptools_80,
   lazr-delegates,
   zope-interface,
   pytestCheckHook,
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ setuptools_80 ];
 
   dependencies = [
     lazr-delegates

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

---
 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 2974b4a36587e74ca22afa5c5ad16b7e0bb924d9 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Mon, 29 Jun 2026 17:53:59 +0200
Subject: [PATCH 07/42] mkroot-utils: init at 0.5.3

Version 0.5.3 uses separate FIFOs for tests so they can no longer
interleave during concurrent execution and should be consistent now.

Co-authored-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/mk/mkroot-utils/package.nix | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/mk/mkroot-utils/package.nix

diff --git a/pkgs/by-name/mk/mkroot-utils/package.nix b/pkgs/by-name/mk/mkroot-utils/package.nix
new file mode 100644
index 000000000000..dcc13d4285a5
--- /dev/null
+++ b/pkgs/by-name/mk/mkroot-utils/package.nix
@@ -0,0 +1,49 @@
+{
+  busybox,
+  cmake,
+  fakeroot,
+  fetchFromGitLab,
+  gitUpdater,
+  lib,
+  python3,
+  stdenv,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mkroot-utils";
+  version = "0.5.3";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "mkroot-utils";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BT0OSK6QzxCegj8cXQcBbdfxoj+GxfGfDkyry0JN4Jo=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  prePatch = ''
+    substituteInPlace CMakeLists.txt flash/flash.c pico/picoget.c --replace-fail '/bin/ash' '${lib.getExe' busybox "ash"}'
+    patchShebangs test
+  '';
+
+  nativeCheckInputs = [ fakeroot ];
+
+  doCheck = true;
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
+  meta = {
+    description = "Simple utilities to extend RunC and \"mkroot\"";
+    homepage = "https://gitlab.com/arpa2/mkroot-utils";
+    license = lib.licenses.bsd2;
+    teams = with lib.teams; [ ngi ];
+  };
+})

From 9f1699c4467932c9d0e064d3f707b4386ccae629 Mon Sep 17 00:00:00 2001
From: Alex Spaulding <aspauldingcode@gmail.com>
Date: Wed, 15 Jul 2026 18:03:56 -0700
Subject: [PATCH 08/42] beeper: 4.2.957 -> 4.2.985

Restore AppImage type-2 magic for 4.2.985+ extracts. Add
aspauldingcode as maintainer.
---
 pkgs/by-name/be/beeper/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 23af3cace5f0..a2e262f622fb 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  runCommand,
   fetchurl,
   appimageTools,
   makeWrapper,
@@ -10,13 +11,21 @@
 }:
 let
   pname = "beeper";
-  version = "4.2.957";
+  version = "4.2.985";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-wUGUwWopQ8ox2+UP5hXIIF2XVLQmZyhfb712S8JjTGk=";
+    hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM=";
   };
+  # Beeper 4.2.985+ ships AppImages without the type-2 magic bytes
+  # (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires.
+  linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } ''
+    cp $src $out
+    chmod +w $out
+    printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none
+  '';
   appimageContents = appimageTools.extract {
-    inherit pname version src;
+    inherit pname version;
+    src = linuxSrc;
 
     postExtract = ''
       appRoot="$out/resources/app"
@@ -35,7 +44,6 @@ let
 
       # hide version status element on about page otherwise an error message is shown
       sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $appRoot/build-browser/*.css
-
     '';
   };
 in
@@ -89,6 +97,7 @@ appimageTools.wrapAppImage {
     maintainers = with lib.maintainers; [
       jshcmpbll
       zh4ngx
+      aspauldingcode
     ];
     platforms = [ "x86_64-linux" ];
   };

From abcb99b715b6117f00d76f32afa5b61fe93756fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 10:53:04 +0000
Subject: [PATCH 09/42] python3Packages.gto: 1.9.0 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix
index 880a1e5c7ef6..af5b9e92dbba 100644
--- a/pkgs/development/python-modules/gto/default.nix
+++ b/pkgs/development/python-modules/gto/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gto";
-  version = "1.9.0";
+  version = "1.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "gto";
     tag = finalAttrs.version;
-    hash = "sha256-LXYpOnk9W/ellG70qZLihmvk4kvVcwZfE5buPNU2qzQ=";
+    hash = "sha256-pzXU7H4ysu0IBHEtSduA7ogNqmRVWagTI5E4P0z/Wio=";
   };
 
   build-system = [

From edfa702a597cc638519e43ba597ea1b5cd0c125b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 16 Jul 2026 12:57:53 +0200
Subject: [PATCH 10/42] rectangle: 0.96 -> 0.98

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

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index c0cd0994b03f..0fdec5ef846d 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -136,13 +136,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.96";
+  version = "0.98";
 
   src = fetchFromGitHub {
     owner = "rxhanson";
     repo = "Rectangle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3FDCptlNztmexfFDRD/XX9fVuEHVG+EzcrqksJeI+fo=";
+    hash = "sha256-GGK9mMxllVg0rfcrTg5aUYaECwV7mNCPLwXM+tKazN8=";
   };
 
   nativeBuildInputs = [

From 683e8fa08bbd9e88785228618c6ea3deb62dc6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@pyxel.be>
Date: Wed, 15 Jul 2026 17:44:58 +0200
Subject: [PATCH 11/42] geographiclib: fix multi-output CMake import prefix

The dev/out output split moved lib/cmake into $dev while the shared library and executables stayed in $out. The exported targets file uses relative ${_IMPORT_PREFIX} paths, so find_package(GeographicLib) resolved libraries and binaries under $dev and failed to link.

Drop the dev output so lib/cmake ships alongside the library in $out and ${_IMPORT_PREFIX} resolves correctly; keep the doc output split off.

Assisted-by: Claude Code Opus 4.8
---
 pkgs/by-name/ge/geographiclib/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix
index 9f915f128d89..34069f754fd7 100644
--- a/pkgs/by-name/ge/geographiclib/package.nix
+++ b/pkgs/by-name/ge/geographiclib/package.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   outputs = [
-    "dev"
     "doc"
     "out"
   ];

From 90791e4c643f5d15154389a5114055f9cb7d71f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@pyxel.be>
Date: Wed, 15 Jul 2026 17:44:58 +0200
Subject: [PATCH 12/42] supercell-wx: drop geographiclib single-output
 workaround

geographiclib now ships its CMake package files alongside the shared library in $out, so find_package(GeographicLib) works with the default multi-output package.

Assisted-by: Claude Code Opus 4.8
---
 pkgs/by-name/su/supercell-wx/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 9631281f6046..3425406e42e6 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -126,10 +126,7 @@ buildStdenv.mkDerivation (finalAttrs: {
     boost
     bzip2
     geos
-    # FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ?
-    (geographiclib.overrideAttrs {
-      outputs = [ "out" ];
-    })
+    geographiclib
     glew
     glm
     gtest

From 8c4803105f25eb444889863a6fefd579b89fd03e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:35:51 +0000
Subject: [PATCH 13/42] bomly: 0.16.1 -> 0.18.0

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

diff --git a/pkgs/by-name/bo/bomly/package.nix b/pkgs/by-name/bo/bomly/package.nix
index 281ef18c8064..02667684cf59 100644
--- a/pkgs/by-name/bo/bomly/package.nix
+++ b/pkgs/by-name/bo/bomly/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "bomly";
-  version = "0.16.1";
+  version = "0.18.0";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
     owner = "bomly-dev";
     repo = "bomly-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RJqYRCnE4lqR68lP9hL9hTOxXS3cPEgspBn2JgvffyM=";
+    hash = "sha256-U7h9U4wiKohJQUauD8lmTScEWpT0kHZobJnJp8u0VbI=";
   };
 
-  vendorHash = "sha256-W7FfqWV86D8fXZ4nm/0IVZuqocgo8/Sd9DA1Ef4SJ/4=";
+  vendorHash = "sha256-rO1hymsyc6Ar7PtNLymP66tKK6X6mwVz4kQt4UzzwDI=";
 
   # .gitattributes excludes all testdata from the GitHub tarball
   postPatch = ''

From 1a74923ede6d804d7e6f5c27790465bf69aa3ce3 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:29:59 +0100
Subject: [PATCH 14/42] yashiki: 0.14.0 -> 0.15.2

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

diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix
index fdcf7936644c..9dea110516b6 100644
--- a/pkgs/by-name/ya/yashiki/package.nix
+++ b/pkgs/by-name/ya/yashiki/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yashiki";
-  version = "0.14.0";
+  version = "0.15.2";
 
   __structuredAttrs = true;
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "typester";
     repo = "yashiki";
     tag = "yashiki-v${finalAttrs.version}";
-    hash = "sha256-ePZ8ONdvj3gaQps+5Ua0OLeFdzNdJhoB9yw6pC7qoEQ=";
+    hash = "sha256-nsmUuhi0yy6x6POC4qLbMib4fxS3QRjlK6QgCiVEnyQ=";
   };
 
-  cargoHash = "sha256-JMrftBKyD188SZqEGI4fA/MrfEK8JLKSeEqrQxhSs3U=";
+  cargoHash = "sha256-3JxtsSipMbMxQO58ZLJbQVrOFFC7FoVguNpqdoL+ziQ=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -42,8 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     cp resources/icon/Assets.car "$app/Contents/Resources/Assets.car"
     substitute Info.plist.template "$app/Contents/Info.plist" \
-      --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}" \
-      --replace-fail "<string>yashiki-launcher</string>" "<string>yashiki</string>"
+      --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}"
 
     installShellCompletion --cmd yashiki --zsh completions/zsh/_yashiki
   '';

From eed21873ad308522389e1c4944c0647592ae4fa8 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Mon, 13 Jul 2026 03:30:18 +0100
Subject: [PATCH 15/42] yashiki: add Br1ght0ne to maintainers

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

diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix
index 9dea110516b6..ded87d22567a 100644
--- a/pkgs/by-name/ya/yashiki/package.nix
+++ b/pkgs/by-name/ya/yashiki/package.nix
@@ -61,7 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/typester/yashiki/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
-    maintainers = with lib.maintainers; [ anntnzrb ];
+    maintainers = with lib.maintainers; [
+      anntnzrb
+      Br1ght0ne
+    ];
     mainProgram = "yashiki";
     platforms = lib.platforms.darwin;
   };

From 8fb92b0a611678a15fc0cb8cdc23f35e788bb3d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 19:52:34 +0000
Subject: [PATCH 16/42] nuclei-templates: 10.4.5 -> 10.4.6

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

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 37a0d5a9631d..a79a6c7d9961 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nuclei-templates";
-  version = "10.4.5";
+  version = "10.4.6";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6czf84bHyvHIT9rA2HUYqQe7lgODl4uRMP/8QepV3AU=";
+    hash = "sha256-Mv+W1CmUUAs6KntuTBgrp5JDlvyMC1C2Ddm5AGDPtbU=";
   };
 
   installPhase = ''

From 830113efa8f4fe14a5363422474fb926f9db84ca Mon Sep 17 00:00:00 2001
From: Geoffry Song <goffrie@gmail.com>
Date: Thu, 16 Jul 2026 12:50:36 -0700
Subject: [PATCH 17/42] mergiraf: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 086cd2759348..e20edd45e41e 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -6,23 +6,27 @@
 
   # native check inputs
   git,
+  jujutsu,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mergiraf";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromCodeberg {
     owner = "mergiraf";
     repo = "mergiraf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws=";
+    hash = "sha256-PfGiPH7CU8z+Flj3X04XnRdWcv5K+hTZMfvHpM52Fic=";
   };
 
-  cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8=";
+  cargoHash = "sha256-1MDjaaH2PcvQz0DKSTADRB+8YEUWP1GN2edHk4EDVGA=";
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [
+    git
+    jujutsu
+  ];
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 2d22cda774b6faf93f92b1c90bb89e3759f2fb51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 00:31:06 +0000
Subject: [PATCH 18/42] libphonenumber: 9.0.34 -> 9.0.35

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

diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index 77d745e6a573..1007318b608f 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.34";
+  version = "9.0.35";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KWn58r2Dnh9DMwiESmrF/pN5LPuYe0G7z3TeM+Zp6ZA=";
+    hash = "sha256-bGbPTZJWdGTdnWQCK9yXqcqK0AkAOsmZ/rRR2a+IT7M=";
   };
 
   patches = [

From 94a5ed626668a4e102f0559dd5b2d32b89b082c6 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Fri, 17 Jul 2026 02:39:15 +0200
Subject: [PATCH 19/42] radare2: 6.1.4 -> 6.1.8

https://github.com/radareorg/radare2/releases/tag/6.1.8

Fixes #538888
Fixes #539166

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/development/tools/analysis/radare2/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 0819a899a1dd..2a5f4b29e7ed 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -25,6 +25,7 @@
   vte,
   xxhash,
   zlib,
+  zydis,
   useX11 ? false,
   rubyBindings ? false,
   luaBindings ? false,
@@ -40,8 +41,8 @@ let
   sdb = fetchFromGitHub {
     owner = "radareorg";
     repo = "sdb";
-    tag = "2.4.2"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap
-    hash = "sha256-JN27SkDqHtX83d1CPUF9hbVKwE/dwhDgn5MlCX9RPrc=";
+    tag = "2.4.6"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap
+    hash = "sha256-5DuHC5uL4gXBJPGW2awDq/5Ufdi1RoEJnm+eAU3X8S4=";
   };
 
   qjs = fetchFromGitHub {
@@ -53,13 +54,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "radare2";
-  version = "6.1.4";
+  version = "6.1.8";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     tag = finalAttrs.version;
-    hash = "sha256-3MwBtjR3XQMhbJHnD30OVedUEKcje5jDPszNynkGCT8=";
+    hash = "sha256-Gh+W0vWsIscbew1u5cuOXWC20azCxYuA7D+qVTkfEN0=";
   };
 
   mesonFlags = [
@@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "use_sys_openssl" true)
     (lib.mesonBool "use_sys_xxhash" true)
     (lib.mesonBool "use_sys_zip" true)
+    (lib.mesonBool "use_sys_zydis" true)
     (lib.mesonBool "use_sys_zlib" true)
     (lib.mesonOption "r2_gittap" finalAttrs.version)
   ];
@@ -97,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     readline
     zlib
+    zydis
   ]
   ++ lib.optionals useX11 [
     gtkdialog

From 6f278e1520cd4ebf1d3fe64bffcc5164c0f9b6fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 03:06:46 +0200
Subject: [PATCH 20/42] python3Packages.sentry-sdk: 2.64.0 -> 2.66.0

https://github.com/getsentry/sentry-python/blob/2.66.0/CHANGELOG.md
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 6785d671b715..2592a2da464b 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -69,14 +69,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sentry-sdk";
-  version = "2.64.0";
+  version = "2.66.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = finalAttrs.version;
-    hash = "sha256-uAxHNyZgTpw6NoXGCw91AgsKQqlJkdgPsw/WdhFMhs4=";
+    hash = "sha256-0xHcTcJH7cNzQ16Yc+fkSKYE316Ztu6Bl7hTwtD97Ds=";
   };
 
   postPatch = ''

From 1b0fdf096c357ea62bd53d14b711112aebb65724 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 01:30:37 +0000
Subject: [PATCH 21/42] herdr: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/by-name/he/herdr/package.nix b/pkgs/by-name/he/herdr/package.nix
index 43b65453d13e..854ac3a19e22 100644
--- a/pkgs/by-name/he/herdr/package.nix
+++ b/pkgs/by-name/he/herdr/package.nix
@@ -12,7 +12,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "herdr";
-  version = "0.7.3";
+  version = "0.7.4";
 
   __structuredAttrs = true;
 
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ogulcancelik";
     repo = "herdr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q2yvMs/N6oAF8xnRIrMxEOOV6Aj8aAXQzuvcaux2enA=";
+    hash = "sha256-dBOQYLFitJ+E3XNz44Ag3CIrBxFj16CmVPp7qil0ssg=";
   };
 
-  cargoHash = "sha256-DRjcIJXWGxiA9c7xIiQoWU9az2EFjXsnFKu5sC933eE=";
+  cargoHash = "sha256-XHzZy2tKLbMQy4POmXowUcGf77ZPunG/oQ3P2wOoVls=";
 
   zigDeps = zig_0_15.fetchDeps {
     inherit (finalAttrs) pname version;

From bc98e6046d5817b41831d976adb0077165c1e43d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 01:42:38 +0000
Subject: [PATCH 22/42] models-dev: sdk-v0.0.5-unstable-2026-07-07 ->
 sdk-v0.0.5-unstable-2026-07-17

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index ab296248c8e1..87326f81842d 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 let
   pname = "models-dev";
-  version = "sdk-v0.0.5-unstable-2026-07-07";
+  version = "sdk-v0.0.5-unstable-2026-07-17";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "models.dev";
-    rev = "f1a9be19f62c24474d27947d5236067504dd755a";
-    hash = "sha256-ty8l1jURV2uf245Xqm+I95qZ8gU9IjTGqR7+yLGxBUs=";
+    rev = "d15aa5a09dc0226f0a292699e35f14243e61d65e";
+    hash = "sha256-S1WzSYs9of11Onw/hK+stSmakjJJhq1rs6mcW8m+xlc=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From cf40341cfab320a5ecee477acf7dedf405005bcd Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 16 Jul 2026 18:57:28 -0700
Subject: [PATCH 23/42] teehee: modernize slightly

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/te/teehee/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index 3442c8f0c498..0d60e53f1364 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -8,10 +8,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "teehee";
   version = "0.2.8";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "Gskartwii";
     repo = "teehee";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
   };
 

From db5479873095f4d155aa2aeac720be87ff8d1593 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:20:37 +0000
Subject: [PATCH 24/42] steam-unwrapped: 1.0.0.85 -> 1.0.0.87

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

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index d654ba61f9b5..d64457af38db 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "steam-unwrapped";
-  version = "1.0.0.85";
+  version = "1.0.0.87";
 
   src = fetchurl {
     # use archive url so the tarball doesn't 404 on a new release
     url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz";
-    hash = "sha256-fy03Si+0E87VuBJRUUViGdkYolWHK0u3cBbLzPOLt/E=";
+    hash = "sha256-ZJN10vk3f4AJqvPi/wmXgEHrkRSJfZxaOIbx2C4nuh8=";
   };
 
   patches = [

From 8236cf26cde7bf3638de8bb68f5cdf8d4c69e5eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 17 Jul 2026 04:22:49 +0200
Subject: [PATCH 25/42] python3Packages.glean-sdk: mark broken

https://hydra.nixos.org/job/nixpkgs/unstable/python313Packages.glean-sdk.aarch64-linux/all
https://hydra.nixos.org/job/nixpkgs/unstable/python313Packages.glean-sdk.x86_64-linux/all
---
 pkgs/development/python-modules/glean-sdk/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index 69d8006deb40..b78e50d2ea54 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -57,7 +56,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "glean" ];
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = true; # fails to build since 2025-12
     description = "Telemetry client libraries and are a part of the Glean project";
     homepage = "https://mozilla.github.io/glean/book/index.html";
     license = lib.licenses.mpl20;

From 424d39ac5625e5025852e94b131bcc5f34664e43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:41:42 +0000
Subject: [PATCH 26/42] redpanda-client: 26.1.12 -> 26.1.13

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

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index a5cdd62417a7..05b95b243c72 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "26.1.12";
+  version = "26.1.13";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-ZF9YzRW1b40syRCV+a5NOsS/SDwstVs1mI++dTDcpWc=";
+    sha256 = "sha256-vYAicA6tUJt4fz2HBvu+T5rKuVjUWP1QN9ViThkMrpA=";
   };
 in
 buildGoModule rec {

From bf13b635d62ab5c45b2a805baf141001f1924e93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 02:45:42 +0000
Subject: [PATCH 27/42] fluxcd: 2.9.1 -> 2.9.2

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

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index 27d051d0008e..f2ea364767e1 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "2.9.1";
-  srcHash = "sha256-aVJpUigIkGXsjvb40hEkZ2OiUghGcte3Msq4DMLIcbU=";
-  vendorHash = "sha256-TG41xOrAAVBsE6CJ4av6y3bxfudk6gV49+/xB9Qu5ME=";
-  manifestsHash = "sha256-DeTjdgOZyvrpQvIoXyVUfRIbHoJ9o74FRuTpVgT1/3I=";
+  version = "2.9.2";
+  srcHash = "sha256-a4925TZIqYqSk4/gyjwTeThOaQiIt1S3Md7b9eu7H20=";
+  vendorHash = "sha256-iPj7F/7u5MrxoZJ4qk6XONeUmAXkMckpXK/P0HNQ78A=";
+  manifestsHash = "sha256-uSfH2hcz1+rqHc9szCe4V40mTl6d+Li308WW9xLVXWs=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

From 7b61c46426fe468a9b3b4d38ac912685c6251ea2 Mon Sep 17 00:00:00 2001
From: William Huebner <wilhueb@gmail.com>
Date: Thu, 16 Jul 2026 23:29:52 -0400
Subject: [PATCH 28/42] grafana-alloy: 1.16.0 -> 1.17.1

Changelog: https://github.com/grafana/alloy/blob/refs/tags/v1.17.1/CHANGELOG.md
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 7a802ca30581..95e24d8005b3 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -15,23 +15,23 @@
 }:
 
 let
-  beylaVersion = "v3.9.5";
+  beylaVersion = "v3.9.8";
 in
 
 buildGoModule (finalAttrs: {
   pname = "grafana-alloy";
-  version = "1.16.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q5R2noxBZ3OPyZqmB+bx3iJKWFxC2WIprcgh9RwjLzk=";
+    hash = "sha256-4HjOerOe+v8GkKgID/oBm5Rt7nQiHjucAQkSYGY5zZs=";
   };
 
   npmDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/internal/web/ui";
-    hash = "sha256-vResNUT4auDsK9ngnJYfMUUOYr/ikPhrvakqCjGq2Q8=";
+    hash = "sha256-eGyKXsZzyDovsMY2U1uAOn22nyRTYGJT+kEh61857Ls=";
   };
 
   frontend = buildNpmPackage {
@@ -65,7 +65,7 @@ buildGoModule (finalAttrs: {
   modRoot = "collector";
 
   proxyVendor = true;
-  vendorHash = "sha256-uTIdurwLfxh27fb1CPCHbHmENk3S6VYNBaGT/5yh3Sc=";
+  vendorHash = "sha256-C6qVdSfTwmjseCjXKn5f9Q9mn3EBg31CQlLk5QY4YRY=";
 
   subPackages = [ "." ];
 

From 5c485513ee1d4bcfa7ecfd6564a17d3633afc7fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 04:53:47 +0000
Subject: [PATCH 29/42] fresh-editor: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index b33990aa1c9c..270143a61da4 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -13,16 +13,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fVBDjcX0AjUTH+vKV5H4NYmknJYfHNHRizuzjQTHYpA=";
+    hash = "sha256-ycB5wEDYlyTDdIk5lE26c2YFMmDGGqcMuSqwqDSyxs0=";
   };
 
-  cargoHash = "sha256-bsIyf63U7/GNZnCD8g6RBykCiArwlD5v1YhrZNsf1is=";
+  cargoHash = "sha256-HWuHKn+vJC3cdS6bKp5iw9VSTRHn/Q5Zsj6OHvmfYp0=";
 
   __structuredAttrs = true;
 

From d4a04ddf5c440ea1ed859cc7719994c01caa76a1 Mon Sep 17 00:00:00 2001
From: eveeifyeve <kbkk7250@outlook.com>
Date: Fri, 17 Jul 2026 15:56:56 +1000
Subject: [PATCH 30/42] python3Packages.generic: use finalAttrs

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 18b0a6f56c54..2a5145a02e75 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -6,13 +6,13 @@
   poetry-core,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "generic";
   version = "1.1.7";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-0U2uZihULrCEQ0WI01B1bIjy8wx+I0itX8+gH723zu0=";
   };
 
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   meta = {
     description = "Generic programming (Multiple dispatch) library for Python";
     homepage = "https://github.com/gaphor/generic";
-    changelog = "https://github.com/gaphor/generic/releases/tag/${version}";
+    changelog = "https://github.com/gaphor/generic/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From b7e5c56a202f9b34918bce4763ca99e8429ea264 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 06:23:18 +0000
Subject: [PATCH 31/42] acme-sh: 3.1.3 -> 3.1.4

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

diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix
index 7b4a65a071cc..daddea57ed14 100644
--- a/pkgs/by-name/ac/acme-sh/package.nix
+++ b/pkgs/by-name/ac/acme-sh/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "acme.sh";
-  version = "3.1.3";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "acmesh-official";
     repo = "acme.sh";
     tag = finalAttrs.version;
-    hash = "sha256-oWVTk4fKbplMY4NJWf9eTokiHSxPMZ8lgSoG4aF8DVk=";
+    hash = "sha256-xw10M4C6bqnxLxPeXE9dbFP/ajkpO2SQUJp56CeYysk=";
   };
 
   nativeBuildInputs = [

From 8a69e6e08a08bc8f0b0f95c34c4459afc7e56c1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 07:10:51 +0000
Subject: [PATCH 32/42] pkgsite: 0.2.0-unstable-2026-07-07 ->
 0.3.0-unstable-2026-07-16

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 678d072ed143..e7a9769ca64e 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0.2.0-unstable-2026-07-07";
+  version = "0.3.0-unstable-2026-07-16";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "0cc61a18508245cabd093f065961abd5df0af028";
-    hash = "sha256-tgLjEs9dt7TA9yRq/toUWPiorA4b20GnjmO6HJbFFd8=";
+    rev = "8d05c43dae2e668886572ee959babdb429ad6429";
+    hash = "sha256-xc/pPJIRGuTGrdh2VFwPY+uud98ST0HaFPUsa5GvvhQ=";
   };
 
-  vendorHash = "sha256-a53JKkoJmnSO+ShxUt68LEq9uDeNi/vN/d0OuhrIUvA=";
+  vendorHash = "sha256-NZzA9QxVSYuSjeZOiwUAXAPBrN00JLHQNPp1lXqtmCw=";
 
   subPackages = [ "cmd/pkgsite" ];
 

From dc7e7baf4790f01c937204f8c96107624eeb64a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jun 2026 06:00:03 +0000
Subject: [PATCH 33/42] rtklib-ex: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/by-name/rt/rtklib-ex/package.nix b/pkgs/by-name/rt/rtklib-ex/package.nix
index 4856f21706de..c8e9a04f9696 100644
--- a/pkgs/by-name/rt/rtklib-ex/package.nix
+++ b/pkgs/by-name/rt/rtklib-ex/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtklib-ex";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "rtklibexplorer";
     repo = "RTKLIB";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j00VEQvxOiAc3EQX3x2b3RxYkbtvCZ17ugnW6b6ChWU=";
+    hash = "sha256-IGjrLuw3q0J6NXv2+Y3N22+nBu31W63QkmZpuHuvQnc=";
   };
 
   nativeBuildInputs = [

From d765b04680dc10c0dbd59aa8d0944d6f9b05c5bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Jul 2026 12:44:33 +0200
Subject: [PATCH 34/42] python313Packages.boschshcpy: 0.4.8 -> 0.4.12

Diff: https://github.com/tschamm/boschshcpy/compare/v0.4.8...v0.4.12

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

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 40e93be1c24d..f58e40c2c84d 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boschshcpy";
-  version = "0.4.8";
+  version = "0.4.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tschamm";
     repo = "boschshcpy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VYraW9zeTQn2fvc1pdpF8Tx+iFRxoNQ6b98VphGao7k=";
+    hash = "sha256-a0ckgCctTzSPI/EUxcUHiQ1fLH6cVZM5qLLdyxc+tII=";
   };
 
   build-system = [ setuptools ];

From 16ed2b9336e01dfb248ed0f70f4dcda0976c3735 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jul 2026 09:36:54 +0200
Subject: [PATCH 35/42] python3Packages.boschshcpy: 0.4.12 -> 0.6.2

Diff: https://github.com/tschamm/boschshcpy/compare/v0.4.12...v0.6.2

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

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index f58e40c2c84d..e46257d913fc 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boschshcpy";
-  version = "0.4.12";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tschamm";
     repo = "boschshcpy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a0ckgCctTzSPI/EUxcUHiQ1fLH6cVZM5qLLdyxc+tII=";
+    hash = "sha256-Un+rcG78t3TdbKuBHOuDPq5+wjlA8jf0pE3zvuHzpjM=";
   };
 
   build-system = [ setuptools ];

From 41c9ec1e3ecca43599a9779b6a3471e8cfe593e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jul 2026 09:40:49 +0200
Subject: [PATCH 36/42] python313Packages.iamdata: 0.1.202607151 ->
 0.1.202607171

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202607151...v0.1.202607171

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 22b30fdbdd5c..df4ab4e625dc 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202607151";
+  version = "0.1.202607171";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MGKX+QzsXyohsRHHy4qt+H4BemgvJesKwKzi2KrETr4=";
+    hash = "sha256-i4/vmq7Adxrmb6Ad/eFU5NwOseHo/uBMsN5UyyqDyqY=";
   };
 
   __darwinAllowLocalNetworking = true;

From 12c6e8c1c2384921c2e6e0385ea2a2d29a73ac09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Jul 2026 09:42:52 +0200
Subject: [PATCH 37/42] python3Packages.tencentcloud-sdk-python: 3.1.133 ->
 3.1.135

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.133...3.1.135

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

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index ad792af8927e..c5453bc03a22 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.133";
+  version = "3.1.135";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-E9xxurSGAvJd4f2CGxI8IR9mSGTwGpOLqNMSEhrhOXY=";
+    hash = "sha256-UErVS8+/IUNjePhBcvpJE4hNxec3pU19eZBbwD+jDcA=";
   };
 
   build-system = [ setuptools ];

From ca5bd42822d1fb23931f774961d352864d10ed19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:04:12 +0000
Subject: [PATCH 38/42] ytdl-sub: 2026.06.23 -> 2026.07.16

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

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index ec2d3f77bafe..84b123ff8311 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ytdl-sub";
-  version = "2026.06.23";
+  version = "2026.07.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = finalAttrs.version;
-    hash = "sha256-VakqR66V90MIx6Bh5MS69iX1nZsFuTJ6YOJG90kf5s0=";
+    hash = "sha256-uvuwp6OqdL4mK3RF7rr2hrDhETgoOaNef7ZLPU95EQg=";
   };
 
   postPatch = ''

From 0bf650c1e8d1507f69e4eadc8e940b8c871f6d5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 08:22:02 +0000
Subject: [PATCH 39/42] mcp-server-fetch: 2026.7.4 -> 2026.7.10

---
 pkgs/by-name/mc/mcp-server-fetch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcp-server-fetch/package.nix b/pkgs/by-name/mc/mcp-server-fetch/package.nix
index e086399f3b6d..d4575f05da2e 100644
--- a/pkgs/by-name/mc/mcp-server-fetch/package.nix
+++ b/pkgs/by-name/mc/mcp-server-fetch/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcp-server-fetch";
-  version = "2026.7.4";
+  version = "2026.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {

From 71c1b60da5986c855b8b225e92a50cd3aa858e77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:21:01 +0000
Subject: [PATCH 40/42] jimtcl: 0.82 -> 0.84

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

diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 73e0d6e568a6..e551e07e3308 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jimtcl";
-  version = "0.82";
+  version = "0.84";
 
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
     rev = finalAttrs.version;
-    sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
+    sha256 = "sha256-MvsC82PMmh7PP1sXNwZRNDNFU7r5LWRA6YqvuvZ9yZE=";
   };
 
   nativeBuildInputs = [

From 750770bcfe61cc544ed2275af3c6c6974d05cc21 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 17 Jul 2026 11:33:21 +0200
Subject: [PATCH 41/42] openocd: use jimtcl 0.82

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

diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix
index e8fdd29854b7..8f71e54961a8 100644
--- a/pkgs/by-name/op/openocd/package.nix
+++ b/pkgs/by-name/op/openocd/package.nix
@@ -17,10 +17,19 @@
   extraHardwareSupport ? [ ],
 }:
 let
-
   isWindows = stdenv.hostPlatform.isWindows;
   notWindows = !isWindows;
 
+  # OpenOCD needs JimTcl 0.82 and fails to build with the latest version (0.84).
+  # When updating OpenOCD, check which JimTcl version its jimtcl submodule uses.
+  jimtcl_0_82 = jimtcl.overrideAttrs (oldAttrs: rec {
+    version = "0.82";
+    src = oldAttrs.src.override {
+      rev = version;
+      sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
+    };
+  });
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openocd";
@@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals notWindows [
     hidapi
-    jimtcl
+    jimtcl_0_82
     libftdi1
     libjaylink
   ]

From c571adaefb071b8f9a08cbf1e7343153d1288019 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Fri, 17 Apr 2026 11:39:57 +0000
Subject: [PATCH 42/42] nixos/sshd: remove 'moduliFile' option, in favour of
 settings.ModuliFile

Per RFC42.

As a result, /etc/ssh/moduli will no longer exist, and sshd_config's ModuliFile will point to /nix/store/...
---
 .../modules/services/networking/ssh/sshd.nix  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index a948cd02bc4f..72702b605f3d 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -232,6 +232,10 @@ in
       "openssh"
       "banner"
     ] "Use services.openssh.settings.Banner instead.")
+    (lib.mkRenamedOptionModule
+      [ "services" "openssh" "moduliFile" ]
+      [ "services" "openssh" "settings" "ModuliFile" ]
+    )
   ];
 
   ###### interface
@@ -729,6 +733,14 @@ in
                 '';
                 example = "/etc/ssh/banner";
               };
+              ModuliFile = lib.mkOption {
+                type = lib.types.path;
+                default = "${config.services.openssh.package}/etc/ssh/moduli";
+                defaultText = lib.literalExpression ''"''${config.services.openssh.package}/etc/ssh/moduli"'';
+                description = ''
+                  Specifies the {manpage}`moduli(5)` file to use for Diffie-Hellman key exchange.
+                '';
+              };
             };
           }
         );
@@ -740,16 +752,6 @@ in
         description = "Verbatim contents of {file}`sshd_config`.";
       };
 
-      moduliFile = lib.mkOption {
-        example = "/etc/my-local-ssh-moduli;";
-        type = lib.types.path;
-        description = ''
-          Path to `moduli` file to install in
-          `/etc/ssh/moduli`. If this option is unset, then
-          the `moduli` file shipped with OpenSSH will be used.
-        '';
-      };
-
     };
 
     users.users = lib.mkOption {
@@ -770,14 +772,12 @@ in
       };
       users.groups.sshd = { };
 
-      services.openssh.moduliFile = lib.mkDefault "${cfg.package}/etc/ssh/moduli";
       services.openssh.sftpServerExecutable = lib.mkDefault "${cfg.package}/libexec/sftp-server";
 
       environment.etc =
         authKeysFiles
         // authPrincipalsFiles
         // {
-          "ssh/moduli".source = cfg.moduliFile;
           "ssh/sshd_config".source = sshconf;
         };