From d61350a2d10fbe8fb298dab19bd830db0f963758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 17 Oct 2025 22:26:39 -0700
Subject: [PATCH 1/2] python3Packages.betterproto: 2.0.0b6 -> 2.0.0b7

Diff: https://github.com/danielgtaylor/python-betterproto/compare/v.2.0.0b6...v.2.0.0b7

Changelog: https://github.com/danielgtaylor/python-betterproto/blob/v.2.0.0b7/CHANGELOG.md
---
 .../python-modules/betterproto/default.nix    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index bf759e8f1f58..ef4839a39ec3 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
-  pythonOlder,
   poetry-core,
   grpclib,
   python-dateutil,
@@ -10,9 +9,10 @@
   jinja2,
   isort,
   python,
+  cachelib,
   pydantic,
-  pytest7CheckHook,
-  pytest-asyncio_0_21,
+  pytestCheckHook,
+  pytest-asyncio,
   pytest-mock,
   typing-extensions,
   tomlkit,
@@ -21,16 +21,14 @@
 
 buildPythonPackage rec {
   pname = "betterproto";
-  version = "2.0.0b6";
+  version = "2.0.0b7";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "danielgtaylor";
     repo = "python-betterproto";
     tag = "v.${version}";
-    hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
+    hash = "sha256-T7QSPH8MFa1hxJOhXc3ZMM62/FxHWjCJJ59IpeM41rI=";
   };
 
   postPatch = ''
@@ -53,11 +51,12 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    cachelib
     grpcio-tools
     pydantic
-    pytest-asyncio_0_21
+    pytest-asyncio
     pytest-mock
-    pytest7CheckHook
+    pytestCheckHook
     tomlkit
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
@@ -73,13 +72,11 @@ buildPythonPackage rec {
     ${python.interpreter} -m tests.generate
   '';
 
-  disabledTestPaths = [
-    # https://github.com/danielgtaylor/python-betterproto/issues/530
-    "tests/inputs/oneof/test_oneof.py"
-  ];
-
   disabledTests = [
-    "test_pydantic_no_value"
+    # incompatible with pytest 8:
+    #     TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
+    "test_message_with_deprecated_field_not_set"
+    "test_service_with_deprecated_method"
     # Test is flaky
     "test_binary_compatibility"
   ];

From d9397fe5af28e91c1e98c9b5f6a42198cc98c793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 18 Oct 2025 13:58:55 -0700
Subject: [PATCH 2/2] python3Packages.sigstore-protobuf-specs: 0.3.2 -> 0.5.0

---
 .../sigstore-protobuf-specs/default.nix           | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
index 9e65def1d162..f7f99b05e8bc 100644
--- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
+++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pythonOlder,
   flit-core,
   fetchPypi,
   buildPythonPackage,
@@ -10,15 +9,13 @@
 
 buildPythonPackage rec {
   pname = "sigstore-protobuf-specs";
-  version = "0.3.2";
+  version = "0.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "sigstore_protobuf_specs";
     inherit version;
-    hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk=";
+    hash = "sha256-zvnrMrLGwlHeNuIoWkCq8glIJ+rhifXngE10jMw9W4E=";
   };
 
   nativeBuildInputs = [ flit-core ];
@@ -35,10 +32,10 @@ buildPythonPackage rec {
 
   passthru.skipBulkUpdate = true;
 
-  meta = with lib; {
+  meta = {
     description = "Library for serializing and deserializing Sigstore messages";
-    homepage = "https://pypi.org/project/sigstore-protobuf-specs/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    homepage = "https://github.com/sigstore/protobuf-specs/tree/main/gen/pb-python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }