python311Packages.zope-*: rename from zope_*

2024-01-06 19:05:46 +01:00 · 2024-01-06 19:05:46 +01:00 · 63f5f08857
commit 63f5f08857
parent 29f6174cd0
55 changed files with 140 additions and 133 deletions
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@ -39,7 +39,7 @@ let
        pillow
        rencode
        six
-        zope_interface
+        zope-interface
        dbus-python
        pycairo
        librsvg
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@ -211,7 +211,7 @@ python.pkgs.buildPythonApplication rec {
    whitenoise
    whoosh
    zipp
-    zope_interface
+    zope-interface
    zxing-cpp
  ]
  ++ redis.optional-dependencies.hiredis
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@ -79,7 +79,7 @@ let
    "zope.interface"
    "node_three"
  ] [
-    "zope_interface"
+    "zope-interface"
    "threejs"
  ];
  # spkg names (this_is_a_package-version) of all transitive deps
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@ -43,7 +43,7 @@
  # , xbr
 , yapf
  # , zlmdb
-, zope_interface
+, zope-interface
 }@args:

 buildPythonPackage rec {
@ -99,7 +99,7 @@ buildPythonPackage rec {
    nvx = [ cffi ];
    scram = [ argon2-cffi cffi passlib ];
    serialization = [ cbor2 flatbuffers msgpack ujson py-ubjson ];
-    twisted = [ attrs args.twisted zope_interface ];
+    twisted = [ attrs args.twisted zope-interface ];
    ui = [ pygobject3 ];
    xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc /* py-eth-sig-utils */ py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ];
  };
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@ -2,9 +2,9 @@
 , fetchPypi
 , buildPythonPackage
 , persistent
-, zope_interface
+, zope-interface
 , transaction
-, zope_testrunner
+, zope-testrunner
 , python
 , pythonOlder
 }:
@ -24,12 +24,12 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    persistent
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
    transaction
-    zope_testrunner
+    zope-testrunner
  ];

  checkPhase = ''
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@ -16,7 +16,7 @@
 , requests
 , six
 , zope-component
-, zope_interface
+, zope-interface
 , setuptools
 , dialog
 , gnureadline
@ -53,7 +53,7 @@ buildPythonPackage rec {
    requests
    six
    zope-component
-    zope_interface
+    zope-interface
    setuptools # for pkg_resources
  ];

--- a/pkgs/development/python-modules/datetime/default.nix
+++ b/pkgs/development/python-modules/datetime/default.nix
@ -3,7 +3,7 @@
 , pythonOlder
 , fetchFromGitHub
 , pytz
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -22,7 +22,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    pytz
-    zope_interface
+    zope-interface
  ];

  pythonImportsCheck = [
@ -37,4 +37,3 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ icyrockcom ];
  };
 }
-
--- a/pkgs/development/python-modules/eggdeps/default.nix
+++ b/pkgs/development/python-modules/eggdeps/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, zope_interface
+, zope-interface
 , zope-testing
 }:

@ -15,7 +15,7 @@ buildPythonPackage rec {
    sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323";
  };

-  propagatedBuildInputs = [ zope_interface zope-testing ];
+  propagatedBuildInputs = [ zope-interface zope-testing ];

  # tests fail, see https://hydra.nixos.org/build/4316603/log/raw
  doCheck = false;
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@ -10,7 +10,7 @@
 , setuptools
 , six
 , testtools
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
    pyrsistent
    setuptools
    six
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/flufl/bounce.nix
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@ -1,11 +1,11 @@
-{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }:
+{ buildPythonPackage, fetchPypi, atpublic, zope-interface, nose2 }:

 buildPythonPackage rec {
  pname = "flufl.bounce";
  version = "4.0";

  buildInputs = [ nose2 ];
-  propagatedBuildInputs = [ atpublic zope_interface ];
+  propagatedBuildInputs = [ atpublic zope-interface ];

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@ -10,8 +10,8 @@
 , importlib-metadata
 , setuptools
 , wheel
-, zope_event
-, zope_interface
+, zope-event
+, zope-interface
 , pythonOlder

 # for passthru.tests
@ -47,8 +47,8 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    importlib-metadata
-    zope_event
-    zope_interface
+    zope-event
+    zope-interface
  ] ++ lib.optionals (!isPyPy) [
    greenlet
  ];
--- a/pkgs/development/python-modules/ghdiff/default.nix
+++ b/pkgs/development/python-modules/ghdiff/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi
-, zope_testrunner, six, chardet}:
+, zope-testrunner, six, chardet}:

 buildPythonPackage rec {
  pname = "ghdiff";
@ -11,7 +11,7 @@ buildPythonPackage rec {
    sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk";
  };

-  nativeCheckInputs = [ zope_testrunner ];
+  nativeCheckInputs = [ zope-testrunner ];
  propagatedBuildInputs = [ six chardet ];

  meta = with lib; {
--- a/pkgs/development/python-modules/klein/default.nix
+++ b/pkgs/development/python-modules/klein/default.nix
@ -14,7 +14,7 @@
 , tubes
 , twisted
 , werkzeug
-, zope_interface
+, zope-interface

 # tests
 , idna
@ -48,7 +48,7 @@ buildPythonPackage rec {
    twisted
    tubes
    werkzeug
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/lazr/config.nix
+++ b/pkgs/development/python-modules/lazr/config.nix
@ -3,7 +3,7 @@
 , fetchPypi
 , setuptools
 , lazr-delegates
-, zope_interface
+, zope-interface
 , pytestCheckHook
 }:

@ -24,7 +24,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    lazr-delegates
-    zope_interface
+    zope-interface
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/lazr/delegates.nix
+++ b/pkgs/development/python-modules/lazr/delegates.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
-, zope_interface
+, zope-interface
 , pytestCheckHook
 }:

@ -22,7 +22,7 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    zope_interface
+    zope-interface
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@ -6,7 +6,7 @@
 , pyparsing
 , service-identity
 , six
-, zope_interface
+, zope-interface
 , pythonOlder
 , python
 }:
@ -27,7 +27,7 @@ buildPythonPackage rec {
    pyparsing
    six
    twisted
-    zope_interface
+    zope-interface
  ] ++ twisted.optional-dependencies.tls;

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , cffi
 , fetchPypi
-, zope_interface
+, zope-interface
 , sphinx
 , manuel
 , pythonOlder
@ -26,7 +26,7 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    zope_interface
+    zope-interface
    cffi
  ];

--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@ -6,7 +6,7 @@
 , pythonOlder
 , sphinxHook
 , sphinx-rtd-theme
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -34,7 +34,7 @@ buildPythonPackage rec {
  nativeBuildInputs = [
    sphinxHook
    sphinx-rtd-theme
-    zope_interface
+    zope-interface
  ];

  passthru.optional-dependencies.crypto = [
--- a/pkgs/development/python-modules/pyramid-chameleon/default.nix
+++ b/pkgs/development/python-modules/pyramid-chameleon/default.nix
@ -7,7 +7,7 @@
 , pyramid
 , pytestCheckHook
 , setuptools
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -36,7 +36,7 @@ buildPythonPackage rec {
    chameleon
    pyramid
    setuptools
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@ -12,7 +12,7 @@
 , venusian
 , webob
 , zope-deprecation
-, zope_interface
+, zope-interface
 , pythonOlder
 }:

@ -38,7 +38,7 @@ buildPythonPackage rec {
    venusian
    webob
    zope-deprecation
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/python3-application/default.nix
+++ b/pkgs/development/python-modules/python3-application/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, isPy3k, buildPythonPackage, fetchFromGitHub, zope_interface, twisted }:
+{ stdenv, lib, isPy3k, buildPythonPackage, fetchFromGitHub, zope-interface, twisted }:

 buildPythonPackage rec {
  pname = "python3-application";
@ -14,7 +14,7 @@ buildPythonPackage rec {
    hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8=";
  };

-  propagatedBuildInputs = [ zope_interface twisted ];
+  propagatedBuildInputs = [ zope-interface twisted ];

  pythonImportsCheck = [ "application" ];

--- a/pkgs/development/python-modules/python3-eventlib/default.nix
+++ b/pkgs/development/python-modules/python3-eventlib/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope_interface, twisted, greenlet }:
+{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope-interface, twisted, greenlet }:

 buildPythonPackage rec {
  pname = "python3-eventlib";
@ -14,7 +14,7 @@ buildPythonPackage rec {
    hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ=";
  };

-  propagatedBuildInputs = [ zope_interface twisted greenlet ];
+  propagatedBuildInputs = [ zope-interface twisted greenlet ];

  dontUseSetuptoolsCheck = true;

--- a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix
+++ b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix
@ -4,8 +4,8 @@
 , pythonOlder
 , setuptools
 , pytestCheckHook
-, zope_interface
-, zope_testrunner
+, zope-interface
+, zope-testrunner
 , sphinx
 }:

@ -27,13 +27,13 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    zope_interface
+    zope-interface
    sphinx
  ];

  nativeCheckInputs = [
    pytestCheckHook
-    zope_testrunner
+    zope-testrunner
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/repoze-who/default.nix
+++ b/pkgs/development/python-modules/repoze-who/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
-, zope_interface
+, zope-interface
 , webob
 , pytestCheckHook
 }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
    setuptools
  ];

-  propagatedBuildInputs = [ zope_interface webob ];
+  propagatedBuildInputs = [ zope-interface webob ];

  nativeCheckInputs = [
    pytestCheckHook
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@ -27,7 +27,7 @@
 , tldextract
 , twisted
 , w3lib
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -75,7 +75,7 @@ buildPythonPackage rec {
    tldextract
    twisted
    w3lib
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, zope_interface
+, zope-interface
 , mock
 , pythonOlder
 }:
@ -19,7 +19,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    zope_interface
+    zope-interface
    mock
  ];

--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@ -17,7 +17,7 @@
 , hyperlink
 , incremental
 , typing-extensions
-, zope_interface
+, zope-interface

 # optional-dependencies
 , appdirs
@ -94,7 +94,7 @@ buildPythonPackage rec {
    hyperlink
    incremental
    typing-extensions
-    zope_interface
+    zope-interface
  ];

  postPatch = ''
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@ -6,7 +6,7 @@
 , pytestCheckHook
 , pythonOlder
 , twisted
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -23,7 +23,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    twisted
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@ -15,7 +15,7 @@
 , pythonOlder
 , service-identity
 , twisted
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -35,7 +35,7 @@ buildPythonPackage rec {
    incremental
    twisted
    automat
-    zope_interface
+    zope-interface
  ] ++ twisted.optional-dependencies.tls;

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/pkgs/development/python-modules/z3c-checkversions/default.nix
@ -4,7 +4,7 @@
 , fetchPypi
 , python
 , zc-buildout
-, zope_testrunner
+, zope-testrunner
 }:

 buildPythonPackage rec {
@ -20,7 +20,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ zc-buildout ];

-  nativeCheckInputs = [ zope_testrunner ];
+  nativeCheckInputs = [ zope-testrunner ];

  checkPhase = ''
    ${python.interpreter} -m zope.testrunner --test-path=src []
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@ -2,7 +2,7 @@
 , stdenv
 , fetchPypi
 , buildPythonPackage
-, zope_testrunner
+, zope-testrunner
 , manuel
 , docutils
 , pygments
@ -20,7 +20,7 @@ buildPythonPackage rec {
  patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;

  buildInputs = [ manuel docutils ];
-  propagatedBuildInputs = [ zope_testrunner ];
+  propagatedBuildInputs = [ zope-testrunner ];
  nativeCheckInputs = [ pygments ];

  meta = with lib; {
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@ -2,10 +2,10 @@
 , fetchPypi
 , buildPythonPackage
 , python
-, zope_testrunner
+, zope-testrunner
 , transaction
 , six
-, zope_interface
+, zope-interface
 , zodbpickle
 , zconfig
 , persistent
@ -31,7 +31,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    transaction
    six
-    zope_interface
+    zope-interface
    zodbpickle
    zconfig
    persistent
@ -41,7 +41,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    manuel
-    zope_testrunner
+    zope-testrunner
  ];

  checkPhase = ''
--- a/pkgs/development/python-modules/zope-component/default.nix
+++ b/pkgs/development/python-modules/zope-component/default.nix
@ -4,10 +4,10 @@
 , zope-configuration
 , zope-deferredimport
 , zope-deprecation
-, zope_event
+, zope-event
 , zope-hookable
 , zope-i18nmessageid
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -25,13 +25,13 @@ buildPythonPackage rec {
    zope-configuration
    zope-deferredimport
    zope-deprecation
-    zope_event
+    zope-event
    zope-hookable
    zope-i18nmessageid
-    zope_interface
+    zope-interface
  ];

-  # ignore tests because of a circular dependency on zope_security
+  # ignore tests because of a circular dependency on zope-security
  doCheck = false;

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/zope-configuration/default.nix
+++ b/pkgs/development/python-modules/zope-configuration/default.nix
@ -4,11 +4,11 @@
 , pythonOlder
 , setuptools
 , zope-i18nmessageid
-, zope_interface
-, zope_schema
+, zope-interface
+, zope-schema
 , pytestCheckHook
 , zope-testing
-, zope_testrunner
+, zope-testrunner
 , manuel
 }:

@ -33,13 +33,13 @@ buildPythonPackage rec {
    manuel
    pytestCheckHook
    zope-testing
-    zope_testrunner
+    zope-testrunner
  ];

  propagatedBuildInputs = [
    zope-i18nmessageid
-    zope_interface
-    zope_schema
+    zope-interface
+    zope-schema
  ];

  # Need to investigate how to run the tests with zope-testrunner
--- a/pkgs/development/python-modules/zope-contenttype/default.nix
+++ b/pkgs/development/python-modules/zope-contenttype/default.nix
@ -3,7 +3,7 @@
 , fetchPypi
 , pythonOlder
 , setuptools
-, zope_testrunner
+, zope-testrunner
 , pytestCheckHook
 }:

@ -26,7 +26,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytestCheckHook
-    zope_testrunner
+    zope-testrunner
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/zope-copy/default.nix
+++ b/pkgs/development/python-modules/zope-copy/default.nix
@ -2,9 +2,9 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
-, zope_interface
-, zope_location
-, zope_schema
+, zope-interface
+, zope-location
+, zope-schema
 , unittestCheckHook
 }:

@ -18,10 +18,10 @@ buildPythonPackage rec {
    hash = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc=";
  };

-  propagatedBuildInputs = [ zope_interface ];
+  propagatedBuildInputs = [ zope-interface ];

  doCheck = !isPy27; # namespace conflicts
-  nativeCheckInputs = [ unittestCheckHook zope_location zope_schema ];
+  nativeCheckInputs = [ unittestCheckHook zope-location zope-schema ];

  unittestFlagsArray = [ "-s" "src/zope/copy" ];

--- a/pkgs/development/python-modules/zope-deferredimport/default.nix
+++ b/pkgs/development/python-modules/zope-deferredimport/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , zope-proxy
-, zope_testrunner
+, zope-testrunner
 }:

 buildPythonPackage rec {
@ -18,7 +18,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ zope-proxy ];

-  nativeCheckInputs = [ zope_testrunner ];
+  nativeCheckInputs = [ zope-testrunner ];

  checkPhase = ''
    zope-testrunner --test-path=src []
--- a/pkgs/development/python-modules/zope-event/default.nix
+++ b/pkgs/development/python-modules/zope-event/default.nix
--- a/pkgs/development/python-modules/zope-exceptions/default.nix
+++ b/pkgs/development/python-modules/zope-exceptions/default.nix
@ -3,7 +3,7 @@
 , fetchPypi
 , pythonOlder
 , setuptools
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -23,7 +23,7 @@ buildPythonPackage rec {
    setuptools
  ];

-  propagatedBuildInputs = [ zope_interface ];
+  propagatedBuildInputs = [ zope-interface ];

  # circular deps
  doCheck = false;
--- a/pkgs/development/python-modules/zope-filerepresentation/default.nix
+++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix
@ -1,8 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, zope_schema
-, zope_interface
+, zope-schema
+, zope-interface
 }:

 buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
    hash = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs=";
  };

-  propagatedBuildInputs = [ zope_interface zope_schema ];
+  propagatedBuildInputs = [ zope-interface zope-schema ];

  checkPhase = ''
    cd src/zope/filerepresentation && python -m unittest
--- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix
+++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, zope_testrunner
+, zope-testrunner
 , unittestCheckHook
 }:

@ -18,7 +18,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    unittestCheckHook
-    zope_testrunner
+    zope-testrunner
  ];

  unittestFlagsArray = [
--- a/pkgs/development/python-modules/zope-interface/default.nix
+++ b/pkgs/development/python-modules/zope-interface/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, zope_event
+, zope-event
 }:

 buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
    hash = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE=";
  };

-  propagatedBuildInputs = [ zope_event ];
+  propagatedBuildInputs = [ zope-event ];

  doCheck = false; # Circular deps.

--- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix
+++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix
@ -3,8 +3,8 @@
 , fetchPypi
 , pythonOlder
 , setuptools
-, zope_event
-, zope_interface
+, zope-event
+, zope-interface
 }:

 buildPythonPackage rec {
@ -24,7 +24,7 @@ buildPythonPackage rec {
    setuptools
  ];

-  propagatedBuildInputs = [ zope_event zope_interface ];
+  propagatedBuildInputs = [ zope-event zope-interface ];

  # namespace colides with local directory
  doCheck = false;
--- a/pkgs/development/python-modules/zope-location/default.nix
+++ b/pkgs/development/python-modules/zope-location/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ zope-proxy ];

-  # ignore circular dependency on zope_schema
+  # ignore circular dependency on zope-schema
  preBuild = ''
    sed -i '/zope.schema/d' setup.py
  '';
--- a/pkgs/development/python-modules/zope-proxy/default.nix
+++ b/pkgs/development/python-modules/zope-proxy/default.nix
@ -3,7 +3,7 @@
 , fetchPypi
 , pythonOlder
 , setuptools
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -23,7 +23,7 @@ buildPythonPackage rec {
    setuptools
  ];

-  propagatedBuildInputs = [ zope_interface ];
+  propagatedBuildInputs = [ zope-interface ];

  # circular deps
  doCheck = false;
--- a/pkgs/development/python-modules/zope-schema/default.nix
+++ b/pkgs/development/python-modules/zope-schema/default.nix
@ -1,9 +1,9 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, zope_location
-, zope_event
-, zope_interface
+, zope-location
+, zope-event
+, zope-interface
 , zope-testing
 }:

@ -16,10 +16,10 @@ buildPythonPackage rec {
    hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k=";
  };

-  propagatedBuildInputs = [ zope_location zope_event zope_interface zope-testing ];
+  propagatedBuildInputs = [ zope-location zope-event zope-interface zope-testing ];

  # ImportError: No module named 'zope.event'
-  # even though zope_event has been included.
+  # even though zope-event has been included.
  # Package seems to work fine.
  doCheck = false;

--- a/pkgs/development/python-modules/zope-size/default.nix
+++ b/pkgs/development/python-modules/zope-size/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , zope-i18nmessageid
-, zope_interface
+, zope-interface
 }:

 buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
    hash = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk=";
  };

-  propagatedBuildInputs = [ zope-i18nmessageid zope_interface ];
+  propagatedBuildInputs = [ zope-i18nmessageid zope-interface ];

  meta = with lib; {
    homepage = "https://github.com/zopefoundation/zope.size";
--- a/pkgs/development/python-modules/zope-testbrowser/default.nix
+++ b/pkgs/development/python-modules/zope-testbrowser/default.nix
@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
-, zope_interface
-, zope_schema
+, zope-interface
+, zope-schema
 , zope-cachedescriptors
 , pytz
 , webtest
@ -13,7 +13,7 @@
 , six
 , mock
 , zope-testing
-, zope_testrunner
+, zope-testrunner
 , python
 }:

@ -37,8 +37,8 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    setuptools
-    zope_interface
-    zope_schema
+    zope-interface
+    zope-schema
    zope-cachedescriptors
    pytz
    webtest
@ -51,7 +51,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    mock
    zope-testing
-    zope_testrunner
+    zope-testrunner
  ];

  checkPhase = ''
--- a/pkgs/development/python-modules/zope-testrunner/default.nix
+++ b/pkgs/development/python-modules/zope-testrunner/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, zope_interface
+, zope-interface
 , zope-exceptions
 , zope-testing
 , six
@ -17,7 +17,7 @@ buildPythonPackage rec {
    hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q=";
  };

-  propagatedBuildInputs = [ zope_interface zope-exceptions zope-testing six ];
+  propagatedBuildInputs = [ zope-interface zope-exceptions zope-testing six ];

  doCheck = false; # custom test modifies sys.path

--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@ -9,7 +9,7 @@
 , twisted
 , jinja2
 , msgpack
-, zope_interface
+, zope-interface
 , sqlalchemy
 , alembic
 , python-dateutil
@ -85,7 +85,7 @@ let
      twisted
      jinja2
      msgpack
-      zope_interface
+      zope-interface
      sqlalchemy
      alembic
      python-dateutil
--- a/pkgs/servers/baserow/default.nix
+++ b/pkgs/servers/baserow/default.nix
@ -122,7 +122,7 @@ with python.pkgs; buildPythonApplication rec {
    pytest-django
    pytest-unordered
    responses
-    zope_interface
+    zope-interface
  ];

  fixupPhase = ''
--- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    mailman
    requests
-    zope_interface
+    zope-interface
  ];

  nativeCheckInputs = [
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
    appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future
    html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark
    service-identity simplejson sphinx-rtd-theme testtools treq twisted zfec
-    zope_interface
+    zope-interface
  ] ++ twisted.optional-dependencies.tls
    ++ twisted.optional-dependencies.conch;

--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -494,12 +494,20 @@ mapAliases ({
  zope_component = zope-component; # added 2023-07-28
  zope_configuration = zope-configuration; # added 2023-11-12
  zope_contenttype = zope-contenttype; # added 2023-10-11
+  zope_copy = zope-copy; # added 2024-01-06
  zope_deprecation = zope-deprecation; # added 2023-10-07
  zope_dottedname = zope-dottedname; # added 2023-11-12
+  zope_event = zope-event; # added 2024-01-06
  zope_exceptions = zope-exceptions; # added 2023-10-11
+  zope_filerepresentation = zope-filerepresentation; # added 2024-01-06
  zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
+  zope_interface = zope-interface; # added 2024-01-06
  zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
+  zope_location = zope-location; # added 2024-01-06
  zope_proxy = zope-proxy; # added 2023-10-07
+  zope_schema = zope-schema; # added 2024-01-06
+  zope_size = zope-size; # added 2024-01-06
  zope_testing = zope-testing; # added 2023-11-12
+  zope_testrunner = zope-testrunner; # added 2024-01-06
  zxing_cpp = zxing-cpp; # added 2023-11-05
 })
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -16439,7 +16439,7 @@ self: super: with self; {

  zope-contenttype = callPackage ../development/python-modules/zope-contenttype { };

-  zope_copy = callPackage ../development/python-modules/zope_copy { };
+  zope-copy = callPackage ../development/python-modules/zope-copy { };

  zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { };

@ -16447,33 +16447,33 @@ self: super: with self; {

  zope-dottedname = callPackage ../development/python-modules/zope-dottedname { };

-  zope_event = callPackage ../development/python-modules/zope_event { };
+  zope-event = callPackage ../development/python-modules/zope-event { };

  zope-exceptions = callPackage ../development/python-modules/zope-exceptions { };

-  zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { };
+  zope-filerepresentation = callPackage ../development/python-modules/zope-filerepresentation { };

  zope-hookable = callPackage ../development/python-modules/zope-hookable { };

  zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { };

-  zope_interface = callPackage ../development/python-modules/zope_interface { };
+  zope-interface = callPackage ../development/python-modules/zope-interface { };

  zope-lifecycleevent = callPackage ../development/python-modules/zope-lifecycleevent { };

-  zope_location = callPackage ../development/python-modules/zope_location { };
+  zope-location = callPackage ../development/python-modules/zope-location { };

  zope-proxy = callPackage ../development/python-modules/zope-proxy { };

-  zope_schema = callPackage ../development/python-modules/zope_schema { };
+  zope-schema = callPackage ../development/python-modules/zope-schema { };

-  zope_size = callPackage ../development/python-modules/zope_size { };
+  zope-size = callPackage ../development/python-modules/zope-size { };

  zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { };

  zope-testing = callPackage ../development/python-modules/zope-testing { };

-  zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
+  zope-testrunner = callPackage ../development/python-modules/zope-testrunner { };

  zopfli = callPackage ../development/python-modules/zopfli {
    inherit (pkgs) zopfli;