From a21929e5e15a30d119c0cbb86bd1c1089e1d3b49 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:38:54 +0100 Subject: [PATCH 01/23] python313Packages.swh-auth: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-auth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/swh-auth/default.nix b/pkgs/development/python-modules/swh-auth/default.nix index 3b4deea11320..7753b6e16535 100644 --- a/pkgs/development/python-modules/swh-auth/default.nix +++ b/pkgs/development/python-modules/swh-auth/default.nix @@ -19,7 +19,7 @@ starlette, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-auth"; version = "0.10.0"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-auth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8ctd5D7zT66oVNZlvRIs8pN7Fe2BhTgC+S9p1HBDO9E="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From ec7ad6e577c6b9177d8e80ab59da3bc02248c7bf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:39:35 +0100 Subject: [PATCH 02/23] python313Packages.swh-auth: (re) adopt --- pkgs/development/python-modules/swh-auth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-auth/default.nix b/pkgs/development/python-modules/swh-auth/default.nix index 7753b6e16535..8f0ae143bae2 100644 --- a/pkgs/development/python-modules/swh-auth/default.nix +++ b/pkgs/development/python-modules/swh-auth/default.nix @@ -65,6 +65,6 @@ buildPythonPackage (finalAttrs: { description = "Set of utility libraries related to user authentication in applications and services based on the use of Keycloak and OpenID Connect"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-auth"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From ddf55a0c225cbbcb75669c205d0048fe177a3274 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:46:37 +0100 Subject: [PATCH 03/23] python313Packages.swh-core: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-core/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index a40256e4e6d1..7af787f5e139 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -42,7 +42,7 @@ pkgs, # Only for pkgs.zstd }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-core"; version = "4.6.0"; pyproject = true; @@ -52,7 +52,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-core"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dI+xfj0DnUbBdYIVycyJQg3B/jnH/eg/Ju8YX2k8Qkc="; }; @@ -125,11 +125,11 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-core/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-core/-/tags/${finalAttrs.src.tag}"; description = "Low-level utilities and helpers used by almost all other modules in the stack"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core"; license = lib.licenses.gpl3Only; mainProgram = "swh"; maintainers = [ ]; }; -} +}) From fba74f1dc22af09c6406b50d067188ac28e0d19a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:47:08 +0100 Subject: [PATCH 04/23] python313Packages.swh-core: (re) adopt --- pkgs/development/python-modules/swh-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index 7af787f5e139..e84619a35532 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -130,6 +130,6 @@ buildPythonPackage (finalAttrs: { homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core"; license = lib.licenses.gpl3Only; mainProgram = "swh"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From ed297c07eb64b88d5c13cf601de8f84af266b5b0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:48:58 +0100 Subject: [PATCH 05/23] python3Packages.swh-export: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-export/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix index bdb3b5cd7673..f266fd2acda6 100644 --- a/pkgs/development/python-modules/swh-export/default.nix +++ b/pkgs/development/python-modules/swh-export/default.nix @@ -22,7 +22,7 @@ pkgs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-export"; version = "1.8.0"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-export"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-n97MMYn7EmTrv411YSxUD1+zfbFB8KOSns44N3NqqV8="; }; @@ -87,4 +87,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From 4453998c80b2adf13792c6836ec9cddea83809d8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:49:15 +0100 Subject: [PATCH 06/23] python313Packages.swh-export: (re) adopt --- pkgs/development/python-modules/swh-export/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix index f266fd2acda6..cc2c61e32a75 100644 --- a/pkgs/development/python-modules/swh-export/default.nix +++ b/pkgs/development/python-modules/swh-export/default.nix @@ -85,6 +85,6 @@ buildPythonPackage (finalAttrs: { description = "Software Heritage dataset tools"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-export"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From 70078e8713501597eecfd465b1d6be53d36403e1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:53:23 +0100 Subject: [PATCH 07/23] python313Packages.swh-journal: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-journal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/swh-journal/default.nix b/pkgs/development/python-modules/swh-journal/default.nix index a08459559606..c3088404113e 100644 --- a/pkgs/development/python-modules/swh-journal/default.nix +++ b/pkgs/development/python-modules/swh-journal/default.nix @@ -13,7 +13,7 @@ pytest-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-journal"; version = "2.0.0"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-journal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ycTB7hSjTerJOd+nEv8HbM82vPAO8P1+xooy0oN4eHw="; }; @@ -62,4 +62,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From 56aca89e1c416cb25ae060c21d88f5d0255b4bec Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:53:51 +0100 Subject: [PATCH 08/23] python313Packages.swh-journal: (re) adopt --- pkgs/development/python-modules/swh-journal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-journal/default.nix b/pkgs/development/python-modules/swh-journal/default.nix index c3088404113e..8db3234f03d7 100644 --- a/pkgs/development/python-modules/swh-journal/default.nix +++ b/pkgs/development/python-modules/swh-journal/default.nix @@ -60,6 +60,6 @@ buildPythonPackage (finalAttrs: { description = "Persistent logger of changes to the archive, with publish-subscribe support"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-journal"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From 032321777cb91b9df4cbfa853ebedd4b0bfe9fd5 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:54:49 +0100 Subject: [PATCH 09/23] python313Packages.swh-model: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-model/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/swh-model/default.nix b/pkgs/development/python-modules/swh-model/default.nix index cde19300c236..47fa3396efa5 100644 --- a/pkgs/development/python-modules/swh-model/default.nix +++ b/pkgs/development/python-modules/swh-model/default.nix @@ -24,7 +24,7 @@ }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-model"; version = "8.4.1"; pyproject = true; @@ -34,7 +34,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-model"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v/vbY0mxvsbuLUAmDACW9brfVF5djMYyvv9Mf1VL6do="; }; @@ -81,4 +81,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From b77713276eeec8d52130fb5d0695ebdb29c32fce Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:55:15 +0100 Subject: [PATCH 10/23] python313Packages.swh-model: (re) adopt --- pkgs/development/python-modules/swh-model/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-model/default.nix b/pkgs/development/python-modules/swh-model/default.nix index 47fa3396efa5..c93484a07e52 100644 --- a/pkgs/development/python-modules/swh-model/default.nix +++ b/pkgs/development/python-modules/swh-model/default.nix @@ -79,6 +79,6 @@ buildPythonPackage (finalAttrs: { description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From 77663020a99f38b61680f720f4077d149e367427 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:57:36 +0100 Subject: [PATCH 11/23] python313Packages.swh-objstorage: switch to `finalAttrs` pattern --- .../development/python-modules/swh-objstorage/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix index 6f127367c293..c0a7bb55d277 100644 --- a/pkgs/development/python-modules/swh-objstorage/default.nix +++ b/pkgs/development/python-modules/swh-objstorage/default.nix @@ -38,7 +38,7 @@ util-linux, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-objstorage"; version = "5.1.0"; pyproject = true; @@ -48,7 +48,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-objstorage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NnNT9Lt/LGDIJpUmfkfPn6JnF3k8Usf2UVa88zHPKlg="; }; @@ -113,10 +113,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage/-/tags/${finalAttrs.src.tag}"; description = "Content-addressable object storage for the Software Heritage project"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage"; license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From 376dde71ee527d8fd5e774105568d1cb4d14855e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:57:59 +0100 Subject: [PATCH 12/23] python313Packages.swh-objstorage: (re) adopt --- pkgs/development/python-modules/swh-objstorage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix index c0a7bb55d277..c7d7c6c6012a 100644 --- a/pkgs/development/python-modules/swh-objstorage/default.nix +++ b/pkgs/development/python-modules/swh-objstorage/default.nix @@ -117,6 +117,6 @@ buildPythonPackage (finalAttrs: { description = "Content-addressable object storage for the Software Heritage project"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From 62308c324ca98915eb2d1742b5bd625c54c7a231 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:59:01 +0100 Subject: [PATCH 13/23] python313Packages.swh-scanner: switch to `finalAttrs` pattern --- .../development/python-modules/swh-scanner/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix index 7dcfb97929e8..479cd4abd9d7 100644 --- a/pkgs/development/python-modules/swh-scanner/default.nix +++ b/pkgs/development/python-modules/swh-scanner/default.nix @@ -22,7 +22,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-scanner"; version = "0.8.3"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-scanner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-baUUuYFapBD7iuDaDP8CSR9f4glVZcS5qBpZddVf7z8="; }; @@ -66,7 +66,7 @@ buildPythonPackage rec { types-requests ]; - disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin) [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Failed: Failed to start the server after 5 seconds. "test_add_provenance_with_release" "test_add_provenance_with_revision" @@ -81,10 +81,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/tags/${finalAttrs.src.tag}"; description = "Source code scanner to analyze code bases and compare them with source code artifacts archived by Software Heritage"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner"; license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From 70aa7612c8d8283aa36640ea28177ef46fdc2004 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 07:59:21 +0100 Subject: [PATCH 14/23] python313Packages.swh-scanner: (re) adopt --- pkgs/development/python-modules/swh-scanner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix index 479cd4abd9d7..883f4b53f54b 100644 --- a/pkgs/development/python-modules/swh-scanner/default.nix +++ b/pkgs/development/python-modules/swh-scanner/default.nix @@ -85,6 +85,6 @@ buildPythonPackage (finalAttrs: { description = "Source code scanner to analyze code bases and compare them with source code artifacts archived by Software Heritage"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From 1e821c4e007184a7e6a8bedf60a3b02f6c1614c9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:00:40 +0100 Subject: [PATCH 15/23] python313Packages.swh-scheduler: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-scheduler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix index 629fee607808..772a9879743e 100644 --- a/pkgs/development/python-modules/swh-scheduler/default.nix +++ b/pkgs/development/python-modules/swh-scheduler/default.nix @@ -29,7 +29,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-scheduler"; version = "3.3.0"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-scheduler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Kv5QH3sj/InKOSjxGtwVxtoAluHx5eIxO5GqcbOs0NY="; }; @@ -89,10 +89,10 @@ buildPythonPackage rec { disabledTests = [ "test_setup_log_handler_with_env_configuration" ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler/-/tags/${finalAttrs.src.tag}"; description = "Job scheduler for the Software Heritage project"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler"; license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From 3af63f8d6ae7aff2a88ca7c0fe8406f6eb4f5a0f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:00:58 +0100 Subject: [PATCH 16/23] python313Packages.swh-scheduler: (re) adopt --- pkgs/development/python-modules/swh-scheduler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix index 772a9879743e..ea4c798e2e71 100644 --- a/pkgs/development/python-modules/swh-scheduler/default.nix +++ b/pkgs/development/python-modules/swh-scheduler/default.nix @@ -93,6 +93,6 @@ buildPythonPackage (finalAttrs: { description = "Job scheduler for the Software Heritage project"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From d22dafbedd5c5053dd0887f327c0687964514f8f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:02:35 +0100 Subject: [PATCH 17/23] python313Packages.swh-shard: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-shard/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/swh-shard/default.nix b/pkgs/development/python-modules/swh-shard/default.nix index 37e67ce539c9..77081e120d08 100644 --- a/pkgs/development/python-modules/swh-shard/default.nix +++ b/pkgs/development/python-modules/swh-shard/default.nix @@ -15,7 +15,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-shard"; version = "2.2.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-shard"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-97oZ+Wa8GmyL2V4CnlSvaTbQZJ+mPbg6uVmWd0oxv1Q="; }; @@ -66,7 +66,7 @@ buildPythonPackage rec { disabledTests = [ "test_setup_log_handler_with_env_configuration" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # assert (51675136 - 51396608) < (100 * 1024) "test_memleak" # ValueError: Cannot convert negative int @@ -76,10 +76,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-shard/-/tags/v2.2.0"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-shard/-/tags/${finalAttrs.src.tag}"; description = "Shard File Format for the Software Heritage Object Storage"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-shard"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.dotlambda ]; }; -} +}) From 2aea71346b21353dcaa35da88b8889db2a664f77 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:02:59 +0100 Subject: [PATCH 18/23] python313Packages.swh-shard: (re) adopt --- pkgs/development/python-modules/swh-shard/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-shard/default.nix b/pkgs/development/python-modules/swh-shard/default.nix index 77081e120d08..cefb105097a4 100644 --- a/pkgs/development/python-modules/swh-shard/default.nix +++ b/pkgs/development/python-modules/swh-shard/default.nix @@ -80,6 +80,9 @@ buildPythonPackage (finalAttrs: { description = "Shard File Format for the Software Heritage Object Storage"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-shard"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.dotlambda ]; + maintainers = with lib.maintainers; [ + dotlambda + drupol + ]; }; }) From 164eac9e6d06450301d66e394418c75056c59dbf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:04:06 +0100 Subject: [PATCH 19/23] python313Packages.swh-storage: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-storage/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix index d23668472e36..ab88dd7b3cae 100644 --- a/pkgs/development/python-modules/swh-storage/default.nix +++ b/pkgs/development/python-modules/swh-storage/default.nix @@ -31,7 +31,7 @@ swh-journal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-storage"; version = "4.1.1"; pyproject = true; @@ -41,7 +41,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-storage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AY2IcRJG19oSy2usI9JZTEKYLI3SEiLpNisqD7zus8A="; }; @@ -106,10 +106,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/${src.tag}"; + changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/${finalAttrs.src.tag}"; description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage"; license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From 24e251491fd101acd6df9599b4c5ca47f0c25aac Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:04:25 +0100 Subject: [PATCH 20/23] python313Packages.swh-storage: (re) adopt --- pkgs/development/python-modules/swh-storage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix index ab88dd7b3cae..326619bcd86d 100644 --- a/pkgs/development/python-modules/swh-storage/default.nix +++ b/pkgs/development/python-modules/swh-storage/default.nix @@ -110,6 +110,6 @@ buildPythonPackage (finalAttrs: { description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From a16c8de64a6eb228dff34064a6e5c78937d55897 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:05:33 +0100 Subject: [PATCH 21/23] python313Packages.swh-web-client: switch to `finalAttrs` pattern --- pkgs/development/python-modules/swh-web-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix index 7853a89e644b..fe0a4ae3d0f0 100644 --- a/pkgs/development/python-modules/swh-web-client/default.nix +++ b/pkgs/development/python-modules/swh-web-client/default.nix @@ -18,7 +18,7 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swh-web-client"; version = "0.9.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { group = "swh"; owner = "devel"; repo = "swh-web-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZZptYLC1os2i0NtBD3mp4QaQQRoKxnr9k8gJuqmpizE="; }; @@ -68,4 +68,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ ]; }; -} +}) From d7a15244d20a3169bb95937f3834a8eba7c0af3a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:05:55 +0100 Subject: [PATCH 22/23] python313Packages.swh-web-client: (re) adopt --- pkgs/development/python-modules/swh-web-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix index fe0a4ae3d0f0..e58396aca2b4 100644 --- a/pkgs/development/python-modules/swh-web-client/default.nix +++ b/pkgs/development/python-modules/swh-web-client/default.nix @@ -66,6 +66,6 @@ buildPythonPackage (finalAttrs: { description = "Client for Software Heritage Web applications, via their APIs"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-web-client"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; }) From 4cd88f726b4f06d7cde14028339304500ff15b25 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 16 Mar 2026 08:12:07 +0100 Subject: [PATCH 23/23] swh: use `lib.getExe'` --- pkgs/by-name/sw/swh/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/swh/package.nix b/pkgs/by-name/sw/swh/package.nix index 95828a6665d4..b8492d8c4803 100644 --- a/pkgs/by-name/sw/swh/package.nix +++ b/pkgs/by-name/sw/swh/package.nix @@ -1,4 +1,5 @@ { + lib, python3Packages, writeShellApplication, withSwhPythonPackages ? [ @@ -19,7 +20,7 @@ in writeShellApplication { name = "swh"; text = '' - ${python3'}/bin/swh "$@" + ${lib.getExe' python3' "swh"} "$@" ''; meta = { inherit (python3Packages.swh-core.meta) license mainProgram platforms;