From dd9517ef2d4b48be995ec586854a717845ad939f Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 5 Jan 2026 09:21:33 +0800 Subject: [PATCH] treewide: move python packages qbisi maintain to finalAttrs --- .../python-modules/checkpoint-schedules/default.nix | 8 ++++---- .../python-modules/constantdict/default.nix | 8 ++++---- .../python-modules/fenics-basix/default.nix | 8 ++++---- .../python-modules/fenics-dolfinx/default.nix | 6 +++--- .../python-modules/fenics-ffcx/default.nix | 8 ++++---- .../python-modules/fenics-ufl/default.nix | 8 ++++---- .../python-modules/firedrake-fiat/default.nix | 6 +++--- .../python-modules/firedrake/default.nix | 6 +++--- .../python-modules/mpi-pytest/default.nix | 8 ++++---- .../python-modules/petsctools/default.nix | 10 +++++----- .../python-modules/pyadjoint-ad/default.nix | 6 +++--- .../python-modules/pybind11-stubgen/default.nix | 8 ++++---- .../development/python-modules/pymbolic/default.nix | 13 ++++++++----- .../python-modules/recursivenodes/default.nix | 8 ++++---- .../python-modules/siphash24/default.nix | 8 ++++---- pkgs/development/python-modules/wslink/default.nix | 12 ++++++------ 16 files changed, 67 insertions(+), 64 deletions(-) diff --git a/pkgs/development/python-modules/checkpoint-schedules/default.nix b/pkgs/development/python-modules/checkpoint-schedules/default.nix index d7d30130eb93..bbe02f32dade 100644 --- a/pkgs/development/python-modules/checkpoint-schedules/default.nix +++ b/pkgs/development/python-modules/checkpoint-schedules/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "checkpoint-schedules"; version = "1.0.4"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firedrakeproject"; repo = "checkpoint_schedules"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3bn/KxxtRLRtOHFeULQdnndonpuhuYLL8/y/zoAurzY="; }; @@ -35,8 +35,8 @@ buildPythonPackage rec { homepage = "https://www.firedrakeproject.org/checkpoint_schedules"; downloadPage = "https://github.com/firedrakeproject/checkpoint_schedules"; description = "Schedules for incremental checkpointing of adjoint simulations"; - changelog = "https://github.com/firedrakeproject/checkpoint_schedules/releases/tag/${src.tag}"; + changelog = "https://github.com/firedrakeproject/checkpoint_schedules/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/constantdict/default.nix b/pkgs/development/python-modules/constantdict/default.nix index 88ec94219d8a..224fbbd20400 100644 --- a/pkgs/development/python-modules/constantdict/default.nix +++ b/pkgs/development/python-modules/constantdict/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "constantdict"; version = "2025.3"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthiasdiener"; repo = "constantdict"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jX6g9xBteZOc/7Ob5N8eUSCycb6JoE5i38T52zknOTI="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { homepage = "https://matthiasdiener.github.io/constantdict"; downloadPage = "https://github.com/matthiasdiener/constantdict"; description = "Immutable dictionary class for Python, implemented as a thin layer around Python's builtin dict class"; - changelog = "https://github.com/matthiasdiener/constantdict/releases/tag/${src.tag}"; + changelog = "https://github.com/matthiasdiener/constantdict/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/fenics-basix/default.nix b/pkgs/development/python-modules/fenics-basix/default.nix index f2372f56ce16..4f2bc052c21d 100644 --- a/pkgs/development/python-modules/fenics-basix/default.nix +++ b/pkgs/development/python-modules/fenics-basix/default.nix @@ -18,7 +18,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fenics-basix"; version = "0.10.0.post0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fenics"; repo = "basix"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iKG6Cs28D0scPEIRKoGk/CgquKzGZvIjf4UIj4MQXHA="; }; @@ -76,8 +76,8 @@ buildPythonPackage rec { homepage = "https://fenicsproject.org"; downloadPage = "https://github.com/fenics/basix"; description = "Finite element definition and tabulation runtime library"; - changelog = "https://github.com/fenics/basix/releases/tag/${src.tag}"; + changelog = "https://github.com/fenics/basix/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix index f37135fffab6..fac894456263 100644 --- a/pkgs/development/python-modules/fenics-dolfinx/default.nix +++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix @@ -55,7 +55,7 @@ let } ); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { inherit (dolfinx) version src @@ -136,7 +136,7 @@ buildPythonPackage rec { homepage = "https://fenicsproject.org"; downloadPage = "https://github.com/fenics/dolfinx"; description = "Computational environment of FEniCSx and implements the FEniCS Problem Solving Environment in C++ and Python"; - changelog = "https://github.com/fenics/dolfinx/releases/tag/${src.tag}"; + changelog = "https://github.com/fenics/dolfinx/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ bsd2 lgpl3Plus @@ -144,4 +144,4 @@ buildPythonPackage rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/fenics-ffcx/default.nix b/pkgs/development/python-modules/fenics-ffcx/default.nix index a61a5ccbcbf5..b5718eb486fb 100644 --- a/pkgs/development/python-modules/fenics-ffcx/default.nix +++ b/pkgs/development/python-modules/fenics-ffcx/default.nix @@ -13,7 +13,7 @@ addBinToPathHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fenics-ffcx"; version = "0.10.1.post0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fenics"; repo = "ffcx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uV3sfK6tpdoVf+O/EYZw3yR1PdqkoXt4q66zwQ8h/Ks="; }; @@ -56,7 +56,7 @@ buildPythonPackage rec { homepage = "https://fenicsproject.org"; downloadPage = "https://github.com/fenics/ffcx"; description = "FEniCSx Form Compiler"; - changelog = "https://github.com/fenics/ffcx/releases/tag/${src.tag}"; + changelog = "https://github.com/fenics/ffcx/releases/tag/v${finalAttrs.version}"; mainProgram = "ffcx"; license = with lib.licenses; [ unlicense @@ -64,4 +64,4 @@ buildPythonPackage rec { ]; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/fenics-ufl/default.nix b/pkgs/development/python-modules/fenics-ufl/default.nix index 10bed13a147a..b9d3f46547a3 100644 --- a/pkgs/development/python-modules/fenics-ufl/default.nix +++ b/pkgs/development/python-modules/fenics-ufl/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fenics-ufl"; version = "2025.2.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fenics"; repo = "ufl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-REDjNiUM3bd166Pq92P9Yl4Ff9C9hFNjTWWO1FElHrU="; }; @@ -42,8 +42,8 @@ buildPythonPackage rec { homepage = "https://fenicsproject.org"; downloadPage = "https://github.com/fenics/ufl"; description = "Unified Form Language"; - changelog = "https://github.com/fenics/ufl/releases/tag/${src.tag}"; + changelog = "https://github.com/fenics/ufl/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix index b87d741dc04f..533819f139a1 100644 --- a/pkgs/development/python-modules/firedrake-fiat/default.nix +++ b/pkgs/development/python-modules/firedrake-fiat/default.nix @@ -14,7 +14,7 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "firedrake-fiat"; version = "2025.10.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firedrakeproject"; repo = "fiat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-x1/gf/QVez6GxPUafxdhxqyT0MkL6w2Qz6VAxRNufdc="; }; @@ -82,4 +82,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix index 811d4f7432f1..ed82a24db2c3 100644 --- a/pkgs/development/python-modules/firedrake/default.nix +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -57,7 +57,7 @@ let mpi-pytest = self.callPackage mpi-pytest.override { }; }); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "firedrake"; version = "2025.10.2"; pyproject = true; @@ -65,7 +65,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firedrakeproject"; repo = "firedrake"; - tag = version; + tag = finalAttrs.version; hash = "sha256-A0dr9A1fm74IzpYiVxzdo4jtELYH7JBeRMOD9uYJODQ="; }; @@ -183,4 +183,4 @@ buildPythonPackage rec { ]; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/mpi-pytest/default.nix b/pkgs/development/python-modules/mpi-pytest/default.nix index c436e1f0a69a..cf908f2a0e32 100644 --- a/pkgs/development/python-modules/mpi-pytest/default.nix +++ b/pkgs/development/python-modules/mpi-pytest/default.nix @@ -9,7 +9,7 @@ mpiCheckPhaseHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpi-pytest"; version = "2025.7"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firedrakeproject"; repo = "mpi-pytest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TZj1hObMVzYfAUC0UjXMvUThbKCNdiB1FMSA0AHjZ9s="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/firedrakeproject/mpi-pytest"; description = "Pytest plugin that lets you run tests in parallel with MPI"; - changelog = "https://github.com/firedrakeproject/mpi-pytest/releases/tag/${src.tag}"; + changelog = "https://github.com/firedrakeproject/mpi-pytest/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/petsctools/default.nix b/pkgs/development/python-modules/petsctools/default.nix index d4b540b454cb..425ea8e135f3 100644 --- a/pkgs/development/python-modules/petsctools/default.nix +++ b/pkgs/development/python-modules/petsctools/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "petsctools"; version = "2025.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firedrakeproject"; repo = "petsctools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5SV34KhympX58lWfFaQo5lVOeafcc/Y8HvYtZtY+4Eo="; }; @@ -41,13 +41,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] - ++ optional-dependencies.petsc4py; + ++ finalAttrs.passthru.optional-dependencies.petsc4py; meta = { homepage = "https://github.com/firedrakeproject/petsctools"; description = "Pythonic extensions for petsc4py and slepc4py"; - changelog = "https://github.com/firedrakeproject/petsctools/releases/tag/${src.tag}"; + changelog = "https://github.com/firedrakeproject/petsctools/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyadjoint-ad/default.nix b/pkgs/development/python-modules/pyadjoint-ad/default.nix index 6a6ad8d50eab..fb4d5d2eec2c 100644 --- a/pkgs/development/python-modules/pyadjoint-ad/default.nix +++ b/pkgs/development/python-modules/pyadjoint-ad/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyadjoint-ad"; version = "2025.10.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dolfin-adjoint"; repo = "pyadjoint"; - tag = version; + tag = finalAttrs.version; hash = "sha256-caW2X4q0mHnD8CEh5jjelD4xBth/R/8/P3m0tTeO/LQ="; }; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/pybind11-stubgen/default.nix b/pkgs/development/python-modules/pybind11-stubgen/default.nix index a54c2b7f8997..f8cb91097f84 100644 --- a/pkgs/development/python-modules/pybind11-stubgen/default.nix +++ b/pkgs/development/python-modules/pybind11-stubgen/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybind11-stubgen"; version = "2.5.5"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sizmailov"; repo = "pybind11-stubgen"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J2LydgkiNQp+2/agwBCSTtr+Ci4zONLkHmnMLFBww24="; }; @@ -28,10 +28,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pybind11_stubgen" ]; meta = { - changelog = "https://github.com/sizmailov/pybind11-stubgen/releases/tag/${src.tag}"; + changelog = "https://github.com/sizmailov/pybind11-stubgen/releases/tag/v${finalAttrs.version}"; description = "Generates stubs for python modules"; homepage = "https://github.com/sizmailov/pybind11-stubgen"; license = lib.licenses.bsd3Lbnl; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 86f95d813991..f856bd3fe167 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -19,7 +19,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pymbolic"; version = "2025.1"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inducer"; repo = "pymbolic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cn2EdhMn5qjK854AF5AY4Hv4M5Ib6gPRJk+kQvsFWRk="; }; @@ -44,15 +44,18 @@ buildPythonPackage rec { numpy = [ numpy ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pythonImportsCheck = [ "pymbolic" ]; meta = { description = "Package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; - changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}"; + changelog = "https://github.com/inducer/pymbolic/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/recursivenodes/default.nix b/pkgs/development/python-modules/recursivenodes/default.nix index 8194aeb0e48b..ff26f35e681e 100644 --- a/pkgs/development/python-modules/recursivenodes/default.nix +++ b/pkgs/development/python-modules/recursivenodes/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "recursivenodes"; version = "0.3.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "tisaac"; repo = "recursivenodes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RThTrYxM4dvTclUZrnne1q1ij9k6aJEeYKTZaxqzs5g="; }; @@ -33,8 +33,8 @@ buildPythonPackage rec { homepage = "https://tisaac.gitlab.io/recursivenodes/"; downloadPage = "https://gitlab.com/tisaac/recursivenodes"; description = "Recursive, parameter-free, explicitly defined interpolation nodes for simplices"; - changelog = "https://gitlab.com/tisaac/recursivenodes/-/releases/${src.tag}"; + changelog = "https://gitlab.com/tisaac/recursivenodes/-/releases/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/siphash24/default.nix b/pkgs/development/python-modules/siphash24/default.nix index 032ed020799f..28eddcdf9b9e 100644 --- a/pkgs/development/python-modules/siphash24/default.nix +++ b/pkgs/development/python-modules/siphash24/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.8"; pname = "siphash24"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dnicolodi"; repo = "python-siphash24"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-51LgmB30MDTBRoZttIESopWMdrozvLFwlxYELmqu5UQ="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/dnicolodi/python-siphash24"; description = "Streaming-capable SipHash Implementation"; - changelog = "https://github.com/dnicolodi/python-siphash24/releases/tag/${src.tag}"; + changelog = "https://github.com/dnicolodi/python-siphash24/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/development/python-modules/wslink/default.nix b/pkgs/development/python-modules/wslink/default.nix index e09cacf22404..ac95520aa2eb 100644 --- a/pkgs/development/python-modules/wslink/default.nix +++ b/pkgs/development/python-modules/wslink/default.nix @@ -8,7 +8,7 @@ cryptography, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wslink"; version = "2.5.0"; pyproject = true; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kitware"; repo = "wslink"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g1I8qCuqfv+pA3IP7b57PZ7vCsykpfJNG97NgJ+N5lE="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; # add missing version string to dist-info postPatch = '' - sed -i "/name *= */a\ version='${version}'," setup.py + sed -i "/name *= */a\ version='${finalAttrs.version}'," setup.py ''; build-system = [ setuptools ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Python/JavaScript library for communicating over WebSocket"; homepage = "https://github.com/Kitware/wslink"; - changelog = "https://github.com/Kitware/wslink/releases/tag/${src.tag}"; + changelog = "https://github.com/Kitware/wslink/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qbisi ]; }; -} +})