From f15201fa483eaad69bf6559aa8a9898a5b714921 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 21 Oct 2025 19:55:54 +0800 Subject: [PATCH 1/4] python3Packages.fenics-basix: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/fenics-basix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fenics-basix/default.nix b/pkgs/development/python-modules/fenics-basix/default.nix index 4d4d10b5c583..35d8b3b3d3c7 100644 --- a/pkgs/development/python-modules/fenics-basix/default.nix +++ b/pkgs/development/python-modules/fenics-basix/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fenics-basix"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "fenics"; repo = "basix"; tag = "v${version}"; - hash = "sha256-jLQMDt6zdl+oixd5Qevn4bvxBsXpTNcbH2Os6TC9sRQ="; + hash = "sha256-atrfIMyLY9EAyw6eiVaC/boG2/a8PCrrv/7J0ntHgSo="; }; dontUseCmakeConfigure = true; From a938e2f7ea6c3e55d4d1b82f52e2f47038b73bcd Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 22 Oct 2025 02:32:00 +0800 Subject: [PATCH 2/4] python3Packages.fenics-ffcx: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/fenics-ffcx/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fenics-ffcx/default.nix b/pkgs/development/python-modules/fenics-ffcx/default.nix index c0b212d7b01d..2ce03df4821e 100644 --- a/pkgs/development/python-modules/fenics-ffcx/default.nix +++ b/pkgs/development/python-modules/fenics-ffcx/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -16,14 +15,14 @@ buildPythonPackage rec { pname = "fenics-ffcx"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "fenics"; repo = "ffcx"; tag = "v${version}"; - hash = "sha256-eAV//RLbrxyhqgbZ2DiR7qML7xfgPn0/Seh+2no0x8w="; + hash = "sha256-i8fawnXWxIHfOvb0nK4/bzhrzfRJJACMCkFZKtdUwkU="; }; pythonRelaxDeps = [ @@ -53,8 +52,6 @@ buildPythonPackage rec { addBinToPathHook ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unused-command-line-argument"; - meta = { homepage = "https://fenicsproject.org"; downloadPage = "https://github.com/fenics/ffcx"; From c0f391c5ec66d7ea28c264e0503bcca51b94b8e8 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 22 Oct 2025 02:57:48 +0800 Subject: [PATCH 3/4] slepc: shellHook -> setupHook --- pkgs/by-name/sl/slepc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix index 02a989552844..fa217811adff 100644 --- a/pkgs/by-name/sl/slepc/package.nix +++ b/pkgs/by-name/sl/slepc/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { pythonImportsCheck = [ "slepc4py" ]; - shellHook = ./setup-hook.sh; + setupHook = ./setup-hook.sh; meta = { description = "Scalable Library for Eigenvalue Problem Computations"; From e3c7cc511b82cf28447250c7606ec3eea90e3aa1 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 22 Oct 2025 03:29:51 +0800 Subject: [PATCH 4/4] python3Packages.fenics-dolfinx: 0.9.0.post1 -> 0.10.0.post1 --- pkgs/by-name/do/dolfinx/package.nix | 6 ++++-- .../python-modules/fenics-dolfinx/default.nix | 17 ++++------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix index 383b7132bb81..16a5b11a8364 100644 --- a/pkgs/by-name/do/dolfinx/package.nix +++ b/pkgs/by-name/do/dolfinx/package.nix @@ -12,6 +12,7 @@ kahip, adios2, python3Packages, + darwinMinVersionHook, catch2_3, withParmetis ? false, }: @@ -25,14 +26,14 @@ let ); in stdenv.mkDerivation (finalAttrs: { - version = "0.9.0.post1"; + version = "0.10.0.post1"; pname = "dolfinx"; src = fetchFromGitHub { owner = "fenics"; repo = "dolfinx"; tag = "v${finalAttrs.version}"; - hash = "sha256-4IIx7vUZeDwOGVdyC2PBvfhVjrmGZeVQKAwgDYScbY0="; + hash = "sha256-ZsaEcJdvsf3dxJ739/CU20+drjbAvuc/HkIGCfh9U5A="; }; preConfigure = '' @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { dolfinxPackages.kahip dolfinxPackages.scotch ] + ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3") ++ lib.optional withParmetis dolfinxPackages.parmetis; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix index 34f1bcd37087..f37135fffab6 100644 --- a/pkgs/development/python-modules/fenics-dolfinx/default.nix +++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix @@ -16,6 +16,7 @@ # buildInputs dolfinx, + darwinMinVersionHook, # dependency numpy, @@ -63,7 +64,6 @@ buildPythonPackage rec { pyproject = true; pythonRelaxDeps = [ - "cffi" "fenics-ufl" ]; @@ -87,7 +87,8 @@ buildPythonPackage rec { buildInputs = [ fenicsPackages.dolfinx - ]; + ] + ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3"); dependencies = [ numpy @@ -102,8 +103,6 @@ buildPythonPackage rec { (mpi4py.override { inherit (fenicsPackages) mpi; }) ]; - doCheck = true; - nativeCheckInputs = [ scipy matplotlib @@ -113,21 +112,13 @@ buildPythonPackage rec { ]; preCheck = '' - rm -rf dolfinx + cd test ''; pythonImportsCheck = [ "dolfinx" ]; - disabledTests = [ - # require cffi<1.17 - "test_cffi_expression" - "test_hexahedron_mesh" - # https://github.com/FEniCS/dolfinx/issues/1104 - "test_cube_distance" - ]; - passthru = { tests = { complex = fenics-dolfinx.override {