diff options
author | ajs124 <ajs124@users.noreply.github.com> | 2021-12-17 19:51:34 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-17 19:51:34 +0000 |
commit | e6188c00f05950f673e922d9864e8955dd268f89 (patch) | |
tree | 8590b858f4797851dcc6c450f92dcc5d1a6dc3ed /pkgs/servers/matrix-synapse | |
parent | dd2d0191a046bc79f36d3682e8532e0e729608d1 (diff) | |
parent | c0a65548471077d382ff66f8e5a56de69c94e25f (diff) |
Merge pull request #149387 from sumnerevans/matrix-synapse-1.49
matrix-synapse: 1.48.0 -> 1.49.0
Diffstat (limited to 'pkgs/servers/matrix-synapse')
3 files changed, 2 insertions, 83 deletions
diff --git a/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch b/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch deleted file mode 100644 index 2a83c5fcf6d92..0000000000000 --- a/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 36ffbb7ad2c535180cae473b470a43f9db4fbdcd Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Mon, 16 Aug 2021 13:27:28 +0200 -Subject: [PATCH 1/2] setup: add homeserver as console script - -With this change, it will be added to `$out/bin` in `nixpkgs` directly. -This became necessary since our old workaround, calling it as script, -doesn't work anymore since the shebangs were removed[1]. - -[1] https://github.com/matrix-org/synapse/pull/10415 ---- - setup.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/setup.py b/setup.py -index c47856351..27f1d842c 100755 ---- a/setup.py -+++ b/setup.py -@@ -133,6 +133,11 @@ setup( - long_description=long_description, - long_description_content_type="text/x-rst", - python_requires="~=3.6", -+ entry_points={ -+ 'console_scripts': [ -+ 'homeserver = synapse.app.homeserver:main' -+ ] -+ }, - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Topic :: Communications :: Chat", --- -2.31.1 - diff --git a/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch b/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch deleted file mode 100644 index 11dd53c9ad3ec..0000000000000 --- a/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3089758015c64cc1e6788793c4fe40a0e1783457 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Tue, 5 Oct 2021 22:33:12 +0200 -Subject: [PATCH 2/2] Expose generic worker as binary under NixOS - ---- - setup.py | 3 ++- - synapse/app/generic_worker.py | 6 +++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 27f1d842c..6383aed6f 100755 ---- a/setup.py -+++ b/setup.py -@@ -135,7 +135,8 @@ setup( - python_requires="~=3.6", - entry_points={ - 'console_scripts': [ -- 'homeserver = synapse.app.homeserver:main' -+ 'homeserver = synapse.app.homeserver:main', -+ 'worker = synapse.app.generic_worker:main' - ] - }, - classifiers=[ -diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py -index 3b7131af8..c77a6a95c 100644 ---- a/synapse/app/generic_worker.py -+++ b/synapse/app/generic_worker.py -@@ -491,6 +491,10 @@ def start(config_options): - _base.start_worker_reactor("synapse-generic-worker", config) - - --if __name__ == "__main__": -+def main(): - with LoggingContext("main"): - start(sys.argv[1:]) -+ -+ -+if __name__ == "__main__": -+ main() --- -2.31.1 - diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 37ca8d2357490..32f79ebe14cd7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,18 +11,13 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.48.0"; + version = "1.49.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G09VbfC9mZ0+shLHRNutR91URewvLW4l4lQaVrsZYaQ="; + sha256 = "sha256-vvLcRy2qt/qOgKkQpj2eHP4691OX0AW58dD3EecluZM="; }; - patches = [ - ./0001-setup-add-homeserver-as-console-script.patch - ./0002-Expose-generic-worker-as-binary-under-NixOS.patch - ]; - buildInputs = [ openssl ]; propagatedBuildInputs = [ |