From f6dbd25fcd03a206dee2c3e49a5f824927d88063 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 May 2026 12:30:12 +0000
Subject: [PATCH 001/104] python3Packages.magika: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix
index 0cf1c3bcc49d..4b08a4a14ada 100644
--- a/pkgs/development/python-modules/magika/default.nix
+++ b/pkgs/development/python-modules/magika/default.nix
@@ -26,7 +26,7 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "magika";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   # Use pypi tarball instead of GitHub source
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
   # while GitHub source requires compiling magika-cli
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-jtkS2PFNBE9D/b0X1r0svdbouCRuib5J9s1UcFNjZnc=";
+    hash = "sha256-rTIWAS9t0ze+NMI649+rNvBiO8Yvv7Mp+aGFLJrUAwQ=";
   };
 
   postPatch = ''

From 64b6d4ba189dc1c8eda1b24adcbd39255c9bf33f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 15:33:42 +0000
Subject: [PATCH 002/104] vt-cli: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/vt/vt-cli/package.nix b/pkgs/by-name/vt/vt-cli/package.nix
index aba81d280e9c..fcbcc6d735fb 100644
--- a/pkgs/by-name/vt/vt-cli/package.nix
+++ b/pkgs/by-name/vt/vt-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vt-cli";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "vt-cli";
     tag = finalAttrs.version;
-    hash = "sha256-B4SOoEc05nDFc93MYZDSj+LRt06jWjudocE4IKEw7jE=";
+    hash = "sha256-oYdF3UmPT43iXWYx4A3ctDIf96nAriwt0gasOIObhlU=";
   };
 
   vendorHash = "sha256-n44nEff0/neaqHfU6UbPjEAW46axJ0hIxrOnlq5QKA0=";

From b7ce3b1b3fff62a1100e5a38793a8573fb1e6715 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 13:38:05 +0000
Subject: [PATCH 003/104] karmor: 1.4.6 -> 1.4.7

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

diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix
index 665fc0b8e669..f76fa6e73a65 100644
--- a/pkgs/by-name/ka/karmor/package.nix
+++ b/pkgs/by-name/ka/karmor/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "karmor";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "kubearmor";
     repo = "kubearmor-client";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xOI6meI88GB5w19T9eSn+8dTnhrUxUCKHUBk/1EaDVI=";
+    hash = "sha256-hohzVj2mlch6rSdjsCl+VcTnX9zvYnRrRM97LwbNeNw=";
   };
 
-  vendorHash = "sha256-FL5WL44dsM0uPYXMNfYKRd37umId21rMGvj84rYTU3A=";
+  vendorHash = "sha256-DrrLromAT0xSr3SUqWTM78oGXTy73VCD2DJlMwSEGEs=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f013dc41fefa4641fb138a8d1b4dc30af8ae3148 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 18:48:21 +0000
Subject: [PATCH 004/104] git-toolbelt: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/by-name/gi/git-toolbelt/package.nix b/pkgs/by-name/gi/git-toolbelt/package.nix
index 1fc88f93f85d..cceaacd277f5 100644
--- a/pkgs/by-name/gi/git-toolbelt/package.nix
+++ b/pkgs/by-name/gi/git-toolbelt/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "git-toolbelt";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "nvie";
     repo = "git-toolbelt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2jpgwB2DEoRtV+WGe81X1rnC7T4+FmJovOFx+4lifQw=";
+    hash = "sha256-5ywYbZeMqHU7/nnnINeR0BfVBxxgYmeXvjIuC45V43g=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 96b557f6aebbcdcf316c060cb98bc925a6fffd53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 May 2026 23:09:24 +0000
Subject: [PATCH 005/104] brutespray: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/by-name/br/brutespray/package.nix b/pkgs/by-name/br/brutespray/package.nix
index 3bebcc60e1c8..b907a99fbbb1 100644
--- a/pkgs/by-name/br/brutespray/package.nix
+++ b/pkgs/by-name/br/brutespray/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "brutespray";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "x90skysn3k";
     repo = "brutespray";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3CDvsYCiVuWr+Hp2NSzecmHl69Xf9Mcl1umqKW09OlQ=";
+    hash = "sha256-ckw5U0TAF8NI3B8jyk7iPJ8T+9YEwFxoa9dJqb7kygI=";
   };
 
-  vendorHash = "sha256-odRe6Jd0MIOyahoMfZJgSbv+AHeUUvWLeENaQFmT9R4=";
+  vendorHash = "sha256-bzyvh7Ty9kl/fZwxYGH2G60wZvp607/+KflaFiZgs60=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 00ac9a150921e07b5d3fc885ecaa613eb028bfde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 01:28:48 +0000
Subject: [PATCH 006/104] cargo-audit: 0.22.1 -> 0.22.2

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

diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix
index d7827e46db66..e48d3efa5a42 100644
--- a/pkgs/by-name/ca/cargo-audit/package.nix
+++ b/pkgs/by-name/ca/cargo-audit/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-audit";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-/K84iYr3mRNH8lbqHHa7Tsh7M3ykQ2hs6T1k/qrSsnA=";
+    hash = "sha256-hrkkDRJvXe2fltWjEW2A0/uKVFWq+9O+wRphsJjT1tE=";
   };
 
-  cargoHash = "sha256-Hr3CliJeb9ljHylx8mjkGyf4ybX79Fmt6CaFb6FMRts=";
+  cargoHash = "sha256-pdFoawDRzJ8gPYAAQHwrCVYeaa1ShSqYA8nwpCAnS1s=";
 
   nativeBuildInputs = [
     pkg-config

From 476861660df06cc125f5dedb299e34b702f96cfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 12:34:51 +0000
Subject: [PATCH 007/104] python3Packages.icoextract: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix
index c83634db420d..76a7e0df1b04 100644
--- a/pkgs/by-name/ic/icoextract/package.nix
+++ b/pkgs/by-name/ic/icoextract/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "icoextract";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlu5";
     repo = "icoextract";
     rev = finalAttrs.version;
-    hash = "sha256-GJCe7oFUidJt21F4NmOXspxZGRQXIjQvFjFhMYsHLjk=";
+    hash = "sha256-uesnYwv1ig7cnakWpH7MKeN6cfjasxVYLHs1JYG0Tss=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From a1dcf2827d6fbd56c8cf7804c234b17825956800 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 14:38:35 +0000
Subject: [PATCH 008/104] gitwatch: 0.5 -> 0.6

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

diff --git a/pkgs/by-name/gi/gitwatch/package.nix b/pkgs/by-name/gi/gitwatch/package.nix
index 0ef9dada2992..75b1e35bd4a3 100644
--- a/pkgs/by-name/gi/gitwatch/package.nix
+++ b/pkgs/by-name/gi/gitwatch/package.nix
@@ -14,12 +14,12 @@
 runCommand "gitwatch"
   rec {
     pname = "gitwatch";
-    version = "0.5";
+    version = "0.6";
     src = fetchFromGitHub {
       owner = "gitwatch";
       repo = "gitwatch";
       rev = "v${version}";
-      hash = "sha256-zOJPCoXco59ufQeGH2DPGbCbKx6rSC/3iNZWoEeoQKk=";
+      hash = "sha256-O8Qk2fGBAT7NGJYd+PIGOaiDQAnexsDm1y+KFHabQEM=";
     };
     nativeBuildInputs = [ makeWrapper ];
 

From b1542dedc50515007fad64099fc15a367f2b8de5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jun 2026 18:28:10 +0000
Subject: [PATCH 009/104] python3Packages.pythonfinder: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
index acac75dd4fc5..5ae952fd4572 100644
--- a/pkgs/development/python-modules/pythonfinder/default.nix
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pythonfinder";
-  version = "3.0.3";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = "pythonfinder";
     tag = finalAttrs.version;
-    hash = "sha256-p+r/0MjxhMcc0n5gPEbdGjC2M+yGqGT/YvxlyU8xTtA=";
+    hash = "sha256-MX5o8KIMpZjUj93QwL54CDp6OjAnhw8TtuEGT8wkKtw=";
   };
 
   build-system = [ setuptools ];

From 46b9f3b5d87728b5bee0bb90f9ef0689d31e0058 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 00:50:31 +0000
Subject: [PATCH 010/104] python3Packages.napari: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index 026a0cb3b56a..d82e41d7d1c7 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -57,14 +57,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "napari";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "napari";
     repo = "napari";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fDt9n4+yQcA03IO7sMhcpiP3TfOWfyvbCjY7ImEj+Qg=";
+    hash = "sha256-BRRJHVcCqxlOPN4kA5B0X9SOY4SiKgnBb7ov1m6aiZY=";
   };
 
   postPatch = ''

From 2364ca3923fd064b7437272082c001b61da88ade Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 24 Jun 2026 01:55:41 +0200
Subject: [PATCH 011/104] {lomiri,lomiri-qt6}.lomiri-wallpapers: 20.04.0 ->
 20.04.1

---
 .../lomiri/data/lomiri-wallpapers/default.nix | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
index 9a49f77d8f1c..51d6f9e0a3a4 100644
--- a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "lomiri-wallpapers";
-  version = "20.04.0";
+  version = "20.04.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-wallpapers";
     rev = finalAttrs.version;
-    hash = "sha256-n8+vY+MPVqW6s5kSo4aEtGZv1AsjB3nNEywbmcNWfhI=";
+    hash = "sha256-NttA+je2jbE0q0EXZ5PSxrpB0ijRbqpSq0N0GCWEzJk=";
   };
 
   dontConfigure = true;
@@ -23,15 +23,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/share
-
-    # release-specific wallpapers
+  ''
+  # release-specific wallpapers
+  + ''
     cp -r ${lib.versions.majorMinor finalAttrs.version} $out/share/wallpapers
-    rm $out/share/wallpapers/.placeholder
-
-    # eternal hardwired fallback/default
-    install -Dm644 {.,$out/share/wallpapers}/warty-final-ubuntu.png
-    ln -s warty-final-ubuntu.png $out/share/wallpapers/lomiri-default-background.png
-
+  ''
+  # default
+  + ''
+    install -Dm644 {.,$out/share/wallpapers}/lomiri-default-background.png
+  ''
+  + ''
     runHook postInstall
   '';
 

From 8a8fb28f9b369d09d7cd4b19da98801df43fa21a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 20:30:13 +0000
Subject: [PATCH 012/104] gruvbox-plus-icons: 6.4.0 -> 6.5.0

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

diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
index ef97dde99380..1bd79a88705d 100644
--- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
+++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
@@ -11,13 +11,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gruvbox-plus-icons";
-  version = "6.4.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "SylEleuth";
     repo = "gruvbox-plus-icon-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t4bQeK9jwaE3nRZEhks9QARKkxKdH9ZTSgPIby323Jc=";
+    hash = "sha256-EG8AmnLqqml7oGeeNqLLpnmMj6/KVAJOKuTjCUoor4s=";
   };
 
   patches = [ ./folder-color.patch ];

From 666adb5620e9e5040ccce44d383712f206aa72c3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 2 Jul 2026 23:35:45 +0200
Subject: [PATCH 013/104] lomiri.lomiri-telephony-service: Apply fixes for test
 flakiness & newer libnotify compat

---
 .../lomiri-telephony-service/default.nix      | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
index 6675c88c140b..980d5483be2c 100644
--- a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
@@ -2,13 +2,13 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   nixosTests,
   runCommand,
   ayatana-indicator-messages,
   bash,
   cmake,
-  ctestCheckHook,
   dbus,
   dbus-glib,
   dbus-test-runner,
@@ -53,6 +53,31 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CNtJPMust7zCuoXw/CpaK4NVXijTXA3Xs4YMJiZyxes=";
   };
 
+  patches = [
+    # Fixes for test flakiness & newer libnotify compatibility
+    # Remove when version > 0.6.2
+    (fetchpatch {
+      name = "0001-lomiri-telephony-service-new-libnotify-needs-spec_version.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/6b0b51a4fcfafcd10ae5fe4928d49c9f73f14d12.patch";
+      hash = "sha256-E9THrqE77GXBY8ftwrkwFzFCTSa/YpkaHiX4ivjH6mM=";
+    })
+    (fetchpatch {
+      name = "0002-lomiri-telephony-service-tests-depend-on-the-notification-mock.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/8c5a3048492eb01354565f0892a61770eb27b957.patch";
+      hash = "sha256-nLN+Evyq4Yf9GN2wSSPXmzEzTPXHDl+Pl5FKOiwdDY8=";
+    })
+    (fetchpatch {
+      name = "0003-lomiri-telephony-service-approver-fix-race-condition-when-accepting-calls.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/b3123f784ed692f9424c978e68867a8662d00083.patch";
+      hash = "sha256-/JEkoEEivFwFoNOrcdDleAGOjdUwS4SlUovMr9trNQQ=";
+    })
+    (fetchpatch {
+      name = "0004-lomiri-telephony-service-Robustness-fixes-for-tests.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/e886fbdd016327634e935986f2b63b90833295be.patch";
+      hash = "sha256-Ie9kM7UHSjmORTOTNzZ1/qtM4ILkOnGjyQCXXo1PU88=";
+    })
+  ];
+
   postPatch = ''
     # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
     # Patch out failure if QMake is not found, since we don't use it
@@ -112,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeCheckInputs = [
-    ctestCheckHook
     dbus-test-runner
     dconf
     gnome-keyring
@@ -139,25 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
   # Starts & talks to D-Bus services, breaks with parallelism
   enableParallelChecking = false;
 
-  disabledTests = [
-    # Flaky, randomly failing to launch properly & stuck until test timeout
-    # https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/issues/70
-    "AccountEntryTest"
-    "AccountEntryFactoryTest"
-    "AuthHandlerTest"
-    "CallEntryTest"
-    "ChatManagerTest"
-    "HandlerTest"
-    "OfonoAccountEntryTest"
-    "PresenceRequestTest"
-    "TelepathyHelperSetupTest"
-
-    # Failing most of the time since libnotify 0.8.8
-    # https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/issues/75
-    "ApproverTest"
-    "MessagingMenuTest"
-  ];
-
   preCheck = ''
     export QT_QPA_PLATFORM=minimal
     export QT_PLUGIN_PATH=${

From 39762b3336271eeed11496c40f19436eefef1829 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jul 2026 11:22:48 +0000
Subject: [PATCH 014/104] .github: Bump korthout/backport-action from 4.5.2 to
 4.6.0

Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 4.5.2 to 4.6.0.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](https://github.com/korthout/backport-action/compare/66065406958f46e82238fd59546f5a99e69e22aa...2e830a1d0b8269505846ddd407a70876913ad1f8)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 4.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index a769a95de428..5805401b08c7 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@66065406958f46e82238fd59546f5a99e69e22aa # v4.5.2
+        uses: korthout/backport-action@2e830a1d0b8269505846ddd407a70876913ad1f8 # v4.6.0
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           add_author_as_reviewer: true

From 0e27a2c56c86ad4b887ccc8c3fa33b80e51c5bb1 Mon Sep 17 00:00:00 2001
From: xaltsc <hey+dev@xaltsc.dev>
Date: Fri, 3 Jul 2026 18:26:46 +0200
Subject: [PATCH 015/104] maintainers: add xaltsc

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 06725dcec750..2443fa134278 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -30426,6 +30426,13 @@
     github = "x807x";
     githubId = 86676478;
   };
+  xaltsc = {
+    email = "hey+dev@xaltsc.dev";
+    matrix = "@xaltsc:matrix.org";
+    name = "xaltsc";
+    github = "xaltsc";
+    githubId = 41400742;
+  };
   xanderio = {
     name = "Alexander Sieg";
     email = "alex@xanderio.de";

From 535f0c892030aac00155c12c834610df7bee9793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 3 Jul 2026 19:27:10 +0200
Subject: [PATCH 016/104] nixos/sabnzbd: add secretValues option

It's a more fine grained alternative to secretFiles.
---
 .../services/networking/sabnzbd/default.nix   | 28 +++++++++++++++++++
 nixos/tests/sabnzbd-module.nix                | 23 +++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/nixos/modules/services/networking/sabnzbd/default.nix b/nixos/modules/services/networking/sabnzbd/default.nix
index 7791423c5943..3775ba680758 100644
--- a/nixos/modules/services/networking/sabnzbd/default.nix
+++ b/nixos/modules/services/networking/sabnzbd/default.nix
@@ -117,6 +117,28 @@ in
         default = [ ];
       };
 
+      secretValues = mkOption {
+        type = with types; attrsOf path;
+        description = ''
+          Attrset of patterns in the settings that should be replaced at
+          runtime, just before the service starts, with values read from the
+          given files. The files must be readable by the service user.
+
+          Compared to the secretFiles option, secretValues allows having the
+          full settings structure in Nix, and only externalizing the secret
+          values themselves.
+        '';
+        default = { };
+        example = lib.literalExpression ''
+          {
+            "@my_server_password@" = "/run/secrets/my_server_password";
+            "@my_server_username@" = "/run/secrets/my_server_username";
+            "@sabnzbd_api_key@" = "/run/secrets/sabnzbd_api_key";
+            "@sabnzbd_nzb_key@" = "/run/secrets/sabnzbd_nzb_key";
+          }
+        '';
+      };
+
       allowConfigWrite = mkOption {
         type = types.bool;
         description = ''
@@ -501,6 +523,12 @@ in
             "''${files[@]}" \
             > "$tmpfile"
 
+          ${lib.concatStringsSep "\n" (
+            lib.mapAttrsToList (n: v: ''
+              "${lib.getExe pkgs.replace-secret}" "${n}" "${v}" "$tmpfile"
+            '') cfg.secretValues
+          )}
+
           install -D \
             -m ${if cfg.allowConfigWrite then "600" else "400"} \
             -o '${cfg.user}' -g '${cfg.group}' \
diff --git a/nixos/tests/sabnzbd-module.nix b/nixos/tests/sabnzbd-module.nix
index 3eb9bd21e2ff..4398c5401832 100644
--- a/nixos/tests/sabnzbd-module.nix
+++ b/nixos/tests/sabnzbd-module.nix
@@ -105,6 +105,26 @@ in
       };
     };
 
+  nodes.with_secret_values =
+    { pkgs, ... }:
+    {
+      config = {
+        services.sabnzbd = {
+          enable = true;
+          settings = {
+            misc.api_key = "@api_key@";
+            misc.nzb_key = "@nzb_key@";
+          };
+          secretValues = {
+            # Just for testing; don't use world readable files from the Nix
+            # store in production!
+            "@api_key@" = builtins.toFile "api_key" "dummyapikey";
+            "@nzb_key@" = builtins.toFile "nzb_key" "dummynzbkey";
+          };
+        };
+      };
+    };
+
   testScript = ''
     def wait_for_up(m):
       m.wait_for_unit("sabnzbd.service")
@@ -113,9 +133,12 @@ in
     wait_for_up(machine)
     wait_for_up(with_writeable_config)
     wait_for_up(with_raw_config_file)
+    wait_for_up(with_secret_values)
 
     machine.succeed("do_test")
     with_writeable_config.succeed("do_test")
     with_raw_config_file.succeed("do_test_2")
+    with_secret_values.succeed("grep dummyapikey /var/lib/sabnzbd/sabnzbd.ini")
+    with_secret_values.succeed("grep dummynzbkey /var/lib/sabnzbd/sabnzbd.ini")
   '';
 }

From bcf3c6ce8a958af17aec7f48c8affa4d742706d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 20:56:19 +0000
Subject: [PATCH 017/104] kakoune-lsp: 20.0.0 -> 21.0.1

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

diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix
index 675875ff419c..08122fda0e05 100644
--- a/pkgs/by-name/ka/kakoune-lsp/package.nix
+++ b/pkgs/by-name/ka/kakoune-lsp/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kakoune-lsp";
-  version = "20.0.0";
+  version = "21.0.1";
 
   src = fetchFromGitHub {
     owner = "kakoune-lsp";
     repo = "kakoune-lsp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1O0Seyz+Wzt2aJh5Os5D/7UI4LVizvY195aXJSMpeyw=";
+    hash = "sha256-ZBeUxH/CBpg/Af1rYjOPWAyDkRNvgeifltpP5GGr+wA=";
   };
 
   patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];
 
-  cargoHash = "sha256-wmoF0pwuXN83xy4R7wC1+YBBNdseFCg8xSqkBR/Axro=";
+  cargoHash = "sha256-TBjoUy2e9GLYa0fNI1NgC4rr32vZXqaUGYksaSHE8hg=";
 
   meta = {
     description = "Kakoune Language Server Protocol Client";

From 5f7906a92e30a85c28f69b6d3004342450df15bc Mon Sep 17 00:00:00 2001
From: xaltsc <hey+dev@xaltsc.dev>
Date: Fri, 3 Jul 2026 19:05:55 +0200
Subject: [PATCH 018/104] kbd-ergol: init at version 0-unstable-2026-07-03
 (#5111b8c90c)

---
 pkgs/by-name/kb/kbd-ergol/package.nix | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/kb/kbd-ergol/package.nix

diff --git a/pkgs/by-name/kb/kbd-ergol/package.nix b/pkgs/by-name/kb/kbd-ergol/package.nix
new file mode 100644
index 000000000000..f9255edd8727
--- /dev/null
+++ b/pkgs/by-name/kb/kbd-ergol/package.nix
@@ -0,0 +1,36 @@
+{
+  stdenv,
+  fetchFromCodeberg,
+  lib,
+  nix-update-script,
+}:
+stdenv.mkDerivation {
+  pname = "kbd-ergol";
+  version = "0-unstable-2026-07-03";
+
+  src = fetchFromCodeberg {
+    owner = "Alerymin";
+    repo = "kbd-ergol";
+    rev = "5111b8c90cee7daddb6c49115ba1ca665b2102ab";
+    hash = "sha256-kkxsTFNXGO8dly8r/EQyKL/JWZC4hUnq67rHChhwmkU=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  # console.nix expects keymaps to be under /share/keymaps
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "/usr/share/kbd/" "$out/share/"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Ergo-L layout in keymap format for linux console";
+    homepage = "https://codeberg.org/Alerymin/kbd-ergol";
+    maintainers = with lib.maintainers; [ xaltsc ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.wtfpl;
+  };
+}

From bc7d4da5456329003f8e51daec3058e5f573bc01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 12:41:48 +0000
Subject: [PATCH 019/104] transcribe: 9.51.1 -> 9.60.0

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

diff --git a/pkgs/by-name/tr/transcribe/package.nix b/pkgs/by-name/tr/transcribe/package.nix
index f03254a6a08f..3ec372cd60ef 100644
--- a/pkgs/by-name/tr/transcribe/package.nix
+++ b/pkgs/by-name/tr/transcribe/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "transcribe";
-  version = "9.51.1";
+  version = "9.60.0";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchzip {
         url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz";
-        sha256 = "sha256-RgiclfufwWDr21NGIfc3/PgYJBBoTwiu9TxLgTU9Pgk=";
+        sha256 = "sha256-YGgZimAuIcdKiRK7SPK13oKElr8OFjGkho1jX40LqSk=";
       }
     else
       throw "Platform not supported";

From 7851b89c404087651fe36ad157723df04c1c81fb Mon Sep 17 00:00:00 2001
From: TarunYellapu <86869295+TarunYellapu@users.noreply.github.com>
Date: Sat, 4 Jul 2026 21:05:48 +0530
Subject: [PATCH 020/104] lact: 0.9.0 -> 0.9.1

---
 pkgs/by-name/la/lact/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index 83831a62c835..5cba545612c6 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -10,6 +10,7 @@
   gdk-pixbuf,
   gtk4,
   libadwaita,
+  libdisplay-info,
   libdrm,
   ocl-icd,
   vulkan-loader,
@@ -25,16 +26,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lact";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c5GJf8AYgaAN3O6AVSEbJybEYb6lSHf7R24/1PKYhyM=";
+    hash = "sha256-/b5Cfexi/RtE3DkON5J3dc4aEX6aLZvIcAhsg6Kdv7M=";
   };
 
-  cargoHash = "sha256-Y+XdCmaDXdP7x22bYm//Ov7+IzlCr8GpFOgCXGFCfbA=";
+  cargoHash = "sha256-XV37VRbCaxySMgEqXmIA0TUpI9uR+6jGOzdMlEfWxDw=";
 
   nativeBuildInputs = [
     pkg-config
@@ -47,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     gdk-pixbuf
     gtk4
     libadwaita
+    libdisplay-info
     libdrm
     ocl-icd
     vulkan-loader
@@ -55,6 +57,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     fuse3
   ];
 
+  checkFlags = [
+    # Requires /dev/fuse, which is unavailable in the Nix build sandbox.
+    "--skip=tests::apply_settings"
+  ];
+
   # we do this here so that the binary is usable during integration tests
   env.RUSTFLAGS = lib.optionalString stdenv.targetPlatform.isElf (
     lib.concatStringsSep " " [

From f737b551e9d68314d6e888be96d31fed38c6ab4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 00:28:22 +0000
Subject: [PATCH 021/104] immich-public-proxy: 2.5.0 -> 3.0.1

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

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index 472d7319cdc2..d34847138c6c 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "2.5.0";
+  version = "3.0.1";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-YcnJFj/IW7ceXN/sEdGuLC0lV0ZpehFqi0UwzEyVlf0=";
+    hash = "sha256-y7y21AEMGHtynsguKp8HmTqZni5dIc7qjt2PQnsxN90=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-IM47ySyVn5B+FLbFUKpbbFKeI0jo4YxqOMg1PTT2SVc=";
+  npmDepsHash = "sha256-a7qiiIvkDqxj1ZUBONLlZ49LSM8UpGIis/NXt5wEDjw=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''

From b3fe5b00a890fba78ae1b0a52cec20e1586a210c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 14:22:18 +0000
Subject: [PATCH 022/104] dependabot-cli: 1.90.0 -> 1.91.0

---
 pkgs/by-name/de/dependabot-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 77d9fed69858..6d2ee5be695c 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,7 +12,7 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.90.0";
+  version = "1.91.0";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
@@ -20,12 +20,12 @@ let
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
   updateJobProxy.imageDigest = "sha256:70cf9a8f006db9cde732faf9e33a4f60af895532bbe803268fc8fd2f70aa3202";
-  updateJobProxy.hash = "sha256-S6ZbaFu6cGZJA26Qf4wCC8rj+cE4MpER3LOgdenM+k8=";
+  updateJobProxy.hash = "sha256-IBUBBSXHwepTqvcWJyo5St+ceCc80ml0Arf6R9v54Eg=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:7940ec1d1828ae4935ef6fc862a7849dbe7d91ca3e294b37493e7e856c5f4f76";
-  updaterGitHubActions.hash = "sha256-o23JPAY+NErfiiK1j4hIHIjuaV3kiwE8D0yXbq8puaE=";
+  updaterGitHubActions.imageDigest = "sha256:57b7da54e9ce0f360523f27b3536f38af1606bf6a0a74a906d39fb9fa5caf80a";
+  updaterGitHubActions.hash = "sha256-cuAlu1PovPztc3P79bz8ySRCCDKh3dbt2WA4/ws6In8=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,7 +34,7 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-MLdCSo89H5/G/V4ncdSAi/B6Nv1prRtF6e/ighHqH5U=";
+    hash = "sha256-8wDP9NRsO/xbtbRTXY1BviEbZUEsiZBosJAni62uyFE=";
   };
 
   vendorHash = "sha256-mo/OOo+vw2jX0ggeEzNE8Qr5xXg0GEaTH6krdGQyeEE=";

From 9531c22a8ce16c5ad3953ace5866733c49842924 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 03:16:50 +0000
Subject: [PATCH 023/104] sops: 3.13.1 -> 3.13.2

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

diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix
index 14f9ec6ec2a6..edb2cda2e262 100644
--- a/pkgs/by-name/so/sops/package.nix
+++ b/pkgs/by-name/so/sops/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "sops";
-  version = "3.13.1";
+  version = "3.13.2";
 
   __structuredAttrs = true;
 
@@ -20,10 +20,10 @@ buildGoModule (finalAttrs: {
     owner = "getsops";
     repo = finalAttrs.pname;
     tag = "v${finalAttrs.version}";
-    hash = "sha256-df3CwJv+sROmikvWZbFGB1OrcSL1svuvFr6WJKYWhDc=";
+    hash = "sha256-en4MsPwqLRi8jlwuzWHgJ+ns42cBXuCzGbnZyGK9Vhk=";
   };
 
-  vendorHash = "sha256-cdaxcNCCHK2Rve96KvmO9lc9gZtgqu6rDeYb2vRvdHw=";
+  vendorHash = "sha256-qBtVnRJK/E545yTUwYXauVFBcpV8mUSxmush5vQMMrs=";
 
   subPackages = [ "cmd/sops" ];
 

From 2d7cf0ce3b92f6cc9bbd6b09cf515c3317f3dbb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 05:05:04 +0000
Subject: [PATCH 024/104] xpipe: 23.5.2 -> 23.6

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

diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 04a359085662..9a59a0ec908d 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-aPEyAlD7bpi30m7952gVzEDJZJr0BPJ7GJtKAg68aEc=";
+      x86_64-linux = "sha256-soypc4tPi9UexNqObZtKWvGgFA/4lPyv5ID3VEbjDDo=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "23.5.2";
+  version = "23.6";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From 5b35c4e0c9ef96459a0c6b8b331cc4dde05b4836 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 06:56:56 +0000
Subject: [PATCH 025/104] SDL_ttf: 2.0.11-unstable-2024-04-23 ->
 2.0.11-unstable-2026-07-05

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

diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
index 0bc0349ed809..7346ce264b91 100644
--- a/pkgs/by-name/sd/SDL_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL_ttf/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_ttf";
-  version = "2.0.11-unstable-2024-04-23";
+  version = "2.0.11-unstable-2026-07-05";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_ttf";
-    rev = "3c4233732b94ce08d5f6a868e597af39e13f8b23";
-    hash = "sha256-FX6Ko4CaOSCSKdpWVsJhTZXlWk1cnjbfVfMDiGG2+TU=";
+    rev = "3af6dd26174bb719c241447d1ea55e40597bb9a6";
+    hash = "sha256-OLPsLIddOnKpMjW+P9D1gEKyYC125X6sqpBbm44d8d8=";
   };
 
   buildInputs = [

From 74068bada3f4efd8c28a368ab604bf639287c8d0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 6 Jul 2026 17:48:49 +0200
Subject: [PATCH 026/104] phpExtensions.mysqlnd: move env variable into env for
 structuredAttrs

---
 pkgs/top-level/php-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 4862bee32275..5969439872af 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -559,7 +559,7 @@ lib.makeScope pkgs.newScope (
               # The configure script doesn't correctly add library link
               # flags, so we add them to the variable used by the Makefile
               # when linking.
-              MYSQLND_SHARED_LIBADD = "-lz -lssl -lcrypto";
+              env.MYSQLND_SHARED_LIBADD = "-lz -lssl -lcrypto";
               # The configure script builds a config.h which is never
               # included. Let's include it in the main header file
               # included by all .c-files.

From 83d7ac2ce5be374e3718f672086b6c5fdbc14b9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 17:17:32 +0000
Subject: [PATCH 027/104] pyprland: 3.4.2 -> 3.4.3

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

diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix
index e7aa394e31c1..0fd6bc16afc1 100644
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyprland";
-  version = "3.4.2";
+  version = "3.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "pyprland";
     tag = finalAttrs.version;
-    hash = "sha256-Bu2UumLJay3Fvd2aXhqWGbxApCVSdJKo51NLy1AC/+0=";
+    hash = "sha256-/CR07do2Ma9DYmQ3dNwaXYZmgIX4gQdVMdtEz+AM78E=";
   };
 
   build-system = [ python3Packages.hatchling ];

From 7c11b39464510638d72b4b9e397857fad9080d81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 17:41:23 +0000
Subject: [PATCH 028/104] python3Packages.lacuscore: 1.25.0 -> 1.25.1

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

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 8d4965a212df..9233dce4d2e9 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lacuscore";
-  version = "1.25.0";
+  version = "1.25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "LacusCore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gCNu0piYtyqXFIYhPhjrVk6qcPPVOsXDcFB3BG/g9G8=";
+    hash = "sha256-wbs/EZuK6eK8mKOB7sb0l4Y/orhugmoEnwy1bclusoU=";
   };
 
   pythonRelaxDeps = [

From cb2472dd79535c3f825c71299a6574fbb6972016 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Mon, 6 Jul 2026 17:25:32 +0000
Subject: [PATCH 029/104] proton-pass-cli: 2.2.1 -> 2.2.2

---
 pkgs/by-name/pr/proton-pass-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index 96e16e6beca3..c0282fa63e9f 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proton-pass-cli";
-  version = "2.2.1";
+  version = "2.2.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -57,19 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
-        hash = "sha256-+v1y8gxFy4Fnk/SNhiPObrnQZHhDGSN2fTZ3b96LRQ4=";
+        hash = "sha256-CdY2oYT7jck81ldf6RNFHsRlOcdFukjVM/2fq0THQPM=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
-        hash = "sha256-W/qSKyieYTM9cIx1x3qdvX0FbwBMg42CO8lIrN+xpa0=";
+        hash = "sha256-oVjbGFgF3wMPJZYfiUfZkRCLzW+QGv44krj/HUACGWE=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
-        hash = "sha256-9lpkph6Quup7olbZsUcgFo8EQPWz1jDRbSffNbRVR5o=";
+        hash = "sha256-Gvek5eqz1Sah5Hw4klxiQSQSAW3LOuEPvFUQUmXlwVM=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
-        hash = "sha256-+RbPDVhFA0aOTOy0EreGV7VUU4IphBc/y5ZWo9GnjOY=";
+        hash = "sha256-Zb91GVv9D+jZZgFEyDdGa37pGV045W41V9XuZDnF91E=";
       };
     };
     updateScript = writeShellScript "update-proton-pass-cli" ''

From 3ce316d2f9df655b41b064f582cdf9e173948f04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 18:11:12 +0000
Subject: [PATCH 030/104] vscode-extensions.ocamllabs.ocaml-platform: 2.0.1 ->
 2.3.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 62b1442404c2..dddf0d6404a9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3692,8 +3692,8 @@ let
         mktplcRef = {
           name = "ocaml-platform";
           publisher = "ocamllabs";
-          version = "2.0.1";
-          hash = "sha256-BFRGEH5a2kTSIZG3o0GkYPeZch5b7OBUN4+pKXSQ7SY=";
+          version = "2.3.0";
+          hash = "sha256-vb2tTtdHRmlF/TZRqUFjZNgE+5jizX/ky+NgzJYvXUg=";
         };
       };
 

From 6fe1fcddcf25b44fb78eac46fca457dc587a2490 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 18:26:37 +0000
Subject: [PATCH 031/104] python3Packages.oelint-parser: 8.11.4 -> 8.11.5

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

diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index 8e5e146ac649..a42dbd7cd982 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-parser";
-  version = "8.11.4";
+  version = "8.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = finalAttrs.version;
-    hash = "sha256-l2An1JQrDA8Sf0R3Xu0qp84fksUQu/3aPkwHGmfv6AY=";
+    hash = "sha256-DwbpF1H5fY854YKqB/8ppg6gMS2VhMzoyY8yr/DsfBk=";
   };
 
   pythonRelaxDeps = [ "regex" ];

From e99a345b00cc1ea5182946eb00d27b9b8e0d5a9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:06:16 +0000
Subject: [PATCH 032/104] sentry-native: 0.15.2 -> 0.15.3

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

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index 89b288392307..46ab40e702e3 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sentry-native";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = finalAttrs.version;
-    hash = "sha256-119xEbCBmY61hJln0+ZncavZDXh+iY3oGrVtZPQZFsk=";
+    hash = "sha256-9UwF8B1dd4RhboMgkZCHI3UqAm8aZAhgLo9VzjwlW/I=";
   };
 
   nativeBuildInputs = [

From a97372ba5515efdf92eb71ca44a91a8d68b67ce5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:08:43 +0000
Subject: [PATCH 033/104] gearboy: 3.8.8 -> 3.8.9

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

diff --git a/pkgs/by-name/ge/gearboy/package.nix b/pkgs/by-name/ge/gearboy/package.nix
index 32678ee1ffe6..e96f9ab020f5 100644
--- a/pkgs/by-name/ge/gearboy/package.nix
+++ b/pkgs/by-name/ge/gearboy/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gearboy";
-  version = "3.8.8";
+  version = "3.8.9";
 
   src = fetchFromGitHub {
     owner = "drhelius";
     repo = "Gearboy";
     tag = finalAttrs.version;
-    hash = "sha256-ZGhkcB7/WAvNaJ+tBNtka4lPHScnRI0hm9X1bUhpfRM=";
+    hash = "sha256-p6gIGWkcv4jJacF4baK8Uej2kwwPnd/ylvgmUHHPXnI=";
   };
 
   __structuredAttrs = true;

From ee32bde211a0293e077c727f25c95b5bf558576c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:14:16 +0000
Subject: [PATCH 034/104] rucio: 40.4.0 -> 40.4.1

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

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
index 4fefdabb3627..738acb2de7cd 100644
--- a/pkgs/development/python-modules/rucio/default.nix
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -40,13 +40,13 @@
 }:
 
 let
-  version = "40.4.0";
+  version = "40.4.1";
 
   src = fetchFromGitHub {
     owner = "rucio";
     repo = "rucio";
     tag = version;
-    hash = "sha256-aeLVMcC6ca3ZgWMSZJhhD1vW9oqxUKls0yF6gQFwfqU=";
+    hash = "sha256-0o4rJbl4GOH0M0sWkNtDqKJgdgrQyCLihao99RVIXqs=";
   };
 in
 buildPythonPackage {

From c27015861034ea4a9ceb46b6f411f71288a1b543 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:16:32 +0000
Subject: [PATCH 035/104] roxctl: 4.11.0 -> 4.11.1

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

diff --git a/pkgs/by-name/ro/roxctl/package.nix b/pkgs/by-name/ro/roxctl/package.nix
index af474816cf18..b56caf04bd1f 100644
--- a/pkgs/by-name/ro/roxctl/package.nix
+++ b/pkgs/by-name/ro/roxctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "roxctl";
-  version = "4.11.0";
+  version = "4.11.1";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = finalAttrs.version;
-    sha256 = "sha256-rUNeRaqjGtAoMj4v/wE7bO1ifOECkvn7C6ui3OhJdIY=";
+    sha256 = "sha256-1+I/piqSFIJsy3PCSs1z7BNmi4Sz+SeuVfAoi0k11IU=";
   };
 
-  vendorHash = "sha256-SoHwodOcS0Yeg0fNunnMrjcRdYM16HCz3EGzw2TbRKE=";
+  vendorHash = "sha256-mNZCsk7qZVej7yN8z/gAYWgSheCBj2sTF7pkmJbkW1w=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From cbcb6299ebb7090dda71172028ae8d421bfe1918 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:27:35 +0000
Subject: [PATCH 036/104] python3Packages.odfdo: 3.22.8 -> 3.22.10

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

diff --git a/pkgs/development/python-modules/odfdo/default.nix b/pkgs/development/python-modules/odfdo/default.nix
index 80a57879c143..292a0dbf23db 100644
--- a/pkgs/development/python-modules/odfdo/default.nix
+++ b/pkgs/development/python-modules/odfdo/default.nix
@@ -9,14 +9,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "odfdo";
-  version = "3.22.8";
+  version = "3.22.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jdum";
     repo = "odfdo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N256BtTV3zUXLL/ynXOTWqyoBorVsTEgevxdmLfRoJw=";
+    hash = "sha256-H/aJhWqkQGtG7bppM1AxWo/GBGYR6qAF7d/nxrby30M=";
   };
 
   build-system = [ uv-build ];

From b503c731fb7f8bf64448c9e268f8586f1d316065 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 19:40:06 +0000
Subject: [PATCH 037/104] netscanner: 0.6.41 -> 0.6.43

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

diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix
index 65e946da47fb..e1ea3949e2fc 100644
--- a/pkgs/by-name/ne/netscanner/package.nix
+++ b/pkgs/by-name/ne/netscanner/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "netscanner";
-  version = "0.6.41";
+  version = "0.6.43";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Chleba";
     repo = "netscanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Srsts0FDLMT01YW5Guv3r8yx5i5ua7bhAFbQ5BMN74=";
+    hash = "sha256-LLzv8+wAlZgXrj1Ldc+uGDfhvDYDtRU25R7UbmGb+ok=";
   };
 
-  cargoHash = "sha256-vlV5SibQlJ/yhJJKweqg6KYinpgZmWUUnyzAS6LBBKw=";
+  cargoHash = "sha256-47bvcj+0ZRcHjyt0cpZ0PT+NRvYdvBQcTTf9tZHci2Q=";
 
   postFixup = ''
     wrapProgram $out/bin/netscanner \

From 40395f15c7a4f32bc1cbaf159135b59d32257e95 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Mon, 6 Jul 2026 20:28:56 +0000
Subject: [PATCH 038/104] android-tools: 35.0.2 -> 36.0.1

* Revert some changes from 576fde128ae73b212c038e10b590148761d0ba82 commit.
  This update now uses system provided libusb instead of bundled one.

* Also, revert changes from 37a1895466014e1ed2589e7ad1add0a7e589e8e8 commit.
  udev is not required directly which is used with libusb.
---
 pkgs/tools/misc/android-tools/default.nix | 27 +++++------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix
index 80fff7f02859..f5678be64de7 100644
--- a/pkgs/tools/misc/android-tools/default.nix
+++ b/pkgs/tools/misc/android-tools/default.nix
@@ -14,10 +14,9 @@
   brotli,
   lz4,
   zstd,
+  libusb1,
   pcre2,
-  fetchpatch2,
   fmt,
-  udev,
 }:
 
 let
@@ -26,22 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "android-tools";
-  version = "35.0.2";
+  version = "36.0.1";
 
   src = fetchurl {
     url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
-    hash = "sha256-0sMiIoAxXzbYv6XALXYytH42W/4ud+maNWT7ZXbwQJc=";
+    hash = "sha256-OOioS3OUgBQd4INr9tWBszOax9U9D3zowESjNoyML48=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://raw.githubusercontent.com/nmeum/android-tools/0c4d79943e23785589ce1881cbb5a9bc76d64d9b/patches/extras/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch";
-      stripLen = 1;
-      extraPrefix = "vendor/extras/";
-      hash = "sha256-PO6ZKP54ri2ujVa/uFXgMy/zMQjjIo4e/EPW2Cu6a1Q=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     ninja
@@ -56,23 +46,16 @@ stdenv.mkDerivation rec {
     brotli
     lz4
     zstd
+    libusb1
     pcre2
     fmt
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
+  ];
   propagatedBuildInputs = [ pythonEnv ];
 
   preConfigure = ''
     export GOCACHE=$TMPDIR/go-cache
   '';
 
-  cmakeFlags = [
-    (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
-    (lib.cmakeBool "protobuf_MODULE_COMPATIBLE" true)
-    (lib.cmakeBool "ANDROID_TOOLS_LIBUSB_ENABLE_UDEV" stdenv.hostPlatform.isLinux)
-    (lib.cmakeBool "ANDROID_TOOLS_USE_BUNDLED_LIBUSB" true)
-  ];
-
   meta = {
     description = "Android SDK platform tools";
     longDescription = ''

From 583187fe7596401adfc0af9e3d8db7b815ab296c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 20:33:31 +0000
Subject: [PATCH 039/104] bottom: 0.14.2 -> 0.14.3

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

diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index efac4477c3ae..57f76bec1ef8 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bottom";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "ClementTsang";
     repo = "bottom";
     tag = finalAttrs.version;
-    hash = "sha256-0RaMkTmX6figTBjAxoH57330pHpVJJP8br33FxezqB0=";
+    hash = "sha256-DJ1Vw1YG4CXhXUwFh2pGyH6lqLw1oHG18AEXlC4xvZk=";
   };
 
-  cargoHash = "sha256-wCcc0t8MA0koeGdqVcz4uYKChU7gtHTQ8yqZGNigSxA=";
+  cargoHash = "sha256-SUR1O5Sm3CFxjkxkPWih7gnvf7L04D+x5SUFXvA/KgQ=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

From 728d5ba04d3cae9e19b00d5d3f231ad7280d59d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 23:07:26 +0000
Subject: [PATCH 040/104] pscale: 0.291.0 -> 0.293.0

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

diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index e264a5560224..ada4f79bc2ce 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pscale";
-  version = "0.291.0";
+  version = "0.293.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-dvWUriwAMgJMSkQPVNu5Ff4KFbp4KPE8lbY2OlttbzA=";
+    sha256 = "sha256-eROK3Bqp72rhUTUUZZlIUbMLTNmjEUXw2TBSsNVLONQ=";
   };
 
-  vendorHash = "sha256-n09VZjMHFnP/myZ0gqWdeD8QOQf3PpTJ9PUfb4x2zHo=";
+  vendorHash = "sha256-IkqXij3i3nUCHfu36yS7e4+5PM6ZHmPuYbgVo7Uv0X8=";
 
   ldflags = [
     "-s"

From b0b42e2949e7f6496fba48832ea70dcd3a09316d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jul 2026 23:49:35 +0000
Subject: [PATCH 041/104] python3Packages.perplexityai: 0.38.0 -> 0.39.0

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

diff --git a/pkgs/development/python-modules/perplexityai/default.nix b/pkgs/development/python-modules/perplexityai/default.nix
index 6f572887e89d..a179c437f835 100644
--- a/pkgs/development/python-modules/perplexityai/default.nix
+++ b/pkgs/development/python-modules/perplexityai/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "perplexityai";
-  version = "0.38.0";
+  version = "0.39.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     owner = "perplexityai";
     repo = "perplexity-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yp5A3aoKtAjWRPZ1Un2OYwezZohWirNm2JhAWLhd6uQ=";
+    hash = "sha256-2uBWvur6R7i1Y8oT2MTac1j+f/UMEmdbaKowDbrc0pA=";
   };
 
   # Can't use relaxPythonDeps as this is a version lock in the build system

From c7acbd9456cccc9b78318e8416ee81d23485adf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 00:37:21 +0000
Subject: [PATCH 042/104] badger: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 0b1581bb915f..0943bdf6f3fd 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "badger";
-  version = "4.9.2";
+  version = "4.9.3";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L6qGeOZlIl6I87t9Ohk57bA+WXT7NwMOJkiA3WaMFhM=";
+    hash = "sha256-B4DXzcgfkYcHqcK8F7NGbLcZWPmojMW4poRfCLv2DXI=";
   };
 
   vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY=";

From b1c2ad68261f28c631223ae8eeccbb25cdd3c323 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 00:43:26 +0000
Subject: [PATCH 043/104] calceph: 4.0.5 -> 5.0.0

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

diff --git a/pkgs/by-name/ca/calceph/package.nix b/pkgs/by-name/ca/calceph/package.nix
index d72a3a3da734..9d36197cd626 100644
--- a/pkgs/by-name/ca/calceph/package.nix
+++ b/pkgs/by-name/ca/calceph/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "calceph";
-  version = "4.0.5";
+  version = "5.0.0";
   src = fetchFromGitLab {
     domain = "gitlab.obspm.fr";
     owner = "imcce_calceph";
     repo = "calceph";
     tag = "calceph_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-V4Hh3FItBv3zYerNqNPeRJ5Afj3QTfdG3Ps5xeiDASg=";
+    hash = "sha256-bSgHRVPo0M8SIlw5uqZ0nyt5cVyg3WmxcHistV1FugY=";
   };
 
   nativeBuildInputs = [

From 0634617eb7776f624662c28b50138f17498c6e73 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 7 Jul 2026 00:08:36 +0000
Subject: [PATCH 044/104] emacsPackages.modus-themes-exporter: init at
 0-unstable-2026-04-24

---
 .../modus-themes-exporter/package.nix         | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix
new file mode 100644
index 000000000000..67b3c50b35d5
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  melpaBuild,
+  fetchFromGitHub,
+  modus-themes,
+  nix-update-script,
+}:
+melpaBuild {
+  pname = "modus-themes-exporter";
+  version = "0-unstable-2026-04-24";
+
+  src = fetchFromGitHub {
+    owner = "protesilaos";
+    repo = "modus-themes-exporter";
+    rev = "a19c4b0f22d353afcd441fbbc6c0565858a86c9b";
+    hash = "sha256-/PCCArQUV1uhhbOC3fqSuUkgDqc4+QlLubTtjx8/vGc=";
+  };
+
+  packageRequires = [ modus-themes ];
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
+
+  meta = {
+    description = "Export a Modus themes to another application";
+    homepage = "https://github.com/protesilaos/modus-themes-exporter";
+    maintainers = [ lib.maintainers.HeitorAugustoLN ];
+    license = lib.licenses.gpl3Plus;
+  };
+}

From aa9e25603e1790106ca4935c30dc53d4a7267154 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 06:24:52 +0000
Subject: [PATCH 045/104] vscode-extensions.databricks.databricks: 2.12.0 ->
 2.12.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 06b9077ffb11..942b912b34d8 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1226,8 +1226,8 @@ let
         mktplcRef = {
           name = "databricks";
           publisher = "databricks";
-          version = "2.12.0";
-          hash = "sha256-dDkJI9j79pFnZlEH9dokUoEYqjMmDyiU00IGGxzno1A=";
+          version = "2.12.1";
+          hash = "sha256-GKm3rZMvU/5Ii01GjUg7rE15TnOtDTh0LwkDVsuSLfY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";

From eeba54c7bfb78ff9100f7dd14c6763cc2f95655c Mon Sep 17 00:00:00 2001
From: Gabriel Dougherty <contact@gabrieldougherty.com>
Date: Sat, 6 Dec 2025 22:53:42 -0500
Subject: [PATCH 046/104] zmx: init at 0.6.0

---
 pkgs/by-name/zm/zmx/package.nix | 87 +++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 pkgs/by-name/zm/zmx/package.nix

diff --git a/pkgs/by-name/zm/zmx/package.nix b/pkgs/by-name/zm/zmx/package.nix
new file mode 100644
index 000000000000..7648925b1527
--- /dev/null
+++ b/pkgs/by-name/zm/zmx/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  apple-sdk,
+  installShellFiles,
+  writeShellScriptBin,
+  zig_0_15,
+  nix-update-script,
+}:
+let
+  zig = zig_0_15;
+
+  sdkRoot = apple-sdk.sdkroot;
+  # Ghostty's Zig build asks Zig to discover the native Darwin SDK via
+  # std.zig.LibCInstallation.findNative, which shells out to xcrun/xcode-select
+  # on macOS. Provide wrappers so this works inside the Nix sandbox.
+  xcrunWrapper = writeShellScriptBin "xcrun" ''
+    echo "${sdkRoot}"
+  '';
+  xcodeselectWrapper = writeShellScriptBin "xcode-select" ''
+    echo "${sdkRoot}"
+  '';
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zmx";
+  version = "0.6.0";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "neurosnap";
+    repo = "zmx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OkXtVf/LdBrZL6FH9TGx+mIhUXt2eSugLxZyMd+HL6k=";
+  };
+
+  zigDeps = zig.fetchDeps {
+    inherit (finalAttrs) src pname version;
+    fetchAll = true;
+    hash = "sha256-TwKoeaE4g5G7t7smKoqHkCCh998nSqKx5k6sO2vDlGs=";
+  };
+
+  postConfigure = ''
+    # Zig may write cache metadata next to fetched dependencies while checking them.
+    cp -rLT ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p"
+    chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
+  '';
+
+  nativeBuildInputs = [
+    installShellFiles
+    zig
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcrunWrapper
+    xcodeselectWrapper
+  ];
+
+  doCheck = true;
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
+      --bash <($out/bin/zmx completions bash) \
+      --zsh <($out/bin/zmx completions zsh) \
+      --fish <($out/bin/zmx completions fish)
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/neurosnap/zmx";
+    description = "Session persistence for terminal processes";
+    longDescription = ''
+      zmx provides session persistence for terminal shell sessions (pty processes).
+      Features include ability to attach and detach from shell sessions without killing them,
+      native terminal scrollback, multiple client connections to the same session,
+      and restoration of previous terminal state and output when re-attaching.
+    '';
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      dwt
+      GabrielDougherty
+    ];
+    mainProgram = "zmx";
+    platforms = lib.platforms.unix;
+  };
+})

From 56731276c4d4a7034a5f24348ba56ad68ca46cd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 07:00:00 +0000
Subject: [PATCH 047/104] python3Packages.gdsfactory: 9.44.0 -> 9.45.0

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

diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix
index 3f12120a89ac..3e6331120dcf 100644
--- a/pkgs/development/python-modules/gdsfactory/default.nix
+++ b/pkgs/development/python-modules/gdsfactory/default.nix
@@ -48,14 +48,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "gdsfactory";
-  version = "9.44.0";
+  version = "9.45.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "gdsfactory";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5iP359Sy93Pr5gmsCEEcTK47d0qbFUy9eEpcFZ6AJp4=";
+    hash = "sha256-BO/4SoD2qSPfNGwRJTMpkbeZc8Zez7Xy23CgX9CIqC0=";
   };
 
   build-system = [

From bd62dbb2c2de02d336a32c6db5b31a19224166b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 07:00:26 +0000
Subject: [PATCH 048/104] python3Packages.django-tenants: 3.10.0 -> 3.11.2

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

diff --git a/pkgs/development/python-modules/django-tenants/default.nix b/pkgs/development/python-modules/django-tenants/default.nix
index aa54ea05527e..4d06c3dd8558 100644
--- a/pkgs/development/python-modules/django-tenants/default.nix
+++ b/pkgs/development/python-modules/django-tenants/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "django-tenants";
-  version = "3.10.0";
+  version = "3.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-tenants";
     repo = "django-tenants";
     tag = "v${version}";
-    hash = "sha256-MzpoA49LOORR8LRLdWKhVZ+zQbF9GKLqBBi/j8WecK8=";
+    hash = "sha256-J7poXEHbRxhULYwFbV4tktet5wdsvd7RNHgivETy9+8=";
   };
 
   build-system = [ setuptools ];

From be8ed5f972e2ac56decdad95dbd44ca8e070be62 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jul 2026 09:31:24 +0200
Subject: [PATCH 049/104] python3Packages.iamdata: 0.1.202607061 ->
 0.1.202607071

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202607061...v0.1.202607071

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202607071
---
 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 aa8f5dd55d12..6ee4a6468e17 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.202607061";
+  version = "0.1.202607071";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IVJw7s3XvrYy1XlnKE9DMu5d39jWFKRiQTnqg5xANwM=";
+    hash = "sha256-gz2PMoEWE2+xUCfcmr8nI1AFTpKoEdrpuhD3HVoD4qM=";
   };
 
   __darwinAllowLocalNetworking = true;

From ecb868f57ae735758e402c6d568e33e4290ff968 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jul 2026 09:32:48 +0200
Subject: [PATCH 050/104] python3Packages.mypy-boto3-logs: 1.43.35 -> 1.43.41

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index dcac6cd77478..a2b40e9beba5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -806,8 +806,8 @@ in
       "sha256-EunrKwNaYp0CDiwp8frI7zASilMF4wYHjDSuCsJ6aJM=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.43.35"
-      "sha256-z43XDlXC123oIHrKLmEprJ3tfVXPDVg1wjLQJ9jM9WY=";
+    buildMypyBoto3Package "logs" "1.43.41"
+      "sha256-HAB24HG1jburH8wOPipqP1G1U7PX3i5BGp6mPUSa100=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.43.0"

From 0e1e9a09886199cc13631698477a90b5f24cacc9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jul 2026 09:32:59 +0200
Subject: [PATCH 051/104] python3Packages.mypy-boto3-opensearch: 1.43.39 ->
 1.43.41

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a2b40e9beba5..496b90510eed 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -966,8 +966,8 @@ in
       "sha256-1wQApBLsMnKRZ3lJZdd2W0+2Zz50QFdzYAhrOvEzByM=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.43.39"
-      "sha256-ML0Y1a5twHRFUmR0MppMRopU2RG9n6y0HpQj4jUb/Dk=";
+    buildMypyBoto3Package "opensearch" "1.43.41"
+      "sha256-eJIlC3LWzy+2xUZ+8uao64+IeYGdVMX1+B0+VLeA/D8=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.43.17"

From cebf1e4b3c5ef91d4ea04f656a4be4c075f77322 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jul 2026 09:33:35 +0200
Subject: [PATCH 052/104] python3Packages.boto3-stubs: 1.43.40 -> 1.43.41

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 4b7965549b2d..fd5b5573c2f2 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.43.40";
+  version = "1.43.41";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-5h8+Bf1ljDkoxwShyn+aAguxkCHJYcg5I5y3F7iv3JU=";
+    hash = "sha256-pXtT4D6Hh/2I3luQLYMDyfZB+8PQtCsSdR50vmQ2dds=";
   };
 
   build-system = [ setuptools ];

From 8a568da1ec57fed2044e4a33900215695146a6f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jul 2026 10:04:17 +0200
Subject: [PATCH 053/104] nerva: 1.37.0 -> 1.37.1

Diff: https://github.com/praetorian-inc/nerva/compare/v1.37.0...v1.37.1

Changelog: https://github.com/praetorian-inc/nerva/blob/v1.37.1/CHANGELOG.md
---
 pkgs/by-name/ne/nerva/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix
index 45f27e67e084..7695acb24b8d 100644
--- a/pkgs/by-name/ne/nerva/package.nix
+++ b/pkgs/by-name/ne/nerva/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nerva";
-  version = "1.37.0";
+  version = "1.37.1";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "nerva";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8naI5r/nmzQKHfub0Yv3uhx1MAh4VCSnsTY/n4BOX5U=";
+    hash = "sha256-gBPZSrXAm7DPxeO//To97sNyovCEJdYoaa4viCvLPME=";
   };
 
   vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";

From ddb536fe4e09d336e5956b1d660d8026891dc3ee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jul 2026 10:07:42 +0200
Subject: [PATCH 054/104] python3Packages.fastgit: 0.0.5 -> 0.0.6

Diff: https://github.com/AnswerDotAI/fastgit/compare/0.0.5...0.0.6

Changelog: https://github.com/AnswerDotAI/fastgit/blob/0.0.6/CHANGELOG.md
---
 pkgs/development/python-modules/fastgit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastgit/default.nix b/pkgs/development/python-modules/fastgit/default.nix
index e14571efeb63..0b98a1ecb573 100644
--- a/pkgs/development/python-modules/fastgit/default.nix
+++ b/pkgs/development/python-modules/fastgit/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastgit";
-  version = "0.0.5";
+  version = "0.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AnswerDotAI";
     repo = "fastgit";
     tag = finalAttrs.version;
-    hash = "sha256-rECQZAhtD6MsDwoED7K8I3HtYdbR8DqCZqP2AqNHroY=";
+    hash = "sha256-kasTNCeFrqEgska7wQ612c6lyQErnjsulqARo8WN9jA=";
   };
 
   build-system = [ setuptools ];

From 8746764d16a0e5475d1a8fb894d4934401b6e9a8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 13 Jun 2026 22:23:54 +0000
Subject: [PATCH 055/104] python3Packages.dask: 2026.3.0 -> 2026.7.0

Diff: https://github.com/dask/dask/compare/2026.3.0...2026.7.0

Changelog: https://docs.dask.org/en/latest/changelog.html
---
 pkgs/development/python-modules/dask/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index f10b8b100be4..e767f05cd464 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -44,14 +44,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dask";
-  version = "2026.3.0";
+  version = "2026.7.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask";
     tag = finalAttrs.version;
-    hash = "sha256-JfCiABGSCJKKSz2/r8fvpVwdQSZqvoQICe+lDvuNhoM=";
+    hash = "sha256-Lp8l4luwCGUmLWzwhAYBn8lrXH2bLTnMO7JCD+TqrKU=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

From 72ef15993ddc727a7017c665654c3168b1ceaede Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 13 Jun 2026 22:25:15 +0000
Subject: [PATCH 056/104] python3Packages.dask-image: 2025.11.0 -> 2026.5.0

Diff: https://github.com/dask/dask-image/compare/v2025.11.0...v2026.5.0

Changelog: https://github.com/dask/dask-image/releases/tag/v2026.5.0
---
 .../python-modules/dask-image/default.nix     | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index e17ebb975c62..7f90dcc8c18b 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -11,7 +11,6 @@
   dask,
   numpy,
   scipy,
-  pandas,
   pims,
 
   # tests
@@ -20,24 +19,22 @@
   scikit-image,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dask-image";
-  version = "2025.11.0";
+  version = "2026.5.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-image";
-    tag = "v${version}";
-    hash = "sha256-+nzYthnobcemunMcAWwRpHOQy6yFtjdib/7VZqWEiqc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SEbabXZx4u+C4IjzfVf81Y/gopxt6m0Jp0ZCN9hx5G8=";
   };
 
   postPatch = ''
-    sed -i "/--flake8/d" pyproject.toml
-
-    # https://numpy.org/doc/stable//release/2.4.0-notes.html#removed-numpy-in1d
-    substituteInPlace tests/test_dask_image/test_ndmeasure/test_core.py \
-      --replace-fail "np.in1d" "np.isin"
+    substituteInPlace pyproject.toml \
+      --replace-fail "--flake8" ""
   '';
 
   build-system = [
@@ -48,9 +45,8 @@ buildPythonPackage rec {
   dependencies = [
     dask
     numpy
-    scipy
-    pandas
     pims
+    scipy
   ];
 
   nativeCheckInputs = [
@@ -80,8 +76,8 @@ buildPythonPackage rec {
   meta = {
     description = "Distributed image processing";
     homepage = "https://github.com/dask/dask-image";
-    changelog = "https://github.com/dask/dask-image/releases/tag/v${version}";
+    changelog = "https://github.com/dask/dask-image/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From 52560d90999af65b12c8b0b5fedf7bc9608c8c71 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 13 Jun 2026 22:31:05 +0000
Subject: [PATCH 057/104] python3Packages.distributed: 2026.3.0 -> 2026.7.0

Diff: https://github.com/dask/distributed/compare/2026.3.0...2026.7.0

Changelog: https://github.com/dask/distributed/releases/tag/2026.7.0
---
 pkgs/development/python-modules/distributed/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 8a03aa1cd8ea..c22fdcc53516 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -21,20 +21,20 @@
   tblib,
   toolz,
   tornado,
-  urllib3,
   zict,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "distributed";
-  version = "2026.3.0";
+  version = "2026.7.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "distributed";
     tag = finalAttrs.version;
-    hash = "sha256-lStJwJbhuyPuJ7Nbcm6S6f7tq1T5DtAy8zE1p2Mdrt0=";
+    hash = "sha256-JwN+Ey+Ii8mELa6oVS+SDiOPYyMcKdaiSjjMqDze+kc=";
   };
 
   build-system = [
@@ -58,7 +58,6 @@ buildPythonPackage (finalAttrs: {
     tblib
     toolz
     tornado
-    urllib3
     zict
   ];
 

From cf86e18da684e8f38123d9a4659bec782b7a5735 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 5 Jul 2026 22:38:51 +0000
Subject: [PATCH 058/104] python3Packages.dask-yarn: drop (unmaintained)

---
 .../python-modules/dask-yarn/default.nix      | 84 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dask-yarn/default.nix

diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix
deleted file mode 100644
index c0a21e97a5e6..000000000000
--- a/pkgs/development/python-modules/dask-yarn/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  setuptools,
-  versioneer,
-  dask,
-  distributed,
-  grpcio,
-  skein,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "dask-yarn";
-  version = "0.9";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "dask";
-    repo = "dask-yarn";
-    tag = version;
-    hash = "sha256-/BTsxQSiVQrihrCa9DE7pueyg3aPAdjd/Dt4dpUwdtM=";
-  };
-
-  patches = [
-    (fetchpatch {
-      # https://github.com/dask/dask-yarn/pull/150
-      name = "address-deprecations-introduced-in-distributed-2021-07-0";
-      url = "https://github.com/dask/dask-yarn/pull/150/commits/459848afcdc22568905ee98622c74e4071496423.patch";
-      hash = "sha256-LS46QBdiAmsp4jQq4DdYdmmk1qzx5JZNTQUlRcRwY5k=";
-    })
-  ];
-
-  postPatch = ''
-    rm versioneer.py
-  '';
-
-  build-system = [
-    setuptools
-    versioneer
-  ];
-
-  dependencies = [
-    dask
-    distributed
-    grpcio
-    skein
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-
-  pythonImportsCheck = [ "dask_yarn" ];
-
-  disabledTests = [
-    # skein.exceptions.DriverError: Failed to start java process
-    "test_basic"
-    "test_adapt"
-    "test_from_specification"
-    "test_from_application_id"
-    "test_from_current"
-    "test_basic_async"
-    "test_widget_and_html_reprs"
-  ];
-
-  meta = {
-    description = "Deploy dask on YARN clusters";
-    mainProgram = "dask-yarn";
-    longDescription = ''
-      Dask-Yarn deploys Dask on YARN clusters,
-            such as are found in traditional Hadoop installations.
-            Dask-Yarn provides an easy interface to quickly start,
-            stop, and scale Dask clusters natively from Python.
-    '';
-    homepage = "https://yarn.dask.org/";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ illustris ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 818cd202a9c9..a8ec130f5be2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -150,6 +150,7 @@ mapAliases {
   cx_Freeze = throw "'cx_Freeze' has been renamed to/replaced by 'cx-freeze'"; # Converted to throw 2025-10-29
   cx_oracle = throw "'cx_oracle' has been renamed to/replaced by 'cx-oracle'"; # Converted to throw 2025-10-29
   dalle-mini = throw "'dalle-mini' has been removed due to lack of upstream maintenance"; # added 2026-02-26
+  dask-yarn = throw "'dask-yarn' has been removed due to lack of upstream maintenance"; # added 2026-07-06
   datashape = throw "'datashape' has been removed as it was unmaintained upstream"; # Added 2026-03-22
   datatable = throw "'datatable' has been removed due to lack of upstream maintenance"; # added 2026-02-02
   dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dac84bd97981..b2b7df6989b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3963,8 +3963,6 @@ self: super: with self; {
 
   dask-mpi = callPackage ../development/python-modules/dask-mpi { };
 
-  dask-yarn = callPackage ../development/python-modules/dask-yarn { };
-
   data-grand-lyon-ha = callPackage ../development/python-modules/data-grand-lyon-ha { };
 
   databackend = callPackage ../development/python-modules/databackend { };

From c359bb290d26f6dd5474a9372328f77b112f3148 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 08:40:50 +0000
Subject: [PATCH 059/104] python3Packages.dask-jobqueue: cleanup

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

diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index cb1749072e99..8acf016e74f7 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -11,13 +11,13 @@
   dask,
   distributed,
 
-  # checks
+  # tests
   cryptography,
   pytest-asyncio,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dask-jobqueue";
   version = "0.9.0";
   pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-jobqueue";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw=";
   };
 
@@ -100,4 +100,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From f59bd240ac20b03c27fe324a1ec9ba756100ecfe Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 08:41:07 +0000
Subject: [PATCH 060/104] python3Packages.dask-jobqueue: skip failing test

---
 pkgs/development/python-modules/dask-jobqueue/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index 8acf016e74f7..2b94ba936a5d 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -43,6 +43,9 @@ buildPythonPackage (finalAttrs: {
   ];
 
   disabledTests = [
+    # AssertionError: assert 1783413599.053456 < (1783413589.024546 + 10)
+    "test_runner"
+
     # Require some unavailable pytest fixtures
     "test_adapt"
     "test_adaptive"

From 753a02b33ae2ddb733d84bea4a270ce8064b281b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 09:05:57 +0000
Subject: [PATCH 061/104] python3Packages.odc-geo: 0.5.1 -> 0.5.2

Diff: https://github.com/opendatacube/odc-geo/compare/v0.5.1...v0.5.2

Changelog: https://github.com/opendatacube/odc-geo/releases/tag/v0.5.2
---
 .../python-modules/odc-geo/default.nix         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/odc-geo/default.nix b/pkgs/development/python-modules/odc-geo/default.nix
index 9b8db05e749a..3f4f03848bd2 100644
--- a/pkgs/development/python-modules/odc-geo/default.nix
+++ b/pkgs/development/python-modules/odc-geo/default.nix
@@ -24,20 +24,22 @@
 
   # tests
   geopandas,
+  imagecodecs,
   matplotlib,
   pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "odc-geo";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "opendatacube";
     repo = "odc-geo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rFhCY5rkZgVXM8aqsV0PoT8iPPpgNEQRI9MVqk6OQFQ=";
+    hash = "sha256-iubxn3ysx7aIMSrlrPPnfKYI8K7wSugM0/Zp2YIXeIg=";
   };
 
   build-system = [
@@ -77,6 +79,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     geopandas
+    imagecodecs
     matplotlib
     pytestCheckHook
   ]
@@ -85,19 +88,14 @@ buildPythonPackage (finalAttrs: {
   disabledTestMarks = [ "network" ];
 
   disabledTests = [
-    # AttributeError (fixes: https://github.com/opendatacube/odc-geo/pull/202)
-    "test_azure_multipart_upload"
-    # network access
-    "test_empty_cog"
-    # urllib url open error
+    # Require internet access
     "test_country_geom"
     "test_from_geopandas"
     "test_geoboxtiles_intersect"
     "test_warp_nan"
-    # requires imagecodecs package (currently not available on nixpkgs)
+
+    # imagecodecs.ImcdError: imcd_byteshuffle returned IMCD_VALUE_ERROR
     "test_cog_with_dask_smoke_test"
-    # xarray compat issue
-    "test_xr_reproject"
   ];
 
   pythonImportsCheck = [

From 4e85e4add9e9643417f0cd2d27b985a35a12aeb1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 09:32:33 +0000
Subject: [PATCH 062/104] python3Packages.scippneutron: 26.6.0 -> 26.7.0

Diff: https://github.com/scipp/scippneutron/compare/26.6.0...26.7.0

Changelog: https://github.com/scipp/scippneutron/releases/tag/26.7.0
---
 pkgs/development/python-modules/scippneutron/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/scippneutron/default.nix b/pkgs/development/python-modules/scippneutron/default.nix
index 67379dc882ad..a225cf80ef11 100644
--- a/pkgs/development/python-modules/scippneutron/default.nix
+++ b/pkgs/development/python-modules/scippneutron/default.nix
@@ -22,6 +22,7 @@
 
   # tests
   pytestCheckHook,
+  anywidget,
   pooch,
   hypothesis,
   ipykernel,
@@ -37,7 +38,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "scippneutron";
-  version = "26.6.0";
+  version = "26.7.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -45,7 +46,7 @@ buildPythonPackage (finalAttrs: {
     owner = "scipp";
     repo = "scippneutron";
     tag = finalAttrs.version;
-    hash = "sha256-ZhQVOUX2LcoLtAvAos7CWfVHKfqIWtIsXeYAPbUZTV0=";
+    hash = "sha256-a/d2TLqrCgUknZ6wIPQRvL/X6v96ZBuL1HjChASeci8=";
   };
 
   build-system = [
@@ -69,6 +70,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pytestCheckHook
+    anywidget
     hypothesis
     ipykernel
     ipympl
@@ -80,7 +82,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   env = {
-    # See: https://github.com/scipp/scippneutron/blob/26.6.0/src/scippneutron/data/__init__.py
+    # See: https://github.com/scipp/scippneutron/blob/26.7.0/src/scippneutron/data/__init__.py
     SCIPPNEUTRON_DATA_DIR =
       let
         # NOTE this might be changed by upstream in the future.

From 9670fcfadc5f8b125ebd2ac2cc71a45a769af819 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 7 Jul 2026 11:44:20 +0200
Subject: [PATCH 063/104] claude-code: 2.1.201 -> 2.1.202

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 7632d291fb4a..d6970d44c573 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.201",
-  "commit": "5bb45156ece6b12214696c88adec695b2dca1338",
-  "buildDate": "2026-07-03T20:01:44Z",
+  "version": "2.1.202",
+  "commit": "23f7f00042c9899630a3a02963fe4bb349512614",
+  "buildDate": "2026-07-06T20:02:44Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "a0852d76afc47b30f5cb0b7625ec9a7714cb189f2eeef6c28c77e2be954fb7fd",
-      "size": 231708784
+      "checksum": "7414f707861e2fe5afef33a466f888a8d2170e5028f5e9d2858f1d3ef45ffca5",
+      "size": 243631376
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "1889287a92d25356ae8bd8d8e67b11456015516ee8ba4277a0c7074786c49bb6",
-      "size": 241100240
+      "checksum": "0dc578bb294094f5041e99a0444030ac6ae7236b387e56f00d4a5214816763bd",
+      "size": 251667920
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "86b2eab34d382c7b428fc2e9f4c97f04e46805e950582472a13eb7d48de60516",
-      "size": 248101616
+      "checksum": "de5e0bb28e2b32409444ed4c1431e2931001c05ed270a3dc96c6706b0693867f",
+      "size": 258587376
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "a34809a6839fdefff21b9347d7fb5b6b58e6a9cc208a5e62853f29c83eb107a3",
-      "size": 251300664
+      "checksum": "71590202249892db3805ecd5b867f831f04b8129eaabd3f9a5bd4ba16b52c839",
+      "size": 261786424
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "5b4cde588b0196c8f88654ca9652c4703788f4d9fbab32a17ab3c444830085ae",
-      "size": 241349816
+      "checksum": "80405fead329dd67d786b2a3d49bb121797a157937c99dedae2e36fcc77b55e6",
+      "size": 251835576
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "a0f81ec99ac65e8c5919e7aae54b8a496488e0f1311884fc9ffd05c7cbf6bd2f",
-      "size": 245985664
+      "checksum": "bd62d47b677b8867e34f32642ee13f9fb87ad31b8acfdd326307eeffec02ec89",
+      "size": 256471424
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "fb804ee019bfbb8d7e85abf965e528e53b5aa5a4e4ebc0f164139dc10a9e0320",
-      "size": 241591968
+      "checksum": "7ff0787ebdc19fc509ccea8886ebf6a53ad8213407fa3a2b7c6d1446efc419f6",
+      "size": 252038816
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "a3ad78a0b593dea94c3ee787b1f5b17a173a7679203a296acf9aae7ef4705d42",
-      "size": 236058784
+      "checksum": "67a437feb7489620063f57e3bb073b8b7b82252d9373c9edc1d4969e42796be4",
+      "size": 246505120
     }
   }
 }

From 651c04662e25d47a8ac90e6c8d1d77a09b99db16 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 7 Jul 2026 11:44:24 +0200
Subject: [PATCH 064/104] vscode-extensions.anthropic.claude-code: 2.1.201 ->
 2.1.202

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../extensions/anthropic.claude-code/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 57bb91f5d47b..c996c416d0f0 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-/uvQIg773WUzalc9XFtBrocsGye3v5y1rvKyJVpXWS0=";
+          hash = "sha256-m1c/d6ZnIKxuzwh62BVITwOrU+O3iarvvzGy8O0Q2fg=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-zC0iYoAxmymxdqo2JgDcMOvUOA3pFbkx0s9C4F6E75k=";
+          hash = "sha256-QXufvHESQtNG0MDO3+ELONqSr7Ugzje4ZPX/VYWOmQ4=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-mhZBWpV3Gl5TLieIEvrtDmtqQBKeiCcDCwOShQnp++Y=";
+          hash = "sha256-gtHPurMqM93UhE6VfqR8y/XiF0nICkrPxwlV+ca7Bd4=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-I570YO5mvXgzXG52NdoGjgVgHbyshm6fIkCIN0li9+4=";
+          hash = "sha256-9YxeN0pYu7E8J1lz1IAzTFluBes7joCEOAzQpkRi7SM=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.201";
+      version = "2.1.202";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 9cfe766cf55da9f004d31532f2337b76886beee1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 10:25:03 +0000
Subject: [PATCH 065/104] python3Packages.pytest-responses: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/pytest-responses/default.nix b/pkgs/development/python-modules/pytest-responses/default.nix
index cef884d564a1..f5c7e733cd6e 100644
--- a/pkgs/development/python-modules/pytest-responses/default.nix
+++ b/pkgs/development/python-modules/pytest-responses/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-responses";
-  version = "0.5.1";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "pytest-responses";
     tag = version;
-    hash = "sha256-6QAiNWCJbo4rmaByrc8VNw39/eF3uqFOss3GJuCvpZg=";
+    hash = "sha256-sn11MX5nab6dDhgZkV/cy4yGnOhB2MyrC+l/RGKEU/8=";
   };
 
   build-system = [ setuptools ];

From 8ee41e5b852729d80135512349e9e252c3462f6b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jul 2026 15:49:20 +0000
Subject: [PATCH 066/104] python3Packages.pytensor: 3.0.7 -> 3.1.2

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

Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-3.1.2
---
 pkgs/development/python-modules/pytensor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index 5a8eb8e2159d..c6115797ae12 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytensor";
-  version = "3.0.7";
+  version = "3.1.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-/ECRFuRSTXZtBD8EUY3dg0Z4SxLG1+7DzHSWFSAnsoU=";
+    hash = "sha256-kKfbVSWsaA9ytii4GXeEmE+Oq8Qi7QNUOozgemqJI+k=";
   };
 
   build-system = [

From 7d37ea48101d62de51c122156d9c0e3456dee1f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 10:29:02 +0000
Subject: [PATCH 067/104] flannel: 0.28.5 -> 0.28.6

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

diff --git a/pkgs/by-name/fl/flannel/package.nix b/pkgs/by-name/fl/flannel/package.nix
index 7a2b5240fdea..34ed44d4c61c 100644
--- a/pkgs/by-name/fl/flannel/package.nix
+++ b/pkgs/by-name/fl/flannel/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.28.5";
+  version = "0.28.6";
   rev = "v${version}";
 
-  vendorHash = "sha256-TsMIH1L2LD+LxoAMwtvOa36sakiyxoJ2Av0oW5+dEJQ=";
+  vendorHash = "sha256-io2xUh5jM2x7P01MIpPgLAVXC/CAL22zrC6kfi4uYFs=";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-cG6w2fErJ6lnEfnHXEVwk6dk056bSamPUWquRu1R0QU=";
+    sha256 = "sha256-djPi4dgG9iR7K5c9NhMVJI1xdBmCX39+G/zt6dDRZx8=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];

From edae51f189730cadfe91f0c749d5a25020a7ef21 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jul 2026 16:59:53 +0000
Subject: [PATCH 068/104] python3Packages.pymc: 6.0.0 -> 6.1.0

Diff: https://github.com/pymc-devs/pymc/compare/v6.0.0...v6.1.0

Changelog: https://github.com/pymc-devs/pymc/releases/tag/v6.1.0
---
 pkgs/development/python-modules/pymc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix
index 3b351ccaabd7..faf1a2023138 100644
--- a/pkgs/development/python-modules/pymc/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pymc";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
     owner = "pymc-devs";
     repo = "pymc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-djioOgEtfKxXcbxYJGjPjCQOxcXi54xXNowJJhUWjE4=";
+    hash = "sha256-veJ42myRo23JXh33qC1OXxiGVI0VAARuYKVs7ObFr+Q=";
   };
 
   build-system = [

From bac0f8064dd2e9bc89015403878f46f8d687204d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 10:56:31 +0000
Subject: [PATCH 069/104] kubedock: 0.21.1 -> 0.22.0

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

diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index b080ac63fe79..7c3fad9533d5 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubedock";
-  version = "0.21.1";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = finalAttrs.version;
-    hash = "sha256-mxOvk2o2Ke8AEA9SyuyqHr+G9A2qpzlE9rqKG7INr4w=";
+    hash = "sha256-BaQT1UWHejcVkvQs88hKZdfyouUcGaghAlI2u/2kv9s=";
   };
 
-  vendorHash = "sha256-SROlRbpokMsnTscxF71upxmjhZPqTbkk50n0Htwh1lc=";
+  vendorHash = "sha256-2kr0nYKCRjHJkyp8/fdxssoDY6jJ03Bnc21Dw34GvB8=";
 
   # config.Build not defined as it would break r-ryantm
   ldflags = [

From 6be23b0af4ecdd99e7ebb8ac785515c1fbb21b2d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 6 Jul 2026 22:33:36 +0000
Subject: [PATCH 070/104] rerun: 0.33.1 -> 0.34.0

Diff: https://github.com/rerun-io/rerun/compare/0.33.1...0.34.0

Changelog: https://github.com/rerun-io/rerun/blob/0.34.0/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix             | 19 +++++++++++++------
 .../python-modules/rerun-notebook/default.nix |  2 +-
 .../python-modules/rerun-sdk/default.nix      | 12 ++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index b3694808af56..d1c4b7fadcbd 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   fetchFromGitHub,
   arrow-cpp,
+
   # nativeBuildInputs
   binaryen,
   lld,
@@ -12,6 +13,7 @@
   protobuf,
   rustfmt,
   nasm,
+
   # buildInputs
   freetype,
   glib,
@@ -19,7 +21,10 @@
   libxkbcommon,
   openssl,
   vulkan-loader,
+  # linux-only:
+  udev,
   wayland,
+
   versionCheckHook,
   # passthru
   nix-update-script,
@@ -35,10 +40,9 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.33.1";
+  version = "0.34.0";
 
   __structuredAttrs = true;
-  strictDeps = true;
 
   outputs = [
     "out"
@@ -49,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-GCIrvNNktW9h2/s90tTxFOmiIRAbWQWOS3Ti03EZ/GM=";
+    hash = "sha256-d+A8SQlbHP8Y1mCtwxGybPBvyJUnCgPLmsP4tiA9/Nk=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -58,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-wCJKerOgOUWNn3wBeHEKn92qzGdICX6P52B2FT5wcZE=";
+  cargoHash = "sha256-qomsbQaYBADWPi1gIZt2Y6lL5mPn468kQY7w9NBTXbg=";
 
   cargoBuildFlags = [
     "--package"
@@ -139,11 +143,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     freetype
     glib
     gtk3
-    (lib.getDev openssl)
     libxkbcommon
+    openssl
     vulkan-loader
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+    (lib.getLib wayland)
+  ];
 
   propagatedBuildInputs = [ arrow-cpp ];
 
diff --git a/pkgs/development/python-modules/rerun-notebook/default.nix b/pkgs/development/python-modules/rerun-notebook/default.nix
index 11b947a01b8a..96e4816d72ff 100644
--- a/pkgs/development/python-modules/rerun-notebook/default.nix
+++ b/pkgs/development/python-modules/rerun-notebook/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     inherit (finalAttrs) version;
     format = "wheel";
     python = "py2.py3";
-    hash = "sha256-PiZOxfVyqTwK0oSQ57TLpDIzuZUSecSEDmJtfdqqCGo=";
+    hash = "sha256-zWhOls/u1g+pv2k5IGROlS/Jp2j2s6Whrdl7zc93vVw=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix
index 7521d115636e..30465ee4eca0 100644
--- a/pkgs/development/python-modules/rerun-sdk/default.nix
+++ b/pkgs/development/python-modules/rerun-sdk/default.nix
@@ -105,11 +105,23 @@ buildPythonPackage {
   postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
   disabledTests = [
+    # RuntimeError: MP4 error: MP4 demux: MP4 error: file contains a box with a larger size than it
+    "test_allow_b_frames_opts_in_to_b_frame_inputs"
+    "test_asset_mode_timeline_type_timestamp_applies_to_index_chunk"
+    "test_b_frames_in_stream_mode_raise"
+    "test_custom_entity_path_applies_to_every_chunk"
+    "test_default_mode_produces_video_stream_chunks"
+    "test_stream_mode_chunk_by_gop_false_emits_one_sample_per_chunk"
+    "test_stream_mode_chunk_by_gop_true_packs_multiple_samples"
+    "test_timeline_type_timestamp_produces_timestamp_typed_column"
+
     # ConnectionError: Connection: connecting to server: transport error
+    "test_batch_shape"
     "test_decode_matrix"
     "test_fixed_rate_sampling_duplicates_decode_correctly"
     "test_isolated_streams"
     "test_off_grid_capture_rate_decodes_correctly"
+    "test_roundtrip_parity"
     "test_save_screenshot"
     "test_send_dataframe_roundtrip"
     "test_server_failed_table_creation_does_not_leak_entry"

From e24bd9a2d06da5b7b45f6ea1ec3cf68ce808543f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 09:51:50 +0000
Subject: [PATCH 071/104] python3Packages.datafusion: 52.3.0 -> 53.0.0

Diff:
https://github.com/apache/datafusion-python/compare/52.3.0...53.0.0

Changelog:
https://github.com/apache/datafusion-python/blob/53.0.0/CHANGELOG.md
---
 pkgs/development/python-modules/datafusion/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 6118e3d8589f..94777e49b2dc 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -25,8 +25,10 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "datafusion";
-  version = "52.3.0";
+  # WARNING: Ensure rerun-sdk is compatible with this version of datafusion
+  version = "53.0.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     name = "datafusion-source";
@@ -35,12 +37,12 @@ buildPythonPackage (finalAttrs: {
     tag = finalAttrs.version;
     # Fetch arrow-testing and parquet-testing (tests assets)
     fetchSubmodules = true;
-    hash = "sha256-kyJoG65XKSF+RElZlsdfVTZp/ufWiUw0YdCpQ8Qcg78=";
+    hash = "sha256-3plgAJuh2rrnvzkQVy3gUgEoHHT4FSjDp5DZx1keD+g=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname src version;
-    hash = "sha256-7/YWJORUjhhZSLyyBT6NFD0RzARJ3SKd11gn4kJ7aYw=";
+    hash = "sha256-kHGlUaPNSs1Nh3HCU+yUVQq/IXp9PUwpDmfAon8eRBk=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 41f150e4067ec749f10af587ee43891517c46fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 7 Jul 2026 13:20:37 +0200
Subject: [PATCH 072/104] python3Packages.openrazer: 3.12.3 -> 3.12.4

Changelog: https://github.com/openrazer/openrazer/releases/tag/v3.12.4
Diff: https://github.com/openrazer/openrazer/compare/v3.12.3...v3.12.4
---
 pkgs/development/python-modules/openrazer/common.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 948ee9f4895d..4c621b8b538f 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,17 +1,18 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "3.12.3";
+  version = "3.12.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
     tag = "v${version}";
-    hash = "sha256-X1NPqbugBdxD5Nt9wIwQADV4CuydGLpgKhlNazVdrIY=";
+    hash = "sha256-WgDYs0ehnzWlX/wvfur0UhFLbZv7jZ6FMybqDaFDuLg=";
   };
 
   meta = {
     homepage = "https://openrazer.github.io/";
+    changelog = "https://github.com/openrazer/openrazer/releases/tag/${src.tag}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ evanjs ];
     platforms = lib.platforms.linux;

From 4d82f051d43a1581e65e75333b490df041941685 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 09:47:01 +0000
Subject: [PATCH 073/104] python3Packages.ngff-zarr: 0.37.0 -> 0.37.1

Diff: https://github.com/fideus-labs/ngff-zarr/compare/py-v0.37.0...py-v0.37.1

Changelog: https://github.com/fideus-labs/ngff-zarr/releases/tag/py-v0.37.1
---
 .../python-modules/ngff-zarr/default.nix      | 84 ++++++++++++++-----
 1 file changed, 65 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/ngff-zarr/default.nix b/pkgs/development/python-modules/ngff-zarr/default.nix
index 0eee8e95bc0c..544c9f223ebf 100644
--- a/pkgs/development/python-modules/ngff-zarr/default.nix
+++ b/pkgs/development/python-modules/ngff-zarr/default.nix
@@ -1,44 +1,57 @@
 {
   lib,
   buildPythonPackage,
-  dask,
-  dask-image,
-  deepdiff,
   fetchFromGitHub,
+
+  # build-system
   hatchling,
+
+  # dependencies
+  dask,
   importlib-resources,
-  itk,
-  itkwasm-downsample,
-  itkwasm-image-io,
   itkwasm,
-  jsonschema,
-  nibabel,
-  imageio,
+  itkwasm-downsample,
   numpy,
-  imagecodecs,
   platformdirs,
-  pooch,
   psutil,
-  pytestCheckHook,
-  rich-argparse,
   rich,
-  tensorstore,
-  tifffile,
+  rich-argparse,
   typing-extensions,
-  writableTmpDirAsHomeHook,
   zarr,
+
+  # optional-dependencies
+  # dask-image:
+  dask-image,
+  # cli:
+  imagecodecs,
+  imageio,
+  itk,
+  itkwasm-image-io,
+  nibabel,
+  tifffile,
+  # tensorstore:
+  tensorstore,
+  # validate:
+  jsonschema,
+
+  # tests
+  deepdiff,
+  pooch,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "ngff-zarr";
-  version = "0.37.0";
+  version = "0.37.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "fideus-labs";
     repo = "ngff-zarr";
     tag = "py-v${finalAttrs.version}";
-    hash = "sha256-v747oBJMKORiEgy3fVzzgl35+9uRbyGvtor+Ga4UkNI=";
+    hash = "sha256-73bduVeH+o7uirhwFcFpU33NUAOZe//GCVYMl6OYgC8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/py/";
@@ -87,7 +100,7 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
     writableTmpDirAsHomeHook
   ]
-  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
   pythonImportsCheck = [ "ngff_zarr" ];
 
@@ -96,16 +109,19 @@ buildPythonPackage (finalAttrs: {
     "test/test_cli_input_to_ngff_image.py"
     "test/test_cli_output.py"
     "test/test_cli_relative_paths.py"
+
     # Attribute errors
     "test/test_pyramid_integrity.py"
     "test/test_multiscales_type.py"
     "test/test_convert_ome_zarr_version.py"
     "test/test_itk_image_to_ngff_image.py"
+
     # Data missing
     "test/test_hcs.py"
     "test/test_hcs_simple.py"
     "test/test_ngff_validation.py"
     "test/test_nibabel_image_to_ngff_image.py"
+
     # Network access
     "test/test_from_ngff_zarr_tensorstore.py"
     "test/test_from_ngff_zarr.py"
@@ -120,16 +136,46 @@ buildPythonPackage (finalAttrs: {
     "test/test_to_ngff_zarr_sharding.py"
     "test/test_to_ngff_zarr_tensorstore.py"
     "test/test_to_ngff_zarr_v3_compression.py"
+
     # Missing dependencies
     "test/test_lif_to_ngff_image.py"
   ];
 
   disabledTests = [
+    # ValueError: zarr 3.2.1 < 3 is not supported
+    "test_clean_tiff_emits_no_structural_warning"
+    "test_multiseries_tiff_to_directory_keeps_per_series_stores"
+    "test_multiseries_tiff_to_ozx_creates_requested_file"
+    "test_non_rgb_multichannel_tiff_no_channel_colors"
+    "test_ome_tiff_channel_colors_from_xml"
+    "test_ome_tiff_rgb_s_axis_overrides_xml_colors"
+    "test_pyramidal_grayscale_tiff"
+    "test_pyramidal_rgb_tiff_channel_consistency"
+    "test_tiff_file_to_ngff_images_2d"
+    "test_tiff_file_to_ngff_images_all_series"
+    "test_tiff_file_to_ngff_images_no_ome_metadata"
+    "test_tiff_file_to_ngff_images_partial_ome_metadata"
+    "test_tiff_file_to_ngff_images_series_all"
+    "test_tiff_file_to_ngff_images_simple_rgb"
+    "test_tiff_file_to_ngff_images_single_series_by_index"
+    "test_tiff_file_to_ngff_images_unit_normalization"
+    "test_tiff_file_to_ngff_images_unsupported_axis_warning"
+    "test_tiff_file_to_ngff_images_with_channel_names"
+    "test_tiff_file_to_ngff_images_with_channels"
+    "test_tiff_file_to_ngff_images_with_ome_metadata"
+    "test_tiff_file_to_ngff_images_with_partial_channel_names"
+    "test_tiff_file_to_ngff_images_with_sample_axis"
+    "test_tiff_file_to_ngff_images_without_channel_names"
+    "test_tiff_sample_axis_rgba_sets_four_channel_colors"
+    "test_tiff_sample_axis_sets_rgb_channel_colors"
+    "test_truncated_tiff_emits_warning"
+
     # Assertion errors
     "test_2d_yx"
     "test_3d_zyx"
     "test_smaller_dask_graph"
     "test_tensorstore_compression"
+
     # Test requires network access
     "test_cli_orientation_preset_end_to_end"
     "test_cli_itk_input_writes_orientation_automatically"

From d825df355fed4b67ca65b19935f28cc106e9e4af Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 11:56:49 +0000
Subject: [PATCH 074/104] python3Packages.ome-zarr: 0.16.0 -> 0.18.0

Diff: https://github.com/ome/ome-zarr-py/compare/v0.16.0...v0.18.0

Changelog: https://github.com/ome/ome-zarr-py/releases/tag/v0.18.0
---
 .../python-modules/ome-zarr/default.nix       | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix
index 980adf7d6864..23ccd2e0ff83 100644
--- a/pkgs/development/python-modules/ome-zarr/default.nix
+++ b/pkgs/development/python-modules/ome-zarr/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ome-zarr";
-  version = "0.16.0";
+  version = "0.18.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
     owner = "ome";
     repo = "ome-zarr-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hrk+F1a1yJzaIb7G80sGdqeMb2POIAD2gLOfK57A22A=";
+    hash = "sha256-cuvPlPvhCoivMPpesARnc0+fUqwxjeHyZ2E1e1iHUb8=";
   };
 
   build-system = [
@@ -66,6 +66,8 @@ buildPythonPackage (finalAttrs: {
 
   disabledTests = [
     # attempts to access network
+    "test_class_reader"
+    "test_class_reader_legacy"
     "test_s3_info"
 
     # AssertionError: assert {'blocksize':... 'blosc', ...} == {'blocksize':... 'blosc', ...}
@@ -75,25 +77,6 @@ buildPythonPackage (finalAttrs: {
   ];
 
   disabledTestPaths = [
-    # Fail with RecursionError
-    # https://github.com/ome/ome-zarr-py/issues/352
-    "tests/test_cli.py::TestCli::test_astronaut_download"
-    "tests/test_cli.py::TestCli::test_astronaut_info"
-    "tests/test_cli.py::TestCli::test_coins_info"
-    "tests/test_emitter.py::test_close"
-    "tests/test_emitter.py::test_create_wrong_encoding"
-    "tests/test_node.py::TestNode::test_image"
-    "tests/test_node.py::TestNode::test_label"
-    "tests/test_node.py::TestNode::test_labels"
-    "tests/test_ome_zarr.py::TestOmeZarr::test_download"
-    "tests/test_ome_zarr.py::TestOmeZarr::test_info"
-    "tests/test_reader.py::TestReader::test_image"
-    "tests/test_reader.py::TestReader::test_label"
-    "tests/test_reader.py::TestReader::test_labels"
-    "tests/test_starting_points.py::TestStartingPoints::test_label"
-    "tests/test_starting_points.py::TestStartingPoints::test_labels"
-    "tests/test_starting_points.py::TestStartingPoints::test_top_level"
-
     # tries to access network:
     "ome_zarr/io.py"
   ];

From c199f20f709e045b5670c2ce911f9e5183f13873 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 12:44:07 +0000
Subject: [PATCH 075/104] bomly: 0.16.0 -> 0.16.1

---
 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 e09af8124794..281ef18c8064 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.0";
+  version = "0.16.1";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
     owner = "bomly-dev";
     repo = "bomly-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y4FJCOzgEUprIBy/RuWVIlco4bI0XNUNabRr+2VebgM=";
+    hash = "sha256-RJqYRCnE4lqR68lP9hL9hTOxXS3cPEgspBn2JgvffyM=";
   };
 
-  vendorHash = "sha256-qptl09fBZigImxr0ReWIqdmvyeHqr372pZqDnyMHe5A=";
+  vendorHash = "sha256-W7FfqWV86D8fXZ4nm/0IVZuqocgo8/Sd9DA1Ef4SJ/4=";
 
   # .gitattributes excludes all testdata from the GitHub tarball
   postPatch = ''

From b587e7fea65ecb945190398cd3735c812e82969d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 18 Jun 2026 08:21:08 +0000
Subject: [PATCH 076/104] mistral-rs: 0.8.4 -> 0.9.0

Diff: https://github.com/EricLBuehler/mistral.rs/compare/v0.8.4...v0.9.0

Changelog:
https://github.com/EricLBuehler/mistral.rs/releases/tag/v0.9.O
---
 pkgs/by-name/mi/mistral-rs/no-native-cpu.patch | 18 ++++--------------
 pkgs/by-name/mi/mistral-rs/package.nix         | 10 +++++-----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch b/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch
index ed65366cce2d..34087f8c4158 100644
--- a/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch
+++ b/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch
@@ -1,20 +1,10 @@
 diff --git a/.cargo/config.toml b/.cargo/config.toml
-index 0ab50ad46..3f5fe0788 100644
+index d3e3031e1..96b624fb3 100644
 --- a/.cargo/config.toml
 +++ b/.cargo/config.toml
-@@ -1,15 +1,10 @@
+@@ -1,5 +1,2 @@
 -[build]
 -rustflags = ["-C", "target-cpu=native"]
 -
- [target.aarch64-apple-darwin]
- rustflags = [
--  "-C", "target-cpu=native",
-   "-C", "target-feature=+aes,+sha2,+fp16,+i8mm",
- ]
- 
- [target.x86_64-apple-darwin]
- rustflags = [
--  "-C", "target-cpu=native",
-   "-C", "target-feature=-avx,-avx2",
- ]
- 
+ [target.wasm32-unknown-unknown]
+ rustflags = ["-C", "target-feature=+simd128"]
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index af7a37c95d62..33a343496199 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -73,14 +73,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mistral-rs";
-  version = "0.8.4";
+  version = "0.9.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "EricLBuehler";
     repo = "mistral.rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BSP8fi4grbEzGOfR4tGCJVjIom/1d2mnFrK8O6BRWL4=";
+    hash = "sha256-3p/e7UZ8BLwT+dpb61NmzX2Z1QxxEgkgjlNzv5lWybM=";
   };
 
   patches = [
@@ -100,16 +100,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     + lib.optionalString cudaSupport ''
       substituteInPlace mistralrs-flash-attn/build.rs \
         --replace-fail \
-          ".with_cutlass(Some(CUTLASS_COMMIT))" \
+          ".with_cutlass(Some(&cutlass_commit))" \
           ""
 
       substituteInPlace mistralrs-quant/build.rs \
         --replace-fail \
-          'builder = builder.with_cutlass(Some("7d49e6c7e2f8896c47f586706e67e1fb215529dc"));' \
+          "builder = builder.with_cutlass(Some(&cutlass_commit));" \
           ""
     '';
 
-  cargoHash = "sha256-T4TPm31fihx9ZvQ6jme67yrc0osl4c9CiAm4+rISgFs=";
+  cargoHash = "sha256-TULJ3mEAWp1ktPDPeBbUJGHhsEuo5T2qh3/JpS+8+ds=";
 
   nativeBuildInputs = [
     pkg-config

From 53900e0a013b49c115b566eba4578f6c0292330d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 14:05:16 +0000
Subject: [PATCH 077/104] terraform-providers.huaweicloud_huaweicloud: 1.93.0
 -> 1.94.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index cb1e88a9a2e3..5d2224c61b2a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -724,11 +724,11 @@
     "vendorHash": "sha256-6knIcS3hkzt3R1IC1hA6EKOceJl51/pJXpftEaZjgtY="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-Ao3CkaQBe172Ookcgl+ugeHH5ClbyOsSpLb4+j9DAZQ=",
+    "hash": "sha256-yuBbgu3DtnwMLwgFZtHpI6yo8p0Pzl6AtlqbW2cWi+c=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.93.0",
+    "rev": "v1.94.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From a8b1e8fe0fe96a3d52471672b93a8bf7e1a7903e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 14:33:03 +0000
Subject: [PATCH 078/104] display3d: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix
index e53d665b3743..b3befef51562 100644
--- a/pkgs/by-name/di/display3d/package.nix
+++ b/pkgs/by-name/di/display3d/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "display3d";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "renpenguin";
     repo = "display3d";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dFfU80/1fhBz9/0fVZigo+nZx6Lj66OsP52oMDpS+BY=";
+    hash = "sha256-f2iT+3xqtFY8e9kmwpEac0/WQLFVL6tXUk/lQgBQzaM=";
   };
 
-  cargoHash = "sha256-eXpoWKYonNZQqqIFrxO4RnLLX1s1osaZxZt3gVTYd4o=";
+  cargoHash = "sha256-IEaiehlOCQGun/CUIbPlCITAm6L/XV1uyQSmlBPnxGk=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 577b3ec8cdc1b6719ba9dd46227a7a900d9dbf84 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 14:12:31 +0000
Subject: [PATCH 079/104] python3Packages.sagemaker-mlflow: 0.4.0 -> 0.5.0

Diff: https://github.com/aws/sagemaker-mlflow/compare/v0.4.0...v0.5.0

Changelog: https://github.com/aws/sagemaker-mlflow/releases/tag/v0.5.0
---
 .../sagemaker-mlflow/default.nix              | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
index 06cfb393bdbe..2e13c49f21d9 100644
--- a/pkgs/development/python-modules/sagemaker-mlflow/default.nix
+++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
@@ -11,13 +11,16 @@
   mlflow-skinny,
 
   # tests
+  matplotlib,
+  pandas,
   pytestCheckHook,
   scikit-learn,
+  skops,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "sagemaker-mlflow";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -25,9 +28,17 @@ buildPythonPackage (finalAttrs: {
     owner = "aws";
     repo = "sagemaker-mlflow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QE40ZBW7N3GPC+eJqj5uzS3L+A6Wu2/LgHOiUsEXKMw=";
+    hash = "sha256-nSI1BGJ2hhzuHxnGjElDuPpuc2rRn2mX5+s4ZSuZna0=";
   };
 
+  # AssertionError: sagemaker_mlflow version is dev - 0.5.0.dev1
+  postPatch = ''
+    substituteInPlace VERSION \
+      --replace-fail \
+        "0.5.0.dev1" \
+        "${finalAttrs.version}"
+  '';
+
   build-system = [
     setuptools
   ];
@@ -40,10 +51,19 @@ buildPythonPackage (finalAttrs: {
   pythonImportsCheck = [ "sagemaker_mlflow" ];
 
   nativeCheckInputs = [
+    matplotlib
+    pandas
     pytestCheckHook
     scikit-learn
+    skops
   ];
 
+  # mlflow.exceptions.MlflowException: The filesystem tracking backend (e.g., './mlruns') is in maintenance mode and will not receive further updates.
+  # Please migrate to a database backend (e.g., 'sqlite:///mlflow.db') to access the latest MLflow features.
+  preCheck = ''
+    export MLFLOW_ALLOW_FILE_STORE=true
+  '';
+
   disabledTests = [
     # AssertionError: assert 's3' in '/build/source/not implemented/0/d3c16d2bad4245bf9fc68f86d2e7599d/artifacts'
     "test_log_metric"
@@ -56,18 +76,6 @@ buildPythonPackage (finalAttrs: {
     "test_log_artifact"
     "test_presigned_url"
     "test_presigned_url_with_fields"
-
-    # Exercises a `sqlite://` model-registry store, only available with the
-    # sqlalchemy backend of the full `mlflow` package (not `mlflow-skinny`).
-    "test_store_instantiation_none"
-  ];
-
-  disabledTestPaths = [
-    # `from mlflow.models import infer_signature` fails to import at collection
-    # time: `infer_signature` is only available in the full `mlflow` package,
-    # not in `mlflow-skinny`. Also see:
-    # https://github.com/aws/sagemaker-mlflow/issues/16
-    "test/integration/tests/test_model_registry.py"
   ];
 
   meta = {

From 1bd86dabb6cf80d9e5861a074c6da69c63dd12b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 14:41:24 +0000
Subject: [PATCH 080/104] python3Packages.trino-python-client: 0.337.0 ->
 0.338.0

---
 .../python-modules/trino-python-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix
index 86b10c9c09c1..ffab91253b22 100644
--- a/pkgs/development/python-modules/trino-python-client/default.nix
+++ b/pkgs/development/python-modules/trino-python-client/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "trino-python-client";
-  version = "0.337.0";
+  version = "0.338.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "trino-python-client";
     owner = "trinodb";
     tag = version;
-    hash = "sha256-q080IbPeck5Ru+3T2jChhNXi05CYPSO8ncf3KI62cRw=";
+    hash = "sha256-kWbqzdeOkzjhcaQOS4bCUnXFILpurtVE3N3KLoqSeds=";
   };
 
   build-system = [ setuptools ];

From 67ddb3f74b73f61b2b9404df4fe3d45b19cc1f7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 14:42:07 +0000
Subject: [PATCH 081/104] nu_scripts: 0-unstable-2026-06-03 ->
 0-unstable-2026-07-02

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

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index ca7be6545fa9..0355a62e8350 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2026-06-03";
+  version = "0-unstable-2026-07-02";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "ca79ff62bd3fe0d31cd50762dcb1c8a46883044e";
-    hash = "sha256-pk29HELNbBfQZDoXeLotUUZlRbQx7k168Rcw1JUOnvU=";
+    rev = "4af42d7f10993ee488ae37762a0e7034b9a004f6";
+    hash = "sha256-Q+RxZ7j1odpxbZXdex2gfJ7uUqmIpNk1W/Cq39K1g0s=";
   };
 
   installPhase = ''

From 49987db5c420cfe47812b4bee26ebd9192828733 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 14:50:15 +0000
Subject: [PATCH 082/104] openrct2: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index 1c3e672e319e..96713155bebd 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -40,14 +40,14 @@
 }:
 
 let
-  objects-version = "1.7.9";
+  objects-version = "1.7.10";
   openmusic-version = "1.6.1";
   opensfx-version = "1.0.6";
   title-sequences-version = "0.4.26";
 
   objects = fetchurl {
     url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
-    hash = "sha256-VUYe0gxugvFOmiec2ERlSwJkmZu5QDTVj6kS/e4m6tY=";
+    hash = "sha256-9IO+Jm3CIHe6hRe78y/+OIw1Q7LuWF4K+9QQLbRSgCE=";
   };
   openmusic = fetchurl {
     url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmusic-version}/openmusic.zip";
@@ -64,13 +64,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openrct2";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sKfNE57ZpTsHJk0uKG0YUQYg63xnOiAEwkgRaG4zgmo=";
+    hash = "sha256-my7fPBD5N0bO1yPaxwHUFqw6TvayQs10kcAX/NqPpIg=";
   };
 
   nativeBuildInputs = [

From 1b6bdba19e692b75b3917110f0e4eb701b4bdca2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 15:38:48 +0000
Subject: [PATCH 083/104] python3Packages.opensfm: cleanup

---
 .../python-modules/opensfm/default.nix        | 154 ++++++++++--------
 1 file changed, 86 insertions(+), 68 deletions(-)

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index 8be40ab1731a..dfccd22f99ae 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -3,52 +3,64 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  runCommand,
-  srcOnly,
-  bashNonInteractive,
-  cmake,
-  ceres-solver,
-  suitesparse,
-  metis,
-  eigen,
+
+  # build-system
+  ninja,
+  scikit-build-core,
   setuptools,
-  pkg-config,
-  pybind11,
-  numpy,
-  pyyaml,
-  flask,
-  fpdf2,
-  opencv-python,
-  lapack,
-  gtest,
+
+  # nativeBuildInputs
+  cmake,
+
+  # buildInputs
+  bashNonInteractive,
+  ceres-solver,
+  eigen,
   gflags,
   glog,
-  pytestCheckHook,
-  networkx,
-  pillow,
+  gtest,
+  lapack,
+  metis,
+  pybind11,
+  suitesparse,
+
+  # dependencies
+  cloudpickle,
   exifread,
+  flask,
+  fpdf2,
+  joblib,
+  matplotlib,
+  networkx,
+  numpy,
+  opencv-python,
+  pillow,
   pyproj,
   python-dateutil,
-  joblib,
-  xmltodict,
-  cloudpickle,
+  pyyaml,
   scipy,
-  sphinx,
-  matplotlib,
-  scikit-build-core,
-  ninja,
+  xmltodict,
+
+  # tests
+  pytestCheckHook,
+
+  # passthru
+  runCommand,
+  srcOnly,
+  nix-update-script,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "opensfm";
   version = "0.5.1-unstable-2026-05-04";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mapillary";
     repo = "OpenSfM";
     rev = "1dc5b95b5c8c4cadd653bdc9f6eb97c0ac1602ba";
-    sha256 = "sha256-K3+H8QSzTxIGAtYDGqOuJFTVaqk+B/R/MDMepJ/bRxY=";
+    hash = "sha256-K3+H8QSzTxIGAtYDGqOuJFTVaqk+B/R/MDMepJ/bRxY=";
   };
 
   patches = [
@@ -80,9 +92,9 @@ buildPythonPackage (finalAttrs: {
   dontUseCmakeConfigure = true;
 
   build-system = [
-    setuptools
-    scikit-build-core
     ninja
+    scikit-build-core
+    setuptools
   ];
 
   nativeBuildInputs = [
@@ -90,34 +102,34 @@ buildPythonPackage (finalAttrs: {
   ];
 
   buildInputs = [
-    ceres-solver
-    suitesparse
-    metis
-    eigen
-    lapack
-    gflags
-    gtest
-    glog
-    pybind11
     bashNonInteractive # for patchShebangs
+    ceres-solver
+    eigen
+    gflags
+    glog
+    gtest
+    lapack
+    metis
+    pybind11
+    suitesparse
   ];
 
   dependencies = [
-    numpy
-    scipy
-    pyyaml
+    cloudpickle
+    exifread
     flask
     fpdf2
-    opencv-python
-    networkx
-    pillow
+    joblib
     matplotlib
-    exifread
+    networkx
+    numpy
+    opencv-python
+    pillow
     pyproj
     python-dateutil
-    joblib
+    pyyaml
+    scipy
     xmltodict
-    cloudpickle
   ];
 
   nativeCheckInputs = [
@@ -146,26 +158,32 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "opensfm" ];
 
-  # https://opensfm.org/docs/using.html#quickstart
-  passthru.tests = lib.genAttrs' [ "berlin" "lund" ] (
-    name:
-    lib.nameValuePair "integration-test-${name}" (
-      runCommand "opensfm-integration-test-${name}"
-        {
-          nativeBuildInputs = [ finalAttrs.finalPackage ];
-        }
-        ''
-          set -euo pipefail
-          opensfm --help
-          cp -r ${srcOnly finalAttrs.finalPackage}/data/${name} data
-          chmod -R +w data/
-          bash -x $(command -v opensfm_run_all) data/
-          if [[ -s data/camera_models.json && -s data/undistorted/reconstruction.json ]]; then
-            touch $out
-          fi
-        ''
-    )
-  );
+  passthru = {
+    # https://opensfm.org/docs/using.html#quickstart
+    tests = lib.genAttrs' [ "berlin" "lund" ] (
+      name:
+      lib.nameValuePair "integration-test-${name}" (
+        runCommand "opensfm-integration-test-${name}"
+          {
+            nativeBuildInputs = [ finalAttrs.finalPackage ];
+          }
+          ''
+            set -euo pipefail
+            opensfm --help
+            cp -r ${srcOnly finalAttrs.finalPackage}/data/${name} data
+            chmod -R +w data/
+            bash -x $(command -v opensfm_run_all) data/
+            if [[ -s data/camera_models.json && -s data/undistorted/reconstruction.json ]]; then
+              touch $out
+            fi
+          ''
+      )
+    );
+
+    updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
+    };
+  };
 
   meta = {
     broken = stdenv.hostPlatform.isDarwin;

From 2adf6d055f8670429785d24c4a2d5ee3072b533c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 15:39:34 +0000
Subject: [PATCH 084/104] python3Packages.opensfm: 0.5.1-unstable-2026-05-04 ->
 odm-4-unstable-2026-07-01

Changelog: https://github.com/mapillary/OpenSfM/blob/a677b6f0648ff3caf439aebbe9aad0ca8abc175b/CHANGELOG.md
---
 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 dfccd22f99ae..7ba20688f3c4 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -52,15 +52,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opensfm";
-  version = "0.5.1-unstable-2026-05-04";
+  version = "odm-4-unstable-2026-07-01";
   pyproject = true;
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mapillary";
     repo = "OpenSfM";
-    rev = "1dc5b95b5c8c4cadd653bdc9f6eb97c0ac1602ba";
-    hash = "sha256-K3+H8QSzTxIGAtYDGqOuJFTVaqk+B/R/MDMepJ/bRxY=";
+    rev = "a677b6f0648ff3caf439aebbe9aad0ca8abc175b";
+    hash = "sha256-Bxpfaj87N2QxP/AczpP3fOl6G8ciMJq5jaaIn7oGR9g=";
   };
 
   patches = [

From bf49257314ff4e1cf5818eefa33e05f99170b00b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 16:01:27 +0000
Subject: [PATCH 085/104] ariang: 1.3.13 -> 1.3.14

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

diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix
index 1aeb512c61ce..2b7b512c648f 100644
--- a/pkgs/by-name/ar/ariang/package.nix
+++ b/pkgs/by-name/ar/ariang/package.nix
@@ -11,18 +11,18 @@
 
 buildNpmPackage rec {
   pname = "ariang";
-  version = "1.3.13";
+  version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "mayswind";
     repo = "AriaNg";
     tag = version;
-    hash = "sha256-u4MnjGMvnnb9EGHwK2QYpW7cuX1e1+6z2/1X1baR8iA=";
+    hash = "sha256-wPFZGNqVveDj9Dh0QSxyy93K7G91CACD4RzmgjaRxjI=";
   };
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-kxoSEdM8H7M9s6U2dtCdfuvqVROEk35jAkO7MgyVVRg=";
+  npmDepsHash = "sha256-D+yqIDeJki0h6bT8eia8W8Xbokjgl4nlBXLApfhMwVc=";
 
   makeCacheWritable = true;
 

From 595abd895f263aaede377e419b92df3d1fec45f7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 16:09:30 +0000
Subject: [PATCH 086/104] python3Packages.opensfm: skip failing tests on
 python>=3.14

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

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index 7ba20688f3c4..c1b4583a80c7 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build-system
   ninja,
@@ -151,6 +152,11 @@ buildPythonPackage (finalAttrs: {
     # flaky
     "test_match_candidates_from_metadata_bow"
   ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    # _pickle.UnpicklingError: global 'numpy._core.numeric._frombuffer' is forbidden
+    "test_run_all"
+    "test_shot_view_ref_count"
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "test_reconstruction_incremental"
     "test_reconstruction_triangulation"

From d7009d08f6dcbe4fc3bda76cae34a1aed06c4a10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 16:23:29 +0000
Subject: [PATCH 087/104] python3Packages.inject: 5.4.0 -> 5.4.1

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

diff --git a/pkgs/development/python-modules/inject/default.nix b/pkgs/development/python-modules/inject/default.nix
index 80e13c306ca4..4f80ba782552 100644
--- a/pkgs/development/python-modules/inject/default.nix
+++ b/pkgs/development/python-modules/inject/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "inject";
-  version = "5.4.0";
+  version = "5.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ivankorobkov";
     repo = "python-inject";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ITnqTGCOPLzATisAcPi52cpxsm9/Adj/Xb53jd18IWo=";
+    hash = "sha256-thVgKkpFtMwTMfeQ2r7xMvLtzBFJ/xIy6aUTq3400VA=";
   };
 
   build-system = [

From 5d6a74361a38e93912f9bb1168ee23f05c8fb7f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 16:26:40 +0000
Subject: [PATCH 088/104] aliyun-cli: 3.4.2 -> 3.4.5

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

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 3654ccc89a56..f675965a2659 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyun-cli";
-  version = "3.4.2";
+  version = "3.4.5";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x43yePNf1HVw9R7PqpAb7J2XYCEn90W81nx/zgfNQBg=";
+    hash = "sha256-Q3jFqWET3mB0kOrLX4JAtza6j/4bXAEBjXzvSGCFgqw=";
     fetchSubmodules = true;
   };
 

From 4e1b967f60bbc4d30df08688c488180104db071a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 16:58:11 +0000
Subject: [PATCH 089/104] polkit-stdin-agent: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/po/polkit-stdin-agent/package.nix b/pkgs/by-name/po/polkit-stdin-agent/package.nix
index 7377d1727ca6..55cfe56966da 100644
--- a/pkgs/by-name/po/polkit-stdin-agent/package.nix
+++ b/pkgs/by-name/po/polkit-stdin-agent/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "polkit-stdin-agent";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "r-vdp";
     repo = "polkit-stdin-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Nl/+IBbUEsxSKSWLXwUB3mV4iAG0z9mv+Bl6CSeFzR4=";
+    hash = "sha256-Na3v1773UZmsI6EdK0SwGeSOAPC890jy0J8EUwBBH2E=";
   };
 
-  cargoHash = "sha256-Eb/7ejVmtG5FNSh66gZO3337KCPNi+xtYVC5qyFKJzg=";
+  cargoHash = "sha256-F/cbNrI6qC4rxUNHIRHE9ZfLh5WuKcE3xz/FaBz5eSw=";
 
   strictDeps = true;
   __structuredAttrs = true;

From 4f62b303092b3c93e394367cfcc55ab4ad0dd063 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 22 Jun 2026 01:31:47 +0200
Subject: [PATCH 090/104] lomiri.lomiri-push-qml: 0.4.0 -> 0.4.1

---
 pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
index 95f926bae663..db8887ff2297 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-push-qml";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-push-qml";
     tag = finalAttrs.version;
-    hash = "sha256-QpkW/fbl0Px5HsKfz/gv+D1S+iSpMZM8TiZCuAq1myk=";
+    hash = "sha256-+D8F0H3S+lfU53CJarE7Wrsc66JvJywzih0IgGD8cJo=";
   };
 
   postPatch = ''

From 5e02d1a22725e302ff143baf9a0acdfea21e5655 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 22 Jun 2026 01:39:15 +0200
Subject: [PATCH 091/104] lomiri-qt6.lomiri-push-qml: init at 0.4.1

---
 pkgs/desktops/lomiri/default.nix              |  2 +-
 .../lomiri/qml/lomiri-push-qml/default.nix    | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index bb432e42e252..9d84817e4e89 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -37,6 +37,7 @@ let
         withDocumentation = !useQt6;
       };
       lomiri-notifications = callPackage ./qml/lomiri-notifications { };
+      lomiri-push-qml = callPackage ./qml/lomiri-push-qml { };
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
       qqc2-suru-style = callPackage ./qml/qqc2-suru-style { };
@@ -90,7 +91,6 @@ let
       u1db-qt = callPackage ./development/u1db-qt { };
 
       #### QML / QML-related
-      lomiri-push-qml = callPackage ./qml/lomiri-push-qml { };
       lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
 
       #### Services
diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
index db8887ff2297..b0a59deddccf 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
@@ -11,6 +11,9 @@
   qtdeclarative,
 }:
 
+let
+  withQt6 = lib.versions.major qtbase.version == "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-push-qml";
   version = "0.4.1";
@@ -22,11 +25,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-+D8F0H3S+lfU53CJarE7Wrsc66JvJywzih0IgGD8cJo=";
   };
 
-  postPatch = ''
-    # Queries QMake for QML install location, returns QtBase build path
-    substituteInPlace src/*/PushNotifications/CMakeLists.txt \
-      --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}'
-  '';
+  postPatch =
+    if (!withQt6) then
+      ''
+        # Queries QMake for QML install location, returns QtBase build path
+        substituteInPlace src/*/PushNotifications/CMakeLists.txt \
+          --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}'
+      ''
+    else
+      ''
+        substituteInPlace src/Lomiri/PushNotifications/CMakeLists.txt \
+          --replace-fail \
+            'set(QT_INSTALL_QML "''${CMAKE_INSTALL_LIBDIR}/qt6/qml/")' \
+            'set(QT_INSTALL_QML "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")'
+      '';
 
   strictDeps = true;
 
@@ -46,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
-    (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" (!lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
+    (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" (!withQt6))
   ];
 
   preBuild = ''

From c47d38d8025a4362115668e87d4fc667d4beae44 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 7 Jul 2026 19:15:51 +0200
Subject: [PATCH 092/104] vimacs: drop

---
 doc/release-notes/rl-2611.section.md     |  2 ++
 pkgs/applications/editors/vim/vimacs.nix | 44 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 --
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/vimacs.nix

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 70c235970e54..3f68455b10b3 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -75,6 +75,8 @@
 - `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2).
 - `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10).
 
+- `vimacs` has been removed, as it has not been maintained in 10 years and was built for an old version of vim (6.0).
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix
deleted file mode 100644
index 050f803fa0dd..000000000000
--- a/pkgs/applications/editors/vim/vimacs.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  config,
-  vim-full,
-  macvim,
-  vimPlugins,
-  useMacvim ? stdenv.hostPlatform.isDarwin && (config.vimacs.macvim or true),
-  vimacsExtraArgs ? "",
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vimacs";
-  version = lib.getVersion finalAttrs.vimPackage;
-  vimPackage = if useMacvim then macvim else vim-full;
-
-  buildInputs = [
-    finalAttrs.vimPackage
-    vimPlugins.vimacs
-  ];
-
-  buildCommand = ''
-    mkdir -p "$out"/bin
-    cp "${vimPlugins.vimacs}"/bin/vim $out/bin/vimacs
-    substituteInPlace "$out"/bin/vimacs \
-      --replace '-vim}' '-@bin@/bin/vim}' \
-      --replace '-gvim}' '-@bin@/bin/vim -g}' \
-      --replace '--cmd "let g:VM_Enabled = 1"' \
-                '--cmd "let g:VM_Enabled = 1" --cmd "set rtp^=@rtp@" ${vimacsExtraArgs}' \
-      --replace @rtp@ ${vimPlugins.vimacs} \
-      --replace @bin@ ${finalAttrs.vimPackage}
-    for prog in vm gvm gvimacs vmdiff vimacsdiff
-    do
-      ln -s "$out"/bin/vimacs $out/bin/$prog
-    done
-  '';
-
-  meta = {
-    description = "Vim-Improved eMACS: Emacs emulation for Vim";
-    homepage = "http://algorithm.com.au/code/vimacs";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ millerjason ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e25946ed237c..7d548a42e626 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2323,6 +2323,7 @@ mapAliases {
   vieb = throw "'vieb' has been removed as it doesn't satisfy our security criteria for browsers."; # Added 2025-06-25
   ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-27
   vim_configurable = throw "'vim_configurable' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27
+  vimacs = throw "'vimacs' has been removed due to lack of maintenance"; # Added 2026-07-07
   vimHugeX = throw "'vimHugeX' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27
   vimpc = throw "'vimpc' has been removed as it is unmaintained and depends on pcre, which is deprecated"; # Added 2026-06-06
   virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 075a6b9b2a72..11c19d5e10d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9625,8 +9625,6 @@ with pkgs;
         };
       });
 
-  vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
-
   # this is a lower-level alternative to wrapNeovim conceived to handle
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative

From a4b564f556d04e06787222c6dcb9ebc605fa0a0b Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 7 Jul 2026 19:15:51 +0200
Subject: [PATCH 093/104] vimPlugins.vimacs: drop

---
 .../applications/editors/vim/plugins/aliases.nix |  1 +
 .../editors/vim/plugins/generated.nix            | 14 --------------
 .../editors/vim/plugins/overrides.nix            | 16 ----------------
 .../editors/vim/plugins/vim-plugin-names         |  1 -
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index a83a782436c7..423895d4e41b 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -74,6 +74,7 @@ mapAliases (
     typescript-nvim = throw "'vimPlugins.typescript-nvim' has been removed: upstream deleted repository"; # Added 2026-06-15
     vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12
     vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14
+    vimacs = throw "'vimPlugins.vimacs' has been removed due to lack of maintenance"; # Added 2026-07-07
     # keep-sorted end
   }
   // deprecations
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index d1c14b6c16ab..debc4fcb89f7 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -25096,20 +25096,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  vimacs = buildVimPlugin {
-    pname = "vimacs";
-    version = "0.96-unstable-2016-03-24";
-    src = fetchFromGitHub {
-      owner = "andrep";
-      repo = "vimacs";
-      rev = "7b8e297722d55089f0f0535fe6422533c98112fb";
-      hash = "sha256-zgSKuwhuyoa67UlX4yX2JumjfHrx7Mlvg7Bv2i6TInU=";
-    };
-    meta.homepage = "https://github.com/andrep/vimacs/";
-    meta.license = unfree;
-    meta.hydraPlatforms = [ ];
-  };
-
   vimade = buildVimPlugin {
     pname = "vimade";
     version = "2.5.1-unstable-2026-05-17";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 802d976e1f8e..1164fd7c1dc1 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -5819,22 +5819,6 @@ assertNoAdditions {
     };
   });
 
-  vimacs = super.vimacs.overrideAttrs (old: {
-    buildPhase = ''
-      substituteInPlace bin/vim \
-        --replace-fail '/usr/bin/vim' 'vim' \
-        --replace-fail '/usr/bin/gvim' 'gvim'
-      # remove unnecessary duplicated bin wrapper script
-      rm -r plugin/vimacs
-    '';
-    meta = old.meta // {
-      description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
-      homepage = "http://algorithm.com.au/code/vimacs";
-      license = lib.licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [ millerjason ];
-    };
-  });
-
   vimade = super.vimade.overrideAttrs {
     checkInputs = with self; [
       # Optional providers
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 274969cc7c32..45eca79a28a3 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1790,7 +1790,6 @@ https://github.com/marrub--/vim-zscript/,,
 https://github.com/dag/vim2hs/,,
 https://github.com/monkoose/vim9-stargate/,,
 https://github.com/dominikduda/vim_current_word/,,
-https://github.com/andrep/vimacs/,,
 https://github.com/TaDaa/vimade/,,
 https://github.com/jreybert/vimagit/,,
 https://github.com/gotcha/vimelette/,,

From a4c5d5d45f8f69b9ba16b89fa82b982834a0b51a Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 7 Jul 2026 19:33:43 +0200
Subject: [PATCH 094/104] nvimpager: use neovim-unwrapped

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

diff --git a/pkgs/by-name/nv/nvimpager/package.nix b/pkgs/by-name/nv/nvimpager/package.nix
index d569c58f4c92..91ecdac77fe8 100644
--- a/pkgs/by-name/nv/nvimpager/package.nix
+++ b/pkgs/by-name/nv/nvimpager/package.nix
@@ -4,7 +4,7 @@
   stdenv,
   bash,
   ncurses,
-  neovim,
+  neovim-unwrapped,
   procps,
   scdoc,
   lua51Packages,
@@ -36,14 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   preBuild = ''
     patchShebangs nvimpager
-    substituteInPlace nvimpager --replace-fail ':-nvim' ':-${lib.getExe neovim}'
+    substituteInPlace nvimpager --replace-fail ':-nvim' ':-${lib.getExe neovim-unwrapped}'
   '';
 
   doCheck = true;
   nativeCheckInputs = [
     lua51Packages.busted
     ncurses # for tput
-    neovim
+    neovim-unwrapped
     procps # for nvim_get_proc() which uses ps(1)
     util-linux
   ];

From 3d566d6d456c64bf6a5ee4fabd0d3dbbb1a24e7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 17:53:51 +0000
Subject: [PATCH 095/104] terraform-providers.buildkite_buildkite: 1.34.2 ->
 1.35.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index cb1e88a9a2e3..5cf18120f37e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -128,13 +128,13 @@
     "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
   },
   "buildkite_buildkite": {
-    "hash": "sha256-CfipoNGW0VofHfgXlbfcjIGYpkuE0UXewDM6UCutg9g=",
+    "hash": "sha256-egeZCTQFyhKG0giyjNK9C/W+OGMOGv2l+65Vg3iTi2A=",
     "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
     "owner": "buildkite",
     "repo": "terraform-provider-buildkite",
-    "rev": "v1.34.2",
+    "rev": "v1.35.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-uYyj6GSV5bWEfRTOODMuReEHe9wnF4cVoHM9rBMpgmM="
+    "vendorHash": "sha256-oYwtPTXNCkTizQWix2GYpb23mFvTmIzbcY3UTfB2Leo="
   },
   "camptocamp_pass": {
     "hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=",

From e2f08770820fb775faa9a3682c9bcafc55db705d Mon Sep 17 00:00:00 2001
From: Phorcys <57866459+phorcys420@users.noreply.github.com>
Date: Tue, 7 Jul 2026 20:45:19 +0200
Subject: [PATCH 096/104] maintainers: update phorcys420 identity

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 42a74e83bb56..fe6dd76cbfa3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21952,8 +21952,8 @@
     name = "Petr Hodina";
   };
   phorcys420 = {
-    name = "Adele";
-    email = "adele@coder.com";
+    name = "Phorcys";
+    email = "nixpkgs@phorcys.net";
     github = "phorcys420";
     githubId = 57866459;
   };

From 72858ea6294eff5add820befea10c7dd32b3025c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jul 2026 19:06:38 +0000
Subject: [PATCH 097/104] wasm-component-ld: 0.5.25 -> 0.5.26

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

diff --git a/pkgs/by-name/wa/wasm-component-ld/package.nix b/pkgs/by-name/wa/wasm-component-ld/package.nix
index ccc96dd71141..07d4b2b7031f 100644
--- a/pkgs/by-name/wa/wasm-component-ld/package.nix
+++ b/pkgs/by-name/wa/wasm-component-ld/package.nix
@@ -6,7 +6,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-component-ld";
-  version = "0.5.25";
+  version = "0.5.26";
 
   __structuredAttrs = true;
 
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "bytecodealliance";
     repo = "wasm-component-ld";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EQqNm3GRuMafbrOyzsdZ5e1pX4LH40wCyKVgSgm8A48=";
+    hash = "sha256-4hKHChIxVpTo18sfeUd8GzjQeb2ONAGeg4I7vKTAhSI=";
   };
 
-  cargoHash = "sha256-1e54TLWGjfNORwr6uLIe/XhdDDOkbalw/6/0UGuBiPk=";
+  cargoHash = "sha256-IQe4TLWbjlB/h7K5qH5ANxoqG8A2D3RF+UVDj4u6qFQ=";
 
   # Tests require a rustc that can target wasm32-wasip1, including std. This is awkward for
   # Nixpkgs to provide at the same time as providing a rustc that's targetting the actual target.

From 9ceab8c31780200bc278b175c0607eacfac914be Mon Sep 17 00:00:00 2001
From: Albert Chae <albertchae@users.noreply.github.com>
Date: Tue, 7 Jul 2026 13:17:24 -0700
Subject: [PATCH 098/104] inngest: add albertchae to maintainers

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

diff --git a/pkgs/by-name/in/inngest/package.nix b/pkgs/by-name/in/inngest/package.nix
index 94fcf1527099..f71572ad50b6 100644
--- a/pkgs/by-name/in/inngest/package.nix
+++ b/pkgs/by-name/in/inngest/package.nix
@@ -99,7 +99,10 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/inngest/inngest/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.sspl;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
-    maintainers = with lib.maintainers; [ kikos0 ];
+    maintainers = with lib.maintainers; [
+      albertchae
+      kikos0
+    ];
     mainProgram = "inngest";
     platforms = lib.lists.remove "x86_64-darwin" lib.platforms.all;
   };

From b1eddb3e5c542c10f7f70f292ab1f333755403ae Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 7 Jul 2026 22:17:58 +0200
Subject: [PATCH 099/104] chromium,chromedriver: 150.0.7871.46 ->
 150.0.7871.100

https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop.html
---
 .../networking/browsers/chromium/info.json           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5cfa7b5ec201..4396c5e283a7 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "150.0.7871.46",
+    "version": "150.0.7871.100",
     "chromedriver": {
-      "version": "149.0.7827.201",
-      "hash_darwin": "sha256-MHCcid+7wdYm8uIdrUIlXrk8ADHNUUXzPyMPFGP98WY=",
-      "hash_darwin_aarch64": "sha256-Gwmdo9qNyV/BnCj18f0BFpNgDf28e8vjNF98e5/vVjQ="
+      "version": "150.0.7871.101",
+      "hash_darwin": "sha256-LJPfzeJjVcEHenRNqKNOGcEZLL/rHRH55yBefLFTlEs=",
+      "hash_darwin_aarch64": "sha256-+WZw22dgaDsDMOQUJTjTuCGyUZT1t1RBjutyqmumX/A="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5b586c06e0d27582900f17e2d59c5370d8d6e0bb",
-        "hash": "sha256-OAZNyZtR5WFWW42r74RSy9fT7Eb7CNZwzoIHhuoqR28=",
+        "rev": "b5a9b587b83512ef1fab99cb7510c58a06d22089",
+        "hash": "sha256-bylGmZC9NhUjcU6amK3mwuZ1it7uTm2hsC60DaKINr4=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {

From d56ba8a22ffa25bdc46fda92fd779b042e0ecae7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 20:24:10 +0000
Subject: [PATCH 100/104] rerun: 0.34.0 -> 0.34.1

Diff: https://github.com/rerun-io/rerun/compare/0.34.0...0.34.1

Changelog: https://github.com/rerun-io/rerun/blob/0.34.1/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix                          | 6 +++---
 pkgs/development/python-modules/rerun-notebook/default.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index d1c4b7fadcbd..fe767dc9b3c9 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -40,7 +40,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.34.0";
+  version = "0.34.1";
 
   __structuredAttrs = true;
 
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-d+A8SQlbHP8Y1mCtwxGybPBvyJUnCgPLmsP4tiA9/Nk=";
+    hash = "sha256-z/9uzp/7+xxmJCcgV+LJqdWWEhE85+upgW1EFfyBvYM=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-qomsbQaYBADWPi1gIZt2Y6lL5mPn468kQY7w9NBTXbg=";
+  cargoHash = "sha256-nvLT+iIsi1C283aJ8qP3Ijw+oizrDKwnQpSG2OchMwE=";
 
   cargoBuildFlags = [
     "--package"
diff --git a/pkgs/development/python-modules/rerun-notebook/default.nix b/pkgs/development/python-modules/rerun-notebook/default.nix
index 96e4816d72ff..be5e9dfc43b3 100644
--- a/pkgs/development/python-modules/rerun-notebook/default.nix
+++ b/pkgs/development/python-modules/rerun-notebook/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     inherit (finalAttrs) version;
     format = "wheel";
     python = "py2.py3";
-    hash = "sha256-zWhOls/u1g+pv2k5IGROlS/Jp2j2s6Whrdl7zc93vVw=";
+    hash = "sha256-BzmZA37loGsjraNgFPObTARxdlr7lj4w0/hQex7Qeg8=";
   };
 
   pythonRelaxDeps = [

From 50344e43a959e534e6fec3d1207b2a592673a72d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jul 2026 20:27:18 +0000
Subject: [PATCH 101/104] sandbox-runtime: 0.0.63 -> 0.0.64

Diff: https://github.com/anthropic-experimental/sandbox-runtime/compare/v0.0.63...v0.0.64

Changelog: https://github.com/anthropic-experimental/sandbox-runtime/releases/tag/v0.0.64
---
 pkgs/by-name/sa/sandbox-runtime/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix
index 913e25450e5c..a4f76cb342f0 100644
--- a/pkgs/by-name/sa/sandbox-runtime/package.nix
+++ b/pkgs/by-name/sa/sandbox-runtime/package.nix
@@ -17,7 +17,7 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sandbox-runtime";
-  version = "0.0.63";
+  version = "0.0.64";
 
   __structuredAttrs = true;
 
@@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
     owner = "anthropic-experimental";
     repo = "sandbox-runtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y01JUdTmmAqs++3LpLIXZyBsq4jKvIxUeOI6zLfcI2g=";
+    hash = "sha256-kKXGZcK3hx3ugud+DxLrBC+IwnUzEe0Gae2lq7DU8hA=";
   };
 
   postPatch =
@@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: {
 
   strictDeps = true;
 
-  npmDepsHash = "sha256-fwk2A1oBv+/YrV+zjzSYlKhIB6oiAZO/88fE2UHWWbA=";
+  npmDepsHash = "sha256-3HOGoIG9syQJ407C8Bg7J7mtPpoIjVtUoFCdbSmT8BU=";
 
   postFixup =
     let

From 16bf5d16d7fa57b421eddc4326a9993fc21d4d73 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 7 Jul 2026 13:25:40 -0700
Subject: [PATCH 102/104] firefox-devtools-mcp: init at 0.9.9

Assisted-by: Claude Code (claude-opus-4-8)
---
 .../fi/firefox-devtools-mcp/package.nix       | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/fi/firefox-devtools-mcp/package.nix

diff --git a/pkgs/by-name/fi/firefox-devtools-mcp/package.nix b/pkgs/by-name/fi/firefox-devtools-mcp/package.nix
new file mode 100644
index 000000000000..fb87d07a6648
--- /dev/null
+++ b/pkgs/by-name/fi/firefox-devtools-mcp/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  makeWrapper,
+  geckodriver,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "firefox-devtools-mcp";
+  version = "0.9.9";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "mozilla";
+    repo = "firefox-devtools-mcp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Bz6LkiUbgu81OnPv6xegmo7EYVgGJdlbB5HZsW4QO/Q=";
+  };
+
+  npmDepsHash = "sha256-JnAivSiThEm+EPm6gY08zQfD/aaF2sLfz6YSfsle9uE=";
+
+  # 0.9.9 ships a stale hardcoded server version (0.7.1) in constants.ts; upstream switched to
+  # build-time injection right after release (Bug 2050918), so this substitution should be dropped
+  # once that fix lands in a tagged release.
+  postPatch = ''
+    substituteInPlace src/config/constants.ts \
+      --replace-fail "'0.7.1'" "'${finalAttrs.version}'"
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # The `geckodriver` npm dependency's install script downloads a prebuilt binary from the network,
+  # which is unavailable in the sandbox. The server locates geckodriver on PATH first (see
+  # src/firefox/core.ts), so skip the install scripts and provide geckodriver from nixpkgs via the
+  # wrapper below.
+  npmFlags = [ "--ignore-scripts" ];
+
+  # `npm run build` (tsup) emits dist/index.js, the package's bin entry point.
+  postInstall = ''
+    wrapProgram $out/bin/firefox-devtools-mcp \
+      --prefix PATH : ${lib.makeBinPath [ geckodriver ]}
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Model Context Protocol server for Firefox DevTools automation";
+    longDescription = ''
+      A Model Context Protocol (MCP) server that automates Firefox via WebDriver BiDi.
+      It works with MCP clients such as Claude Code, Claude Desktop, Cursor and Cline,
+      exposing tools to navigate pages, take snapshots, inspect the DOM, capture network requests
+      and console messages, take screenshots and more.
+
+      A local Firefox installation is required at runtime.
+    '';
+    homepage = "https://github.com/mozilla/firefox-devtools-mcp";
+    changelog = "https://github.com/mozilla/firefox-devtools-mcp/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ philiptaron ];
+    mainProgram = "firefox-devtools-mcp";
+    platforms = lib.platforms.unix;
+  };
+})

From da3c2f4c0e20f77dfad78b2d640cacf7bfa76e91 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 7 Jul 2026 23:41:53 +0200
Subject: [PATCH 103/104] prometheus-kea-exporter: 0.7.0 -> 0.7.1

https://github.com/mweinelt/kea-exporter/blob/v0.7.1/HISTORY
---
 .../pr/prometheus-kea-exporter/package.nix    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-kea-exporter/package.nix b/pkgs/by-name/pr/prometheus-kea-exporter/package.nix
index 2b2cadba9b01..dc9c463886a0 100644
--- a/pkgs/by-name/pr/prometheus-kea-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-kea-exporter/package.nix
@@ -1,19 +1,21 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   nixosTests,
+  versionCheckHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "kea-exporter";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "kea_exporter";
-    inherit version;
-    hash = "sha256-kn2iwYWcyW90tgfWmzLF7rU06fJyLRzqYKNLOgu/Yqk=";
+  src = fetchFromGitHub {
+    owner = "mweinelt";
+    repo = "kea-exporter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UwQYR01cBdPEUBhOo5TqwmptAvJpxln1OLU2boAFdn4=";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -26,21 +28,17 @@ python3Packages.buildPythonApplication rec {
     requests
   ];
 
-  checkPhase = ''
-    $out/bin/kea-exporter --help > /dev/null
-    $out/bin/kea-exporter --version | grep -q ${version}
-  '';
-
+  nativeInstallCheckInputs = [ versionCheckHook ];
   passthru.tests = {
     inherit (nixosTests) kea;
   };
 
   meta = {
-    changelog = "https://github.com/mweinelt/kea-exporter/blob/v${version}/HISTORY";
+    changelog = "https://github.com/mweinelt/kea-exporter/blob/v${finalAttrs.version}/HISTORY";
     description = "Export Kea Metrics in the Prometheus Exposition Format";
     mainProgram = "kea-exporter";
     homepage = "https://github.com/mweinelt/kea-exporter";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hexa ];
   };
-}
+})

From b908e3e050d791a94acd4b472be2ae9bc1e29b4d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 7 Jul 2026 23:42:56 +0200
Subject: [PATCH 104/104] nixos/tests/kea: restore prometheus exporter test

---
 nixos/tests/kea.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix
index e339c4cc7000..ec249f0c7150 100644
--- a/nixos/tests/kea.nix
+++ b/nixos/tests/kea.nix
@@ -110,6 +110,13 @@
             };
           };
         };
+
+        services.prometheus.exporters.kea = {
+          enable = true;
+          controlSocketPaths = [
+            config.services.kea.dhcp4.settings.control-socket.socket-name
+          ];
+        };
       };
 
     nameserver =
@@ -217,5 +224,9 @@
 
       with subtest("DDNS"):
           nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3")
+
+      with subtest("Prometheus Exporter"):
+        router.log(router.execute("curl 127.0.0.1:9547")[1])
+        router.succeed("curl --silent 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'")
     '';
 }