From 39ea250bb65e4d3313985fc9c0084191c99f2340 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 28 Jul 2023 09:55:45 +0900 Subject: [PATCH 1/3] python310Packages.zope-component: rename from zope_component --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- .../{zope_component => zope-component}/default.nix | 2 +- .../python-modules/zope_lifecycleevent/default.nix | 4 ++-- pkgs/servers/mail/mailman/package.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) rename pkgs/development/python-modules/{zope_component => zope-component}/default.nix (96%) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index d0d6280e4e0cc..ad3600b2eaba7 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -15,7 +15,7 @@ , pytz , requests , six -, zope_component +, zope-component , zope_interface , dialog , gnureadline @@ -50,7 +50,7 @@ buildPythonPackage rec { pytz requests six - zope_component + zope-component zope_interface ]; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 426459a67fb40..a5dbfd521d620 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , webtest -, zope_component +, zope-component , hupper , pastedeploy , plaster @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ webtest - zope_component + zope-component ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index af8153297531f..4ccc1251a8fba 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -7,7 +7,7 @@ , pythonOlder , sybil , twisted -, zope_component +, zope-component }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook sybil twisted - zope_component + zope-component ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope-component/default.nix similarity index 96% rename from pkgs/development/python-modules/zope_component/default.nix rename to pkgs/development/python-modules/zope-component/default.nix index c59aa01b58846..4ce7476d93ec4 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "zope.component"; + pname = "zope-component"; version = "5.1.0"; src = fetchPypi { diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 1d230c732bb80..807deb097feb8 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , zope_event -, zope_component +, zope-component }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; - propagatedBuildInputs = [ zope_event zope_component ]; + propagatedBuildInputs = [ zope_event zope-component ]; # namespace colides with local directory doCheck = false; diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 0644c18ddf866..c92e7a2e39202 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { passlib requests sqlalchemy - zope_component + zope-component zope_configuration ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8b9160d2a5ca5..b15ceea3a1ce1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -377,4 +377,5 @@ mapAliases ({ zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 + zope_component = zope-component; # added 2023-07-28 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b171e8e9ba753..6469f4a2bb456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13911,7 +13911,7 @@ self: super: with self; { zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { }; - zope_component = callPackage ../development/python-modules/zope_component { }; + zope-component = callPackage ../development/python-modules/zope-component { }; zope_configuration = callPackage ../development/python-modules/zope_configuration { }; From 6295ab5b29a62b4d62eaa0221fcbb3e458f0fe0b Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 28 Jul 2023 10:01:47 +0900 Subject: [PATCH 2/3] python310Packages.zope-component: refactor --- .../python-modules/zope-component/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 4ce7476d93ec4..3903b2fa3d861 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -1,35 +1,47 @@ { lib , buildPythonPackage , fetchPypi +, zope_configuration , zope-deferredimport , zope_deprecation , zope_event , zope-hookable -, zope_interface -, zope_configuration , zope_i18nmessageid +, zope_interface }: buildPythonPackage rec { pname = "zope-component"; version = "5.1.0"; + format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "zope.component"; + inherit version; hash = "sha256-pQj5/vG29ShkYtM0DNif+rXHiZ3KBAEzcjnLa6fGuwo="; }; propagatedBuildInputs = [ - zope-deferredimport zope_deprecation zope_event zope-hookable zope_interface - zope_configuration zope_i18nmessageid + zope_configuration + zope-deferredimport + zope_deprecation + zope_event + zope-hookable + zope_i18nmessageid + zope_interface ]; # ignore tests because of a circular dependency on zope_security doCheck = false; + pythonImportsCheck = [ + "zope.component" + ]; + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; + changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; From 0da71c3f163913f706710cb237b86c6bb40aeddd Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 28 Jul 2023 10:02:07 +0900 Subject: [PATCH 3/3] python310Packages.zope-component: 5.1.0 -> 6.0 Changelog: https://github.com/zopefoundation/zope.component/blob/6.0/CHANGES.rst --- pkgs/development/python-modules/zope-component/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 3903b2fa3d861..93373d8a310ee 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "zope-component"; - version = "5.1.0"; + version = "6.0"; format = "setuptools"; src = fetchPypi { pname = "zope.component"; inherit version; - hash = "sha256-pQj5/vG29ShkYtM0DNif+rXHiZ3KBAEzcjnLa6fGuwo="; + hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; }; propagatedBuildInputs = [