cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #207283 from mweinelt/synapse-pyicu

Browse source 
matrix-synapse: Use improved user search
This commit is contained in:
Maximilian Bosch 2022-12-29 21:42:13 +01:00 committed by GitHub
commit 891ed931cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/gramps/default.nix
View file

@ -29,7 +29,7 @@ in buildPythonApplication rec {
sha256 = "00358nzyw686ypqv45imc5k9frcqnhla0hpx9ynna3iy6iz5006x"; 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 # Same installPhase as in buildPythonApplication but without --old-and-unmanageble
# install flag. # install flag.

4
pkgs/development/python-modules/agate/default.nix
View file

@ -9,7 +9,7 @@
, lxml , lxml
, nose , nose
, parsedatetime , parsedatetime
, PyICU , pyicu
, python-slugify , python-slugify
, pytimeparse , pytimeparse
, pythonOlder , pythonOlder
@ -46,7 +46,7 @@ buildPythonPackage rec {
glibcLocales glibcLocales
lxml lxml
nose nose
PyICU pyicu
pytz pytz
]; ];

4
pkgs/development/python-modules/natsort/default.nix
View file

@ -4,7 +4,7 @@
, fetchPypi , fetchPypi
, glibcLocales , glibcLocales
, hypothesis , hypothesis
, PyICU , pyicu
, pytest-mock , pytest-mock
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
@ -24,7 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
fastnumbers fastnumbers
PyICU pyicu
]; ];
checkInputs = [ checkInputs = [

4
pkgs/development/python-modules/normality/default.nix
View file

@ -4,7 +4,7 @@
, text-unidecode , text-unidecode
, chardet , chardet
, banal , banal
, PyICU , pyicu
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -22,7 +22,7 @@ buildPythonPackage rec {
text-unidecode text-unidecode
chardet chardet
banal banal
PyICU pyicu
]; ];
checkInputs = [ checkInputs = [

8
pkgs/development/python-modules/pyicu/default.nix
View file

@ -7,12 +7,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyICU"; pname = "pyicu";
version = "2.10.2"; version = "2.10.2";
format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "PyICU";
sha256 = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; inherit version;
hash = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE=";
}; };
nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config

4
pkgs/development/python-modules/slob/default.nix
View file

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy3k , isPy3k
, PyICU , pyicu
, python , python
}: }:
@ -18,7 +18,7 @@ buildPythonPackage {
sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh"; sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh";
}; };
propagatedBuildInputs = [ PyICU ]; propagatedBuildInputs = [ pyicu ];
checkPhase = '' checkPhase = ''
${python.interpreter} -m unittest slob ${python.interpreter} -m unittest slob

1
pkgs/servers/matrix-synapse/default.nix
View file

@ -65,6 +65,7 @@ buildPythonApplication rec {
psycopg2 psycopg2
pyasn1 pyasn1
pydantic pydantic
pyicu
pyjwt pyjwt
pymacaroons pymacaroons
pynacl pynacl

2
pkgs/servers/nominatim/default.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
psycopg2 psycopg2
psutil psutil
jinja2 jinja2
PyICU pyicu
datrie datrie
]; ];

2
pkgs/tools/misc/xdxf2slob/default.nix
View file

@ -11,7 +11,7 @@ python3Packages.buildPythonApplication {
sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd";
}; };
propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ]; propagatedBuildInputs = [ python3Packages.pyicu python3Packages.slob ];
meta = with lib; { meta = with lib; {
description = "Tool to convert XDXF dictionary files to slob format"; description = "Tool to convert XDXF dictionary files to slob format";

1
pkgs/top-level/python-aliases.nix
View file

@ -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 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 = 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 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 pyjson5 = json5; # added 2022-08-28
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
PyLD = pyld; # added 2022-06-22 PyLD = pyld; # added 2022-06-22

2
pkgs/top-level/python-packages.nix
View file

@ -8017,7 +8017,7 @@ self: super: with self; {
pyicloud = callPackage ../development/python-modules/pyicloud { }; pyicloud = callPackage ../development/python-modules/pyicloud { };
PyICU = callPackage ../development/python-modules/pyicu { }; pyicu = callPackage ../development/python-modules/pyicu { };
pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy {
inherit (pkgs) ssdeep; inherit (pkgs) ssdeep;