From 5634d55e895ba9cc331f189e8e9811d0fd0f8643 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 30 Dec 2024 00:01:39 +0100
Subject: [PATCH 1/2] python312Packages.tensorstore: 0.1.65 -> 0.1.71

Changelog: https://github.com/google/tensorstore/releases/tag/v0.1.71
---
 .../python-modules/tensorstore/default.nix    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tensorstore/default.nix b/pkgs/development/python-modules/tensorstore/default.nix
index 42693111f4020..4af9405da391d 100644
--- a/pkgs/development/python-modules/tensorstore/default.nix
+++ b/pkgs/development/python-modules/tensorstore/default.nix
@@ -17,20 +17,23 @@ let
     "aarch64-darwin" = "macosx_11_0_arm64";
   };
   hashes = {
-    "310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk=";
-    "311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4=";
-    "312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8=";
-    "310-aarch64-linux" = "sha256-Ocfg3VArM/14a06cpMuJDYP/MIo9rCvtFO4Cd3AahA4=";
-    "311-aarch64-linux" = "sha256-hegFeV3m0jpjTXNU6ue/3kGe1Cy+Pfeh4GDe96dvL7o=";
-    "312-aarch64-linux" = "sha256-O0VVtSqSEd4dqjmaXMTRvf/Bcc9YR7zzbz9N/8GVcXk=";
-    "310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro=";
-    "311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo=";
-    "312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM=";
+    "310-x86_64-linux" = "sha256-GmzcxS5LhB0j5Qovoo4Bbm2fYdbqkYjUVV6hibBAoPY=";
+    "311-x86_64-linux" = "sha256-NzVYuAPYwsV/xhOxEAeuWBOfGaPN3UQ6DeXXtTIeWWE=";
+    "312-x86_64-linux" = "sha256-ztVDC836f8s6a9xEczF2FYy4d7Nb3SM8rILiW0zJTpI=";
+    "313-x86_64-linux" = "sha256-UrVG8Hayw78hfGDwXeQSTMEZfOkvjoJufsc64yQHSlo=";
+    "310-aarch64-linux" = "sha256-lQQbVaLshtH2aQUS0Yg1gbGPL09Gw9l4lK6wrC22r38=";
+    "311-aarch64-linux" = "sha256-ZcOhoqNaG1N0A/NkA9JYyqtHflZLwPZBCblBzHe08gM=";
+    "312-aarch64-linux" = "sha256-h6l6NLBHXdx9KvxA5d1/jRJSKqge37zMs5Yoz1kUVNU=";
+    "313-aarch64-linux" = "sha256-YnbiebRetdm5XE3z55ViVfQU/UsSjS3hbYrs3obDY1c";
+    "310-aarch64-darwin" = "sha256-uWG7u3ocakjkwUBqmMrr60AEYeLnWgi23wwBMpQDehU=";
+    "311-aarch64-darwin" = "sha256-9A5zvNwzPfs/f+D88CO8vsQVM8mFZldxj/duzhoZAuA=";
+    "312-aarch64-darwin" = "sha256-06JP62GV8cIiFillwBB8n/VtMizKI+GfDmZjb264DxQ=";
+    "313-aarch64-darwin" = "sha256-3ohD+zRiiZ3nvN7qzLkjA6nWEAa8NjZN60qI30YyC6Q=";
   };
 in
 buildPythonPackage rec {
   pname = "tensorstore";
-  version = "0.1.65";
+  version = "0.1.71";
   format = "wheel";
 
   # The source build involves some wonky Bazel stuff.

From 8fcee6fad69a4f5124deb4dfd8db6935dbf19944 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Oct 2024 17:28:01 +0200
Subject: [PATCH 2/2] python312Packages.orbax-checkpoint: 0.6.4 -> 0.10.2

Diff: https://github.com/google/orbax/compare/refs/tags/v0.6.4...v0.10.2

Changelog: https://github.com/google/orbax/releases/tag/v0.10.2
---
 .../orbax-checkpoint/default.nix              | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 511542d0a4902..5c815f85dd801 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -11,14 +11,13 @@
   # dependencies
   etils,
   humanize,
-  importlib-resources,
   jax,
-  jaxlib,
   msgpack,
   nest-asyncio,
   numpy,
   protobuf,
   pyyaml,
+  simplejson,
   tensorstore,
   typing-extensions,
 
@@ -26,20 +25,21 @@
   chex,
   google-cloud-logging,
   mock,
+  optax,
   pytest-xdist,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.6.4";
+  version = "0.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-xd75/AKBFUdA6a8sQnCB2rVbHl/Foy4LTb07jnwrTjA=";
+    tag = "v${version}";
+    hash = "sha256-BTg4kUz5jfoK2uR/deqqJb8PYoj+FfkuoMZAeSjKKnA=";
   };
 
   sourceRoot = "${src.name}/checkpoint";
@@ -50,14 +50,13 @@ buildPythonPackage rec {
     absl-py
     etils
     humanize
-    importlib-resources
     jax
-    jaxlib
     msgpack
     nest-asyncio
     numpy
     protobuf
     pyyaml
+    simplejson
     tensorstore
     typing-extensions
   ];
@@ -66,6 +65,7 @@ buildPythonPackage rec {
     chex
     google-cloud-logging
     mock
+    optax
     pytest-xdist
     pytestCheckHook
   ];
@@ -84,14 +84,19 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Circular dependency flax
+    "orbax/checkpoint/_src/metadata/empty_values_test.py"
+    "orbax/checkpoint/_src/metadata/tree_rich_types_test.py"
+    "orbax/checkpoint/_src/metadata/tree_test.py"
+    "orbax/checkpoint/_src/testing/test_tree_utils.py"
+    "orbax/checkpoint/_src/tree/utils_test.py"
+    "orbax/checkpoint/single_host_test.py"
     "orbax/checkpoint/transform_utils_test.py"
-    "orbax/checkpoint/utils_test.py"
   ];
 
   meta = {
     description = "Orbax provides common utility libraries for JAX users";
     homepage = "https://github.com/google/orbax/tree/main/checkpoint";
-    changelog = "https://github.com/google/orbax/releases/tag/v${version}";
+    changelog = "https://github.com/google/orbax/blob/v${version}/checkpoint/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };