Unverified Commit 22bb9b30 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

python3Packages.firedrake: 2025.4.2 -> 2025.10.1 (#449013)

parents 424c8636 6d034fff
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@

buildPythonPackage rec {
  pname = "firedrake-fiat";
  version = "2025.4.2";
  version = "2025.10.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "firedrakeproject";
    repo = "fiat";
    tag = version;
    hash = "sha256-SIi/4JW9L4kyFxEmbG9pqe0QtY80UMOh7LSFLmrHhZY=";
    hash = "sha256-kyQe4VFzcK1idMt/NNND2cytGUryyhh5+ZP292zxT7c=";
  };

  postPatch =
+19 −29
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@
  libsupermesh,
  loopy,
  petsc4py,
  petsctools,
  numpy,
  packaging,
  pkgconfig,
@@ -35,6 +36,7 @@
  scipy,
  sympy,
  islpy,
  vtk,
  matplotlib,
  immutabledict,

@@ -59,36 +61,31 @@ let
in
buildPythonPackage rec {
  pname = "firedrake";
  version = "2025.4.2";
  version = "2025.10.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "firedrakeproject";
    repo = "firedrake";
    tag = version;
    hash = "sha256-bAGmXoHPAdMYJMMQYVq98LYro1Vd+o9pfvXC3BsQUf0=";
    hash = "sha256-paZNs6T9v7TNSdc8YJTjNcQvGrPg/Sy9K27/aUxNu5w=";
  };

  postPatch =
  patches = [
    (fetchpatch2 {
      url = "https://github.com/firedrakeproject/firedrake/pull/4632/commits/717ae8a62e19e0cc91419c12ca14170d252b2bb9.patch?full_index=1";
      hash = "sha256-XHIcXmfh/brlQkrM4FTRvTrOovLvBN5mBrqZpZewTnc=";
    })
  ];

  # relax build-dependency petsc4py
    ''
  postPatch = ''
    substituteInPlace pyproject.toml --replace-fail \
        "petsc4py==3.23.4" "petsc4py"
    ''
    + lib.optionalString stdenv.hostPlatform.isLinux ''
      substituteInPlace firedrake/petsc.py --replace-fail \
        'program = ["ldd"]' \
        'program = ["${lib.getExe' pax-utils "lddtree"}"]'
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
      substituteInPlace firedrake/petsc.py --replace-fail \
        'program = ["otool"' \
        'program = ["${lib.getExe' stdenv.cc.bintools.bintools "otool"}"'
      "petsc4py==3.24.0" "petsc4py"
  '';

  pythonRelaxDeps = [
    "decorator"
    "slepc4py"
  ];

  build-system = [
@@ -117,6 +114,7 @@ buildPythonPackage rec {
    libsupermesh
    loopy
    petsc4py
    petsctools
    numpy
    packaging
    pkgconfig
@@ -128,6 +126,7 @@ buildPythonPackage rec {
    rtree
    scipy
    sympy
    vtk
    # required by script spydump
    matplotlib
    # required by pyop2
@@ -155,20 +154,11 @@ buildPythonPackage rec {
    writableTmpDirAsHomeHook
  ];

  # These scripts are used by official sdist/editable_wheel only
  postInstall = ''
    rm $out/bin/firedrake-{check,status,run-split-tests}
  '';

  preCheck = ''
    rm -rf firedrake pyop2 tinyasm tsfc
  '';

  # run official smoke tests
  checkPhase = ''
    runHook preCheck

    make check
    $out/bin/firedrake-check

    runHook postCheck
  '';
+2 −4
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@

buildPythonPackage rec {
  pname = "pyadjoint-ad";
  version = "2025.04.1";
  version = "2025.10.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "dolfin-adjoint";
    repo = "pyadjoint";
    tag = version;
    hash = "sha256-S9A0qCatnnLuOkqWsEC4tjVY1HZqqi2T5iXu+WUoN24=";
    hash = "sha256-caW2X4q0mHnD8CEh5jjelD4xBth/R/8/P3m0tTeO/LQ=";
  };

  build-system = [
@@ -30,8 +30,6 @@ buildPythonPackage rec {
  ];

  pythonImportsCheck = [
    # The firedrake_adjoint module is deprecated and requires a cyclic dependency of firedrake
    # "firedrake_adjoint"
    "numpy_adjoint"
    "pyadjoint"
    "pyadjoint.optimization"