From b9024d4b3367112941c35720e0579ebdd248cb52 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Fri, 3 Jan 2025 09:21:31 +0100 Subject: [PATCH] python3Packages.fenics: pin boost186, add patches --- .../python-modules/fenics/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix index b2750f7a7054..15f4fc83b541 100644 --- a/pkgs/development/python-modules/fenics/default.nix +++ b/pkgs/development/python-modules/fenics/default.nix @@ -4,7 +4,7 @@ fetchurl, fetchpatch, blas, - boost, + boost186, cmake, doxygen, eigen, @@ -133,6 +133,13 @@ let url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g"; }; + patches = [ + (fetchpatch { + name = "fenics-ffc-numpy2-compat.patch"; + url = "https://bitbucket.org/fenics-project/ffc/commits/245d15115b35b5ac091251fe6c84cc6474704b3c/raw"; + hash = "sha256-TcLQZ44C+uR2ryxtCBjR/5Tjn7B0S4MqoYi0nlP8JwI="; + }) + ]; nativeBuildInputs = [ pybind11 ]; propagatedBuildInputs = [ dijitso @@ -177,6 +184,11 @@ let url = "https://bitbucket.org/fenics-project/dolfin/issues/attachments/1116/fenics-project/dolfin/1602778118.04/1116/0001-Use-__BYTE_ORDER__-instead-of-removed-Boost-endian.h.patch"; hash = "sha256-wPaDmPU+jaD3ce3nNEbvM5p8e3zBdLozamLTJ/0ai2c="; }) + (fetchpatch { + name = "fenics-boost-filesystem-1.85-compat.patch."; + url = "https://bitbucket.org/sblauth/dolfin/commits/16fa03887b3e9ec417c484ddf92db104cb9a93f9/raw"; + hash = "sha256-ZMKfzeWlPre88cKzrj04Tj+nQWS4ixat0bBvyt3TJmk="; + }) ]; # https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=dolfin&id=a965ad934f7b3d49a5e77fa6fb5e3c710ec2163e postPatch = '' @@ -197,7 +209,7 @@ let pkg-config ]; buildInputs = [ - boost + boost186 dijitso eigen ffc @@ -265,7 +277,7 @@ let ''; buildInputs = [ dolfin - boost + boost186 ]; propagatedBuildInputs = [