diff --git a/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch b/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch new file mode 100644 index 00000000000..4a5e068a828 --- /dev/null +++ b/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch @@ -0,0 +1,13 @@ +--- b/pyproject.toml ++++ a/pyproject.toml +@@ -154,9 +154,7 @@ + # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 + jsonschema = ">=3.0.0" + # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 ++frozendict = ">=1,!=2.1.2" +-# We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this +-# because frozendict has been more trouble than it's worth; we would like to move to immutabledict. +-frozendict = ">=1,!=2.1.2,<2.3.5" + # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0 + unpaddedbase64 = ">=2.1.0" + # We require 1.5.0 to work around an issue when running against the C implementation of diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index fb46570d805..9fd2a9018d9 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.77.0 +version=1.80.0 revision=1 build_style=python3-pep517 build_helper=rust @@ -24,7 +24,7 @@ license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=d84eceb807ed03e6d580990008bc82e29d20cd62bd11a8b73a559c0fb2797504 +checksum=7835d4790fb340269595fd792a6f7d6e49b004698634eca3c2453b8adc21b9f9 if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" @@ -39,7 +39,7 @@ make_dirs=" /var/log/synapse 0755 synapse synapse" pre_check() { - unzip ${make_install_target} "*.dist-info/*" + yes | unzip ${make_install_target} "*.dist-info/*" [ -d build/lib* ] && cp -r tests build/lib* }