Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

matrix-synapse: Use improved user search #207283

Merged
merged 2 commits into from
Dec 29, 2022
Merged

matrix-synapse: Use improved user search #207283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78555d7
matrix-synapse: Use improved user search
mweinelt Dec 22, 2022
bbbb7a7
python3Packges.pyicu: rename from PyICU
mweinelt Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/misc/gramps/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/agate/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
, lxml
, nose
, parsedatetime
, PyICU
, pyicu
, python-slugify
, pytimeparse
, pythonOlder
Expand Down Expand Up @@ -46,7 +46,7 @@ buildPythonPackage rec {
glibcLocales
lxml
nose
PyICU
pyicu
pytz
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/natsort/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, fetchPypi
, glibcLocales
, hypothesis
, PyICU
, pyicu
, pytest-mock
, pytestCheckHook
, pythonOlder
Expand All @@ -24,7 +24,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [
fastnumbers
PyICU
pyicu
];

checkInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/normality/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, text-unidecode
, chardet
, banal
, PyICU
, pyicu
, pytestCheckHook
}:
buildPythonPackage rec {
Expand All @@ -22,7 +22,7 @@ buildPythonPackage rec {
text-unidecode
chardet
banal
PyICU
pyicu
];

checkInputs = [
Expand Down
8 changes: 5 additions & 3 deletions pkgs/development/python-modules/pyicu/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
}:

buildPythonPackage rec {
pname = "PyICU";
pname = "pyicu";
mweinelt marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/slob/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, PyICU
, pyicu
, python
}:

Expand All @@ -18,7 +18,7 @@ buildPythonPackage {
sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh";
};

propagatedBuildInputs = [ PyICU ];
propagatedBuildInputs = [ pyicu ];

checkPhase = ''
${python.interpreter} -m unittest slob
Expand Down
1 change: 1 addition & 0 deletions pkgs/servers/matrix-synapse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ buildPythonApplication rec {
psycopg2
pyasn1
pydantic
pyicu
pyjwt
pymacaroons
pynacl
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/nominatim/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
psycopg2
psutil
jinja2
PyICU
pyicu
datrie
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/misc/xdxf2slob/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down