diff options
| author | Ivan Shapovalov | 2022-10-18 12:56:15 +0300 |
|---|---|---|
| committer | Ivan Shapovalov | 2022-10-18 12:56:40 +0300 |
| commit | 98d086661bebd0f3b12297a785ec0d02a1c13027 (patch) | |
| tree | 074456c0059127e29955ec2c080243abe8c2e8b9 | |
| parent | 48bae4cf5000dd03a9bdd6013ee3ff0820fcd497 (diff) | |
| download | aur-98d086661bebd0f3b12297a785ec0d02a1c13027.tar.gz | |
Bump to 1.69.0, backport patch to relax poetry-core requirements
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-Allow-poetry-core-1.3.2.patch | 35 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 42 insertions, 3 deletions
@@ -1,6 +1,6 @@ pkgbase = matrix-synapse-git pkgdesc = Matrix reference homeserver - pkgver = 1.68.0.r1.g9bd442e202 + pkgver = 1.69.0.r0.g6b097a3e17 pkgrel = 1 url = https://github.com/matrix-org/synapse install = synapse.install @@ -78,6 +78,7 @@ pkgbase = matrix-synapse-git source = sysusers-synapse.conf source = tmpfiles-synapse.conf source = override-hardened.conf + source = 0001-Allow-poetry-core-1.3.2.patch md5sums = SKIP md5sums = 2ef84c75b422b701d60abb0f07dfa7cb md5sums = 86f5af69a6123d913c97acc6e1738aa1 @@ -86,5 +87,6 @@ pkgbase = matrix-synapse-git md5sums = ecd9f66fb57fe1a2e1e2df07a460a35b md5sums = e961c9ecad84a70345a57a7e9e6d5b09 md5sums = e93ce7c015b3617f71c0fe2a4879f0e5 + md5sums = 29a91903e0601676fe2d1488ed98afe3 pkgname = matrix-synapse-git diff --git a/0001-Allow-poetry-core-1.3.2.patch b/0001-Allow-poetry-core-1.3.2.patch new file mode 100644 index 000000000000..ab2099500207 --- /dev/null +++ b/0001-Allow-poetry-core-1.3.2.patch @@ -0,0 +1,35 @@ +From 0861226554e3e556a1fdc54033e6bdd03bc4bd2e Mon Sep 17 00:00:00 2001 +From: Ivan Shapovalov <intelfx@intelfx.name> +Date: Tue, 18 Oct 2022 10:57:59 +0300 +Subject: [PATCH] Allow poetry-core 1.3.2 + +Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name> +--- + changelog.d/14217.misc | 1 + + pyproject.toml | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 changelog.d/14217.misc + +diff --git a/changelog.d/14217.misc b/changelog.d/14217.misc +new file mode 100644 +index 0000000000..625df66637 +--- /dev/null ++++ b/changelog.d/14217.misc +@@ -0,0 +1 @@ ++Update dependency requirements to allow building with poetry-core 1.3.2. +diff --git a/pyproject.toml b/pyproject.toml +index 78ff799e8e..7fbbc08915 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -312,7 +312,7 @@ towncrier = ">=18.6.0rc1" + # system changes. + # We are happy to raise these upper bounds upon request, + # provided we check that it's safe to do so (i.e. that CI passes). +-requires = ["poetry-core>=1.0.0,<=1.3.1", "setuptools_rust>=1.3,<=1.5.2"] ++requires = ["poetry-core>=1.0.0,<=1.3.2", "setuptools_rust>=1.3,<=1.5.2"] + build-backend = "poetry.core.masonry.api" + + +-- +2.38.0 + @@ -2,7 +2,7 @@ # Contributor: Johannes Löthberg <johannes@kyriasis.com> pkgname=matrix-synapse-git -pkgver=1.68.0.r1.g9bd442e202 +pkgver=1.69.0.r0.g6b097a3e17 pkgrel=1 pkgdesc="Matrix reference homeserver" @@ -88,6 +88,7 @@ source=( 'sysusers-synapse.conf' 'tmpfiles-synapse.conf' 'override-hardened.conf' + '0001-Allow-poetry-core-1.3.2.patch' ) md5sums=('SKIP' @@ -97,7 +98,8 @@ md5sums=('SKIP' 'ea198d6265d626af4a4c143bf3df9a66' 'ecd9f66fb57fe1a2e1e2df07a460a35b' 'e961c9ecad84a70345a57a7e9e6d5b09' - 'e93ce7c015b3617f71c0fe2a4879f0e5') + 'e93ce7c015b3617f71c0fe2a4879f0e5' + '29a91903e0601676fe2d1488ed98afe3') backup=('etc/synapse/log_config.yaml') install=synapse.install |