diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 8a61e6606611..51c8b62c9716 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -19,7 +19,7 @@ , routes , setuptools-scm , simplejson -, zc_lockfile +, zc-lockfile }: buildPythonPackage rec { @@ -52,7 +52,7 @@ buildPythonPackage rec { cheroot portend more-itertools - zc_lockfile + zc-lockfile jaraco-collections ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 9b6eb2dcbe25..add726dc175d 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -47,7 +47,7 @@ , tqdm , typing-extensions , voluptuous -, zc_lockfile +, zc-lockfile , enableGoogle ? false , enableAWS ? false , enableAzure ? false @@ -119,7 +119,7 @@ buildPythonPackage rec { tqdm typing-extensions voluptuous - zc_lockfile + zc-lockfile ] ++ lib.optionals enableGoogle passthru.optional-dependencies.gs ++ lib.optionals enableAWS passthru.optional-dependencies.s3 diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 2a965000d4f0..91094c81ab41 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -7,7 +7,7 @@ , pytest , setuptools-scm , toml -, zc_lockfile +, zc-lockfile }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests psutil - zc_lockfile + zc-lockfile ]; # no tests in PyPI tarball diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix similarity index 86% rename from pkgs/development/python-modules/zc_lockfile/default.nix rename to pkgs/development/python-modules/zc-lockfile/default.nix index d8be54666a0d..5104a221e1e8 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "zc.lockfile"; + pname = "zc-lockfile"; version = "3.0"; src = fetchPypi { - inherit pname version; + pname = "zc.lockfile"; + inherit version; hash = "sha256-5Y/9ndYsbUMuhoK/oZbJDKw+XB4/JNrjuJ1ggihV14g="; }; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 5389eec5f53f..4e2975639564 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -9,7 +9,7 @@ , zodbpickle , zconfig , persistent -, zc_lockfile +, zc-lockfile , btrees , manuel }: @@ -35,7 +35,7 @@ buildPythonPackage rec { zodbpickle zconfig persistent - zc_lockfile + zc-lockfile btrees ]; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 1bbf9c59021d..5601ae2f7d0f 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -43,7 +43,7 @@ let sgmllib3k six tempora - zc_lockfile + zc-lockfile ]); path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2bbbaedc9458..1fee4978610b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -512,8 +512,9 @@ mapAliases ({ Yapsy = yapsy; # added 2023-02-19 z3 = z3-solver; # added 2023-12-03 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 - zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; + zc-buildout221 = zc-buildout; # added 2021-07-21 + zc_lockfile = zc-lockfile; # added 2024-01-06 zipstream-new = throw "zipstream-new has been removed, because it was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07b73a71e6aa..10046fa26d7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16423,7 +16423,7 @@ self: super: with self; { zc-buildout = callPackage ../development/python-modules/buildout { }; - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + zc-lockfile = callPackage ../development/python-modules/zc-lockfile { }; zcbor = callPackage ../development/python-modules/zcbor { };