diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix index d730c40e4af1..d60bc8bac569 100644 --- a/pkgs/by-name/pr/precice/package.nix +++ b/pkgs/by-name/pr/precice/package.nix @@ -2,48 +2,35 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, eigen, libxml2, mpi, - python3, + python3Packages, petsc, pkg-config, }: 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) - (lib.cmakeFeature "PYTHON_LIBRARIES" python3.libPrefix) - (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}") ]; nativeBuildInputs = [ cmake pkg-config - python3 - python3.pkgs.numpy ]; buildInputs = [ @@ -52,6 +39,8 @@ stdenv.mkDerivation rec { libxml2 mpi petsc + python3Packages.python + python3Packages.numpy ]; meta = { 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d15cfca161bb..243343eba16a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13595,7 +13595,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 { };