diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/matrix.scm | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
| download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz | |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/matrix.scm')
| -rw-r--r-- | gnu/packages/matrix.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 83a0d478af..6a6cc628ca 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -61,13 +61,13 @@ an LDAP server.") (define-public synapse (package (name "synapse") - (version "1.20.1") + (version "1.22.1") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "1sf36vwvy2f9jy6dldq6gqfmh60384i5j64s7yc131b4dp0n7lcw")))) + "1pbxdqpfa7wzdz61p6x58x7841vng1g65qayxgcw73bn1shl50jb")))) (build-system python-build-system) ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs @@ -109,6 +109,7 @@ an LDAP server.") ("python-txacme" ,python-txacme) ("python-pysaml2" ,python-pysaml2) ("python-lxml" ,python-lxml) + ("python-packaging" ,python-packaging) ;; sentry-sdk, jaeger-client, and opentracing could be included, but ;; all are monitoring aids and not essential. ("python-pyjwt" ,python-pyjwt))) |