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

1 files changed, 138 insertions, 145 deletions

diff --git a/px/packages/matrix-client.scm b/px/packages/matrix-client.scm
index 90e567c..9939ace 100644
--- a/px/packages/matrix-client.scm
+++ b/px/packages/matrix-client.scm
@@ -42,96 +42,94 @@
   #:use-module (guix build-system qt)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix licenses)
+                #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
-  #:use-module (px  packages library)
+  #:use-module (px packages library)
   #:use-module (srfi srfi-1))
 
 (define-public qmtxclient
   (package
     (name "qmtxclient")
     (version "0.8.2-4")
-     (source
+    (source
      (origin
        (method url-fetch)
-       (uri (string-append
-          "https://source.pantherx.org/" name "_v" version ".tgz"))
+       (uri (string-append "https://source.pantherx.org/" name "_v" version
+                           ".tgz"))
        (sha256
-          (base32
-            "07fc46a4nqs509i8biqb6ys74sgj0rdzwpvn7kfk6xf4gv172csn"))))
+        (base32 "07fc46a4nqs509i8biqb6ys74sgj0rdzwpvn7kfk6xf4gv172csn"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))
-    (inputs
-     (list boost
-           qtbase-5
-           json-modern-cxx
-           libevent
-           libolm
-           libsodium
-           openssl
-           spdlog
-           zlib))
-    (native-inputs
-     (list pkg-config))
+    (inputs (list boost
+                  qtbase-5
+                  json-modern-cxx
+                  libevent
+                  libolm
+                  libsodium
+                  openssl
+                  spdlog
+                  zlib))
+    (native-inputs (list pkg-config))
     (home-page "https://git.pantherx.org/development/libraries/qmtxclient")
-    (synopsis "Client API library for Matrix forked from mtxclient, replacing the network layer with Qt")
-    (description "Client API library for Matrix forked from mtxclient, replacing the network layer with Qt.")
+    (synopsis
+     "Client API library for Matrix forked from mtxclient, replacing the network layer with Qt")
+    (description
+     "Client API library for Matrix forked from mtxclient, replacing the network layer with Qt.")
     (license license:expat)))
 
 (define-public matrix-client-library
   (package
     (name "matrix-client-library")
     (version "0.1.36")
-     (source
+    (source
      (origin
        (method url-fetch)
-       (uri (string-append
-          "https://source.pantherx.org/" name "_" version ".tgz"))
+       (uri (string-append "https://source.pantherx.org/" name "_" version
+                           ".tgz"))
        (sha256
-          (base32
-            "1x5788zky49cw981gvlsyxypm7vc74950p7n2bf66l4mby8cgp0q"))))
+        (base32 "1x5788zky49cw981gvlsyxypm7vc74950p7n2bf66l4mby8cgp0q"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f
-       #:phases
-        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-source
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((pulseaudio (assoc-ref inputs "pulseaudio")))
-                        (substitute* "src/voip/AudioDevices.cpp" (("pactl") (string-append pulseaudio "/bin/pactl")))
-                        (substitute* "src/voip/AudioDeviceControl.cpp" (("pacmd") (string-append pulseaudio "/bin/pacmd")))
-               #t))))))
-    (inputs
-     `(("cmark" ,cmark)
-       ("gst-plugins-base" ,gst-plugins-base)
-       ("gst-plugins-bad" ,gst-plugins-bad)   ; sdp & webrtc for voip
-       ("gst-plugins-good-qmlgl" ,gst-plugins-good-qmlgl) ; rtpmanager for voip (using good plugins with qmlgl)
-       ("json-modern-cxx" ,json-modern-cxx)
-       ("libevent" ,libevent)
-       ("libnice" ,libnice)                   ; for voip
-       ("libolm" ,libolm)
-       ("lmdb" ,lmdb)
-       ("lmdbxx" ,lmdbxx)
-       ("qmtxclient" ,qmtxclient)
-       ("openssl" ,openssl)
-       ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative-5)
-       ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols2" ,qtquickcontrols2-5)
-       ("qtsvg" ,qtsvg-5)
-       ("spdlog" ,spdlog)
-       ("zlib" ,zlib)
-       ))
-    (native-inputs
-     `(
-       ("pkg-config" ,pkg-config)
-       ))
-    (home-page "https://git.pantherx.org/development/libraries/matrix-client-library")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'patch-source
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let ((pulseaudio (assoc-ref inputs "pulseaudio")))
+                        (substitute* "src/voip/AudioDevices.cpp"
+                          (("pactl")
+                           (string-append pulseaudio "/bin/pactl")))
+                        (substitute* "src/voip/AudioDeviceControl.cpp"
+                          (("pacmd")
+                           (string-append pulseaudio "/bin/pacmd"))) #t))))))
+    (inputs `(("cmark" ,cmark)
+              ("gst-plugins-base" ,gst-plugins-base)
+              ("gst-plugins-bad" ,gst-plugins-bad) ;sdp & webrtc for voip
+              ("gst-plugins-good-qmlgl" ,gst-plugins-good-qmlgl) ;rtpmanager for voip (using good plugins with qmlgl)
+              ("json-modern-cxx" ,json-modern-cxx)
+              ("libevent" ,libevent)
+              ("libnice" ,libnice) ;for voip
+              ("libolm" ,libolm)
+              ("lmdb" ,lmdb)
+              ("lmdbxx" ,lmdbxx)
+              ("qmtxclient" ,qmtxclient)
+              ("openssl" ,openssl)
+              ("pulseaudio" ,pulseaudio)
+              ("qtbase" ,qtbase-5)
+              ("qtdeclarative" ,qtdeclarative-5)
+              ("qtmultimedia" ,qtmultimedia-5)
+              ("qtquickcontrols2" ,qtquickcontrols2-5)
+              ("qtsvg" ,qtsvg-5)
+              ("spdlog" ,spdlog)
+              ("zlib" ,zlib)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (home-page
+     "https://git.pantherx.org/development/libraries/matrix-client-library")
     (synopsis "Client library for Matrix using Qt and C++17")
-    (description "Provide a library for using the Matrix protocol that
+    (description
+     "Provide a library for using the Matrix protocol that
 feels more like a mainstream chat app and less like an IRC client.
 Many matrix features are supported, including user registration, rooms, typing
 notification, emojis, E2E encryption, and voip calls.")
@@ -141,24 +139,23 @@ notification, emojis, E2E encryption, and voip calls.")
   (package
     (inherit matrix-client-library)
     (name "matrix-client-library-with-ciba")
-  (arguments
-   `(#:configure-flags '("-DCIBA_AUTHENTICATION=ON")
-     ,@(package-arguments matrix-client-library)))
-  (inputs
-   `(("px-auth-library-cpp" ,px-auth-library-cpp)
-     ,@(package-inputs matrix-client-library)))))
+    (arguments
+     `(#:configure-flags '("-DCIBA_AUTHENTICATION=ON")
+       ,@(package-arguments matrix-client-library)))
+    (inputs `(("px-auth-library-cpp" ,px-auth-library-cpp)
+              ,@(package-inputs matrix-client-library)))))
 
 (define-public px-matrix-client-library-with-ciba
   (package
     (inherit matrix-client-library-with-ciba)
     (name "px-matrix-client-library-with-ciba")
-  (arguments
-   `(#:configure-flags '("-DCIBA_AUTHENTICATION=ON" "-DPX_ACCOUNTS_INTEGRATION=ON")
-     ,@(package-arguments matrix-client-library)))
-  (inputs
-   `(("capnproto" ,capnproto-0.9)
-     ("px-accounts-matrix-bridge" ,px-accounts-matrix-bridge)
-     ,@(package-inputs matrix-client-library-with-ciba)))))
+    (arguments
+     `(#:configure-flags '("-DCIBA_AUTHENTICATION=ON"
+                           "-DPX_ACCOUNTS_INTEGRATION=ON")
+       ,@(package-arguments matrix-client-library)))
+    (inputs `(("capnproto" ,capnproto-0.9)
+              ("px-accounts-matrix-bridge" ,px-accounts-matrix-bridge)
+              ,@(package-inputs matrix-client-library-with-ciba)))))
 
 (define-public matrix-client-gui-library
   (package
@@ -167,53 +164,50 @@ notification, emojis, E2E encryption, and voip calls.")
     (source
      (origin
        (method url-fetch)
-        (uri (string-append
-                 "https://source.pantherx.org/matrix-client_" version ".tgz"))
-        (sha256
-         (base32 "0wlknihv96v98j0j36a5q9j9qrgsg4z3mmz47ccnjmc30cyb9raw"))))
+       (uri (string-append "https://source.pantherx.org/matrix-client_"
+                           version ".tgz"))
+       (sha256
+        (base32 "0wlknihv96v98j0j36a5q9j9qrgsg4z3mmz47ccnjmc30cyb9raw"))))
     (arguments
-     `(#:tests? #f ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "MatrixClientLib.pro"
-               (("/usr") (assoc-ref outputs "out")))
-             (invoke "qmake" "MatrixClientLib.pro" ))))))
+     `(#:tests? #f ;no tests
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (substitute* "MatrixClientLib.pro"
+                        (("/usr")
+                         (assoc-ref outputs "out")))
+                      (invoke "qmake" "MatrixClientLib.pro"))))))
     (build-system qt-build-system)
-    (inputs
-     (list blurhash
-           json-modern-cxx
-           libevent
-           libolm
-           lmdb
-           lmdbxx
-           matrix-client-library-with-ciba
-           px-auth-library-cpp
-           qmtxclient
-           openssl
-           pulseaudio
-           qtbase-5
-           qtdeclarative-5
-           qtgraphicaleffects
-           qtlocation
-           qtmultimedia-5
-           qtquickcontrols-5
-           qtquickcontrols2-5
-           qtsvg-5
-           scodes
-           spdlog
-           xcb-util-wm
-           zlib
-           zxing-cpp-08978e2))
-    (propagated-inputs (list   
-           libnice                      ; for voip         
-           gst-plugins-good-qmlgl       ; rtpmanager for voip
-           gst-plugins-base
-           gst-plugins-bad              ; sdp & webrtc for voip
-          ))
-    (native-inputs
-      (list pkg-config qttools-5))
+    (inputs (list blurhash
+                  json-modern-cxx
+                  libevent
+                  libolm
+                  lmdb
+                  lmdbxx
+                  matrix-client-library-with-ciba
+                  px-auth-library-cpp
+                  qmtxclient
+                  openssl
+                  pulseaudio
+                  qtbase-5
+                  qtdeclarative-5
+                  qtgraphicaleffects
+                  qtlocation
+                  qtmultimedia-5
+                  qtquickcontrols-5
+                  qtquickcontrols2-5
+                  qtsvg-5
+                  scodes
+                  spdlog
+                  xcb-util-wm
+                  zlib
+                  zxing-cpp-08978e2))
+    (propagated-inputs (list libnice ;for voip
+                             gst-plugins-good-qmlgl ;rtpmanager for voip
+                             gst-plugins-base
+                             gst-plugins-bad ;sdp & webrtc for voip
+                             ))
+    (native-inputs (list pkg-config qttools-5))
     (home-page "")
     (synopsis "")
     (description "")
@@ -224,23 +218,24 @@ notification, emojis, E2E encryption, and voip calls.")
     (inherit matrix-client-gui-library)
     (name "matrix-client-gui")
     (arguments
-     `(#:tests? #f ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "MatrixClientApp.pro"
-               (("/usr") (assoc-ref outputs "out")))
-             (substitute* "configurations/configurations.pri"
-               (("/usr") (assoc-ref outputs "out")))
-             (invoke "qmake" "MatrixClientApp.pro" ))))))
-    (inputs 
-    `(("px-matrix-client-library-with-ciba" ,px-matrix-client-library-with-ciba)
-      ("px-auth-library-cpp" ,px-auth-library-cpp)
-      ("px-accounts-matrix-bridge" ,px-accounts-matrix-bridge)
-      ("capnproto" ,capnproto-0.9)
-      ,@(fold alist-delete (package-inputs matrix-client-gui-library)
-                            '("matrix-client-library"))))))
+     `(#:tests? #f ;no tests
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (substitute* "MatrixClientApp.pro"
+                        (("/usr")
+                         (assoc-ref outputs "out")))
+                      (substitute* "configurations/configurations.pri"
+                        (("/usr")
+                         (assoc-ref outputs "out")))
+                      (invoke "qmake" "MatrixClientApp.pro"))))))
+    (inputs `(("px-matrix-client-library-with-ciba" ,px-matrix-client-library-with-ciba)
+              ("px-auth-library-cpp" ,px-auth-library-cpp)
+              ("px-accounts-matrix-bridge" ,px-accounts-matrix-bridge)
+              ("capnproto" ,capnproto-0.9)
+              ,@(fold alist-delete
+                      (package-inputs matrix-client-gui-library)
+                      '("matrix-client-library"))))))
 
 (define-public matrix-client-call-auto-accept
   (package
@@ -250,14 +245,12 @@ notification, emojis, E2E encryption, and voip calls.")
     (source
      (origin
        (method url-fetch)
-        (uri (string-append
-                 "https://source.pantherx.org/" name "_" version ".tgz"))
-        (sha256
-         (base32 "0n8zfvpf40p0bmv41csz3gq40nfcw8xwb5nv8nad9ixxx7c08jm0"))))
+       (uri (string-append "https://source.pantherx.org/" name "_" version
+                           ".tgz"))
+       (sha256
+        (base32 "0n8zfvpf40p0bmv41csz3gq40nfcw8xwb5nv8nad9ixxx7c08jm0"))))
     (build-system qt-build-system)
     (arguments
      `(#:tests? #f))
-    (inputs
-    `(("matrix-client-gui-library" ,matrix-client-gui-library)
-      ,@(package-inputs matrix-client-gui-library)))
-     ))
+    (inputs `(("matrix-client-gui-library" ,matrix-client-gui-library)
+              ,@(package-inputs matrix-client-gui-library)))))