From 8621bc52f13d069da83133d0bc34fbc0fe943ed6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 19 May 2025 00:45:02 +0200
Subject: [PATCH 1/3] python312Packages.apache-beam: 2.63.0 -> 2.65.0

Diff: https://github.com/apache/beam/compare/refs/tags/v2.63.0...refs/tags/v2.65.0

Changelog: https://github.com/apache/beam/blob/release-2.65.0/CHANGES.md
---
 pkgs/development/python-modules/apache-beam/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 3bcf99a4abf5..bcf7f40062c8 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -17,7 +17,6 @@
   yapf,
 
   # dependencies
-  cloudpickle,
   crcmod,
   dill,
   fastavro,
@@ -63,14 +62,14 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.63.0";
+  version = "2.65.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     tag = "v${version}";
-    hash = "sha256-ixJstawgU3UGtNKVzkwMCLkdY7QKTbxNe6JJ7vG+vmA=";
+    hash = "sha256-vDW0PVNep+egIZBe4t8IPwLgsQDmoO4rrA4wUoAHzfg=";
   };
 
   pythonRelaxDeps = [
@@ -109,7 +108,6 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    cloudpickle
     crcmod
     dill
     fastavro

From 890d1a5e6fe6cdb848f8c5734bd5a9b590530406 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 20 May 2025 18:57:18 +0200
Subject: [PATCH 2/3] python312Packages.tensorflow-datasets: skip failing test

https://github.com/tensorflow/datasets/issues/11055
---
 .../python-modules/tensorflow-datasets/default.nix         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 625619e9bd0a..95d2fa35cc90 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -136,6 +136,13 @@ buildPythonPackage rec {
     "--deselect=tensorflow_datasets/text/c4_wsrs/c4_wsrs_test.py::C4WSRSTest"
   ];
 
+  disabledTests = [
+    # Since updating apache-beam to 2.65.0
+    # RuntimeError: Unable to pickle fn CallableWrapperDoFn...: maximum recursion depth exceeded
+    # https://github.com/tensorflow/datasets/issues/11055
+    "test_download_and_prepare_as_dataset"
+  ];
+
   disabledTestPaths = [
     # Sandbox violations: network access, filesystem write attempts outside of build dir, ...
     "tensorflow_datasets/core/dataset_builder_test.py"

From 16942250db79352e1233ad22eb146d7af19b802c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 20 May 2025 19:18:00 +0200
Subject: [PATCH 3/3] python312Packages.tensorflow-datasets: add missing test
 dependency (cloudpickle)

---
 pkgs/development/python-modules/tensorflow-datasets/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 95d2fa35cc90..728e669aae08 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -26,6 +26,7 @@
   apache-beam,
   beautifulsoup4,
   click,
+  cloudpickle,
   datasets,
   ffmpeg,
   imagemagick,
@@ -101,6 +102,7 @@ buildPythonPackage rec {
     apache-beam
     beautifulsoup4
     click
+    cloudpickle
     datasets
     ffmpeg
     imagemagick