From cc040ce2af3d11449f3af43ba58685f1ec9830db Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 Jan 2026 12:54:13 -0800
Subject: [PATCH 1/2] python3Packages.zodb: 6.1 -> 6.2

---
 .../python-modules/zodb/default.nix           | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 49baf1a63efa..2ce8dc96abb3 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -3,49 +3,60 @@
   fetchFromGitHub,
   buildPythonPackage,
   python,
+  pythonAtLeast,
+
+  # build-system
   setuptools,
+
+  # dependencies
+  btrees,
+  persistent,
+  transaction,
+  zc-lockfile,
+  zconfig,
+  zodbpickle,
+  zope-interface,
+
+  # tests
+  manuel,
   zope-testing,
   zope-testrunner,
-  transaction,
-  zope-interface,
-  zodbpickle,
-  zconfig,
-  persistent,
-  zc-lockfile,
-  btrees,
-  manuel,
 }:
 
 buildPythonPackage rec {
   pname = "zodb";
-  version = "6.1";
+  version = "6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zodb";
     tag = version;
-    hash = "sha256-O6mu4RWi5qNcPyIgre5+bk4ZGZOZdG1vIdc8HqbfcaQ=";
+    hash = "sha256-R6qf/9Sr70OsZzes+haT/J6RIz6Wlof/l6rQRl3snHI=";
   };
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools ==" "setuptools >="
-
     # remove broken test
     rm -vf src/ZODB/tests/testdocumentation.py
+  ''
+  + lib.optionalString (pythonAtLeast "3.14") ''
+    # remove broken under python 3.14
+    rm -vf src/ZODB/tests/testConnectionSavepoint.py
+    rm -vf src/ZODB/tests/testMVCCMappingStorage.py
+    rm -vf src/ZODB/tests/testFileStorage.py
+    rm -vf src/ZODB/tests/testblob.py
   '';
 
   build-system = [ setuptools ];
 
   dependencies = [
-    transaction
-    zope-interface
-    zodbpickle
-    zconfig
-    persistent
-    zc-lockfile
     btrees
+    persistent
+    transaction
+    zc-lockfile
+    zconfig
+    zodbpickle
+    zope-interface
   ];
 
   nativeCheckInputs = [
@@ -62,6 +73,7 @@ buildPythonPackage rec {
     description = "Zope Object Database: object database and persistence";
     homepage = "https://zodb-docs.readthedocs.io/";
     changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst";
+    downloadPage = "https://github.com/zopefoundation/ZODB";
     license = lib.licenses.zpl21;
     maintainers = [ ];
   };

From bfee022a68a73cc5e2df111c43ece075edbabd2c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 31 Jan 2026 12:01:33 -0800
Subject: [PATCH 2/2] python3Packages.zodb: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 2ce8dc96abb3..3f296d981644 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -23,7 +23,7 @@
   zope-testrunner,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "zodb";
   version = "6.2";
   pyproject = true;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zodb";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-R6qf/9Sr70OsZzes+haT/J6RIz6Wlof/l6rQRl3snHI=";
   };
 
@@ -72,9 +72,9 @@ buildPythonPackage rec {
   meta = {
     description = "Zope Object Database: object database and persistence";
     homepage = "https://zodb-docs.readthedocs.io/";
-    changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/zopefoundation/ZODB/blob/${finalAttrs.src.tag}/CHANGES.rst";
     downloadPage = "https://github.com/zopefoundation/ZODB";
     license = lib.licenses.zpl21;
     maintainers = [ ];
   };
-}
+})