From ea228cee0c333cea7f414ffb3a82215259ec2eda Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Mon, 23 Mar 2026 14:47:14 +0100 Subject: [PATCH 1/4] python3Packages.bson: fix build with python 3.14 Upstream PR: https://github.com/py-bson/bson/pull/140 --- pkgs/development/python-modules/bson/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix index c7fc3443f7c5..7e18eb6bcb96 100644 --- a/pkgs/development/python-modules/bson/default.nix +++ b/pkgs/development/python-modules/bson/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, python-dateutil, six, pytestCheckHook, @@ -19,6 +20,16 @@ buildPythonPackage rec { hash = "sha256-mirRpo27RoOBlwxVOKnHaDIzJOErp7c2VxCOunUm/u4="; }; + patches = [ + # Upstream PR: https://github.com/py-bson/bson/pull/140 + (fetchpatch { + name = "python-3.14.patch"; + url = "https://github.com/py-bson/bson/commit/4e6b4c206f7204034ef74bff8ae84a95d76d1684.patch"; + includes = [ "setup.py" ]; + hash = "sha256-JOmW/KMqzFdXKH4TMR/PG1YU3SvLTBc3L3E9kXag3bQ="; + }) + ]; + postPatch = '' find . -type f -name '*.py' -exec sed -i 's|assertEquals|assertEqual|g' {} + ''; From 3670638339c627747cc1825bb454f6057a3cf300 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Mon, 23 Mar 2026 14:49:39 +0100 Subject: [PATCH 2/4] python3Packages.bson: move python 3.11 compat patch to `patches` Upstream PR: https://github.com/py-bson/bson/pull/113 --- pkgs/development/python-modules/bson/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix index 7e18eb6bcb96..4dd295d20f04 100644 --- a/pkgs/development/python-modules/bson/default.nix +++ b/pkgs/development/python-modules/bson/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { }; patches = [ + # Upstream PR: https://github.com/py-bson/bson/pull/113 + (fetchpatch { + name = "python-3.11.patch"; + url = "https://github.com/py-bson/bson/commit/5346e73124de8a1f9e2a1960501416529e4cee02.patch"; + hash = "sha256-kNs00j/FDjb2av+0WMORrCo75NcuaJXUl4SbYlksnfo="; + }) # Upstream PR: https://github.com/py-bson/bson/pull/140 (fetchpatch { name = "python-3.14.patch"; @@ -30,10 +36,6 @@ buildPythonPackage rec { }) ]; - postPatch = '' - find . -type f -name '*.py' -exec sed -i 's|assertEquals|assertEqual|g' {} + - ''; - propagatedBuildInputs = [ python-dateutil six From c389f00084a39ab0fac945721a487e17918a1bbc Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Mon, 23 Mar 2026 14:52:46 +0100 Subject: [PATCH 3/4] python3Packages.bson: modernize --- pkgs/development/python-modules/bson/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix index 4dd295d20f04..fa0199c38f4c 100644 --- a/pkgs/development/python-modules/bson/default.nix +++ b/pkgs/development/python-modules/bson/default.nix @@ -3,20 +3,21 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, python-dateutil, six, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bson"; version = "0.5.10"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "py-bson"; repo = "bson"; - tag = version; + tag = finalAttrs.version; hash = "sha256-mirRpo27RoOBlwxVOKnHaDIzJOErp7c2VxCOunUm/u4="; }; @@ -36,7 +37,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-dateutil six ]; @@ -51,4 +54,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 374c4ec59ab050eca357fb134b1deac40aa3c563 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Mon, 23 Mar 2026 14:55:15 +0100 Subject: [PATCH 4/4] python3Packages.bson: fix `meta.license` https://github.com/py-bson/bson/blob/master/LICENSE https://github.com/py-bson/bson/blob/master/LICENSE_APACHE --- pkgs/development/python-modules/bson/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix index fa0199c38f4c..2bb2f11738fd 100644 --- a/pkgs/development/python-modules/bson/default.nix +++ b/pkgs/development/python-modules/bson/default.nix @@ -51,7 +51,10 @@ buildPythonPackage (finalAttrs: { meta = { description = "BSON codec for Python"; homepage = "https://github.com/py-bson/bson"; - license = lib.licenses.asl20; + license = [ + lib.licenses.asl20 + lib.licenses.bsd3 + ]; maintainers = with lib.maintainers; [ fab ]; }; })