From 136c2e9b6f06cf56ccb8acf89c2def562560f48b Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 11 Oct 2023 11:28:55 +0900 Subject: [PATCH 1/3] python311Packages.zope-lifecycleevent: rename from zope_lifecycleevent --- .../{zope_lifecycleevent => zope-lifecycleevent}/default.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{zope_lifecycleevent => zope-lifecycleevent}/default.nix (89%) diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix similarity index 89% rename from pkgs/development/python-modules/zope_lifecycleevent/default.nix rename to pkgs/development/python-modules/zope-lifecycleevent/default.nix index 807deb097feb..31077143f381 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -7,11 +7,12 @@ }: buildPythonPackage rec { - pname = "zope.lifecycleevent"; + pname = "zope-lifecycleevent"; version = "4.4"; src = fetchPypi { - inherit pname version; + pname = "zope.lifecycleevent"; + inherit version; hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a791b8ccd86c..5f6c543db4c3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -421,5 +421,6 @@ mapAliases ({ zope_component = zope-component; # added 2023-07-28 zope_deprecation = zope-deprecation; # added 2023-10-07 zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 + zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11 zope_proxy = zope-proxy; # added 2023-10-07 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e845f54927d..f364bd6019a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15918,7 +15918,7 @@ self: super: with self; { zope_interface = callPackage ../development/python-modules/zope_interface { }; - zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; + zope-lifecycleevent = callPackage ../development/python-modules/zope-lifecycleevent { }; zope_location = callPackage ../development/python-modules/zope_location { }; From 58b0faf3881b01ffb1894fc3c0b0c4dc56c03923 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 11 Oct 2023 12:00:55 +0900 Subject: [PATCH 2/3] python311Packages.zope-lifecycleevent: refactor --- .../python-modules/zope-lifecycleevent/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index 31077143f381..619817d41fd2 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -2,13 +2,15 @@ , buildPythonPackage , fetchPypi , isPy3k +, setuptools , zope_event -, zope-component +, zope_interface }: buildPythonPackage rec { pname = "zope-lifecycleevent"; version = "4.4"; + pyproject = true; src = fetchPypi { pname = "zope.lifecycleevent"; @@ -16,7 +18,11 @@ buildPythonPackage rec { hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; - propagatedBuildInputs = [ zope_event zope-component ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ zope_event zope_interface ]; # namespace colides with local directory doCheck = false; @@ -30,8 +36,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.lifecycleevent/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; - } From 60995e325c4dcb045fc58395928d2ebf39c7d4c2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 11 Oct 2023 12:01:41 +0900 Subject: [PATCH 3/3] python311Packages.zope-lifecycleevent: 4.4 -> 5.0 Changelog: https://github.com/zopefoundation/zope.lifecycleevent/blob/5.0/CHANGES.rst --- .../python-modules/zope-lifecycleevent/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index 619817d41fd2..fc6b0005ffac 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , setuptools , zope_event , zope_interface @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "zope-lifecycleevent"; - version = "4.4"; + version = "5.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "zope.lifecycleevent"; inherit version; - hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; + hash = "sha256-6tP7SW52FPm1adFtrUt4BSsKwhh1utjWbKNQNS2bb50="; }; nativeBuildInputs = [ @@ -27,8 +29,7 @@ buildPythonPackage rec { # namespace colides with local directory doCheck = false; - # zope uses pep 420 namespaces for python3, doesn't work with nix + python2 - pythonImportsCheck = lib.optionals isPy3k [ + pythonImportsCheck = [ "zope.lifecycleevent" "zope.interface" ];