diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 3a5b4c09f164..be7eb979928d 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { click flask flask-babel - jaraco_functools + jaraco-functools jinja2 markdown2 ply diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index cd6cabbe5791..e8b4b2e011a8 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, jaraco_functools +, jaraco-functools , jaraco_text , more-itertools , portend @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_functools + jaraco-functools more-itertools six ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix similarity index 89% rename from pkgs/development/python-modules/jaraco_functools/default.nix rename to pkgs/development/python-modules/jaraco-functools/default.nix index c0a373c8b686..9cd5e9988f66 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "jaraco.functools"; + pname = "jaraco-functools"; version = "3.6.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.functools"; + inherit version; hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; }; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index b56f5e9ac30b..84dec6382034 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -14,7 +14,7 @@ , jaraco_text , jaraco_logging , jaraco-email -, jaraco_functools +, jaraco-functools , jaraco_collections , path , python-dateutil @@ -61,7 +61,7 @@ buildPythonPackage rec { jaraco_text jaraco_logging jaraco-email - jaraco_functools + jaraco-functools jaraco_collections path python-dateutil diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index fa4efeb53afc..8db49ddcd3e0 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -5,7 +5,7 @@ , setuptools , setuptools-scm , toml -, jaraco_functools +, jaraco-functools , jaraco-context , more-itertools , jaraco_collections @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ toml - jaraco_functools + jaraco-functools jaraco-context more-itertools jaraco_collections diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 38febd83f49b..76762f12a6de 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -4,7 +4,7 @@ , pythonOlder , autocommand , importlib-resources -, jaraco_functools +, jaraco-functools , jaraco-context , inflect , pathlib2 @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autocommand jaraco-context - jaraco_functools + jaraco-functools inflect ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index bc25094c3d7f..9c82820f8416 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -23,7 +23,7 @@ , html5lib , importlib-metadata , intbitset -, jaraco_functools +, jaraco-functools , javaproperties , jinja2 , jsonstreams @@ -94,7 +94,7 @@ buildPythonPackage rec { html5lib importlib-metadata intbitset - jaraco_functools + jaraco-functools javaproperties jinja2 jsonstreams diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 1a63403f6a2d..128af5bc0687 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -8,7 +8,7 @@ # runtime , pytz -, jaraco_functools +, jaraco-functools # tests , freezegun @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_functools + jaraco-functools pytz ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4ccb830c46de..4dd1cb35d35c 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_functools = jaraco-functools; # 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 ddfe4e81eb6d..0a44fe3ac75c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5213,7 +5213,7 @@ self: super: with self; { jaraco-context = callPackage ../development/python-modules/jaraco-context { }; - jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; + jaraco-functools = callPackage ../development/python-modules/jaraco-functools { }; jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { };