Unverified Commit 3af0eb84 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

python3Packages.fenics-dolfinx: 0.9.0.post1 -> 0.10.0.post1 (#454312)

parents afb0f982 e3c7cc51
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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 = [
+1 −1
Original line number Diff line number Diff line
@@ -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";
+2 −2
Original line number Diff line number Diff line
@@ -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;
+4 −13
Original line number Diff line number Diff line
@@ -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 {
+2 −5
Original line number Diff line number Diff line
{
  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";