From 37bf4c4dc8c2ff46aea515e29b1f07ccb5803477 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 11 Oct 2023 10:55:40 +0900
Subject: [PATCH 1/3] python311Packages.zope-contenttype: rename from
 zope_contenttype

---
 .../{zope_contenttype => zope-contenttype}/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_contenttype => zope-contenttype}/default.nix (85%)

diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix
similarity index 85%
rename from pkgs/development/python-modules/zope_contenttype/default.nix
rename to pkgs/development/python-modules/zope-contenttype/default.nix
index 6d90dcce7283..ea457d47ce06 100644
--- a/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/pkgs/development/python-modules/zope-contenttype/default.nix
@@ -5,11 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "zope.contenttype";
+  pname = "zope-contenttype";
   version = "4.6";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "zope.contenttype";
+    inherit version;
     hash = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA=";
   };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a791b8ccd86c..7637ca5e22b0 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -419,6 +419,7 @@ mapAliases ({
   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
+  zope_contenttype = zope-contenttype; # added 2023-10-11
   zope_deprecation = zope-deprecation; # added 2023-10-07
   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 6e845f54927d..2c2796d8b27d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15896,7 +15896,7 @@ self: super: with self; {
 
   zope_configuration = callPackage ../development/python-modules/zope_configuration { };
 
-  zope_contenttype = callPackage ../development/python-modules/zope_contenttype { };
+  zope-contenttype = callPackage ../development/python-modules/zope-contenttype { };
 
   zope_copy = callPackage ../development/python-modules/zope_copy { };
 

From c3cf8c3f92a4e822500bdaa6caf109132450d05a Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 11 Oct 2023 11:04:56 +0900
Subject: [PATCH 2/3] python311Packages.zope-contenttype: refactor

---
 .../zope-contenttype/default.nix              | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix
index ea457d47ce06..5e05ccb6c519 100644
--- a/pkgs/development/python-modules/zope-contenttype/default.nix
+++ b/pkgs/development/python-modules/zope-contenttype/default.nix
@@ -1,12 +1,15 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , zope_testrunner
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "zope-contenttype";
   version = "4.6";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "zope.contenttype";
@@ -14,12 +17,24 @@ buildPythonPackage rec {
     hash = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA=";
   };
 
-  nativeCheckInputs = [ zope_testrunner ];
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    zope_testrunner
+  ];
+
+  pythonImportsCheck = [
+    "zope.contenttype"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.contenttype";
     description = "A utility module for content-type (MIME type) handling";
-    license = licenses.zpl20;
+    changelog = "https://github.com/zopefoundation/zope.contenttype/blob/${version}/CHANGES.rst";
+    license = licenses.zpl21;
     maintainers = with maintainers; [ goibhniu ];
   };
 }

From 678b644bdc95ae84add9628e5e0fb1d9968310ea Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 11 Oct 2023 11:06:15 +0900
Subject: [PATCH 3/3] python311Packages.zope-contenttype: 4.6 -> 5.1

Changelog: https://github.com/zopefoundation/zope.contenttype/blob/5.1/CHANGES.rst
---
 .../python-modules/zope-contenttype/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix
index 5e05ccb6c519..c9d88d056eea 100644
--- a/pkgs/development/python-modules/zope-contenttype/default.nix
+++ b/pkgs/development/python-modules/zope-contenttype/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
 , setuptools
 , zope_testrunner
 , pytestCheckHook
@@ -8,13 +9,15 @@
 
 buildPythonPackage rec {
   pname = "zope-contenttype";
-  version = "4.6";
+  version = "5.1";
   pyproject = true;
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     pname = "zope.contenttype";
     inherit version;
-    hash = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA=";
+    hash = "sha256-AAHvG2XKZQUZBW3OUwxY0LOWlXzPBQIyPIoVSdtk0xc=";
   };
 
   nativeBuildInputs = [