From a9d8bca30c5ea5529ac8b5216fb5d02abb38203f Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 2 Sep 2025 06:54:00 +0800 Subject: [PATCH 1/4] python3Packages.firedrake-fiat: fix pname --- pkgs/development/python-modules/firedrake-fiat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix index 10f348818690..9c3d2aa279bd 100644 --- a/pkgs/development/python-modules/firedrake-fiat/default.nix +++ b/pkgs/development/python-modules/firedrake-fiat/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage rec { - pname = "firdrake-fiat"; + pname = "firedrake-fiat"; version = "2025.4.0"; pyproject = true; From 0b06031ede562c2d92a17b11729c199620187140 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 4 Sep 2025 14:42:36 +0800 Subject: [PATCH 2/4] python3Packages.firedrake-fiat: skip bulk update and add updateScript --- .../python-modules/firedrake-fiat/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix index 9c3d2aa279bd..25a5b3466f24 100644 --- a/pkgs/development/python-modules/firedrake-fiat/default.nix +++ b/pkgs/development/python-modules/firedrake-fiat/default.nix @@ -11,6 +11,7 @@ symengine, fenics-ufl, pytestCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -62,6 +63,18 @@ buildPythonPackage rec { "--skip-download" ]; + passthru = { + # python updater script sets the wrong tag + skipBulkUpdate = true; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "([0-9.]+)" + ]; + }; + }; + meta = { description = "FInite element Automatic Tabulator"; homepage = "http://fenics-fiat.readthedocs.org/"; From 1c28b775960eb1ee094640d968a3c83325b7f61f Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 2 Sep 2025 06:53:22 +0800 Subject: [PATCH 3/4] python3Packages.firedrake-fiat: 2025.4.0 -> 2025.4.1 Diff: firedrakeproject/fiat@2025.4.0...2025.4.1 Changelog: https://github.com/firedrakeproject/fiat/releases/tag/2025.4.1 --- pkgs/development/python-modules/firedrake-fiat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix index 25a5b3466f24..412077919710 100644 --- a/pkgs/development/python-modules/firedrake-fiat/default.nix +++ b/pkgs/development/python-modules/firedrake-fiat/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "firedrake-fiat"; - version = "2025.4.0"; + version = "2025.4.1"; pyproject = true; src = fetchFromGitHub { owner = "firedrakeproject"; repo = "fiat"; tag = version; - hash = "sha256-i+hDpeg4SYRF7OK6uh1p1gVscyuJ4FjmyUUiLR7P7/A="; + hash = "sha256-rN2JPXsauyBF6X2378kOmqHNB+1EqxiGnDaVoEXy4vw="; }; postPatch = From 9d949bfed91b77768cf223062d4bf5798ce2bf79 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 4 Sep 2025 14:23:30 +0800 Subject: [PATCH 4/4] python3Packages.firedrake: add updateScript --- pkgs/development/python-modules/firedrake/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix index d46edecae34f..645bf8ae82ff 100644 --- a/pkgs/development/python-modules/firedrake/default.nix +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -43,9 +43,10 @@ mpiCheckPhaseHook, writableTmpDirAsHomeHook, - # passthru.tests + # passthru firedrake, mpich, + nix-update-script, }: let firedrakePackages = lib.makeScope newScope (self: { @@ -173,6 +174,13 @@ buildPythonPackage rec { # python updater script sets the wrong tag skipBulkUpdate = true; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "([0-9.]+)" + ]; + }; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { mpich = firedrake.override { petsc4py = petsc4py.override { mpi = mpich; };