From 98772246de8d2deba9d87be8757cf0c49b90553a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 19:46:28 +0000
Subject: [PATCH 1/3] kubetail: 1.6.20 -> 1.6.21

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

diff --git a/pkgs/by-name/ku/kubetail/package.nix b/pkgs/by-name/ku/kubetail/package.nix
index dd34d5042548..9c3d723e0f3d 100644
--- a/pkgs/by-name/ku/kubetail/package.nix
+++ b/pkgs/by-name/ku/kubetail/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kubetail";
-  version = "1.6.20";
+  version = "1.6.21";
 
   src = fetchFromGitHub {
     owner = "johanhaleby";
     repo = "kubetail";
     rev = version;
-    sha256 = "sha256-RbbZHKXRtbs42cCbw+xb8TLul6ebUeCiNclMFF39c3M=";
+    sha256 = "sha256-Uzr63TkveJqfZl4USo0MNdlcvofxDp+o+reZmJG5F78=";
   };
 
   nativeBuildInputs = [

From d3e5d2dbecb9fcc40fc27c3bed8eb84d64ccab0a Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Sat, 4 Oct 2025 05:48:49 +0800
Subject: [PATCH 2/3] monado: Remove protobuf override for opencv

The override was originally added in #442919 because monado depends on
protobuf through two paths:

- monado -> opencv4 -> protobuf
- monado -> onnxruntime -> protobuf

And since, *at that time*, onnxruntime has protobuf pinned to
protobuf_21, we had to override opencv4 with protobuf_21 as well to
avoid mixing two different versions of protobuf. Otherwise, mayhem
occurs on initialization, manifesting as crashes or deadlocks. This does
not seem to be known when #442919 was written.

With #437307, onnxruntime is no longer pinned to protobuf_21, so the
same mixing problem was introduced back into monado, just the other
direction.

Revert the override for opencv4 to fix it.
---
 pkgs/by-name/mo/monado/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index 466e0de71535..34feeb6da8ea 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -41,7 +41,6 @@
   orc,
   pcre2,
   pkg-config,
-  protobuf_21,
   python3,
   SDL2,
   shaderc,
@@ -64,14 +63,7 @@
   serviceSupport ? true,
   tracingSupport ? false,
 }:
-let
-  # For some reason protobuf 32 causes a segfault during startup
-  # Pin to last (known) working version
-  # See https://github.com/NixOS/nixpkgs/issues/439075
-  opencv4' = opencv4.override {
-    protobuf = protobuf_21;
-  };
-in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "monado";
   version = "25.0.0";
@@ -133,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXrandr
     onnxruntime
-    opencv4'
+    opencv4
     openhmd
     openvr
     orc

From f11bf3c63ebddb38a04b6d3c3ba0705c1a9e0fb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 20:46:13 +0000
Subject: [PATCH 3/3] jp-zip-codes: 0-unstable-2025-09-01 ->
 0-unstable-2025-10-01

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

diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix
index 578b2f74b6ce..a5dfb23eded3 100644
--- a/pkgs/by-name/jp/jp-zip-codes/package.nix
+++ b/pkgs/by-name/jp/jp-zip-codes/package.nix
@@ -7,15 +7,15 @@
 
 stdenvNoCC.mkDerivation {
   pname = "jp-zip-code";
-  version = "0-unstable-2025-09-01";
+  version = "0-unstable-2025-10-01";
 
   # This package uses a mirror as the source because the
   # original provider uses the same URL for updated content.
   src = fetchFromGitHub {
     owner = "musjj";
     repo = "jp-zip-codes";
-    rev = "87a760cee8a6b103d834197caca72c3392ccbcde";
-    hash = "sha256-7vOcScEk4fKIeUa+FGCnBczlAwUC00E7EKQq7wQ2bUI=";
+    rev = "9464f58fe654ada94f6f53e5338b5fb2b15e314a";
+    hash = "sha256-G+uCQPW2e/DEAvAx3TYvPt0Dl2rM77WUmuPJ17voxUE=";
   };
 
   installPhase = ''