diff options
author | Felix Buehler <account@buehler.rocks> | 2024-01-06 19:05:46 +0100 |
---|---|---|
committer | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-01-06 21:04:16 +0100 |
commit | 63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1 (patch) | |
tree | 7ed4913679f5dae27e0989cbc70020d8acc98a2d /pkgs | |
parent | 29f6174cd069884b95f755b387314e57196bb3fc (diff) | |
download | nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.tar nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.tar.gz nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.tar.bz2 nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.tar.lz nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.tar.xz nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.tar.zst nixlib-63f5f08857fcdda4bb786295fb9cc7d5c9abf8c1.zip |
python311Packages.zope-*: rename from zope_*
Diffstat (limited to 'pkgs')
55 files changed, 140 insertions, 133 deletions
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index dee7cde6fd3f..54c378a08625 100644 --- 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 diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7cb012770695..0e40c19fef41 100644 --- 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 diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 378f7e29dd99..b2c0843d3100 100644 --- 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 diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 363763efd60e..429082e442b8 100644 --- 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 */ ]; }; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 930ede2cd120..232a7f62f44f 100644 --- 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 = '' diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 97b7d79040d9..621a0f991856 100644 --- 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 ]; diff --git a/pkgs/development/python-modules/datetime/default.nix b/pkgs/development/python-modules/datetime/default.nix index 98b33ecf7fd3..332babd307de 100644 --- 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 ]; }; } - diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 57c73ec20ba0..006e096b44d1 100644 --- 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; diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 1ddae0409fbb..2362aa747c50 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index c4b98c649084..81d2d4840cf1 100644 --- 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; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 52e058df47b1..0863a52d003d 100644 --- 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 ]; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index 67d6d0000140..b4a5e584ed52 100644 --- 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; { diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index c19746970a71..dd9d154cba63 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index bc369705e265..79e60a5f9880 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index e0b03e693194..ef4eda0de9e5 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 633e7aa967a2..0095995ed6c1 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index efe366123bdf..d2a5e6165760 100644 --- 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 ]; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index cef52b754ad6..836f3449754a 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/pyramid-chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix index 81e3d151e91e..ab4f230afbdd 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a6ab240954f3..d3f8d03debed 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index b71ae929d17f..8abfd28cb15e 100644 --- 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" ]; diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index 8a394a2d1313..a108e7f0b625 100644 --- 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; diff --git a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix index 2950f34f386b..879a18e3d4a7 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/repoze-who/default.nix b/pkgs/development/python-modules/repoze-who/default.nix index 4f73fa89f31f..07d6de4e67e6 100644 --- 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 diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 88ecd6f2be8a..72a3957723ea 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index acb0488e41cd..4587bc494988 100644 --- 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 ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 801adb77da37..a8047e62c25d 100644 --- 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 = '' diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index eeb53a809255..ec8ffb3901fb 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 03da40472d5b..e9b1fdf24b1c 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index b83525cb1517..25b0fb7ba9e6 100644 --- 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 [] diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index d02848c6b167..c8e852135764 100644 --- 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; { diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 4e1ed3ce994e..30b00e9ea7c6 100644 --- 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 = '' diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 44f01efa8d2e..eaa5bf84ea69 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index e5a30f1e7d68..7a21ad79e29b 100644 --- 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 diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix index c9d88d056eea..d979ff9e78f5 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix index 4be3b5600e1e..d5571b6417ef 100644 --- 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" ]; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index cca21b1f8bfc..367131b400ec 100644 --- 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 [] diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index 93cfc749c923..93cfc749c923 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 8146b2b2704b..ae38402c9736 100644 --- 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; diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix index b119099f9b60..960b4a9e881e 100644 --- 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 diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index fa8f4c1a30ee..3331be330db3 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 2a8bd1d7854b..f834301a464e 100644 --- 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. diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index fc6b0005ffac..1b94583ce9d8 100644 --- 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; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope-location/default.nix index d0f79775d12b..032e0c7be2b7 100644 --- 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 ''; diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index d6a93b9d3eb5..3c2a6d4be9f8 100644 --- 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; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index 329ab7455c5c..6fde974b6205 100644 --- 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; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index 836d0fa66f82..32a08b5add6f 100644 --- 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"; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 290066f3e157..732c367de577 100644 --- 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 = '' diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index f3a762e3a2c5..742adb082fad 100644 --- 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 diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 5b26a284a0bc..d57e11fb07ab 100644 --- 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 diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index dfb5ea5bf91f..ea46b4bfb8f2 100644 --- 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 = '' diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index ba3fdbacdb72..13f01c9919f0 100644 --- 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 = [ diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 620d953c88bc..3d2298e8b70e 100644 --- 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; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 71a4993e5fa7..55637f24f480 100644 --- 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 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae1cf7d55b3e..6036bfd2fd3d 100644 --- 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; |