From 78555d7540db828a8bbcd708263b6439470a9abe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Dec 2022 16:26:57 +0100 Subject: [PATCH 1/2] matrix-synapse: Use improved user search by propagating pyicu, bindings to libicu, that help to deal with international display names. --- pkgs/servers/matrix-synapse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 36a967220602..6d4b18ae8772 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -65,6 +65,7 @@ buildPythonApplication rec { psycopg2 pyasn1 pydantic + PyICU pyjwt pymacaroons pynacl From bbbb7a79cd05f8cfe483616f1edeb6679ae94e72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Dec 2022 16:30:58 +0100 Subject: [PATCH 2/2] python3Packges.pyicu: rename from PyICU --- pkgs/applications/misc/gramps/default.nix | 2 +- pkgs/development/python-modules/agate/default.nix | 4 ++-- pkgs/development/python-modules/natsort/default.nix | 4 ++-- pkgs/development/python-modules/normality/default.nix | 4 ++-- pkgs/development/python-modules/pyicu/default.nix | 8 +++++--- pkgs/development/python-modules/slob/default.nix | 4 ++-- pkgs/servers/matrix-synapse/default.nix | 2 +- pkgs/servers/nominatim/default.nix | 2 +- pkgs/tools/misc/xdxf2slob/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7365d297e3b8..9424ceeee51f 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { sha256 = "00358nzyw686ypqv45imc5k9frcqnhla0hpx9ynna3iy6iz5006x"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; + pythonPath = with pythonPackages; [ bsddb3 pyicu pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 29f580636480..e2b45293dab0 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -9,7 +9,7 @@ , lxml , nose , parsedatetime -, PyICU +, pyicu , python-slugify , pytimeparse , pythonOlder @@ -46,7 +46,7 @@ buildPythonPackage rec { glibcLocales lxml nose - PyICU + pyicu pytz ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 065367e36dd6..c6e6a2795373 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -4,7 +4,7 @@ , fetchPypi , glibcLocales , hypothesis -, PyICU +, pyicu , pytest-mock , pytestCheckHook , pythonOlder @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastnumbers - PyICU + pyicu ]; checkInputs = [ diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index a91489f1aded..2b3f5fd4021f 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -4,7 +4,7 @@ , text-unidecode , chardet , banal -, PyICU +, pyicu , pytestCheckHook }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { text-unidecode chardet banal - PyICU + pyicu ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 54c757c93915..5e34624b5401 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -7,12 +7,14 @@ }: buildPythonPackage rec { - pname = "PyICU"; + pname = "pyicu"; version = "2.10.2"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; + pname = "PyICU"; + inherit version; + hash = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 72af69e3e7c2..363bd0ab62d7 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy3k -, PyICU +, pyicu , python }: @@ -18,7 +18,7 @@ buildPythonPackage { sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh"; }; - propagatedBuildInputs = [ PyICU ]; + propagatedBuildInputs = [ pyicu ]; checkPhase = '' ${python.interpreter} -m unittest slob diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 6d4b18ae8772..c94700e19032 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { psycopg2 pyasn1 pydantic - PyICU + pyicu pyjwt pymacaroons pynacl diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 4b7f9e3e2577..3994177e0847 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { psycopg2 psutil jinja2 - PyICU + pyicu datrie ]; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 4a89db07c45c..a24f9196efb9 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication { sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; }; - propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ]; + propagatedBuildInputs = [ python3Packages.pyicu python3Packages.slob ]; meta = with lib; { description = "Tool to convert XDXF dictionary files to slob format"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8223de074b81..75f5cf537a20 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -148,6 +148,7 @@ mapAliases ({ pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 + PyICU = pyicu; # Added 2022-12-22 pyjson5 = json5; # added 2022-08-28 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ca17accf532..0f55887292b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8013,7 +8013,7 @@ self: super: with self; { pyicloud = callPackage ../development/python-modules/pyicloud { }; - PyICU = callPackage ../development/python-modules/pyicu { }; + pyicu = callPackage ../development/python-modules/pyicu { }; pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { inherit (pkgs) ssdeep;