diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index e8b4b2e011a8..11ce178e6906 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , jaraco-functools -, jaraco_text +, jaraco-text , more-itertools , portend , pypytools @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - jaraco_text + jaraco-text portend pypytools pytest-mock diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 99525060c51a..06eb74c19228 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, six +, jaraco_logging +, jaraco-text +, jaraco_stream +, pytz +, jaraco_itertools +, setuptools-scm +, jaraco_collections +, importlib-metadata }: buildPythonPackage rec { @@ -21,7 +31,7 @@ buildPythonPackage rec { six importlib-metadata jaraco_logging - jaraco_text + jaraco-text jaraco_stream pytz jaraco_itertools diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix index 6e036379b5ce..285d9382235d 100644 --- a/pkgs/development/python-modules/jaraco-email/default.nix +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -6,7 +6,7 @@ , fetchpatch , setuptools , setuptools-scm -, jaraco_text +, jaraco-text , jaraco_collections , keyring , pytestCheckHook @@ -48,7 +48,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ - jaraco_text + jaraco-text jaraco_collections keyring ]; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index 84dec6382034..ec5c1c64dd0b 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -11,7 +11,7 @@ , keyring , requests , feedparser -, jaraco_text +, jaraco-text , jaraco_logging , jaraco-email , jaraco-functools @@ -58,7 +58,7 @@ buildPythonPackage rec { keyring requests feedparser - jaraco_text + jaraco-text jaraco_logging jaraco-email jaraco-functools diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix similarity index 93% rename from pkgs/development/python-modules/jaraco_text/default.nix rename to pkgs/development/python-modules/jaraco-text/default.nix index 76762f12a6de..eacbf2cbfd96 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco-text/default.nix @@ -13,14 +13,15 @@ }: buildPythonPackage rec { - pname = "jaraco.text"; + pname = "jaraco-text"; version = "3.11.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "jaraco.text"; + inherit version; hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; }; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 05cae411dc0f..27bff341b56e 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,7 +4,7 @@ , setuptools , setuptools-scm , jaraco-classes -, jaraco_text +, jaraco-text }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jaraco-classes - jaraco_text + jaraco-text ]; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4dd1cb35d35c..0b72877f05e4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -157,6 +157,7 @@ mapAliases ({ itanium_demangler = itanium-demangler; # added 2022-10-17 jaraco_classes = jaraco-classes; # 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 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 0a44fe3ac75c..a1b8fb5301f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5225,7 +5225,7 @@ self: super: with self; { jaraco-test = callPackage ../development/python-modules/jaraco-test { }; - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + jaraco-text = callPackage ../development/python-modules/jaraco-text { }; jarowinkler = callPackage ../development/python-modules/jarowinkler { };