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; diff --git a/pkgs/development/python-modules/swh-auth/default.nix b/pkgs/development/python-modules/swh-auth/default.nix index 3b4deea11320..8f0ae143bae2 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="; }; @@ -65,6 +65,6 @@ buildPythonPackage rec { 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 ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index a40256e4e6d1..e84619a35532 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 = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix index bdb3b5cd7673..cc2c61e32a75 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="; }; @@ -85,6 +85,6 @@ buildPythonPackage rec { description = "Software Heritage dataset tools"; homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-export"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-journal/default.nix b/pkgs/development/python-modules/swh-journal/default.nix index a08459559606..8db3234f03d7 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="; }; @@ -60,6 +60,6 @@ buildPythonPackage rec { 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 ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-model/default.nix b/pkgs/development/python-modules/swh-model/default.nix index cde19300c236..c93484a07e52 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="; }; @@ -79,6 +79,6 @@ buildPythonPackage rec { 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 ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix index 6f127367c293..c7d7c6c6012a 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 = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix index 7dcfb97929e8..883f4b53f54b 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 = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix index 629fee607808..ea4c798e2e71 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 = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-shard/default.nix b/pkgs/development/python-modules/swh-shard/default.nix index 37e67ce539c9..cefb105097a4 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,13 @@ 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 ]; + maintainers = with lib.maintainers; [ + dotlambda + drupol + ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix index d23668472e36..326619bcd86d 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 = [ ]; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix index 7853a89e644b..e58396aca2b4 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="; }; @@ -66,6 +66,6 @@ buildPythonPackage rec { 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 ]; }; -} +})