diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index eda1bd94c65c..b00d249d6a39 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchPypi , importlib-resources -, jaraco_classes +, jaraco-classes , jaraco_collections , jaraco_itertools , jaraco-context @@ -57,7 +57,7 @@ buildPythonPackage rec { requests-toolbelt jaraco_collections jaraco-context - jaraco_classes + jaraco-classes jaraco-net more-itertools importlib-resources diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix similarity index 96% rename from pkgs/development/python-modules/jaraco_classes/default.nix rename to pkgs/development/python-modules/jaraco-classes/default.nix index 5fd16f1f505a..8c9b32fb11ee 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "jaraco.classes"; + pname = "jaraco-classes"; version = "3.1.1"; disabled = isPy27; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 32b2a974d3bd..05cae411dc0f 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -3,7 +3,7 @@ , fetchPypi , setuptools , setuptools-scm -, jaraco_classes +, jaraco-classes , jaraco_text }: @@ -30,7 +30,7 @@ buildPythonPackage rec { env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ - jaraco_classes + jaraco-classes jaraco_text ]; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index f0989d493d9e..c729e1da5362 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,7 +6,7 @@ , setuptools-scm , importlib-metadata , dbus-python -, jaraco_classes +, jaraco-classes , jeepney , secretstorage , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_classes + jaraco-classes ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e6cd378e4be7..4ccb830c46de 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -154,7 +154,8 @@ mapAliases ({ intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 - itanium_demangler = itanium-demangler; # added 2022-1017 + itanium_demangler = itanium-demangler; # added 2022-10-17 + jaraco_classes = jaraco-classes; # added 2023-07-14 JayDeBeApi = jaydebeapi; # added 2023-02-19 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a94ab6135041..ddfe4e81eb6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5205,7 +5205,7 @@ self: super: with self; { jaraco-abode = callPackage ../development/python-modules/jaraco-abode { }; - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + jaraco-classes = callPackage ../development/python-modules/jaraco-classes { }; jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };