summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-09-26 19:04:21 -0400
committerGitHub <noreply@github.com>2023-09-26 19:04:21 -0400
commitd0ae465b9ceb3e67d2d9eed489d92d36a7c0d30a (patch)
tree27d87cab9933c0c0e59866cb74ce723dde6b7f7a
parentMerge pull request #257471 from r-ryantm/auto-update/python310Packages.clarif... (diff)
parentmatrix-synapse: 1.92.1 -> 1.93.0 (diff)
downloadnixpkgs-d0ae465b9ceb3e67d2d9eed489d92d36a7c0d30a.tar.gz
Merge pull request #257469 from sumnerevans/matrix-synapse-1.93
matrix-synapse: 1.92.1 -> 1.93.0
-rw-r--r--pkgs/servers/matrix-synapse/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 60da7eafa379..45e9e89b3d65 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -16,20 +16,20 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.92.1";
+ version = "1.93.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
- hash = "sha256-rCxoYtdvh+Gu0O2T3uu0k2FFFFc7m09LuKJvkSky3M4=";
+ hash = "sha256-fmY5xjpbFwzrX47ijPxOUTI0w9stYVPpSV+HRF4GdlA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-yZeCENWdPv80Na1++/IQFOrhah/VHWwJDNV2dI/yTHg=";
+ hash = "sha256-9cCEfDV5X65JublgkUP6NVfMIObPawx+nXTmIG9lg5o=";
};
postPatch = ''
@@ -41,6 +41,10 @@ python3.pkgs.buildPythonApplication rec {
# be extra defensive, but we don't want to deal with updating this
sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml
sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml
+
+ # Don't force pillow to be 10.0.1 because we already have patched it, and
+ # we don't use the pillow wheels.
+ sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
'';
nativeBuildInputs = with python3.pkgs; [