rewrite: apply guix-reference formatting; cleanup some module imports

1 files changed, 55 insertions, 54 deletions

diff --git a/px/packages/matrix.scm b/px/packages/matrix.scm
index fdcb530..fcfaf6f 100644
--- a/px/packages/matrix.scm
+++ b/px/packages/matrix.scm
@@ -1,5 +1,6 @@
 (define-module (px packages matrix)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix licenses)
+                #:prefix license:)
   #:use-module (gnu packages check)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages matrix)
@@ -17,63 +18,63 @@
   (package
     (name "synapse")
     (version "1.45.1")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "matrix-synapse" version))
-              (sha256
-               (base32
-                "0dmps93cy4b2g73kxvbnsnci1vxj38m2jcaqyxrb9ind0rsik5zi"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "matrix-synapse" version))
+       (sha256
+        (base32 "0dmps93cy4b2g73kxvbnsnci1vxj38m2jcaqyxrb9ind0rsik5zi"))))
     (build-system python-build-system)
     ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
-    (propagated-inputs
-     `(("python-simplejson" ,python-simplejson) ; not attested but required
-       ;; requirements (synapse/python_dependencies.py)
-       ("python-jsonschema" ,python-jsonschema)
-       ("python-frozendict" ,python-frozendict)
-       ("python-unpaddedbase64" ,python-unpaddedbase64)
-       ("python-canonicaljson" ,python-canonicaljson)
-       ("python-signedjson" ,python-signedjson)
-       ("python-pynacl" ,python-pynacl)
-       ("python-idna" ,python-idna)
-       ("python-service-identity" ,python-service-identity)
-       ("python-twisted" ,python-twisted)
-       ("python-treq" ,python-treq)
-       ("python-pyopenssl" ,python-pyopenssl)
-       ("python-pyyaml" ,python-pyyaml)
-       ("python-pyasn1" ,python-pyasn1)
-       ("python-pyasn1-modules" ,python-pyasn1-modules)
-       ("python-daemonize" ,python-daemonize)
-       ("python-bcrypt" ,python-bcrypt)
-       ("python-pillow" ,python-pillow)
-       ("python-sortedcontainers" ,python-sortedcontainers)
-       ("python-pymacaroons" ,python-pymacaroons)
-       ("python-msgpack" ,python-msgpack)
-       ("python-phonenumbers" ,python-phonenumbers)
-       ("python-six" ,python-six)
-       ("python-prometheus-client" ,python-prometheus-client)
-       ("python-attrs" ,python-attrs)
-       ("python-netaddr" ,python-netaddr)
-       ("python-jinja2" ,python-jinja2)
-       ("python-bleach" ,python-bleach)
-       ("python-typing-extensions" ,python-typing-extensions)
-       ;; conditional requirements (synapse/python_dependencies.py)
-       ;;("python-hiredis" ,python-hiredis)
-       ("python-matrix-synapse-ldap3" ,python-matrix-synapse-ldap3)
-       ("python-psycopg2" ,python-psycopg2)
-       ("python-jinja2" ,python-jinja2)
-       ("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)))
-    (native-inputs
-     `(("python-mock" ,python-mock)
-       ("python-parameterized" ,python-parameterized)))
+    (propagated-inputs `(("python-simplejson" ,python-simplejson)
+                          ;not attested but required
+                         ;; requirements (synapse/python_dependencies.py)
+                         ("python-jsonschema" ,python-jsonschema)
+                         ("python-frozendict" ,python-frozendict)
+                         ("python-unpaddedbase64" ,python-unpaddedbase64)
+                         ("python-canonicaljson" ,python-canonicaljson)
+                         ("python-signedjson" ,python-signedjson)
+                         ("python-pynacl" ,python-pynacl)
+                         ("python-idna" ,python-idna)
+                         ("python-service-identity" ,python-service-identity)
+                         ("python-twisted" ,python-twisted)
+                         ("python-treq" ,python-treq)
+                         ("python-pyopenssl" ,python-pyopenssl)
+                         ("python-pyyaml" ,python-pyyaml)
+                         ("python-pyasn1" ,python-pyasn1)
+                         ("python-pyasn1-modules" ,python-pyasn1-modules)
+                         ("python-daemonize" ,python-daemonize)
+                         ("python-bcrypt" ,python-bcrypt)
+                         ("python-pillow" ,python-pillow)
+                         ("python-sortedcontainers" ,python-sortedcontainers)
+                         ("python-pymacaroons" ,python-pymacaroons)
+                         ("python-msgpack" ,python-msgpack)
+                         ("python-phonenumbers" ,python-phonenumbers)
+                         ("python-six" ,python-six)
+                         ("python-prometheus-client" ,python-prometheus-client)
+                         ("python-attrs" ,python-attrs)
+                         ("python-netaddr" ,python-netaddr)
+                         ("python-jinja2" ,python-jinja2)
+                         ("python-bleach" ,python-bleach)
+                         ("python-typing-extensions" ,python-typing-extensions)
+                         ;; conditional requirements (synapse/python_dependencies.py)
+                         ;; ("python-hiredis" ,python-hiredis)
+                         ("python-matrix-synapse-ldap3" ,python-matrix-synapse-ldap3)
+                         ("python-psycopg2" ,python-psycopg2)
+                         ("python-jinja2" ,python-jinja2)
+                         ("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)))
+    (native-inputs `(("python-mock" ,python-mock)
+                     ("python-parameterized" ,python-parameterized)))
     (home-page "https://github.com/matrix-org/synapse")
     (synopsis "Matrix reference homeserver")
-    (description "Synapse is a reference \"homeserver\" implementation of
+    (description
+     "Synapse is a reference \"homeserver\" implementation of
 Matrix from the core development team at matrix.org, written in
 Python/Twisted.  It is intended to showcase the concept of Matrix and let
 folks see the spec in the context of a codebase and let you run your own