Unverified Commit 9dcdce2d authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

python313Packages.swh-{*}: switch to `finalAttrs` pattern, (re) adopt (#500321)

parents 0a48eab3 4cd88f72

pkgs/by-name/sw/swh/package.nix

+2 −1
Original line number Diff line number Diff line 
{

  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;

pkgs/development/python-modules/swh-auth/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})

pkgs/development/python-modules/swh-core/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})

pkgs/development/python-modules/swh-export/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})

pkgs/development/python-modules/swh-journal/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})