From e1c64c34cbb9fef4171f5f5c5ea6ce98d1c486dc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 10 Apr 2025 20:51:57 +0200
Subject: [PATCH 1/2] python312Packages.jaxopt: 0.8.3 -> 0.8.4

Diff: https://github.com/google/jaxopt/compare/refs/tags/jaxopt-v0.8.3...jaxopt-v0.8.4

Changelog: https://github.com/google/jaxopt/releases/tag/jaxopt-v0.8.4
---
 .../python-modules/jaxopt/default.nix         | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix
index c8ada5b43e31..90dff56e0cf9 100644
--- a/pkgs/development/python-modules/jaxopt/default.nix
+++ b/pkgs/development/python-modules/jaxopt/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -24,32 +23,16 @@
 
 buildPythonPackage rec {
   pname = "jaxopt";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "jaxopt";
     tag = "jaxopt-v${version}";
-    hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U=";
+    hash = "sha256-StuI9Z9wRjuvjsGoQUkcjoKbR6hNkGmOcddUc18yO3I=";
   };
 
-  patches = [
-    # fix failing tests from scipy 1.12 update
-    # https://github.com/google/jaxopt/pull/574
-    (fetchpatch {
-      name = "scipy-1.12-fix-tests.patch";
-      url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch";
-      hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY=";
-    })
-    # fix invalid string escape sequences
-    (fetchpatch {
-      name = "fix-escape-sequences.patch";
-      url = "https://github.com/google/jaxopt/commit/f5bb530f5f000d0739c9b26eee2d32211eb99f40.patch";
-      hash = "sha256-E0ZXIfzWxKHuiBn4lAWf7AjNtll7OJU/NGZm6PTmhzo=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From 59f19d16811f442dffb290175a25bb4f9a3214b4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 11 Apr 2025 00:09:06 +0200
Subject: [PATCH 2/2] python312Packages.blackjax: ignore DeprecationWarnin in
 tests

---
 pkgs/development/python-modules/blackjax/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index e89e390771a7..7228669a13f9 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -49,6 +49,12 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
+  pytestFlagsArray = [
+    # DeprecationWarning: JAXopt is no longer maintained
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
   disabledTestPaths = [
     "tests/test_benchmarks.py"