From 55a68ede17c13ec8edf611d132d1ba0670c55779 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Oct 2023 22:09:20 +0900 Subject: [PATCH 1/3] python311Packages.zope-proxy: rename from zope_proxy --- .../python-modules/zope-deferredimport/default.nix | 4 ++-- .../python-modules/{zope_proxy => zope-proxy}/default.nix | 5 +++-- pkgs/development/python-modules/zope_location/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{zope_proxy => zope-proxy}/default.nix (87%) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index b60a393e4286..a2143171dc54 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_proxy +, zope-proxy , zope_testrunner }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; }; - propagatedBuildInputs = [ zope_proxy ]; + propagatedBuildInputs = [ zope-proxy ]; nativeCheckInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix similarity index 87% rename from pkgs/development/python-modules/zope_proxy/default.nix rename to pkgs/development/python-modules/zope-proxy/default.nix index 199a4b97d5eb..2edcc6b03427 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "zope.proxy"; + pname = "zope-proxy"; version = "5.0.0"; src = fetchPypi { - inherit pname version; + pname = "zope.proxy"; + inherit version; hash = "sha256-b6RMl6QStNxR4vX9Tcc8W9SZ01KA+IzSvNJviuHkV3s="; }; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index aaf85eaadbbd..d0f79775d12b 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_proxy +, zope-proxy }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; }; - propagatedBuildInputs = [ zope_proxy ]; + propagatedBuildInputs = [ zope-proxy ]; # ignore circular dependency on zope_schema preBuild = '' diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 74e3d05a3bb2..9ed097deae8d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -408,4 +408,5 @@ mapAliases ({ 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 zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 + 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 c02f4d85f3d0..ab80c3563795 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15901,7 +15901,7 @@ self: super: with self; { zope_location = callPackage ../development/python-modules/zope_location { }; - zope_proxy = callPackage ../development/python-modules/zope_proxy { }; + zope-proxy = callPackage ../development/python-modules/zope-proxy { }; zope_schema = callPackage ../development/python-modules/zope_schema { }; From afb49a7626a2e11e4abbac8225a0da54905d9efe Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Oct 2023 22:39:51 +0900 Subject: [PATCH 2/3] python311Packages.zope-proxy: refactor --- .../python-modules/zope-proxy/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index 2edcc6b03427..fdf9f5f90e0a 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -1,12 +1,17 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools , zope_interface }: buildPythonPackage rec { pname = "zope-proxy"; version = "5.0.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "zope.proxy"; @@ -14,16 +19,24 @@ buildPythonPackage rec { hash = "sha256-b6RMl6QStNxR4vX9Tcc8W9SZ01KA+IzSvNJviuHkV3s="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ zope_interface ]; # circular deps doCheck = false; + pythonImportsCheck = [ + "zope.proxy" + ]; + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; - } From c9462cf90bf0234ad5eba7dbb7343e7f98fbee31 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Oct 2023 22:41:38 +0900 Subject: [PATCH 3/3] python311Packages.zope-proxy: 5.0.0 -> 5.1 Changelog: https://github.com/zopefoundation/zope.proxy/blob/5.1/CHANGES.rst --- pkgs/development/python-modules/zope-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index fdf9f5f90e0a..d6a93b9d3eb5 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "zope-proxy"; - version = "5.0.0"; + version = "5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.proxy"; inherit version; - hash = "sha256-b6RMl6QStNxR4vX9Tcc8W9SZ01KA+IzSvNJviuHkV3s="; + hash = "sha256-d3e9P4986nRSFyYgLhptUVPb9knyBOJQBYrQOvRqQxg="; }; nativeBuildInputs = [