From 87ca4f3fad60c5c0a54f8c4b883064e5a681a468 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sat, 9 Aug 2025 05:04:48 +0800
Subject: [PATCH 1/3] precice: 3.1.2 -> 3.2.0-unstable-2025-05-23

Fix build with libxml2-1.4.0 or higher.
---
 pkgs/by-name/pr/precice/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index d730c40e4af1..34be1b7edef0 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   boost,
   eigen,
@@ -15,23 +14,15 @@
 
 stdenv.mkDerivation rec {
   pname = "precice";
-  version = "3.1.2";
+  version = "3.2.0-unstable-2025-05-23";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "precice";
-    rev = "v${version}";
-    hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0=";
+    rev = "6ee3e347843d4d3c416a32917f6505d35b822445";
+    hash = "sha256-BxNAbpeLqJPzQ9dvvgC9jJQQFBdVMunSqIekz7SIHv4=";
   };
 
-  patches = lib.optionals (!lib.versionOlder "3.1.2" version) [
-    (fetchpatch {
-      name = "boost-187-fixes.patch";
-      url = "https://github.com/precice/precice/commit/23788e9eeac49a2069e129a0cb1ac846e8cbeb9f.patch";
-      hash = "sha256-Z8qOGOkXoCui8Wy0H/OeE+NaTDvyRuPm2A+VJKtjH4s=";
-    })
-  ];
-
   cmakeFlags = [
     (lib.cmakeBool "PRECICE_PETScMapping" false)
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)

From 56f4f36c8f16066a7fd92861f99a7aec21e06577 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sat, 9 Aug 2025 05:11:44 +0800
Subject: [PATCH 2/3] precice: use python3Packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Newer versions (≥ 2.4.0) use CMake's modern find_package(Python3) which
can find Python automatically, so no manual setup is needed.
---
 pkgs/by-name/pr/precice/package.nix | 8 +++-----
 pkgs/top-level/python-packages.nix  | 6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index 34be1b7edef0..d60bc8bac569 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -7,7 +7,7 @@
   eigen,
   libxml2,
   mpi,
-  python3,
+  python3Packages,
   petsc,
   pkg-config,
 }:
@@ -26,15 +26,11 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     (lib.cmakeBool "PRECICE_PETScMapping" false)
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-    (lib.cmakeFeature "PYTHON_LIBRARIES" python3.libPrefix)
-    (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
   ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    python3
-    python3.pkgs.numpy
   ];
 
   buildInputs = [
@@ -43,6 +39,8 @@ stdenv.mkDerivation rec {
     libxml2
     mpi
     petsc
+    python3Packages.python
+    python3Packages.numpy
   ];
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc147660992c..16058c28feed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13563,7 +13563,11 @@ self: super: with self; {
 
   pyppmd = callPackage ../development/python-modules/pyppmd { };
 
-  pyprecice = callPackage ../development/python-modules/pyprecice { };
+  pyprecice = callPackage ../development/python-modules/pyprecice {
+    precice = pkgs.precice.override {
+      python3Packages = self;
+    };
+  };
 
   pypresence = callPackage ../development/python-modules/pypresence { };
 

From d0a9da193d496ec84153208358a3055c6f554b90 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sat, 9 Aug 2025 05:32:40 +0800
Subject: [PATCH 3/3] python3Packages.pyprecice: 3.1.2 -> 3.2.1

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

diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index 48bf841129f8..712476ee1436 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -17,20 +17,19 @@
 
 buildPythonPackage rec {
   pname = "pyprecice";
-  version = "3.1.2";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "python-bindings";
     tag = "v${version}";
-    hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y=";
+    hash = "sha256-8AM2wbPX54UaMO4MzLOV0TljLTAPOqR9gUbtT2McNjs=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=61,<72" "setuptools" \
-      --replace-fail "numpy<2" "numpy"
+      --replace-fail "setuptools>=61,<72" "setuptools"
   '';
 
   build-system = [
@@ -40,10 +39,6 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  pythonRelaxDeps = [
-    "numpy"
-  ];
-
   dependencies = [
     numpy
     mpi4py