diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 8c437d8cfb32..48b040565f79 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , cheroot , fetchPypi -, jaraco_collections +, jaraco-collections , more-itertools , objgraph , path @@ -53,7 +53,7 @@ buildPythonPackage rec { portend more-itertools zc_lockfile - jaraco_collections + jaraco-collections ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 06eb74c19228..cffb7ef875fd 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -9,7 +9,7 @@ , pytz , jaraco_itertools , setuptools-scm -, jaraco_collections +, jaraco-collections , importlib-metadata }: @@ -35,7 +35,7 @@ buildPythonPackage rec { jaraco_stream pytz jaraco_itertools - jaraco_collections + jaraco-collections ]; doCheck = false; diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index b00d249d6a39..3b8ff1dab687 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -6,7 +6,7 @@ , fetchPypi , importlib-resources , jaraco-classes -, jaraco_collections +, jaraco-collections , jaraco_itertools , jaraco-context , jaraco-net @@ -55,7 +55,7 @@ buildPythonPackage rec { colorlog keyring requests-toolbelt - jaraco_collections + jaraco-collections jaraco-context jaraco-classes jaraco-net diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix similarity index 91% rename from pkgs/development/python-modules/jaraco_collections/default.nix rename to pkgs/development/python-modules/jaraco-collections/default.nix index 27bff341b56e..1d8f9a8f2241 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco-collections/default.nix @@ -8,12 +8,13 @@ }: buildPythonPackage rec { - pname = "jaraco.collections"; + pname = "jaraco-collections"; version = "4.3.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.collections"; + inherit version; hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; }; diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix index 285d9382235d..b23d9504dea1 100644 --- a/pkgs/development/python-modules/jaraco-email/default.nix +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -7,7 +7,7 @@ , setuptools , setuptools-scm , jaraco-text -, jaraco_collections +, jaraco-collections , keyring , pytestCheckHook }: @@ -49,7 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jaraco-text - jaraco_collections + jaraco-collections keyring ]; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index ec5c1c64dd0b..e411e84ee146 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -15,7 +15,7 @@ , jaraco_logging , jaraco-email , jaraco-functools -, jaraco_collections +, jaraco-collections , path , python-dateutil , pathvalidate @@ -62,7 +62,7 @@ buildPythonPackage rec { jaraco_logging jaraco-email jaraco-functools - jaraco_collections + jaraco-collections path python-dateutil pathvalidate diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index 8db49ddcd3e0..cba2f375af35 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -8,7 +8,7 @@ , jaraco-functools , jaraco-context , more-itertools -, jaraco_collections +, jaraco-collections , pytestCheckHook }: @@ -35,7 +35,7 @@ buildPythonPackage rec { jaraco-functools jaraco-context more-itertools - jaraco_collections + jaraco-collections ]; nativeCheckInputs = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0b72877f05e4..101ba92c045c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -156,6 +156,7 @@ mapAliases ({ influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-10-17 jaraco_classes = jaraco-classes; # added 2023-07-14 + jaraco_collections = jaraco-collections; # added 2023-07-14 jaraco_functools = jaraco-functools; # added 2023-07-14 jaraco_text = jaraco-text; # added 2023-07-14 JayDeBeApi = jaydebeapi; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1b8fb5301f3..c087e3a9bf9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5207,7 +5207,7 @@ self: super: with self; { jaraco-classes = callPackage ../development/python-modules/jaraco-classes { }; - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + jaraco-collections = callPackage ../development/python-modules/jaraco-collections { }; jaraco-email = callPackage ../development/python-modules/jaraco-email { };