Merge pull request #279227 from Stunkymonkey/zc-lockfile-normalize

python311Packages.zc-lockfile: rename from zc_lockfile

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
   ];
 

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

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

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=";
   };
 

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
   ];
 

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 {

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

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 { };